From d8ed02f2cf38ecfa6aebed976281be37bd36f1fc Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 10 Nov 2026 14:56:29 -0500 Subject: [PATCH 001/101] feat: EA store with sign-in, library, native downloads, updates and launch without the EA app (#2259) * docs: research and plan for EA and Ubisoft stores * feat(ea): EA store with sign-in, library, native downloads, updates and launch without the EA app * perf(ea): fetch large archive records as parallel ranges * fix(ea): register game display names * fix(ea): license legacy EA Core games and harden the LSX endpoint * fix(ea): run legacy Origin SDK games with a stand-in Origin process * fix(ea): trust only the prepared game on LSX and stop stale library syncs * fix(ea): close LSX sessions on stop and drop clients that never hand-shake * fix(ea): require every hashed field before licensing or caching a probe * fix(ea): trust one LSX session per launch * fix(ea): serialize the library cache write with sign-out and rerun a skipped sync * fix(ea): hand off library sync requests under one lock * fix(ea): clear the sign-in before invalidating the library * fix(ea): serialize sign-out with token refresh and with the library cache * fix(ea): LSX trusts only verified peers, new launch closes old sessions, exit stops its own game * fix(ea): LSX hides profile and presence from unverified peers * fix(ea): LSX handshake has a fixed deadline and untrusted sessions yield their slot * fix(ea): LSX never registers a client after its listener was stopped * fix(ea): LSX evicts each untrusted session at most once * fix(ea): LSX admission and eviction share one lock and keep the cap * fix(ea): LSX trust promotion excludes eviction * fix(ea): LSX launch generation guards restarts and drops results after shutdown * fix(ea): LSX publishes launch state under the admission lock and tags accepts by generation * fix(ea): LSX restarts rebind its listener and promotion checks the launch generation * fix(ea): record why EA refuses a game licence in the store log * chore(ea): log owned offers and the full licence refusal * chore(ea): log the account's entitlements when no game licence is granted * chore(ea): log legacy entitlements when no game licence is granted * chore(ea): log only the refused game's own entitlements * fix(ea): skip trial launchers flagged 1 and license games whose LSX peer Android cannot name --- .gitattributes | 2 + README.md | 1 + .../main/java/com/droiddeck/launcher/App.kt | 2 + .../droiddeck/launcher/stores/CloudSaves.kt | 6 +- .../droiddeck/launcher/stores/LoginFlows.kt | 2 + .../com/droiddeck/launcher/stores/Store.kt | 3 +- .../droiddeck/launcher/stores/StoreLaunch.kt | 13 +- .../launcher/stores/StoreLaunchRequests.kt | 7 + .../droiddeck/launcher/stores/StoreSizes.kt | 2 + .../com/droiddeck/launcher/stores/ea/EaApi.kt | 224 +++++ .../droiddeck/launcher/stores/ea/EaAuth.kt | 230 +++++ .../droiddeck/launcher/stores/ea/EaBackend.kt | 131 +++ .../droiddeck/launcher/stores/ea/EaCrypto.kt | 83 ++ .../droiddeck/launcher/stores/ea/EaHttp.kt | 47 + .../launcher/stores/ea/EaInstaller.kt | 140 +++ .../droiddeck/launcher/stores/ea/EaLaunch.kt | 138 +++ .../droiddeck/launcher/stores/ea/EaLibrary.kt | 293 ++++++ .../com/droiddeck/launcher/stores/ea/EaLsx.kt | 446 +++++++++ .../launcher/stores/ea/EaManifest.kt | 134 +++ .../droiddeck/launcher/stores/ea/EaNative.kt | 57 ++ .../com/droiddeck/launcher/stores/ea/EaOoa.kt | 196 ++++ .../droiddeck/launcher/ui/EaUpdateButton.kt | 17 + .../com/droiddeck/launcher/ui/GameDetail.kt | 3 +- .../com/droiddeck/launcher/ui/LibraryPage.kt | 2 +- .../com/droiddeck/launcher/ui/StoreChips.kt | 2 + .../com/droiddeck/launcher/ui/StoresPage.kt | 1 + .../main/resources/ea/graphql/GameImages.gql | 69 ++ .../resources/ea/graphql/GetUserPlayer.gql | 49 + .../resources/ea/graphql/availableBuilds.gql | 9 + .../main/resources/ea/graphql/downloadUrl.gql | 7 + .../ea/graphql/getLegacyCatalogDefs.gql | 66 ++ .../ea/graphql/getLegacyEntitlements.gql | 33 + .../ea/graphql/getPreloadedOwnedGames.gql | 69 ++ .../resources/ea/graphql/sdkEntitlements.gql | 27 + app/src/main/rust/stores/src/ea/ffi.rs | 207 +++++ app/src/main/rust/stores/src/ea/install.rs | 850 ++++++++++++++++++ .../main/rust/stores/src/ea/install/tests.rs | 258 ++++++ app/src/main/rust/stores/src/ea/mod.rs | 4 + app/src/main/rust/stores/src/ea/net.rs | 98 ++ app/src/main/rust/stores/src/ea/zip.rs | 288 ++++++ app/src/main/rust/stores/src/lib.rs | 1 + .../droiddeck/launcher/stores/ea/EaTest.kt | 323 +++++++ docs/development/ea-store.md | 31 + docs/development/ea-ubisoft-stores.md | 245 +++++ .../usr/local/bin/droiddeck-store-launch | 346 +++++++ tools/tests/test_store_launch_ea.py | 129 +++ 46 files changed, 5284 insertions(+), 7 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaCrypto.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaHttp.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaInstaller.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaLaunch.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaLsx.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaManifest.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaNative.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/EaUpdateButton.kt create mode 100644 app/src/main/resources/ea/graphql/GameImages.gql create mode 100644 app/src/main/resources/ea/graphql/GetUserPlayer.gql create mode 100644 app/src/main/resources/ea/graphql/availableBuilds.gql create mode 100644 app/src/main/resources/ea/graphql/downloadUrl.gql create mode 100644 app/src/main/resources/ea/graphql/getLegacyCatalogDefs.gql create mode 100644 app/src/main/resources/ea/graphql/getLegacyEntitlements.gql create mode 100644 app/src/main/resources/ea/graphql/getPreloadedOwnedGames.gql create mode 100644 app/src/main/resources/ea/graphql/sdkEntitlements.gql create mode 100644 app/src/main/rust/stores/src/ea/ffi.rs create mode 100644 app/src/main/rust/stores/src/ea/install.rs create mode 100644 app/src/main/rust/stores/src/ea/install/tests.rs create mode 100644 app/src/main/rust/stores/src/ea/mod.rs create mode 100644 app/src/main/rust/stores/src/ea/net.rs create mode 100644 app/src/main/rust/stores/src/ea/zip.rs create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt create mode 100644 docs/development/ea-store.md create mode 100644 docs/development/ea-ubisoft-stores.md create mode 100644 tools/tests/test_store_launch_ea.py diff --git a/.gitattributes b/.gitattributes index 940dbb5f13..019aa1e8f9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,3 +10,5 @@ tools/mangoapp/mangoapp text eol=lf app/src/main/assets/desktop-removal/*.json text eol=lf app/src/main/assets/desktop-removal/*.txt text eol=lf *.pdf binary + +app/src/main/resources/ea/graphql/*.gql -text diff --git a/README.md b/README.md index f7ec639de3..73c18762b1 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,7 @@ DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. V - Epic Games and GOG build on [Phobos](https://github.com/phobos665)'s adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl). GOG install script registry entries are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher) (GPL-3.0) reads them. - Epic's official Linux launcher preview runs through FEX. That setup is outside Epic's listed Linux support. - Battle.net is by [@kayakyakr](https://github.com/kayakyakr). It runs Blizzard's own client in Proton (downloaded from Blizzard, not included) and shows key art from the [Battle.net Shop](https://shop.battle.net). Without Steam, its games see the pad as an Xbox 360 controller via `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. +- The EA store follows the EA app's protocols as documented by [ArmchairDevelopers](https://github.com/ArmchairDevelopers)' [Maxima](https://github.com/ArmchairDevelopers/Maxima) (GPL-3.0): sign-in, the GraphQL queries (included verbatim, since EA matches them by hash), build archives, online activation licences and the LSX game endpoint. The code is DroidDeck's own. - Battle.net installs drive Blizzard's Agent the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) does, with requests from [wowdev.wiki](https://wowdev.wiki/Agent). Read without taking code: [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader. - World of Warcraft addon imports replace an addon's folder from a temporary copy, as [WowUp](https://github.com/WowUp/WowUp) does, and read flavour folders the way [WoWDeck](https://github.com/sigboe/wowdeck) does. No code from either is used. - The World of Warcraft addon Download window searches [WoWInterface](https://www.wowinterface.com) through its MMOUI API. [CurseForge](https://www.curseforge.com/wow) opens in the user's browser, with no API and no key. diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 5ef39f6b6e..7235bf95c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -61,6 +61,8 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.xbox.XboxBackend) com.droiddeck.launcher.sync.Syncthing.init(this) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.battlenet.BattleNetBackend) + com.droiddeck.launcher.stores.ea.EaBackend.app = this + com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.ea.EaBackend) } private fun prefetchAddonPacks() { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index 48244c4895..389caee48a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -87,7 +87,7 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> "" + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -148,7 +148,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -173,7 +173,7 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { 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 4e53c5ea08..640635788d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -13,11 +13,13 @@ internal object LoginFlows { Store.EPIC -> epicFlow() Store.AMAZON -> amazonFlow() Store.GAMEJOLT -> gameJoltFlow(browserUserAgent) + Store.EA -> eaFlow(browserUserAgent) Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @Volatile var epicFlow: () -> StoreLoginActivity.Flow? = { null } @Volatile var amazonFlow: () -> StoreLoginActivity.Flow? = { null } + @Volatile var eaFlow: (String) -> StoreLoginActivity.Flow? = { null } @Volatile var gameJoltFlow: (String) -> StoreLoginActivity.Flow? = { null } private class GogFlow(private val state: String, override val userAgent: String) : StoreLoginActivity.Flow { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index b7d0fbce1c..8813675b22 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -7,7 +7,8 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { XBOX("xbox", "Xbox", "Xbox"), ITCH("itch", "Itch.io", "Itch.io"), GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"), - BATTLENET("battlenet", "Battle.net", "Battle.net"); + BATTLENET("battlenet", "Battle.net", "Battle.net"), + EA("ea", "EA", "EA"); val folder: String get() = if (this == ITCH) "itch" else shortLabel diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt index 378d7fa74b..f1a527a396 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt @@ -11,9 +11,12 @@ object StoreLaunch { const val LAUNCHER = ".droiddeck-launch.bat" const val EPIC_CODE = ".droiddeck-epic-code" const val EPIC_ARGS = ".droiddeck-epic-args" + const val EA_ENV = ".droiddeck-ea-env" + /** A sleeping stand-in that the launch hook installs; older EA SDKs require a running Origin process. */ + const val EA_ORIGIN = "C:\\Program Files (x86)\\Origin\\Origin.exe" fun writeLauncher(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { - val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC + val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA val file = File(folder, LAUNCHER) if (!needs) { file.delete(); return sidecar.copy(launcher = null) } file.writeText(launcherText(sidecar)) @@ -49,6 +52,14 @@ object StoreLaunch { lines += "del \"%~dp0$EPIC_ARGS\"" lines += "if exist \"%~dp0$EPIC_CODE\" del \"%~dp0$EPIC_CODE\"" lines += "set \"$CLIENT_VAR=\" & \"%~dp0$exe\" %$CLIENT_VAR%" + } else if (sidecar.store == Store.EA) { + lines += "if not exist \"%~dp0$EA_ENV\" goto run" + lines += "for /f \"usebackq tokens=1,* delims==\" %%a in (\"%~dp0$EA_ENV\") do set \"%%a=%%b\"" + lines += "del \"%~dp0$EA_ENV\"" + lines += ":run" + lines += "if exist \"$EA_ORIGIN\" start \"\" \"$EA_ORIGIN\"" + lines += run + lines += "taskkill /f /im Origin.exe >nul 2>&1" } else { lines += run } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index b4b9f7669a..dbfa4a80dd 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -38,6 +38,7 @@ object StoreLaunchRequests { fun stop() { com.droiddeck.launcher.stores.xbox.XboxRuntime.stop() + com.droiddeck.launcher.stores.ea.EaLsx.stop() synchronized(lock) { observer?.stopWatching() observer = null @@ -58,6 +59,12 @@ object StoreLaunchRequests { "xbox-renew" -> JSONObject().put("ok", com.droiddeck.launcher.stores.xbox.XboxRuntime.renew(app, request.optString("id"), request.optString("lease"))) "xbox-prepare" -> runCatching { com.droiddeck.launcher.stores.xbox.XboxRuntime.prepare(app, request.getString("id")) } .getOrElse { JSONObject().put("ok", false).put("reason", "Xbox account service is unavailable. Sign in again and retry.") } + "ea-prepare" -> runCatching { lastLaunched = Store.EA to request.optString("id"); com.droiddeck.launcher.stores.ea.EaLaunch.prepare(app, request) } + .getOrElse { JSONObject().put("ok", false).put("reason", "error-" + it.javaClass.simpleName) } + "ea-exited" -> { + com.droiddeck.launcher.stores.ea.EaLsx.stop(request.optString("id")) + JSONObject().put("ok", true) + } "gog-achievements" -> runCatching { com.droiddeck.launcher.stores.gog.GogComet.prepare(app, request.optString("id")) } .getOrElse { JSONObject().put("ok", false).put("ready", false).put("reason", "service-unavailable") } "epic-code" -> { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 545c981e50..65d72c6d91 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -55,6 +55,7 @@ object StoreSizes { Store.EPIC -> EpicPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.ITCH, Store.GAMEJOLT -> {} + Store.EA -> com.droiddeck.launcher.stores.ea.EaPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.GOG, Store.XBOX, Store.BATTLENET -> {} } } @@ -111,6 +112,7 @@ object StoreSizes { val bytes = AmazonApiClient.getBytes(AmazonApiClient.appendPath(spec.downloadUrl, "manifest.proto"), token) ?: return 0L AmazonManifest.parse(bytes).totalInstallSize } + Store.EA -> com.droiddeck.launcher.stores.ea.EaSizes.size(context, item) Store.GOG, Store.XBOX, Store.BATTLENET -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds.size(context, item) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt new file mode 100644 index 0000000000..185e23f424 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt @@ -0,0 +1,224 @@ +package com.droiddeck.launcher.stores.ea + +import android.net.Uri +import org.json.JSONArray +import org.json.JSONObject + +class EaApiException(val status: Int, message: String) : Exception(message) + +object EaApi { + private const val GRAPHQL = "https://service-aggregation-layer.juno.ea.com/graphql" + private const val LOCALE = "DEFAULT" + + class Player(val userId: String, val personaId: String, val displayName: String, val eaId: String) + + class OwnedProduct( + val offerId: String, + val productId: String, + val name: String, + val slug: String, + val baseSlug: String, + val gameType: String, + val downloadable: Boolean, + val trial: Boolean, + val ownership: List, + ) + + class Offer( + val offerId: String, + val contentId: String, + val displayName: String, + val displayType: String, + val downloadable: Boolean, + val executePathOverride: String, + val installCheckOverride: String, + val executeParameters: String, + val multiplayerId: String, + val masterTitleId: String, + val gameVersion: String, + val cloudSaves: String, + val locales: List, + ) + + class Images(val tall: String?, val wide: String?, val logo: String?) + + class Build(val buildId: String, val gameVersion: String, val liveDate: String) + + private val queries = HashMap() + + internal fun query(name: String): String = synchronized(queries) { + queries.getOrPut(name) { + val stream = EaApi::class.java.getResourceAsStream("/ea/graphql/$name.gql") ?: throw IllegalStateException("missing query $name") + stream.use { it.readBytes().toString(Charsets.UTF_8) } + } + } + + private fun persisted(name: String): String = + JSONObject().put("persistedQuery", JSONObject().put("version", 1).put("sha256Hash", EaCrypto.hex(EaCrypto.sha256(query(name).toByteArray())))).toString() + + internal fun call(token: String, name: String, variables: JSONObject): JSONObject { + val headers = mapOf("Authorization" to "Bearer $token", "Accept" to "application/json") + val get = Uri.parse(GRAPHQL).buildUpon() + .appendQueryParameter("extensions", persisted(name)) + .appendQueryParameter("operationName", name) + .appendQueryParameter("variables", variables.toString()) + .build().toString() + var reply = EaHttp.request(get, headers = headers) + var json = runCatching { JSONObject(reply.text) }.getOrNull() + if (!reply.ok || json == null || json.has("errors")) { + val body = JSONObject() + .put("extensions", JSONObject(persisted(name))) + .put("variables", variables) + .put("operationName", name) + .put("query", query(name)) + reply = EaHttp.request(GRAPHQL, "POST", headers + ("Content-Type" to "application/json"), body.toString().toByteArray()) + json = runCatching { JSONObject(reply.text) }.getOrNull() + } + if (reply.status == 401) throw EaApiException(401, "EA refused the session") + if (json == null) throw EaApiException(reply.status, "EA gave no answer to $name (${reply.status})") + json.optJSONArray("errors")?.optJSONObject(0)?.let { throw EaApiException(reply.status, "$name: ${it.optString("message")}") } + return json.optJSONObject("data") ?: throw EaApiException(reply.status, "$name returned no data") + } + + fun player(token: String): Player { + val me = call(token, "GetUserPlayer", JSONObject()).optJSONObject("me") ?: throw EaApiException(0, "no player") + val p = me.optJSONObject("player") + return Player( + userId = me.optString("pd"), + personaId = p?.optString("psd").orEmpty(), + displayName = p?.optString("displayName").orEmpty(), + eaId = p?.optString("uniqueName").orEmpty().ifEmpty { p?.optString("displayName").orEmpty() }, + ) + } + + internal fun parseOwned(page: JSONObject): Pair, String?> { + val owned = page.optJSONObject("me")?.optJSONObject("ownedGameProducts") ?: return emptyList() to null + val items = owned.optJSONArray("items") ?: JSONArray() + val list = (0 until items.length()).mapNotNull { items.optJSONObject(it) }.mapNotNull { o -> + val product = o.optJSONObject("product") ?: return@mapNotNull null + val base = product.optJSONObject("baseItem") + val user = product.optJSONObject("gameProductUser") + val methods = user?.optJSONArray("ownershipMethods") + OwnedProduct( + offerId = o.optString("originOfferId").ifEmpty { return@mapNotNull null }, + productId = product.optString("id"), + name = (base?.optString("title")?.takeIf { it.isNotBlank() } ?: product.optString("name")).replace("\n", " ").trim(), + slug = product.optString("gameSlug"), + baseSlug = base?.optString("baseGameSlug").orEmpty().takeIf { it != "null" }.orEmpty(), + gameType = base?.optString("gameType").orEmpty(), + downloadable = product.optBoolean("downloadable", true), + trial = product.optJSONObject("trialDetails")?.optString("trialType").orEmpty().let { it.isNotEmpty() && it != "null" }, + ownership = (0 until (methods?.length() ?: 0)).map { methods!!.optString(it) }, + ) + } + val next = owned.optString("next").takeIf { it.isNotBlank() && it != "null" } + return list to next + } + + fun owned(token: String): List { + val out = ArrayList() + var next: String? = "0" + var guard = 0 + while (next != null && guard++ < 50) { + val variables = JSONObject() + .put("isMac", false) + .put("limit", 100) + .put("next", next) + .put("type", JSONArray().put("DIGITAL_FULL_GAME").put("PACKAGED_FULL_GAME")) + .put("storefronts", JSONArray().put("EA")) + .put("platforms", JSONArray().put("PC")) + val (items, after) = parseOwned(call(token, "getPreloadedOwnedGames", variables)) + out += items + next = after?.takeIf { it != next && items.isNotEmpty() } + } + return out + } + + internal fun parseOffers(data: JSONObject): List { + val arr = data.optJSONArray("legacyOffers") ?: return emptyList() + return (0 until arr.length()).mapNotNull { arr.optJSONObject(it) }.mapNotNull { o -> + val downloads = o.optJSONArray("downloads") + val version = (0 until (downloads?.length() ?: 0)).mapNotNull { downloads!!.optJSONObject(it) } + .firstOrNull { it.optString("downloadType").equals("LIVE", true) }?.optString("gameVersion") + ?: downloads?.optJSONObject(0)?.optString("gameVersion") + val locales = o.optJSONArray("softwareLocales") + fun s(k: String) = o.optString(k).takeIf { it != "null" }.orEmpty() + Offer( + offerId = s("offerId").ifEmpty { return@mapNotNull null }, + contentId = s("contentId"), + displayName = s("displayName"), + displayType = s("displayType"), + downloadable = o.optBoolean("isDownloadable", true), + executePathOverride = s("executePathOverride"), + installCheckOverride = s("installCheckOverride"), + executeParameters = s("executeParameters"), + multiplayerId = s("multiplayerId"), + masterTitleId = s("primaryMasterTitleId"), + gameVersion = version.orEmpty().takeIf { it != "null" }.orEmpty(), + cloudSaves = s("cloudSaveConfigurationOverride"), + locales = (0 until (locales?.length() ?: 0)).map { locales!!.optString(it) }, + ) + } + } + + fun offers(token: String, ids: List): List = ids.distinct().chunked(50).flatMap { chunk -> + parseOffers(call(token, "getLegacyCatalogDefs", JSONObject().put("offerIds", JSONArray(chunk)))) + } + + private fun path(o: JSONObject?, vararg keys: String): String? { + var cur = o ?: return null + for (k in keys.dropLast(1)) cur = cur.optJSONObject(k) ?: return null + return cur.optString(keys.last()).takeIf { it.startsWith("http") } + } + + internal fun parseImages(data: JSONObject): Images { + val game = data.optJSONObject("game") + val key = game?.optJSONObject("keyArt") + val pack = game?.optJSONObject("packArt") + return Images( + tall = path(pack, "aspect9x16Image", "path") ?: path(key, "aspect9x16Image", "path"), + wide = path(key, "aspect16x9Image", "path") ?: path(key, "largestImage", "path") ?: path(pack, "aspect2x1Image", "path"), + logo = path(game, "primaryLogo", "largestImage", "path") ?: path(game, "primaryLogo", "path"), + ) + } + + fun images(token: String, slug: String): Images = + parseImages(call(token, "GameImages", JSONObject().put("gameSlug", slug).put("locale", LOCALE))) + + fun downloadUrl(token: String, offerId: String, buildId: String? = null): String { + val data = call(token, "downloadUrl", JSONObject().put("offerId", offerId).put("buildId", buildId.orEmpty())) + return data.optJSONObject("downloadUrl")?.optString("url").orEmpty().ifEmpty { throw EaApiException(0, "EA gave no download link") } + } + + fun builds(token: String, offerId: String): List { + val arr = call(token, "availableBuilds", JSONObject().put("offerId", offerId)).optJSONArray("availableBuilds") ?: return emptyList() + return (0 until arr.length()).mapNotNull { arr.optJSONObject(it) }.map { + Build(it.optString("buildId"), it.optString("gameVersion").takeIf { v -> v != "null" }.orEmpty(), it.optString("buildLiveDate")) + } + } + + fun legacyEntitlements(token: String): List { + val out = ArrayList() + var next: String? = "0" + var guard = 0 + while (next != null && guard++ < 50) { + val variables = JSONObject().put("limit", 100).put("next", next).put("storeFronts", JSONArray().put("EA")) + val page = call(token, "getLegacyEntitlements", variables).optJSONObject("me")?.optJSONObject("legacyEntitlements") ?: break + val items = page.optJSONArray("items") ?: JSONArray() + for (i in 0 until items.length()) items.optJSONObject(i)?.let(out::add) + next = page.optString("next").takeIf { it.isNotBlank() && it != "null" && it != next && items.length() > 0 } + } + return out + } + + fun entitlements(token: String, group: String): JSONArray { + val variables = JSONObject() + .put("productIds", JSONArray()) + .put("includeChildGroups", false) + .put("groupNames", JSONArray().put(group)) + .put("entitlementTag", "") + .put("pageSize", 100) + .put("pageNumber", 1) + return call(token, "sdkEntitlements", variables).optJSONObject("me")?.optJSONObject("sdkEntitlements")?.optJSONArray("entitlements") ?: JSONArray() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt new file mode 100644 index 0000000000..67fb8e655e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt @@ -0,0 +1,230 @@ +package com.droiddeck.launcher.stores.ea + +import android.content.Context +import android.net.Uri +import android.util.Log +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import org.json.JSONObject +import java.security.SecureRandom +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.TimeZone + +object EaAuth { + private const val TAG = "EaAuth" + const val CLIENT_ID = "JUNO_PC_CLIENT" + private const val CLIENT_SECRET = "4mRLtYMb6vq9qglomWEaT4ChxsXWcyqbQpuBNfMPOYOiDmYYQmjuaBsF2Zp0RyVeWkfqhE9TuGgAw7te" + const val AUTH_URL = "https://accounts.ea.com/connect/auth" + private const val TOKEN_URL = "https://accounts.ea.com/connect/token" + const val REDIRECT = "qrc:///html/login_successful.html" + private const val REFRESH_MARGIN_MS = 5 * 60 * 1000L + private val refreshLock = Any() + private val random = SecureRandom() + + private val PC_SIGN_KEYS = mapOf( + "v1" to "ISa3dpGOc8wW7Adn4auACSQmaccrOyR2".toByteArray(), + "v2" to "nt5FfJbdPzNcl2pkC3zgjO43Knvscxft".toByteArray(), + ) + + val OPAQUE_SCOPES = listOf( + "basic.commerce.cartv2", "service.atom", "dp.client.default", "signin", "social_recommendation_user", + "basic.optin.write", "basic.commerce.cartv2.write", "basic.billing", "external.social_information_ups_admin", + ) + + class Account( + val accessToken: String, + val refreshToken: String, + val expiresAt: Long, + val userId: String, + val personaId: String, + val displayName: String, + val eaId: String, + ) + + class Pending(val url: String, val verifier: String) + + internal fun fromJson(o: JSONObject): Account? { + val access = o.optString("access_token").ifEmpty { return null } + return Account( + accessToken = access, + refreshToken = o.optString("refresh_token"), + expiresAt = o.optLong("expires_at"), + userId = o.optString("user_id"), + personaId = o.optString("persona_id"), + displayName = o.optString("display_name"), + eaId = o.optString("ea_id"), + ) + } + + fun load(context: Context): Account? = StoreAccounts.read(context.applicationContext, Store.EA)?.let(::fromJson) + + private fun deviceId(context: Context): String { + val prefs = EaPrefs.get(context) + prefs.getString("device", null)?.let { return it } + val made = EaCrypto.hex(ByteArray(16).also(random::nextBytes)) + prefs.edit().putString("device", made).apply() + return made + } + + internal fun pcSign(device: String, now: Date = Date(), version: String = if (random.nextBoolean()) "v1" else "v2"): String { + val stamp = SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }.format(now) + val mid = EaCrypto.fnv1a(("DroidDeck" + device.uppercase() + "DroidDeck").toByteArray()).toString() + val json = "{\"av\":\"v1\",\"bsn\":\"None\",\"gid\":0,\"hsn\":\"None\",\"mid\":\"$mid\",\"msn\":\"${device.uppercase()}\",\"sv\":\"$version\",\"ts\":\"$stamp\"}" + val payload = EaCrypto.base64Url(json.toByteArray()) + val signature = EaCrypto.base64Url(EaCrypto.hmacSha256(PC_SIGN_KEYS.getValue(version), payload.toByteArray())) + return "$payload.$signature" + } + + internal fun authUrl( + device: String, + responseType: String, + challenge: String? = null, + accessToken: String? = null, + clientId: String = CLIENT_ID, + scopes: List = emptyList(), + tokenFormat: String? = null, + expiresIn: Int? = null, + ): String { + val b = Uri.parse(AUTH_URL).buildUpon() + .appendQueryParameter("client_id", clientId) + .appendQueryParameter("sbiod_enabled", "false") + .appendQueryParameter("response_type", responseType) + .appendQueryParameter("locale", "en_US") + .appendQueryParameter("pc_sign", pcSign(device)) + .appendQueryParameter("nonce", random.nextInt().toString()) + if (scopes.isNotEmpty()) b.appendQueryParameter("scope", scopes.joinToString(" ")) + if (challenge != null) { + b.appendQueryParameter("code_challenge_method", "S256") + b.appendQueryParameter("code_challenge", challenge) + } + if (accessToken != null) b.appendQueryParameter("access_token", accessToken) + if (tokenFormat != null) b.appendQueryParameter("token_format", tokenFormat) + if (expiresIn != null) b.appendQueryParameter("expires_in", expiresIn.toString()) + return b.build().toString() + } + + fun begin(context: Context): Pending { + val verifier = EaCrypto.base64Url(ByteArray(32).also(random::nextBytes)) + val challenge = EaCrypto.base64Url(EaCrypto.sha256(verifier.toByteArray())) + return Pending(authUrl(deviceId(context), "code", challenge = challenge), verifier) + } + + /** Pulls one parameter out of the redirect EA sends to its desktop client's local page. */ + internal fun redirectValue(location: String, name: String): String? { + val normal = location.replace("qrc:///html", "http://127.0.0.1").replace("qrc:/html", "http://127.0.0.1") + val uri = Uri.parse(normal) + uri.getQueryParameter(name)?.let { return it } + val fragment = uri.encodedFragment ?: return null + return Uri.parse("http://x/?$fragment").getQueryParameter(name) + } + + private fun tokenCall(values: List>): JSONObject { + val reply = EaHttp.request( + TOKEN_URL, "POST", + mapOf("Content-Type" to "application/x-www-form-urlencoded"), + EaHttp.form(values + listOf("client_id" to CLIENT_ID, "client_secret" to CLIENT_SECRET)).toByteArray(), + follow = false, + ) + val json = runCatching { JSONObject(reply.text) }.getOrNull() + if (!reply.ok || json == null || json.optString("access_token").isEmpty()) { + throw IllegalStateException("EA token request failed (${reply.status}): ${json?.optString("error_description")?.ifEmpty { json.optString("error") } ?: ""}") + } + return json + } + + fun exchange(context: Context, code: String, verifier: String) { + val token = tokenCall( + listOf( + "grant_type" to "authorization_code", "code" to code, "code_verifier" to verifier, + "redirect_uri" to REDIRECT, "token_format" to "JWS", + ), + ) + val access = token.getString("access_token") + val player = runCatching { EaApi.player(access) }.onFailure { Log.w(TAG, "player: ${it.message}") }.getOrNull() + val record = JSONObject() + .put("access_token", access) + .put("refresh_token", token.optString("refresh_token")) + .put("expires_at", System.currentTimeMillis() + token.optLong("expires_in", 3600) * 1000) + .put("user_id", player?.userId.orEmpty()) + .put("persona_id", player?.personaId.orEmpty()) + .put("display_name", player?.displayName.orEmpty()) + .put("ea_id", player?.eaId.orEmpty()) + StoreAccounts.write(context.applicationContext, Store.EA, record) + } + + private fun fresh(a: Account) = a.expiresAt - System.currentTimeMillis() > REFRESH_MARGIN_MS || a.refreshToken.isEmpty() + + private fun refreshLocked(context: Context, a: Account): String? { + if (a.refreshToken.isEmpty()) return null + val token = try { + tokenCall(listOf("grant_type" to "refresh_token", "refresh_token" to a.refreshToken)) + } catch (e: Exception) { + Log.w(TAG, "refresh: ${e.message}") + return null + } + val access = token.getString("access_token") + val player = if (load(context)?.userId.isNullOrEmpty()) runCatching { EaApi.player(access) }.getOrNull() else null + return access.takeIf { storeRefreshed(context, access, token.optLong("expires_in", 3600), token.optString("refresh_token"), player) } + } + + /** Writes a refreshed token into the saved sign-in, unless sign-out removed it meanwhile. */ + internal fun storeRefreshed(context: Context, access: String, expiresIn: Long, refresh: String, player: EaApi.Player? = null): Boolean = + synchronized(refreshLock) { + val app = context.applicationContext + val record = StoreAccounts.read(app, Store.EA) ?: return false + record.put("access_token", access).put("expires_at", System.currentTimeMillis() + expiresIn * 1000) + refresh.takeIf { it.isNotEmpty() }?.let { record.put("refresh_token", it) } + player?.let { record.put("user_id", it.userId).put("persona_id", it.personaId).put("display_name", it.displayName).put("ea_id", it.eaId) } + StoreAccounts.write(app, Store.EA, record) + true + } + + fun accessToken(context: Context): String? { + val current = load(context) ?: return null + if (fresh(current)) return current.accessToken + synchronized(refreshLock) { + val again = load(context) ?: return null + if (fresh(again)) return again.accessToken + return refreshLocked(context, again) ?: again.accessToken.takeIf { again.expiresAt > System.currentTimeMillis() } + } + } + + fun refreshNow(context: Context, stale: String?): String? = synchronized(refreshLock) { + val current = load(context) ?: return null + if (stale != null && current.accessToken != stale) return current.accessToken + refreshLocked(context, current) + } + + /** Asks EA to mint a code or token for another client from the signed-in session, as the EA app does for games. */ + fun mint( + context: Context, + clientId: String, + responseType: String, + scopes: List = emptyList(), + tokenFormat: String? = null, + expiresIn: Int? = null, + ): String? { + val access = accessToken(context) ?: return null + val url = authUrl(deviceId(context), responseType, accessToken = access, clientId = clientId, scopes = scopes, tokenFormat = tokenFormat, expiresIn = expiresIn) + val reply = runCatching { EaHttp.request(url, follow = false) }.getOrElse { + Log.w(TAG, "mint $clientId: ${it.javaClass.simpleName}") + return null + } + val location = reply.header("Location") ?: run { + Log.w(TAG, "mint $clientId: no redirect (${reply.status})") + return null + } + if (location.startsWith("https://signin.ea.com")) { + Log.w(TAG, "mint $clientId: the session needs a new sign-in") + return null + } + return redirectValue(location, if (responseType == "token") "access_token" else responseType) + } + + /** Waits for any refresh in progress, so it cannot write the sign-in back afterwards. */ + fun signOut(context: Context) { + synchronized(refreshLock) { StoreAccounts.clear(context.applicationContext, Store.EA) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt new file mode 100644 index 0000000000..091243ae53 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt @@ -0,0 +1,131 @@ +package com.droiddeck.launcher.stores.ea + +import android.content.Context +import android.content.Intent +import android.util.Log +import android.webkit.WebView +import androidx.compose.runtime.mutableStateMapOf +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.LoginFlows +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreInstallRoot +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 + +object EaBackend : StoreBackend { + override val store: Store = Store.EA + + @Volatile internal var app: Context? = null + + init { + LoginFlows.eaFlow = { ua -> app?.let { EaLogin(EaAuth.begin(it), ua) } } + } + + override fun signIn(context: Context) { + app = context.applicationContext + context.startActivity( + Intent(context, StoreLoginActivity::class.java) + .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) + } + + override fun signOut(context: Context) { + val app = context.applicationContext + EaAuth.signOut(app) + EaLibrary.reset(app) + EaUpdates.available.clear() + runCatching { WebCookies.expire(EaLogin.SIGN_IN_URLS, ".ea.com", listOf("/")) {} } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + this.app = app + Thread({ EaLibrary.sync(app, force) }, "ea-sync").start() + } + + override fun loadShelves(context: Context, force: Boolean) {} + + override fun install(context: Context, item: CatalogItem, root: java.io.File) { + val app = context.applicationContext + if (!EaNative.ready()) { + StoresState.logLine(EaNative.ENGINE_MISSING) + StoresState.post { StoresState.problems[store] = EaNative.ENGINE_MISSING } + return + } + val folder = StoreInstallRoot.folderFor(app, store, item.id, item.title, root) + val entry = DownloadEntry(store, item.id, item.title, cover = item.tallImageUrl ?: item.imageUrl, bytesTotal = item.sizeBytes, location = StoreInstallRoot.labelFor(app, folder)) + DownloadQueue.enqueue(app, entry) { EaInstaller(app, item, folder) } + } + + override fun uninstall(context: Context, game: InstalledStoreGame) {} +} + +internal class EaLogin(private val pending: EaAuth.Pending, override val userAgent: String) : StoreLoginActivity.Flow { + override val startUrl: String get() = pending.url + + override fun isRedirect(url: String): Boolean = url.startsWith("qrc:", ignoreCase = true) + + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(SIGN_IN_URLS, ".ea.com", listOf("/")) { done() } }.onFailure { done() } + } + + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? { + val code = EaAuth.redirectValue(url, "code") ?: return activity.getString(R.string.stores_login_error_verification) + return try { + EaAuth.exchange(activity, code, pending.verifier) + null + } catch (e: Exception) { + Log.w("EaLogin", "sign-in failed: ${e.message}") + activity.getString(R.string.stores_login_error_generic) + } + } + + companion object { + val SIGN_IN_URLS = listOf("https://accounts.ea.com", "https://signin.ea.com", "https://www.ea.com") + } +} + +object EaUpdates { + val available = mutableStateMapOf() + private val checked = java.util.concurrent.ConcurrentHashMap() + private const val RECHECK_MS = 30 * 60 * 1000L + + fun check(context: Context, game: InstalledStoreGame, force: Boolean = false) { + val app = context.applicationContext + val id = game.sidecar.id + val now = System.currentTimeMillis() + if (!force && now - (checked[id] ?: 0L) < RECHECK_MS) return + checked[id] = now + Thread({ + val token = EaAuth.accessToken(app) + val offer = token?.let { runCatching { EaApi.offers(it, listOf(id)) }.getOrNull() }?.firstOrNull() + if (offer == null) { + checked.remove(id) + return@Thread + } + val live = offer.gameVersion + val installed = game.sidecar.installVersion + StoresState.post { + if (live.isNotEmpty() && installed.isNotEmpty() && live != installed) available[game.key] = live else available.remove(game.key) + } + }, "ea-update-check").start() + } + + fun start(context: Context, game: InstalledStoreGame) { + val app = context.applicationContext + val root = game.folder.parentFile?.parentFile ?: return + val known = EaLibrary.game(app, game.sidecar.id) + val item = known?.let { EaLibrary.toCatalogItem(app, it) } ?: CatalogItem( + Store.EA, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, owned = true, extra = game.sidecar.extra, + ) + available.remove(game.key) + StoresState.install(app, item, root) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCrypto.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCrypto.kt new file mode 100644 index 0000000000..d36a541085 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCrypto.kt @@ -0,0 +1,83 @@ +package com.droiddeck.launcher.stores.ea + +import java.security.MessageDigest +import java.time.LocalDate +import java.time.ZoneOffset +import javax.crypto.Cipher +import javax.crypto.Mac +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.SecretKeySpec + +internal object EaCrypto { + val LSX_DEFAULT_KEY = ByteArray(16) { it.toByte() } + + private val OOA_KEY = intArrayOf(65, 50, 114, 45, 208, 130, 239, 176, 220, 100, 87, 197, 118, 104, 202, 9) + .map { it.toByte() }.toByteArray() + + private const val PRIME_10K = 104729L + private const val PRIME_20K = 224737L + private const val PRIME_30K = 350377L + + fun ecbEncrypt(data: ByteArray, key: ByteArray): ByteArray = + Cipher.getInstance("AES/ECB/PKCS5Padding").run { init(Cipher.ENCRYPT_MODE, SecretKeySpec(key, "AES")); doFinal(data) } + + fun ecbDecrypt(data: ByteArray, key: ByteArray): ByteArray = + Cipher.getInstance("AES/ECB/PKCS5Padding").run { init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES")); doFinal(data) } + + fun licenseEncrypt(data: ByteArray): ByteArray = + Cipher.getInstance("AES/CBC/PKCS5Padding").run { init(Cipher.ENCRYPT_MODE, SecretKeySpec(OOA_KEY, "AES"), IvParameterSpec(ByteArray(16))); doFinal(data) } + + fun licenseDecrypt(data: ByteArray): ByteArray = + Cipher.getInstance("AES/CBC/PKCS5Padding").run { init(Cipher.DECRYPT_MODE, SecretKeySpec(OOA_KEY, "AES"), IvParameterSpec(ByteArray(16))); doFinal(data) } + + fun hex(bytes: ByteArray): String = bytes.joinToString("") { "%02x".format(it.toInt() and 0xFF) } + + fun unhex(text: String): ByteArray { + val digits = text.lowercase().filter { it in '0'..'9' || it in 'a'..'f' } + if (digits.length % 2 != 0) return ByteArray(0) + return ByteArray(digits.length / 2) { i -> digits.substring(i * 2, i * 2 + 2).toInt(16).toByte() } + } + + /** The session key both sides derive after the LSX challenge, from a seed the game picks. */ + fun lsxKey(seed: Int): ByteArray { + if (seed == 0) return LSX_DEFAULT_KEY.copyOf() + var state = 7L + fun next(): Int { + state = (state * 214013L + 2531011L) and 0xFFFFFFFFL + return ((state ushr 16) and 0xFFFF).toInt() + } + val start = (next().toLong() + seed) and 0xFFFFFFFFL + state = start + return ByteArray(16) { next().toByte() } + } + + fun challengeAnswer(key: String): String = hex(ecbEncrypt(key.toByteArray(Charsets.US_ASCII), LSX_DEFAULT_KEY)) + + fun challengeSeed(version: String, answer: String): Int? = when (version) { + "2" -> 0 + "3" -> (answer[0].code shl 8) or answer[1].code + else -> null + } + + /** EA's launch handshake code, which changes every UTC day. */ + fun rtpCode(day: LocalDate = LocalDate.now(ZoneOffset.UTC)): Long { + val time = ((PRIME_10K * day.year) xor (day.monthValue * PRIME_20K) xor (day.dayOfMonth * PRIME_30K)) and 0xFFFFFFFFL + return (time xor ((time shl 16) and 0xFFFFFFFFL) xor (time ushr 16)) and 0xFFFFFFFFL + } + + fun sha256(data: ByteArray): ByteArray = MessageDigest.getInstance("SHA-256").digest(data) + + fun sha1(data: ByteArray): ByteArray = MessageDigest.getInstance("SHA-1").digest(data) + + fun hmacSha256(key: ByteArray, data: ByteArray): ByteArray = + Mac.getInstance("HmacSHA256").run { init(SecretKeySpec(key, "HmacSHA256")); doFinal(data) } + + fun fnv1a(data: ByteArray): ULong { + var hash = 0xcbf29ce484222325UL + for (b in data) hash = (hash xor (b.toUByte().toULong())) * 0x100000001b3UL + return hash + } + + fun base64Url(data: ByteArray): String = + java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(data) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaHttp.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaHttp.kt new file mode 100644 index 0000000000..193c4d741c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaHttp.kt @@ -0,0 +1,47 @@ +package com.droiddeck.launcher.stores.ea + +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder + +internal class EaReply(val status: Int, val body: ByteArray, val headers: Map>) { + val ok: Boolean get() = status in 200..299 + val text: String get() = body.toString(Charsets.UTF_8) + fun header(name: String): String? = headers.entries.firstOrNull { it.key.equals(name, ignoreCase = true) }?.value?.firstOrNull() +} + +internal object EaHttp { + const val USER_AGENT = "Mozilla/5.0 EA Desktop/13.735.2.6250" + private const val TIMEOUT = 30_000 + + fun form(values: List>): String = + values.joinToString("&") { (k, v) -> URLEncoder.encode(k, "UTF-8") + "=" + URLEncoder.encode(v, "UTF-8") } + + fun request( + url: String, + method: String = "GET", + headers: Map = emptyMap(), + body: ByteArray? = null, + follow: Boolean = true, + ): EaReply { + val c = URL(url).openConnection() as HttpURLConnection + try { + c.requestMethod = method + c.connectTimeout = TIMEOUT + c.readTimeout = TIMEOUT + c.instanceFollowRedirects = follow + c.setRequestProperty("User-Agent", USER_AGENT) + for ((k, v) in headers) c.setRequestProperty(k, v) + if (body != null) { + c.doOutput = true + c.outputStream.use { it.write(body) } + } + val status = c.responseCode + val stream = if (status >= 400) c.errorStream else c.inputStream + val bytes = stream?.use { it.readBytes() } ?: ByteArray(0) + return EaReply(status, bytes, c.headerFields.filterKeys { it != null }) + } finally { + c.disconnect() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaInstaller.kt new file mode 100644 index 0000000000..22d973592d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaInstaller.kt @@ -0,0 +1,140 @@ +package com.droiddeck.launcher.stores.ea + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreExe +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.amazon.AmazonNative +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import com.droiddeck.launcher.stores.download.StoreDownloadTier +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicLong + +internal class EaInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + + override fun run(handle: DownloadQueue.JobHandle): String? { + handle.stage(DownloadStage.MANIFEST, app.getString(R.string.stores_sync_sign_in)) + var token = EaAuth.accessToken(app) ?: throw IllegalStateException("Not signed in to EA") + val url = try { + EaApi.downloadUrl(token, item.id) + } catch (e: EaApiException) { + if (e.status != 401) throw IllegalStateException(e.message) + token = EaAuth.refreshNow(app, token) ?: throw IllegalStateException("The EA sign-in has expired") + EaApi.downloadUrl(token, item.id) + } + val game = EaLibrary.game(app, item.id) + val version = runCatching { EaApi.offers(token, listOf(item.id)).firstOrNull()?.gameVersion }.getOrNull().orEmpty() + .ifEmpty { game?.version.orEmpty() } + val cover = item.tallImageUrl ?: item.imageUrl + StoreInstalls.begin(folder, Store.EA, item.id, item.title, cover, item.imageUrl) + if (cancelled.get()) return null + + val tier = StoreDownloadTier.current(app) + handle.log("ea: \"${item.title}\" tier=${tier.id} window=${tier.networkWindow}") + val request = JSONObject() + .put("url", url) + .put("gameDir", folder.absolutePath) + .put("maxWorkers", tier.networkWindow.coerceIn(1, 64)) + .put("processWorkers", tier.processWorkers) + .put("caBundle", "") + val shown = AtomicLong(-1) + val downloading = AtomicBoolean(false) + val listener = object : AmazonNative.InstallListener { + override fun onStatus(text: String) { handle.stage(DownloadStage.MANIFEST, text) } + override fun onCheck(doneBytes: Long, totalBytes: Long, files: Int, filesTotal: Int) { + handle.stage(DownloadStage.MANIFEST, "Checking files…") + handle.stageProgress(doneBytes, totalBytes, files, filesTotal, bytes = true) + } + override fun onSizes(pendingBytes: Long, totalBytes: Long) { handle.diskSize(totalBytes) } + override fun onProgress(done: Long, total: Long, files: Int, filesTotal: Int) { + if (downloading.compareAndSet(false, true)) handle.stage(DownloadStage.DOWNLOAD) + while (true) { + val before = shown.get() + if (done < before) return + if (shown.compareAndSet(before, done)) break + } + handle.progress(done, total, "Downloading ($files/$filesTotal files)") + } + override fun onLog(line: String) { handle.log("ea: $line") } + override fun beforeReplace(): Boolean = try { + StoreInstalls.markUpdating(folder) + true + } catch (e: Exception) { + handle.log("ea: the install record could not be switched to updating (${e.javaClass.simpleName})") + false + } + override fun onComplete(success: Boolean, cancelled: Boolean, error: String, result: String) = Unit + } + val outcome = EaNative.install(request, listener, cancelled) + if (outcome.cancelled || cancelled.get() && !outcome.success) return null + if (!outcome.success) throw IllegalStateException(outcome.error.ifEmpty { "The EA install failed" }) + val result = outcome.result ?: JSONObject() + result.optLong("totalBytes").takeIf { it > 0 }?.let { EaPrefs.get(app).edit().putLong("size_${item.id}", it).apply() } + + handle.stage(DownloadStage.INSTALL, app.getString(R.string.stores_registering)) + val sidecar = sidecarFor(app, item, folder, game, version, cover) { handle.log("ea: $it") } + StoreInstalls.complete(app, folder, sidecar, onStep = { done, steps -> handle.stageProgress(done.toLong(), steps.toLong()) }) + return folder.path + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (deleteFiles) StoreInstalls.discard(app, folder, emptyList()) + } + + companion object { + fun locale(context: Context, available: List): String { + val wanted = StoreLanguage.localeFor(null, context) + val exact = "${wanted.language}_${wanted.country}" + return available.firstOrNull { it.equals(exact, true) } + ?: available.firstOrNull { it.substringBefore('_').equals(wanted.language, true) } + ?: available.firstOrNull { it.equals("en_US", true) } + ?: "en_US" + } + + internal fun sidecarFor(app: Context, item: CatalogItem, folder: File, game: EaGame?, version: String, cover: String?, log: (String) -> Unit): StoreGameSidecar { + val manifest = EaManifest.read(folder) + if (manifest == null) log("no installerdata.xml in ${folder.name}") + val launcher = manifest?.launcher() + val candidates = listOfNotNull(launcher?.path, game?.executePath?.takeIf { it.isNotEmpty() }) + var exe = candidates.firstNotNullOfOrNull { EaPaths.relativeOnDisk(folder, EaPaths.relative(it)) }.orEmpty() + if (exe.isEmpty()) exe = StoreExe.pick(folder, null, item.title) + if (exe.isEmpty()) { log("no exe found; pick one in Steam settings › Added games"); exe = "game.exe" } else log("exe=$exe") + val args = EaPaths.splitArgs(listOf(game?.parameters.orEmpty(), launcher?.parameters.orEmpty()).filter { it.isNotBlank() }.joinToString(" ")) + val keys = JSONArray() + listOfNotNull(game?.installCheck, game?.executePath, launcher?.path).mapNotNull { EaPaths.registered(it) } + .distinctBy { it.key.lowercase() + "|" + it.value.lowercase() } + .forEach { keys.put(JSONArray().put(it.key).put(it.value)) } + val extra = linkedMapOf( + "contentId" to (game?.contentId ?: item.extra["contentId"].orEmpty()), + "slug" to (game?.slug ?: item.extra["slug"].orEmpty()), + "multiplayerId" to game?.multiplayerId.orEmpty(), + "masterTitleId" to game?.masterTitleId.orEmpty(), + "locale" to locale(app, game?.locales.orEmpty()), + "registry" to keys.toString(), + "touchup" to manifest?.touchupPath.orEmpty().replace('\\', '/').trimStart('/'), + "touchupArgs" to manifest?.touchupParameters.orEmpty(), + "contentIds" to manifest?.contentIds.orEmpty().joinToString(","), + "displayName" to manifest?.title(locale(app, game?.locales.orEmpty())).orEmpty(), + ).filterValues { it.isNotEmpty() } + return StoreGameSidecar( + Store.EA, item.id, item.title, exe = exe, args = args, + installVersion = version.ifEmpty { manifest?.version.orEmpty() }, installedAt = System.currentTimeMillis(), + cover = cover, hero = item.imageUrl, extra = extra, cloud = false, logo = item.logoUrl, + ) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLaunch.kt new file mode 100644 index 0000000000..a9b623a2d6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLaunch.kt @@ -0,0 +1,138 @@ +package com.droiddeck.launcher.stores.ea + +import android.content.Context +import android.util.Base64 +import android.util.Log +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.util.UUID + +object EaLaunch { + private const val TAG = "EaLaunch" + const val ENV_FILE = ".droiddeck-ea-env" + + private fun installed(context: Context, id: String): Pair? = + StoreInstallRoot.gameFolders(context).firstNotNullOfOrNull { f -> + StoreGameSidecar.read(f)?.takeIf { it.store == Store.EA && it.id == id && it.isInstalled }?.let { f to it } + } + + internal fun environment( + offerId: String, + contentId: String, + locale: String, + generic: String, + access: String, + opaque: String, + account: EaAuth.Account, + session: String = UUID.randomUUID().toString(), + ): LinkedHashMap = linkedMapOf( + "EAAuthCode" to "unavailable", + "EAEgsProxyIpcPort" to "0", + "EAEntitlementSource" to "EA", + "EAExternalSource" to "EA", + "EAFreeTrialGame" to "false", + "EAGameLocale" to locale, + "EAGenericAuthToken" to generic, + "EALaunchCode" to "unavailable", + "EALaunchOwner" to "EA", + "EALaunchEAID" to account.eaId.ifEmpty { account.displayName }, + "EALaunchEnv" to "production", + "EALaunchOfflineMode" to "false", + "EALsxPort" to EaLsx.PORT.toString(), + "EARtPLaunchCode" to EaCrypto.rtpCode().toString(), + "EASecureLaunchTokenTemp" to account.userId, + "EASteamProxyIpcPort" to "0", + "OriginSessionKey" to session, + "ContentId" to contentId, + "EAOnErrorExitRetCode" to "1", + "EAConnectionId" to offerId, + "EALicenseToken" to offerId, + "EALaunchUserAuthToken" to opaque, + "EAAccessTokenJWS" to access, + ) + + /** Adds what installs made before the manifest's content ids and title were recorded are missing. */ + internal fun backfill(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { + if (sidecar.extra.containsKey("contentIds") || sidecar.extra.containsKey("displayName")) return sidecar + val manifest = EaManifest.read(folder) ?: return sidecar + val locale = sidecar.extra["locale"].orEmpty().ifEmpty { "en_US" } + val added = mapOf( + "contentIds" to manifest.contentIds.joinToString(","), + "displayName" to manifest.title(locale).orEmpty(), + ).filterValues { it.isNotEmpty() } + if (added.isEmpty()) return sidecar + val updated = sidecar.copy(extra = sidecar.extra + added) + runCatching { updated.write(folder) }.onFailure { Log.w(TAG, "sidecar: ${it.javaClass.simpleName}") } + return updated + } + + /** Answers the guest's request right before an EA game starts: session, licence and the LSX endpoint. */ + fun prepare(context: Context, request: JSONObject): JSONObject { + val app = context.applicationContext + val id = request.optString("id") + val reply = JSONObject().put("ok", false) + val (folder, recorded) = installed(app, id) ?: return reply.put("reason", "not-installed") + val sidecar = backfill(folder, recorded) + runCatching { com.droiddeck.launcher.stores.StoreLaunch.refreshLauncher(folder, sidecar) } + File(folder, ENV_FILE).delete() + val account = EaAuth.load(app) ?: return reply.put("reason", "signed-out") + val access = EaAuth.accessToken(app) ?: return reply.put("reason", "sign-in-expired") + val contentId = sidecar.extra["contentId"].orEmpty() + val locale = sidecar.extra["locale"].orEmpty().ifEmpty { "en_US" } + val core = EaOoa.coreDir(folder, sidecar.exe) + val hashVersion = core?.let(EaOoa::activationVersion) ?: 1 + val hardware = request.optJSONObject("hardware")?.let(EaOoa.Hardware::fromJson)?.takeIf { it.complete(hashVersion) } + val legacy = EaOoa.legacyCore(core) + + val lifetime = if (legacy) 14400 else 550 + val opaque = EaAuth.mint(app, EaAuth.CLIENT_ID, "token", EaAuth.OPAQUE_SCOPES, "OPAQUE", lifetime).orEmpty() + val known = (sidecar.extra["contentIds"].orEmpty().split(',') + sidecar.extra["multiplayerId"].orEmpty()).map { it.trim() }.filter { it.isNotEmpty() }.toSet() + val lsx = EaLsx.start(app, EaLsx.Game(id, contentId, sidecar.title, sidecar.installVersion, locale, hardware, hashVersion, opaque, + System.currentTimeMillis() + (lifetime - 30) * 1000L, known)) + val env = environment(id, contentId, locale, if (legacy && opaque.isNotEmpty()) opaque else access, access, opaque, EaAuth.load(app) ?: account) + val tmp = File(folder, "$ENV_FILE.tmp") + tmp.writeText(env.entries.joinToString("\r\n", postfix = "\r\n") { "${it.key}=${it.value}" }) + tmp.renameTo(File(folder, ENV_FILE)) + + val licenses = JSONArray() + val notes = ArrayList() + if (core != null) { + val ids = (listOf(contentId) + sidecar.extra["contentIds"].orEmpty().split(',')).map { it.trim() }.filter { it.isNotEmpty() }.distinct() + if (hardware == null) notes += "no-hardware" else { + val hash = EaOoa.machineHash(hardware, hashVersion) + for (content in ids) { + notes += try { + for ((path, data) in EaOoa.files(core, EaOoa.request(access, content, hash))) { + licenses.put(JSONObject().put("path", path).put("data", Base64.encodeToString(data, Base64.NO_WRAP))) + } + "$content:ok" + } catch (e: Exception) { + Log.w(TAG, "licence $content for $id: ${e.message}") + com.droiddeck.launcher.stores.StoresState.logLine("ea licence $content for $id v$hashVersion legacy=$legacy: ${e.message}") + "$content:refused" + } + } + } + } + if (core != null && notes.isNotEmpty() && notes.none { it.endsWith(":ok") }) runCatching { + val rows = EaApi.legacyEntitlements(access).filter { it.optString("productId") == id } + val types = rows.joinToString(",") { it.optString("entitlementType") + "/" + it.optString("entitlementTag") + "/" + it.optString("status") } + com.droiddeck.launcher.stores.StoresState.logLine("ea $id has no licence; entitlements: ${types.ifEmpty { "none" }}") + } + val licenseNote = if (core == null) "none-needed" else "v$hashVersion " + notes.joinToString(",") + Log.i(TAG, "prepared $id lsx=$lsx legacy=$legacy opaque=${opaque.isNotEmpty()} licence=$licenseNote") + return reply.put("ok", true).put("lsx", lsx).put("license", licenseNote).put("licenses", licenses) + } +} + +object EaSizes { + fun size(context: Context, item: com.droiddeck.launcher.stores.CatalogItem): Long { + val token = EaAuth.accessToken(context) ?: return 0L + val url = runCatching { EaApi.downloadUrl(token, item.id) }.getOrNull() ?: return 0L + return EaNative.call("zip.size", JSONObject().put("url", url))?.optLong("totalBytes") ?: 0L + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt new file mode 100644 index 0000000000..2a90b2550c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt @@ -0,0 +1,293 @@ +package com.droiddeck.launcher.stores.ea + +import android.content.Context +import android.content.SharedPreferences +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreNet +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.mergeItems +import org.json.JSONArray +import org.json.JSONObject +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +object EaPrefs { + const val FILE = "stores.ea" + fun get(context: Context): SharedPreferences = context.applicationContext.getSharedPreferences(FILE, Context.MODE_PRIVATE) +} + +data class EaGame( + val offerId: String, + val contentId: String, + val title: String, + val slug: String, + val tall: String = "", + val wide: String = "", + val logo: String = "", + val version: String = "", + val executePath: String = "", + val installCheck: String = "", + val parameters: String = "", + val multiplayerId: String = "", + val masterTitleId: String = "", + val cloudSaves: String = "", + val locales: List = emptyList(), +) { + fun toJson(): JSONObject = JSONObject() + .put("offerId", offerId).put("contentId", contentId).put("title", title).put("slug", slug) + .put("tall", tall).put("wide", wide).put("logo", logo).put("version", version) + .put("executePath", executePath).put("installCheck", installCheck).put("parameters", parameters) + .put("multiplayerId", multiplayerId).put("masterTitleId", masterTitleId).put("cloudSaves", cloudSaves) + .put("locales", JSONArray(locales)) + + companion object { + fun fromJson(o: JSONObject): EaGame? { + val locales = o.optJSONArray("locales") + return EaGame( + offerId = o.optString("offerId").ifEmpty { return null }, + contentId = o.optString("contentId"), + title = o.optString("title"), + slug = o.optString("slug"), + tall = o.optString("tall"), + wide = o.optString("wide"), + logo = o.optString("logo"), + version = o.optString("version"), + executePath = o.optString("executePath"), + installCheck = o.optString("installCheck"), + parameters = o.optString("parameters"), + multiplayerId = o.optString("multiplayerId"), + masterTitleId = o.optString("masterTitleId"), + cloudSaves = o.optString("cloudSaves"), + locales = (0 until (locales?.length() ?: 0)).map { locales!!.optString(it) }, + ) + } + } +} + +object EaLibrary { + private const val KEY_CACHE = "library_cache" + private const val KEY_SYNCED_AT = "library_synced_at" + private const val THROTTLE_MS = 6 * 60 * 60 * 1000L + private const val ART_TTL_MS = 7 * 24 * 60 * 60 * 1000L + private const val ART_THREADS = 4 + const val STORE_URL = "https://www.ea.com/ea-app/library" + private val gate = SyncGate() + private val generation = java.util.concurrent.atomic.AtomicInteger() + + /** Drops the cache and makes any sync already running drop its results, in one step. */ + fun reset(context: Context) { + synchronized(cacheLock) { + generation.incrementAndGet() + EaPrefs.get(context).edit().remove(KEY_CACHE).remove(KEY_SYNCED_AT).commit() + } + } + + internal fun snapshot(app: Context): Pair> = synchronized(cacheLock) { generation.get() to cached(app) } + + internal fun storeCache(app: Context, games: List, gen: Int): Boolean = synchronized(cacheLock) { + gen == generation.get() && + EaPrefs.get(app).edit().putString(KEY_CACHE, JSONArray(games.map { it.toJson() }).toString()).putLong(KEY_SYNCED_AT, System.currentTimeMillis()).commit() + } + + private val cacheLock = Any() + private val store = Store.EA + + fun cached(context: Context): List { + val text = EaPrefs.get(context).getString(KEY_CACHE, null) ?: return emptyList() + val arr = runCatching { JSONArray(text) }.getOrNull() ?: return emptyList() + return (0 until arr.length()).mapNotNull { arr.optJSONObject(it)?.let(EaGame::fromJson) } + } + + fun game(context: Context, offerId: String): EaGame? = cached(context).firstOrNull { it.offerId == offerId } + + + fun toCatalogItem(context: Context, g: EaGame): CatalogItem { + val prefs = EaPrefs.get(context) + val tall = g.tall.ifEmpty { prefs.getString("poster_${g.offerId}", null).orEmpty() } + return CatalogItem( + store = store, + id = g.offerId, + title = g.title.ifBlank { g.slug }, + imageUrl = g.wide.ifEmpty { tall }.ifEmpty { null }, + tallImageUrl = tall.ifEmpty { g.wide }.ifEmpty { null }, + publisher = "Electronic Arts", + owned = true, + sizeBytes = prefs.getLong("size_${g.offerId}", 0L), + storeUrl = STORE_URL, + extra = mapOf("contentId" to g.contentId, "slug" to g.slug, "version" to g.version), + logoUrl = g.logo.ifEmpty { null }, + ) + } + + /** One entry per game: owned editions of the same base game collapse onto the base offer. */ + internal fun pick(owned: List, offers: Map): List> { + val usable = owned.filter { o -> + val offer = offers[o.offerId] ?: return@filter false + !o.trial && o.downloadable && offer.downloadable && + (offer.displayType.isEmpty() || offer.displayType.equals("FullGame", true)) && + (o.gameType.isEmpty() || o.gameType.equals("BASE_GAME", true)) + } + return usable.groupBy { it.baseSlug.ifEmpty { it.slug }.ifEmpty { it.offerId } }.values.map { group -> + val chosen = group.firstOrNull { it.baseSlug.isEmpty() } ?: group.first() + chosen to offers.getValue(chosen.offerId) + }.sortedBy { it.first.name.lowercase() } + } + + private fun art(app: Context, token: String, slugs: Collection, gen: Int): Map { + val prefs = EaPrefs.get(app) + val now = System.currentTimeMillis() + val out = java.util.concurrent.ConcurrentHashMap() + val pool = Executors.newFixedThreadPool(ART_THREADS) + try { + for (slug in slugs.filter { it.isNotEmpty() }) { + if (gen != generation.get()) break + val cached = prefs.getString("art_$slug", null)?.let { runCatching { JSONObject(it) }.getOrNull() } + if (cached != null && now - cached.optLong("at") < ART_TTL_MS) { + out[slug] = EaApi.Images(cached.optString("tall").ifEmpty { null }, cached.optString("wide").ifEmpty { null }, cached.optString("logo").ifEmpty { null }) + continue + } + pool.execute { + if (gen != generation.get()) return@execute + val images = runCatching { EaApi.images(token, slug) }.getOrNull() ?: return@execute + out[slug] = images + prefs.edit().putString( + "art_$slug", + JSONObject().put("at", now).put("tall", images.tall.orEmpty()).put("wide", images.wide.orEmpty()).put("logo", images.logo.orEmpty()).toString(), + ).apply() + } + } + } finally { + pool.shutdown() + pool.awaitTermination(2, TimeUnit.MINUTES) + } + return out + } + + private fun posters(app: Context, games: List, gen: Int) { + val prefs = EaPrefs.get(app) + val todo = games.filter { it.tall.isEmpty() && !prefs.contains("poster_${it.offerId}") }.take(40) + if (todo.isEmpty()) return + val pool = Executors.newFixedThreadPool(ART_THREADS) + try { + for (g in todo) pool.execute { + if (gen != generation.get()) return@execute + prefs.edit().putString("poster_${g.offerId}", runCatching { StoreNet.sgdbPoster(g.title) }.getOrDefault("")).apply() + } + } finally { + pool.shutdown() + pool.awaitTermination(5, TimeUnit.MINUTES) + } + } + + private fun publish(app: Context, games: List, gen: Int = generation.get()) { + if (gen != generation.get()) return + val items = games.map { toCatalogItem(app, it) } + StoresState.post { + if (gen != generation.get()) return@post + StoresState.library[store] = mergeItems(StoresState.library[store], items) + val installed = StoresState.installed.filter { it.sidecar.store == store }.map { it.sidecar.id }.toSet() + StoresState.shelves[store] = StoreShelves(trending = items.filterNot { it.id in installed }, art = StoresState.shelves[store]?.art.orEmpty()) + } + } + + private inline fun withToken(app: Context, token: String, call: (String) -> T): T = try { + call(token) + } catch (e: EaApiException) { + if (e.status != 401) throw e + call(EaAuth.refreshNow(app, token) ?: throw e) + } + + fun sync(context: Context, force: Boolean) { + if (!gate.enter()) return + var forced = force + do { + runCatching { syncOnce(context.applicationContext, forced) } + forced = true + } while (gate.leave()) + } + + private fun syncOnce(app: Context, force: Boolean) { + val (gen, cache) = snapshot(app) + val prefs = EaPrefs.get(app) + val quiet = cache.isNotEmpty() && !force + fun status(id: Int) { if (!quiet) StoresState.post { StoresState.status[store] = app.getString(id) } } + fun problem(text: String?) { + StoresState.post { + StoresState.status.remove(store) + if (text == null) StoresState.problems.remove(store) else StoresState.problems[store] = text + } + } + try { + if (cache.isNotEmpty()) publish(app, cache, gen) + if (!force && cache.isNotEmpty() && System.currentTimeMillis() - prefs.getLong(KEY_SYNCED_AT, 0L) in 0 until THROTTLE_MS) { + return problem(null) + } + status(R.string.stores_sync_sign_in) + val token = EaAuth.accessToken(app) ?: return problem(StoresState.notSignedInLine(store)) + status(R.string.stores_sync_game_list) + val owned = withToken(app, token) { EaApi.owned(it) } + val offers = withToken(app, token) { EaApi.offers(it, owned.map { o -> o.offerId }) }.associateBy { it.offerId } + val picked = pick(owned, offers) + StoresState.logLine("ea: ${owned.size} owned products, ${picked.size} games") + for ((o, offer) in picked) StoresState.logLine( + "ea: owned ${o.offerId} content=${offer.contentId} master=${offer.masterTitleId} mp=${offer.multiplayerId} via=${o.ownership.joinToString("+")} type=${o.gameType}") + if (picked.isEmpty()) return problem(if (cache.isEmpty()) app.getString(R.string.stores_sync_no_games, store.label) else null) + if (gen != generation.get()) return + status(R.string.stores_sync_cover_art) + val images = art(app, token, picked.map { it.first.slug }, gen) + val games = picked.map { (o, offer) -> + val img = images[o.slug] + EaGame( + offerId = o.offerId, contentId = offer.contentId, title = o.name.ifBlank { offer.displayName }, slug = o.slug, + tall = img?.tall.orEmpty(), wide = img?.wide.orEmpty(), logo = img?.logo.orEmpty(), version = offer.gameVersion, + executePath = offer.executePathOverride, installCheck = offer.installCheckOverride, parameters = offer.executeParameters, + multiplayerId = offer.multiplayerId, masterTitleId = offer.masterTitleId, cloudSaves = offer.cloudSaves, locales = offer.locales, + ) + } + if (!storeCache(app, games, gen)) return + posters(app, games, gen) + if (gen != generation.get()) return + publish(app, games, gen) + problem(null) + } catch (e: EaApiException) { + StoresState.logLine("ea: library sync failed: ${e.message}") + if (e.status == 401) StoresState.markSignInExpired(store) + problem(if (cache.isEmpty()) e.message else null) + } catch (e: Exception) { + StoresState.logLine("ea: library sync failed: ${e.javaClass.simpleName} ${e.message.orEmpty()}") + problem(if (cache.isEmpty()) e.message ?: app.getString(R.string.stores_sync_failed) else null) + } + } +} + +/** One sync at a time; a request made meanwhile makes the running one go round again rather than being lost. */ +internal class SyncGate { + private var busy = false + private var again = false + + /** True when the caller should run; false when a running sync will pick the request up. */ + @Synchronized + fun enter(): Boolean { + if (busy) { + again = true + return false + } + busy = true + return true + } + + /** True when another round was requested while running; the caller stays the runner. */ + @Synchronized + fun leave(): Boolean { + if (again) { + again = false + return true + } + busy = false + return false + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLsx.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLsx.kt new file mode 100644 index 0000000000..f9e6b286a0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLsx.kt @@ -0,0 +1,446 @@ +package com.droiddeck.launcher.stores.ea + +import android.content.Context +import android.util.Log +import org.xmlpull.v1.XmlPullParser +import org.xmlpull.v1.XmlPullParserFactory +import java.io.ByteArrayOutputStream +import java.io.OutputStream +import java.io.StringReader +import java.net.InetAddress +import java.net.ServerSocket +import java.net.Socket +import java.time.LocalDateTime +import java.time.ZoneOffset +import java.time.format.DateTimeFormatter + +/** + * The local SDK endpoint EA games talk to in place of the EA app (LSX: XML over TCP, AES after a + * challenge). It answers for the one game DroidDeck last prepared. + */ +object EaLsx { + private const val TAG = "EaLsx" + const val PORT = 3216 + private const val SENDER = "EALS" + private const val CHALLENGE_KEY = "cacf897a20b6d612ad0c05e011df52bb" + private const val CHALLENGE_VERSION = "10,5,30,15625" + private const val LANGUAGES = "ar_SA,de_DE,en_US,es_ES,es_MX,fr_FR,it_IT,ja_JP,ko_KR,pl_PL,pt_BR,ru_RU,zh_CN,zh_TW" + + private val SERVICES = listOf( + "EbisuSDK" to "SDK", "EbisuSDK" to "PROFILE", "XMPP" to "PRESENCE", "XMPP" to "FRIENDS", "Commerce" to "COMMERCE", + "EbisuSDK" to "RECENTPLAYER", "EbisuSDK" to "IGO", "EbisuSDK" to "MISC", "EALS" to "LOGIN", "EbisuSDK" to "UTILITY", + "XMPP" to "XMPP", "XMPP" to "CHAT", "EbisuSDK" to "IGO_EVENT", "EALS" to "EALS_EVENTS", "EbisuSDK" to "LOGIN_EVENT", + "XMPP" to "INVITE_EVENT", "EbisuSDK" to "PROFILE_EVENT", "XMPP" to "PRESENCE_EVENT", "XMPP" to "FRIENDS_EVENT", + "Commerce" to "COMMERCE_EVENT", "XMPP" to "CHAT_EVENT", "EbisuSDK" to "DOWNLOAD_EVENT", "EbisuSDK" to "PERMISSION", + "EbisuSDK" to "RESOURCES", "EbisuSDK" to "BLOCKED_USERS", "EbisuSDK" to "BLOCKED_USER_EVENT", "EbisuSDK" to "GET_USERID", + "EbisuSDK" to "ONLINE_STATUS_EVENT", "EbisuSDK" to "ACHIEVEMENT", "EbisuSDK" to "ACHIEVEMENT_EVENT", + "EbisuSDK" to "BROADCAST_EVENT", "PI" to "PROGRESSIVE_INSTALLATION", "PI" to "PROGRESSIVE_INSTALLATION_EVENT", + "EbisuSDK" to "CONTENT", + ) + + class Game( + val offerId: String, + val contentId: String, + val title: String, + val version: String, + val locale: String, + val hardware: EaOoa.Hardware?, + val hashVersion: Int, + val token: String = "", + val tokenExpiresAt: Long = 0L, + val contentIds: Set = emptySet(), + ) { + val validToken: String? get() = token.takeIf { it.isNotEmpty() && System.currentTimeMillis() < tokenExpiresAt } + } + + /** The parts of a request a reply depends on. */ + class Message(val recipient: String, val id: String, val name: String, val attrs: Map, val children: List>) + + interface Account { + val userId: String + val personaId: String + val persona: String + fun authCode(clientId: String, scope: String?): String? + fun license(contentId: String, requestTicket: String, ticketEngine: String): String? + fun entitlements(group: String): List> + fun token(): String? + } + + @Volatile var game: Game? = null + @Volatile private var account: Account? = null + /** The one session of the current launch that may act for the account. */ + /** Bumped whenever the launch changes; a connection accepted under an older one is not admitted. */ + @Volatile internal var generation = 0 + private val holder = java.util.concurrent.atomic.AtomicReference(null) + private var server: ServerSocket? = null + private val lock = Any() + private const val MAX_CLIENTS = 8 + private val WHITESPACE = Regex("[ \t]+") + + fun start(context: Context, game: Game): Boolean { + synchronized(lock) { + closeSessions() + this.game = game + account = AppAccount(context.applicationContext) + runCatching { server?.close() } + return try { + val socket = ServerSocket().apply { + reuseAddress = true + bind(java.net.InetSocketAddress(InetAddress.getByName("127.0.0.1"), PORT), 8) + } + server = socket + Thread({ accept(socket) }, "ea-lsx").apply { isDaemon = true }.start() + Log.i(TAG, "listening on $PORT") + true + } catch (e: Exception) { + Log.w(TAG, "could not listen on $PORT: ${e.javaClass.simpleName}") + false + } + } + } + + /** Ends the endpoint; with [offerId], only if it still serves that game, so a late exit cannot stop a newer launch. */ + fun stop(offerId: String? = null) { + synchronized(lock) { + if (offerId != null && game?.offerId != offerId) return + runCatching { server?.close() } + server = null + game = null + account = null + closeSessions() + } + } + + private fun closeSessions() { + generation++ + holder.set(null) + synchronized(sessions) { sessions.forEach { it.trusted = false } } + for (socket in open) runCatching { socket.close() } + open.clear() + } + + private val open = java.util.Collections.newSetFromMap(java.util.concurrent.ConcurrentHashMap()) + private const val HANDSHAKE_TIMEOUT_MS = 15_000 + private const val UNTRUSTED_IDLE_MS = 10 * 60 * 1000 + + private fun accept(socket: ServerSocket) { + while (!socket.isClosed) { + val client = runCatching { socket.accept() }.getOrNull() ?: continue + val (owner, unreadable) = ownerUid(client) + val verified = owner?.let { it == android.os.Process.myUid() } + if (verified == false) { + Log.w(TAG, "refused a connection from another app") + runCatching { client.close() } + continue + } + if (unreadable != null) note("peer cannot be identified: $unreadable") + val session = runCatching { Session(client, client.getOutputStream(), verified == true, unreadable != null) }.getOrNull() + val live = session != null && synchronized(lock) { server === socket && admit(session).also { if (it) open += client } } + if (!live) { + runCatching { client.close() } + continue + } + Thread({ try { serve(client, session!!) } finally { synchronized(sessions) { sessions -= session!! }; open -= client } }, "ea-lsx-client").apply { isDaemon = true }.start() + } + } + + /** + * The uid owning the connecting socket, or null where SELinux hides /proc/net. The guest runs + * under this app's uid, so any other uid is another app; an unknown owner never gets credentials. + */ + /** The connecting socket's uid, or why Android hid socket ownership from this app (some builds deny /proc/net). */ + private fun ownerUid(client: Socket): Pair { + val port = client.port + var denied: String? = null + var read = false + for (path in listOf("/proc/net/tcp6", "/proc/net/tcp")) { + val lines = runCatching { java.io.File(path).readLines() }.onFailure { denied = "$path ${it.javaClass.simpleName}" }.getOrNull() ?: continue + read = true + owner(lines, port)?.let { return it to null } + } + return null to if (read) null else denied ?: "no socket table" + } + + internal fun owner(lines: List, port: Int): Int? = lines.drop(1).firstNotNullOfOrNull { line -> + val f = line.trim().split(WHITESPACE) + val local = f.getOrNull(1)?.substringAfterLast(':')?.toIntOrNull(16) + val remote = f.getOrNull(2)?.substringAfterLast(':')?.toIntOrNull(16) + if (local == port && remote == PORT) f.getOrNull(7)?.toIntOrNull() else null + } + + /** + * Adds [session] unless the cap is reached by sessions that cannot be replaced; otherwise the + * oldest session that never claimed the prepared game (then the oldest untrusted one) makes room. + * Counting and eviction share one lock, so the live total never passes the cap. + */ + internal fun admit(session: Session): Boolean = synchronized(sessions) { + if (sessions.count { !it.evicted } >= MAX_CLIENTS) { + val candidates = sessions.filter { !it.trusted && !it.evicted } + val victim = candidates.firstOrNull { !it.claimed } ?: candidates.firstOrNull() ?: return false + victim.evicted = true + runCatching { victim.socket.close() } + } + sessions += session + true + } + + internal val sessions = LinkedHashSet() + + /** Trust and eviction exclude each other: an evicted session never becomes trusted, a trusted one is never evicted. */ + internal fun promote(session: Session, matches: Boolean) { + synchronized(sessions) { session.trusted = matches && !session.evicted && session.born == generation && holder.compareAndSet(null, session) } + } + + internal class Session(val socket: Socket, val output: OutputStream, val verified: Boolean, val unverifiable: Boolean = false) { + val born = generation + val connectedAt = System.currentTimeMillis() + @Volatile var evicted = false + @Volatile var claimed = false + var key: ByteArray? = null + @Volatile var trusted = false + var pending: ByteArray? = null + + /** A peer Android names as another app never gets account data; one Android cannot name is judged by its claim alone. */ + val mayTrust get() = (verified || unverifiable) && claimed + + @Synchronized + fun send(xml: String) { + val key = this.key + val text = if (key == null) xml else EaCrypto.hex(EaCrypto.ecbEncrypt(xml.toByteArray(), key)) + output.write(text.toByteArray()) + output.write(0) + output.flush() + } + } + + private fun note(line: String) = com.droiddeck.launcher.stores.StoresState.logLine("ea lsx: $line") + + private fun serve(client: Socket, session: Session) { + client.tcpNoDelay = true + client.soTimeout = HANDSHAKE_TIMEOUT_MS + val seen = LinkedHashSet() + var why = "closed by the game" + note("game connected") + try { + session.send("") + val input = client.getInputStream() + val pending = ByteArrayOutputStream() + val chunk = ByteArray(16 * 1024) + while (true) { + if (session.key == null) { + val left = session.connectedAt + HANDSHAKE_TIMEOUT_MS - System.currentTimeMillis() + if (left <= 0) throw java.net.SocketTimeoutException() + client.soTimeout = left.toInt() + } + val n = input.read(chunk) + if (n < 0) break + pending.write(chunk, 0, n) + for (frame in frames(pending, session.key)) { + for (one in Regex(".*?", RegexOption.DOT_MATCHES_ALL).findAll(frame)) { + val message = parse(one.value) ?: continue + if (seen.add(message.name)) note("request ${message.name}") + val reply = runCatching { answer(session, message) } + .onFailure { note("${message.name} failed: ${it.javaClass.simpleName}") }.getOrNull() + if (reply != null) session.send("$reply") + session.pending?.let { session.key = it; session.pending = null } + if (session.key != null) { + val idle = if (session.trusted) 0 else UNTRUSTED_IDLE_MS + if (client.soTimeout != idle) client.soTimeout = idle + } + } + } + if (pending.size() > 4 * 1024 * 1024) { why = "message too large"; break } + } + } catch (e: java.net.SocketTimeoutException) { + why = "no trusted handshake in time" + } catch (e: Exception) { + why = e.javaClass.simpleName + } finally { + holder.compareAndSet(session, null) + note("game disconnected ($why)") + runCatching { client.close() } + } + } + + /** + * Complete messages in what has arrived so far. Messages normally end in a NUL; one that does + * not counts once it holds a whole `` element, plain or decrypted. + */ + private fun frames(pending: ByteArrayOutputStream, key: ByteArray?): List { + val bytes = pending.toByteArray() + val out = ArrayList() + var start = 0 + for (i in bytes.indices) { + if (bytes[i].toInt() != 0) continue + if (i > start) decode(String(bytes, start, i - start, Charsets.UTF_8), key)?.let(out::add) + start = i + 1 + } + var rest = String(bytes, start, bytes.size - start, Charsets.UTF_8) + if (rest.isNotBlank()) decode(rest, key)?.takeIf { it.contains("") }?.let { out += it; rest = "" } + pending.reset() + pending.write(rest.toByteArray(Charsets.UTF_8)) + return out + } + + private fun decode(frame: String, key: ByteArray?): String? { + val text = frame.trim() + if (text.isEmpty()) return null + if (text.startsWith("<")) return text + val k = key ?: return null + return runCatching { String(EaCrypto.ecbDecrypt(EaCrypto.unhex(text), k)) }.getOrNull() + } + + internal fun parse(xml: String): Message? = runCatching { + val parser = XmlPullParserFactory.newInstance().newPullParser() + parser.setInput(StringReader(xml)) + var recipient = "" + var id = "" + var name = "" + val attrs = HashMap() + val children = ArrayList>() + var depth = 0 + var child = "" + while (parser.eventType != XmlPullParser.END_DOCUMENT) { + when (parser.eventType) { + XmlPullParser.START_TAG -> { + depth++ + when (depth) { + 2 -> if (parser.name == "Request") { + recipient = parser.getAttributeValue(null, "recipient").orEmpty() + id = parser.getAttributeValue(null, "id").orEmpty() + } else return@runCatching null + 3 -> { + name = parser.name + for (i in 0 until parser.attributeCount) attrs[parser.getAttributeName(i)] = parser.getAttributeValue(i) + } + 4 -> child = parser.name + } + } + XmlPullParser.TEXT -> if (depth == 4) children += child to parser.text.trim() + XmlPullParser.END_TAG -> depth-- + } + parser.next() + } + if (name.isEmpty()) null else Message(recipient, id, name, attrs, children) + }.getOrNull() + + private fun esc(s: String) = s.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """) + + private fun tag(name: String, vararg attrs: Pair, body: String? = null): String { + val a = attrs.filter { it.second != null }.joinToString("") { " ${it.first}=\"${esc(it.second.toString())}\"" } + return if (body == null) "<$name$a/>" else "<$name$a>$body" + } + + private fun now() = LocalDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss")) + + private fun answer(session: Session, m: Message): String? { + val g = game + val who = account + val person = who?.takeIf { session.trusted } + val locale = g?.locale ?: "en_US" + return when (m.name) { + "ChallengeResponse" -> { + val answer = EaCrypto.challengeAnswer(m.attrs["key"].orEmpty()) + val version = m.attrs["version"].orEmpty() + val seed = EaCrypto.challengeSeed(version, answer) ?: 0 + val content = m.children.firstOrNull { it.first == "ContentId" }?.second.orEmpty() + session.claimed = g != null && content.isNotEmpty() && (content == g.contentId || content == g.offerId || content in g.contentIds) + val matches = session.mayTrust + promote(session, matches) + note("challenge version '$version' content '$content' ${when { session.trusted -> "matches the prepared game"; matches -> "matches, but another session holds this launch"; !session.verified && !session.unverifiable -> "comes from an unverified peer"; else -> "does not match the prepared game" }}") + session.pending = EaCrypto.lsxKey(seed) + Log.i(TAG, "game connected: ${m.children.firstOrNull { it.first == "Title" }?.second.orEmpty()}") + tag("ChallengeAccepted", "response" to answer) + } + "GetConfig" -> tag("GetConfigResponse", body = SERVICES.joinToString("") { tag("Service", "Name" to it.first, "Facility" to it.second) }) + "GetProfile" -> tag( + "GetProfileResponse", + "Persona" to person?.persona.orEmpty(), "SubscriberLevel" to 0, "CommerceCurrency" to "USD", "IsTrialSubscriber" to false, + "Country" to "US", "UserId" to person?.userId.orEmpty(), "GeoCountry" to "US", "AvatarId" to "", "IsSubscriber" to false, + "IsSteamSubscriber" to false, "PersonaId" to person?.personaId.orEmpty(), "IsUnderAge" to false, "UserIndex" to 0, + ) + "GetSetting" -> tag("GetSettingResponse", "Setting" to when (m.attrs["SettingId"]) { + "ENVIRONMENT" -> "production" + "LANGUAGE" -> locale + else -> "false" + }) + "GetGameInfo" -> tag("GetGameInfoResponse", "GameInfo" to when (m.attrs["GameInfoId"]) { + "FREETRIAL" -> "false" + "LANGUAGES" -> LANGUAGES + "INSTALLED_LANGUAGE" -> locale + "INSTALLED_VERSION", "AVAILABLE_VERSION" -> g?.version.orEmpty() + else -> "" + }) + "GetAllGameInfo" -> tag( + "GetAllGameInfoResponse", + "FullGamePurchased" to true, "FullGameReleased" to true, "InstalledVersion" to (g?.version ?: "0"), "MaxGroupSize" to 16, + "Languages" to LANGUAGES, "Expiration" to "0000-00-00T00:00:00", "UpToDate" to true, "HasExpiration" to false, + "EntitlementSource" to "EA", "AvailableVersion" to (g?.version ?: "0"), "DisplayName" to g?.title.orEmpty(), + "FreeTrial" to false, "InstalledLanguage" to locale, "FullGameReleaseDate" to "2000-01-01T00:00:00", "SystemTime" to now(), + ) + "GetInternetConnectedState" -> tag("InternetConnectedState", "connected" to 1) + "IsProgressiveInstallationAvailable" -> tag("IsProgressiveInstallationAvailableResponse", "ItemId" to m.attrs["ItemId"].orEmpty(), "Available" to false) + "AreChunksInstalled" -> tag( + "AreChunksInstalledResponse", "ItemId" to m.attrs["ItemId"].orEmpty(), "Installed" to true, + body = m.children.joinToString("") { tag(it.first, body = esc(it.second)) }, + ) + "GetAuthCode" -> tag("AuthCode", "value" to (who?.takeIf { session.trusted }?.authCode(m.attrs["ClientId"].orEmpty(), m.attrs["Scope"])?.takeIf { session.trusted } ?: "invalid")) + "GetAuthToken" -> tag("AuthToken", "value" to if (!session.trusted) "" else (g?.validToken ?: who?.token().orEmpty())) + "RequestLicense" -> { + val token = who?.takeIf { session.trusted }?.license(g?.contentId.orEmpty(), m.attrs["RequestTicket"].orEmpty(), m.attrs["TicketEngine"].orEmpty())?.takeIf { session.trusted }.orEmpty() + tag("RequestLicenseResponse", "License" to token) + } + "QueryEntitlements" -> { + val group = m.attrs["Group"].orEmpty() + val rows = who?.takeIf { session.trusted }?.entitlements(group).orEmpty() + tag("QueryEntitlementsResponse", body = rows.joinToString("") { e -> + tag( + "Entitlement", + "LastModifiedDate" to "0000-00-00T00:00:00", "EntitlementId" to e["id"], "UseCount" to (e["useCount"] ?: "0"), + "Version" to (e["version"] ?: "0"), "ItemId" to e["productId"], "ResourceId" to "", "GrantDate" to e["grantDate"], + "Group" to group, "EntitlementTag" to e["entitlementTag"], "Type" to e["entitlementType"], + "Expiration" to (e["terminationDate"]?.takeIf { it.isNotEmpty() && it != "null" } ?: "0000-00-00T00:00:00"), "Source" to "", + ) + }) + } + "GetPresence" -> tag("GetPresenceResponse", "UserId" to person?.userId.orEmpty(), "Presence" to "INGAME") + "QueryPresence" -> tag("QueryPresenceResponse", body = "") + "QueryFriends" -> tag("QueryFriendsResponse", body = "") + "GetBlockList" -> tag("GetBlockListResponse", "Return" to "Success", body = "") + "QueryOffers" -> tag("QueryOffersResponse", body = "") + "QueryImage" -> tag("QueryImageResponse", "Result" to 0, body = "") + "GetVoipStatus" -> tag("GetVoipStatusResponse", "Available" to false, "Active" to false) + "ShowIGOWindow", "SetDownloaderUtilization" -> null + else -> tag("ErrorSuccess", "Code" to 0, "Description" to "") + } + } + + private class AppAccount(private val app: Context) : Account { + private val saved get() = EaAuth.load(app) + override val userId: String get() = saved?.userId.orEmpty() + override val personaId: String get() = saved?.personaId.orEmpty() + override val persona: String get() = saved?.eaId?.ifEmpty { null } ?: saved?.displayName.orEmpty() + + override fun authCode(clientId: String, scope: String?): String? = + EaAuth.mint(app, clientId, "code", scopes = scope?.split(' ')?.filter { it.isNotBlank() }.orEmpty()) + + override fun license(contentId: String, requestTicket: String, ticketEngine: String): String? { + val g = game ?: return null + val hw = g.hardware ?: return null + val token = EaAuth.accessToken(app) ?: return null + return runCatching { + EaOoa.request(token, contentId, EaOoa.machineHash(hw, g.hashVersion), requestTicket.ifEmpty { null }, ticketEngine.ifEmpty { null }).gameToken + }.onFailure { Log.w(TAG, "licence: ${it.message}") }.getOrNull() + } + + override fun token(): String? = EaAuth.mint(app, EaAuth.CLIENT_ID, "token", EaAuth.OPAQUE_SCOPES, "OPAQUE", 14400) + + override fun entitlements(group: String): List> { + val token = EaAuth.accessToken(app) ?: return emptyList() + val arr = runCatching { EaApi.entitlements(token, group) }.getOrNull() ?: return emptyList() + return (0 until arr.length()).mapNotNull { arr.optJSONObject(it) }.map { o -> + o.keys().asSequence().associateWith { k -> o.optString(k) } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaManifest.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaManifest.kt new file mode 100644 index 0000000000..8c98311c0c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaManifest.kt @@ -0,0 +1,134 @@ +package com.droiddeck.launcher.stores.ea + +import org.xmlpull.v1.XmlPullParser +import org.xmlpull.v1.XmlPullParserFactory +import java.io.File +import java.io.StringReader + +/** What `__Installer/installerdata.xml` in an EA build says about running and finishing the install. */ +class EaManifest( + val version: String, + val launchers: List, + val touchupPath: String, + val touchupParameters: String, + val contentIds: List = emptyList(), + val titles: Map = emptyMap(), +) { + fun title(locale: String): String? = titles[locale] ?: titles["en_US"] ?: titles.values.firstOrNull() + + class Launcher(val path: String, val parameters: String, val trial: Boolean) + + fun launcher(): Launcher? = launchers.firstOrNull { !it.trial } ?: launchers.firstOrNull() + + companion object { + const val RELATIVE = "__Installer/installerdata.xml" + + fun decode(bytes: ByteArray): String { + val utf16 = bytes.size >= 2 && ((bytes[0] == 0xFF.toByte() && bytes[1] == 0xFE.toByte()) || (bytes[0] == 0xFE.toByte() && bytes[1] == 0xFF.toByte())) + val text = if (utf16) String(bytes, Charsets.UTF_16) else String(bytes, Charsets.UTF_8) + return text.trimStart('') + } + + fun read(folder: File): EaManifest? { + val file = File(folder, RELATIVE).takeIf { it.isFile } ?: EaPaths.find(folder, RELATIVE) ?: return null + return runCatching { parse(decode(file.readBytes())) }.getOrNull() + } + + fun parse(xml: String): EaManifest { + val parser = XmlPullParserFactory.newInstance().newPullParser() + parser.setInput(StringReader(xml.replace(Regex("^<\\?xml[^>]*\\?>"), ""))) + val stack = ArrayList() + var version = "" + val launchers = ArrayList() + var touchupPath = "" + var touchupParams = "" + var path = "" + var params = "" + var trial = false + val contentIds = ArrayList() + val titles = LinkedHashMap() + var locale = "" + while (parser.eventType != XmlPullParser.END_DOCUMENT) { + when (parser.eventType) { + XmlPullParser.START_TAG -> { + val name = parser.name + stack += name + if (name.equals("gameVersion", true)) { + version = parser.getAttributeValue(null, "version") ?: version + } + if (name.equals("launcher", true)) { path = ""; params = ""; trial = false } + if (name.equals("localeInfo", true)) locale = parser.getAttributeValue(null, "locale").orEmpty() + } + XmlPullParser.TEXT -> { + val text = parser.text.trim() + val tag = stack.lastOrNull().orEmpty() + val parent = stack.getOrNull(stack.size - 2).orEmpty() + if (text.isNotEmpty()) when { + parent.equals("launcher", true) && tag.equals("filePath", true) -> path = text + parent.equals("launcher", true) && tag.equals("parameters", true) -> params = text + parent.equals("launcher", true) && tag.equals("trial", true) -> trial = text.equals("true", true) || text == "1" + (parent.equals("touchup", true) || parent.equals("executable", true)) && tag.equals("filePath", true) -> touchupPath = text + (parent.equals("touchup", true) || parent.equals("executable", true)) && tag.equals("parameters", true) -> touchupParams = text + parent.equals("contentIDs", true) && tag.equals("contentID", true) -> contentIds += text + parent.equals("localeInfo", true) && tag.equals("title", true) && locale.isNotEmpty() -> titles[locale] = text + } + } + XmlPullParser.END_TAG -> { + if (parser.name.equals("launcher", true) && path.isNotEmpty()) launchers += Launcher(path, params, trial) + stack.removeLastOrNull() + } + } + parser.next() + } + return EaManifest(version, launchers, touchupPath, touchupParams, contentIds, titles) + } + } +} + +object EaPaths { + private val KEY = Regex("^\\[([^\\]]+)\\](.*)$") + + /** `[HKEY_LOCAL_MACHINE\SOFTWARE\Publisher\Game\Install Dir]bin\game.exe` splits into the registry key, value and relative path. */ + class Registered(val key: String, val value: String, val rest: String) + + fun registered(path: String): Registered? { + val m = KEY.find(path.trim()) ?: return null + val full = m.groupValues[1] + val cut = full.lastIndexOf('\\').takeIf { it > 0 } ?: return null + return Registered(full.substring(0, cut), full.substring(cut + 1), m.groupValues[2]) + } + + fun relative(path: String): String { + val rest = registered(path)?.rest ?: path.replace("{installLocation}", "", ignoreCase = true) + return rest.replace('\\', '/').trimStart('/').split('/').filter { it.isNotEmpty() && it != "." }.joinToString("/") + } + + /** The real file for a path the manifest may spell in a different case. */ + fun find(folder: File, relative: String): File? { + var cur = folder + for (part in relative.replace('\\', '/').split('/').filter { it.isNotEmpty() }) { + val names = cur.listFiles() ?: return null + cur = names.firstOrNull { it.name == part } ?: names.firstOrNull { it.name.equals(part, true) } ?: return null + } + return cur.takeIf { it.exists() && it != folder } + } + + fun relativeOnDisk(folder: File, relative: String): String? = + find(folder, relative)?.relativeTo(folder)?.path?.replace(File.separatorChar, '/') + + fun splitArgs(text: String): List { + val out = ArrayList() + val cur = StringBuilder() + var quoted = false + var any = false + for (c in text) { + when { + c == '"' -> { quoted = !quoted; any = true } + c.isWhitespace() && !quoted -> { if (any || cur.isNotEmpty()) out += cur.toString(); cur.clear(); any = false } + else -> cur.append(c) + } + } + if (any || cur.isNotEmpty()) out += cur.toString() + return out + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaNative.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaNative.kt new file mode 100644 index 0000000000..b8a4b60052 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaNative.kt @@ -0,0 +1,57 @@ +package com.droiddeck.launcher.stores.ea + +import android.util.Log +import com.droiddeck.launcher.stores.StoresNative +import com.droiddeck.launcher.stores.amazon.AmazonNative +import org.json.JSONObject +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +object EaNative { + private const val TAG = "EaNative" + const val ENGINE_MISSING = "EA: the store engine is not available" + + fun ready(): Boolean = StoresNative.ensureLoaded() + + fun call(op: String, request: JSONObject): JSONObject? { + if (!ready()) return null + val text = try { nativeCall(op, request.toString()) } catch (t: Throwable) { + Log.w(TAG, "$op: ${t.javaClass.simpleName}") + null + } ?: return null + return runCatching { JSONObject(text) }.getOrNull() + } + + fun install(request: JSONObject, events: AmazonNative.InstallListener, cancelled: AtomicBoolean): AmazonNative.InstallOutcome { + if (!ready()) return AmazonNative.InstallOutcome(false, false, ENGINE_MISSING, null) + val done = CountDownLatch(1) + val holder = arrayOfNulls(1) + val bridge = object : AmazonNative.InstallListener by events { + override fun onComplete(success: Boolean, cancelled: Boolean, error: String, result: String) { + holder[0] = AmazonNative.InstallOutcome(success, cancelled, error, result.takeIf { it.isNotEmpty() }?.let { runCatching { JSONObject(it) }.getOrNull() }) + done.countDown() + } + } + val handle = try { nativeInstall(request.toString(), bridge) } catch (t: Throwable) { + return AmazonNative.InstallOutcome(false, false, "The EA install could not start: ${t.javaClass.simpleName}", null) + } + if (handle == 0L) return holder[0] ?: AmazonNative.InstallOutcome(false, false, "The EA install could not start", null) + try { + var forwarded = false + while (true) { + val finished = try { done.await(250, TimeUnit.MILLISECONDS) } catch (e: InterruptedException) { cancelled.set(true); false } + if (finished) break + if (!forwarded && cancelled.get()) { nativeCancel(handle); forwarded = true } + } + } finally { + nativeRelease(handle) + } + return holder[0] ?: AmazonNative.InstallOutcome(false, false, "The EA install ended without a result", null) + } + + @JvmStatic private external fun nativeCall(op: String, request: String): String? + @JvmStatic private external fun nativeInstall(request: String, listener: AmazonNative.InstallListener): Long + @JvmStatic private external fun nativeCancel(handle: Long) + @JvmStatic private external fun nativeRelease(handle: Long) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt new file mode 100644 index 0000000000..9590ce4a0b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt @@ -0,0 +1,196 @@ +package com.droiddeck.launcher.stores.ea + +import org.json.JSONObject +import org.xmlpull.v1.XmlPullParser +import org.xmlpull.v1.XmlPullParserFactory +import java.io.File +import java.io.StringReader +import java.net.URLEncoder +import java.security.SecureRandom + +/** Origin Online Activation: the per-machine licence an EA game's activation layer checks before it runs. */ +object EaOoa { + private const val LICENSES = "https://proxy.novafusion.ea.com/licenses" + const val LICENSE_DIR = "ProgramData/Electronic Arts/EA Services/License" + private const val SIGNATURE_SLOT = 65 + + /** + * What the game sees of the machine inside its Wine prefix: firmware and OS values from Wine's + * WMI, CPU values from CPUID executed as x86 code, since an emulated game sees the emulator's + * CPUID rather than the host CPU WMI describes. + */ + class Hardware( + val boardManufacturer: String, + val boardSerial: String, + val biosManufacturer: String, + val biosSerial: String, + val osInstallDate: String, + val osSerial: String, + val volumeSerial: String, + val gpuPnpId: String, + val cpuVendor: String, + val cpuEdx: String, + val cpuEax: String, + val cpuEcx: String, + val brand: String, + val hostname: String, + ) { + /** Whether the probe reported everything the hash of this activation version is built from. */ + fun complete(version: Int): Boolean { + val needed = arrayListOf(boardManufacturer, biosManufacturer) + when { + version <= 1 -> needed += listOf(hostname, osInstallDate, osSerial) + version == 2 -> needed += listOf(osInstallDate, osSerial, volumeSerial, cpuVendor, cpuEdx, cpuEcx) + version == 3 -> needed += listOf(volumeSerial, cpuVendor, cpuEdx, cpuEcx) + else -> needed += listOf(volumeSerial, cpuVendor, cpuEdx, cpuEax) + } + return needed.all { it.isNotEmpty() } + } + + companion object { + fun fromJson(o: JSONObject): Hardware { + fun s(k: String) = o.optString(k).trim() + return Hardware( + boardManufacturer = s("boardManufacturer"), + boardSerial = s("boardSerial").ifEmpty { "None" }, + biosManufacturer = s("biosManufacturer"), + biosSerial = s("biosSerial").ifEmpty { "None" }, + osInstallDate = s("osInstallDate"), + osSerial = s("osSerial"), + volumeSerial = s("volumeSerial").replace("-", "").lowercase().let { if (it.isEmpty()) it else it.padStart(8, '0') }, + gpuPnpId = s("gpuPnpId").ifEmpty { "None" }, + cpuVendor = s("cpuVendor"), + cpuEdx = s("cpuEdx").uppercase(), + cpuEax = s("cpuEax").uppercase(), + cpuEcx = s("cpuEcx").lowercase(), + brand = o.optString("cpuBrand"), + hostname = s("hostname"), + ) + } + } + } + + fun machineHash(hw: Hardware, version: Int): String { + val edxEax = hw.cpuEdx + hw.cpuEax + val edx = hw.cpuEdx.lowercase() + val shortGpu = hw.gpuPnpId.substringBeforeLast('\\', hw.gpuPnpId) + val parts = arrayListOf(hw.boardManufacturer, hw.boardSerial) + when { + version <= 1 -> parts += listOf(hw.hostname, hw.biosManufacturer, hw.biosSerial, hw.osInstallDate, hw.osSerial) + version == 2 -> parts += listOf(hw.biosManufacturer, hw.biosSerial, hw.osInstallDate, hw.osSerial, hw.volumeSerial, shortGpu, hw.cpuVendor, edx, hw.cpuEcx) + version == 3 -> parts += listOf(hw.biosManufacturer, hw.biosSerial, hw.volumeSerial, shortGpu, hw.cpuVendor, edx, hw.cpuEcx) + else -> parts += listOf(hw.biosManufacturer, hw.biosSerial, hw.volumeSerial, hw.gpuPnpId, hw.cpuVendor, edxEax) + } + val text = StringBuilder(parts.joinToString(";")).append(';') + if (version >= 2) text.append(hw.brand.take(47).padEnd(47, '\u0000')).append(';') + val digest = EaCrypto.sha1(text.toString().toByteArray(Charsets.ISO_8859_1)) + return if (version < 4) digest.joinToString("") { Integer.toHexString(it.toInt() and 0xFF) } else EaCrypto.hex(digest) + } + + /** Version of the game's activation layer, which decides how the machine hash is built. */ + fun activationVersion(core: File): Int { + val dll = listOf("activation.dll", "awc.dll").firstNotNullOfOrNull { EaPaths.find(core, it) } ?: return 1 + val (major, minor, patch) = productVersion(dll.readBytes()) ?: return 1 + return when { + major >= 5 -> 4 + major == 4 && (minor > 7 || (minor == 7 && patch >= 6)) -> 3 + major == 4 && minor == 7 -> 2 + major == 4 -> 1 + else -> 0 + } + } + + /** The activation layer's folder: `Core` beside the game's exe, where EA ships it, or at the game root. */ + fun coreDir(game: File, exe: String): File? { + val exeDir = exe.replace('\\', '/').substringBeforeLast('/', "") + val candidates = listOfNotNull(exeDir.takeIf { it.isNotEmpty() }?.let { "$it/Core" }, "Core") + return candidates.firstNotNullOfOrNull { EaPaths.find(game, it)?.takeIf { f -> f.isDirectory } } + } + + /** Games built on the 2012-era EA Core client, which want an opaque token rather than a JWS one. */ + fun legacyCore(core: File?): Boolean = core != null && EaPaths.find(core, "EACore.dll") != null + + private fun encodedSignature(core: File): Boolean = EaPaths.find(core, "activation.exe") != null + + internal fun productVersion(pe: ByteArray): Triple? { + val magic = byteArrayOf(0xBD.toByte(), 0x04, 0xEF.toByte(), 0xFE.toByte()) + var i = 0 + while (i + 24 <= pe.size) { + if (pe[i] == magic[0] && pe[i + 1] == magic[1] && pe[i + 2] == magic[2] && pe[i + 3] == magic[3]) { + fun u32(at: Int) = (pe[at].toLong() and 0xFF) or ((pe[at + 1].toLong() and 0xFF) shl 8) or ((pe[at + 2].toLong() and 0xFF) shl 16) or ((pe[at + 3].toLong() and 0xFF) shl 24) + val ms = u32(i + 16) + val ls = u32(i + 20) + return Triple((ms ushr 16).toInt(), (ms and 0xFFFF).toInt(), (ls ushr 16).toInt()) + } + i++ + } + return null + } + + class License(val fields: LinkedHashMap, val namespace: String, val signature: String) { + val gameToken: String? get() = fields["GameToken"]?.takeIf { it.isNotEmpty() } + val contentId: String get() = fields["ContentId"].orEmpty() + } + + internal fun parseLicense(xml: String, signature: String): License { + val parser = XmlPullParserFactory.newInstance().apply { isNamespaceAware = false }.newPullParser() + parser.setInput(StringReader(xml.replace(Regex("^<\\?xml[^>]*\\?>"), "").trim())) + val fields = LinkedHashMap() + var ns = "" + var depth = 0 + var tag = "" + while (parser.eventType != XmlPullParser.END_DOCUMENT) { + when (parser.eventType) { + XmlPullParser.START_TAG -> { + depth++ + if (depth == 1) ns = parser.getAttributeValue(null, "xmlns").orEmpty() else tag = parser.name + if (depth == 2) fields[tag] = "" + } + XmlPullParser.TEXT -> if (depth == 2) fields[tag] = fields[tag].orEmpty() + parser.text + XmlPullParser.END_TAG -> depth-- + } + parser.next() + } + return License(fields, ns, signature) + } + + private fun esc(s: String) = s.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """) + + fun licenseXml(l: License): String { + val order = listOf("CipherKey", "MachineHash", "ContentId", "UserId", "GameToken", "GrantTime", "StartTime", "Nonce") + val body = StringBuilder("") + body.append("") + for (k in order) { + val v = l.fields[k] ?: continue + if (k == "GameToken" && v.isEmpty()) continue + body.append('<').append(k).append('>').append(esc(v)).append("') + } + return body.append("").toString() + } + + fun licenseBlob(l: License, encoded: Boolean): ByteArray { + val signature = if (encoded) l.signature.toByteArray() else java.util.Base64.getDecoder().decode(l.signature) + val head = ByteArray(SIGNATURE_SLOT) + System.arraycopy(signature, 0, head, 0, signature.size.coerceAtMost(SIGNATURE_SLOT)) + return head + EaCrypto.licenseEncrypt(licenseXml(l).toByteArray()) + } + + fun request(token: String, contentId: String, machineHash: String, requestToken: String? = null, requestType: String? = null): License { + val nonce = EaCrypto.hex(ByteArray(4).also(SecureRandom()::nextBytes)) + val params = mutableListOf("contentId" to contentId, "machineHash" to machineHash, "nonce" to nonce, "ea_eadmtoken" to token) + if (requestToken != null) params += "requestToken" to requestToken + if (requestType != null) params += "requestType" to requestType + val url = LICENSES + "?" + params.joinToString("&") { (k, v) -> k + "=" + URLEncoder.encode(v, "UTF-8") } + val reply = EaHttp.request(url, headers = mapOf("X-Requester-Id" to "Origin Online Activation", "User-Agent" to "EACTransaction")) + if (!reply.ok) throw IllegalStateException("EA refused the licence (${reply.status}): ${reply.text.replace(Regex("(eadmToken value=\")[^\"]*"), "$1\"").take(600)}") + val signature = reply.header("x-signature") ?: throw IllegalStateException("EA's licence had no signature") + return parseLicense(String(EaCrypto.licenseDecrypt(reply.body), Charsets.UTF_8), signature) + } + + /** Licence files for a game about to start, named as the activation layer looks for them. */ + fun files(core: File, license: License): List> { + val blob = licenseBlob(license, encodedSignature(core)) + val id = license.contentId + return listOf("$LICENSE_DIR/$id.dlf" to blob, "$LICENSE_DIR/${id}_cached.dlf" to blob) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/EaUpdateButton.kt b/app/src/main/java/com/droiddeck/launcher/ui/EaUpdateButton.kt new file mode 100644 index 0000000000..9fe2a41155 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/EaUpdateButton.kt @@ -0,0 +1,17 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.ea.EaUpdates + +@Composable +internal fun EaUpdateButton(installed: InstalledStoreGame, enabled: Boolean) { + val ctx = LocalContext.current + LaunchedEffect(installed.key, installed.sidecar.installVersion) { EaUpdates.check(ctx, installed) } + if (EaUpdates.available[installed.key] == null) return + SecondaryButton(stringResource(R.string.common_update), enabled = enabled) { EaUpdates.start(ctx, installed) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 808c944858..f42a85de51 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -430,6 +430,7 @@ internal fun GameActions( openUrl(ctx, item?.storeUrl.orEmpty().ifBlank { GameJoltApi.pageUrl("game", installed.sidecar.id) }) } } + if (store == Store.EA && installed != null) EaUpdateButton(installed, download == null && StoresState.uninstalling[installed.key] == null) if (store == Store.GOG && installed != null) GogMaintenanceActions(installed) if (store == Store.XBOX && id != null) XboxInstalledStream(id, game?.name ?: item?.title.orEmpty(), item) if (store == Store.XBOX && installed != null && id != null) { @@ -915,7 +916,7 @@ private fun AddonRow(name: String, target: WowAddons.Target, a: FrontEndActions) @Composable private fun CloudRows(g: Library.SteamGame) { - val store = Store.byId(g.source)?.takeIf { it != Store.AMAZON } ?: return + val store = Store.byId(g.source)?.takeIf { it != Store.AMAZON && it != Store.EA } ?: return val id = g.storeId ?: return val context = LocalContext.current.applicationContext var busy by remember(g.gameId) { mutableStateOf(null) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index dfba4cf31f..73dad7aa70 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -742,7 +742,7 @@ internal fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?, showDownlo } } -private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available || it in GameJoltUpdates.available } == true || +private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available || it in GameJoltUpdates.available || it in com.droiddeck.launcher.stores.ea.EaUpdates.available } == true || e.source == Store.GOG.id && (e.item?.id ?: e.game?.storeId)?.let { GogMaintenance.checks[it]?.state } == GogMaintenance.State.AVAILABLE @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index 1d2aef9d6e..3eede9da18 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -33,6 +33,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.ITCH.id -> SourceColours(Color(0xFF3A1A1E), Color(0xFFFFB3B3), Color(0xFFFF5C5C)) Store.GAMEJOLT.id -> SourceColours(Color(0xFF232E00), Color(0xFFE3FF66), Color(0xFFCCFF00)) Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) + Store.EA.id -> SourceColours(Color(0xFF3A0E12), Color(0xFFFF9A9A), Color(0xFFFF4747)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) else -> SourceColours(Color(0xFF1A1D22), Color(0xFF9AA3AF), Color(0xFF9AA3AF)) @@ -48,6 +49,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.ITCH.id -> Store.ITCH.label Store.GAMEJOLT.id -> Store.GAMEJOLT.label Store.BATTLENET.id -> Store.BATTLENET.label + Store.EA.id -> Store.EA.label else -> stringResource(R.string.source_added) } 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 c5f31f5d32..88e473285b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1157,6 +1157,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.ITCH -> Color(0xFFFF5C5C) to Color(0xFFD93B3B) Store.GAMEJOLT -> Color(0xFFCCFF00) to Color(0xFFA3CC00) Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) + Store.EA -> Color(0xFFFF4747) to Color(0xFFE03030) null -> return base } val on = if (accent.luminance() > 0.18f) Color(0xFF0B0B0D) else Color.White diff --git a/app/src/main/resources/ea/graphql/GameImages.gql b/app/src/main/resources/ea/graphql/GameImages.gql new file mode 100644 index 0000000000..92d8a50b87 --- /dev/null +++ b/app/src/main/resources/ea/graphql/GameImages.gql @@ -0,0 +1,69 @@ +query GameImages($gameSlug: String!, $locale: Locale!) { + game(slug: $gameSlug, locale: $locale) { + id + slug + title + keyArt { + ...imageRenditionData + __typename + } + packArt { + ...PackArt + __typename + } + ...PrimaryLogo + __typename + } +} + +fragment imageRenditionData on ImageRendition { + path + aspect9x16Image { + path + __typename + } + aspect16x9Image { + path + __typename + } + aspect1x1Image { + path + __typename + } + largestImage { + path + __typename + } + rawImages { + path + __typename + } + __typename +} + +fragment PrimaryLogo on GameV2 { + primaryLogo(uiClientContexts: ["juno-web-game-tile"]) { + path + title + largestImage { + path + width + height + __typename + } + __typename + } + __typename +} + +fragment PackArt on ImageRendition { + aspect2x1Image { + path + __typename + } + aspect9x16Image { + path + __typename + } + __typename +} diff --git a/app/src/main/resources/ea/graphql/GetUserPlayer.gql b/app/src/main/resources/ea/graphql/GetUserPlayer.gql new file mode 100644 index 0000000000..4094c264ab --- /dev/null +++ b/app/src/main/resources/ea/graphql/GetUserPlayer.gql @@ -0,0 +1,49 @@ +query GetUserPlayer { + me { + id: pd + pd + player { + ...Player + __typename + } + __typename + } +} + +fragment Player on Player { + id: pd + pd + psd + displayName + uniqueName + nickname + avatar { + ...Avatar + __typename + } + relationship + __typename +} + +fragment Avatar on AvatarList { + large { + ...image + __typename + } + medium { + ...image + __typename + } + small { + ...image + __typename + } + __typename +} + +fragment image on Image { + height + width + path + __typename +} diff --git a/app/src/main/resources/ea/graphql/availableBuilds.gql b/app/src/main/resources/ea/graphql/availableBuilds.gql new file mode 100644 index 0000000000..b410f0a7f9 --- /dev/null +++ b/app/src/main/resources/ea/graphql/availableBuilds.gql @@ -0,0 +1,9 @@ +query availableBuilds($offerId: String!) { + availableBuilds(offerId: $offerId) { + buildId + downloadType + gameVersion + buildLiveDate + __typename + } +} diff --git a/app/src/main/resources/ea/graphql/downloadUrl.gql b/app/src/main/resources/ea/graphql/downloadUrl.gql new file mode 100644 index 0000000000..0110c64f93 --- /dev/null +++ b/app/src/main/resources/ea/graphql/downloadUrl.gql @@ -0,0 +1,7 @@ +query downloadUrl($offerId: String!, $buildId: String) { + downloadUrl(offerId: $offerId, buildId: $buildId) { + url + syncUrl + __typename + } +} diff --git a/app/src/main/resources/ea/graphql/getLegacyCatalogDefs.gql b/app/src/main/resources/ea/graphql/getLegacyCatalogDefs.gql new file mode 100644 index 0000000000..6d3da0d9f8 --- /dev/null +++ b/app/src/main/resources/ea/graphql/getLegacyCatalogDefs.gql @@ -0,0 +1,66 @@ +query getLegacyCatalogDefs($offerIds: [String!]!, $locale: Locale) { + legacyOffers(offerIds: $offerIds, locale: $locale) { + offerId: id + contentId + basePlatform + primaryMasterTitleId + mdmProjectNumber + achievementSetOverride + gameLauncherURL + gameLauncherURLClientID + stagingKeyPath + mdmTitleIds + multiplayerId + executePathOverride + installationDirectory + installCheckOverride + monitorPlay + displayName + displayType + igoBrowserDefaultUrl + executeParameters + softwareLocales + dipManifestRelativePath + metadataInstallLocation + distributionSubType + downloads { + igoApiEnabled + downloadType + version + executeElevated + buildReleaseVersion + buildLiveDate + buildMetaData + gameVersion + treatUpdatesAsMandatory + enableDifferentialUpdate + __typename + } + locale + greyMarketControls + isDownloadable + isPreviewDownload + downloadStartDate + releaseDate + useEndDate + subscriptionUnlockDate + subscriptionUseEndDate + softwarePlatform + softwareId + downloadPackageType + installerPath + processorArchitecture + macBundleID + gameEditionTypeFacetKeyRankDesc + appliedCountryCode + cloudSaveConfigurationOverride + firstParties{ + partner + partnerId + partnerIdType + __typename + } + suppressedOfferIds + __typename + } +} diff --git a/app/src/main/resources/ea/graphql/getLegacyEntitlements.gql b/app/src/main/resources/ea/graphql/getLegacyEntitlements.gql new file mode 100644 index 0000000000..d4a6de1012 --- /dev/null +++ b/app/src/main/resources/ea/graphql/getLegacyEntitlements.gql @@ -0,0 +1,33 @@ +query getLegacyEntitlements($limit: Int, $next: String, $storeFronts: [UserLegacyEntitlementStorefront!]!) { + me { + legacyEntitlements( + paging: {limit: $limit, next: $next}, + storefronts: $storeFronts, + status: [ACTIVE, DISABLED] + ) { + next + items { + cdKey + entitlementTag + entitlementType + externalType + grantDate + groupName + id + isSubscription + isSubscriptionExpired + lastModifiedDate + originPermissions + productId + status + statusReasonCode + terminationDate + trialTimeRemainingSeconds + useCount + version + __typename + } + __typename + } + } +} \ No newline at end of file diff --git a/app/src/main/resources/ea/graphql/getPreloadedOwnedGames.gql b/app/src/main/resources/ea/graphql/getPreloadedOwnedGames.gql new file mode 100644 index 0000000000..b3a5a488eb --- /dev/null +++ b/app/src/main/resources/ea/graphql/getPreloadedOwnedGames.gql @@ -0,0 +1,69 @@ +query getPreloadedOwnedGames($next: String, $locale: Locale, $limit: Int, $type: [GameProductType!]!, $entitlementEnabled: Boolean, $isMac: Boolean = false, $storefronts: [UserGameProductStorefront!], $ownershipMethods: [OwnershipMethod!], $processorArchitectures: [ProcessorArchitecture!], $platforms: [GamePlatform!]!) { + me { + id: pd + ownedGameProducts(storefronts: $storefronts, locale: $locale, paging: {limit: $limit, next: $next}, productFound: true, orderBy: {field: NAME, direction: ASC}, ownershipMethod: $ownershipMethods, processorArchitectures: $processorArchitectures, type: $type, downloadableOnly: false, entitlementEnabled: $entitlementEnabled, platforms: $platforms) { + next + totalCount + items { + ...userGameProductFragment + __typename + } + __typename + } + __typename + } +} + +fragment userGameProductFragment on UserGameProduct { + id: originOfferId + originOfferId + status + product { + ...OwnedGameProductFragment + __typename + } + __typename +} + +fragment OwnedGameProductFragment on GameProduct { + id + name + downloadable + gameSlug + trialDetails { + trialType + __typename + } + baseItem(availabilities: [VISIBLE]) { + title + id + baseGameSlug + gameType + __typename + } + gamePlatformDetails @include(if: $isMac) { + gamePlatform + __typename + } + processorArchitectureDetails @include(if: $isMac) { + processorArchitecture + platform + __typename + } + gameProductUser(storefronts: $storefronts) { + ownershipMethods + initialEntitlementDate + entitlementId + gameProductUserTrial { + trialTimeRemainingSeconds + __typename + } + status + __typename + } + purchaseStatus { + repurchasable + __typename + } + __typename +} diff --git a/app/src/main/resources/ea/graphql/sdkEntitlements.gql b/app/src/main/resources/ea/graphql/sdkEntitlements.gql new file mode 100644 index 0000000000..df6613663e --- /dev/null +++ b/app/src/main/resources/ea/graphql/sdkEntitlements.gql @@ -0,0 +1,27 @@ +query sdkEntitlements($productIds: [String!]!, $includeChildGroups: Boolean!, $groupNames: [String!]!, $entitlementTag: String!, $pageSize: Int!, $pageNumber: Int!) { + me { + sdkEntitlements( + productIds: $productIds, + includeChildGroups: $includeChildGroups, + groupNames: $groupNames, + entitlementTag: $entitlementTag, + paging: { + pageSize: $pageSize, pageNumber: $pageNumber + } + ) { + entitlements { + entitlementTag + entitlementType + grantDate + groupName + id + productId + terminationDate + useCount + version + __typename + } + __typename + } + } +} diff --git a/app/src/main/rust/stores/src/ea/ffi.rs b/app/src/main/rust/stores/src/ea/ffi.rs new file mode 100644 index 0000000000..7656c6b33e --- /dev/null +++ b/app/src/main/rust/stores/src/ea/ffi.rs @@ -0,0 +1,207 @@ +use std::panic::{catch_unwind, AssertUnwindSafe}; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::Arc; + +use jni::objects::{GlobalRef, JClass, JObject, JString, JValue}; +use jni::sys::{jlong, jstring, JNI_FALSE, JNI_TRUE}; +use jni::{JNIEnv, JavaVM}; +use serde_json::json; + +use super::install; +use crate::amazon::install::{Events, Stop}; + +fn read_string(env: &mut JNIEnv, value: &JString) -> String { + if value.is_null() { + return String::new(); + } + env.get_string(value).map(|s| s.to_string_lossy().into_owned()).unwrap_or_default() +} + +fn new_string(env: &mut JNIEnv, text: &str) -> jstring { + env.new_string(text).map(|s| s.into_raw()).unwrap_or(std::ptr::null_mut()) +} + +fn call(op: &str, request: &str) -> String { + let parsed: serde_json::Value = serde_json::from_str(request).unwrap_or(serde_json::Value::Null); + let url = parsed.get("url").and_then(|v| v.as_str()).unwrap_or(""); + let answer = match op { + "zip.size" => install::size(url).unwrap_or_else(|e| json!({ "error": e })), + _ => json!({ "error": format!("unknown operation {op}") }), + }; + answer.to_string() +} + +#[no_mangle] +pub extern "system" fn Java_com_droiddeck_launcher_stores_ea_EaNative_nativeCall( + mut env: JNIEnv, + _class: JClass, + op: JString, + request: JString, +) -> jstring { + let op = read_string(&mut env, &op); + let request = read_string(&mut env, &request); + match catch_unwind(AssertUnwindSafe(|| call(&op, &request))) { + Ok(text) => new_string(&mut env, &text), + Err(_) => std::ptr::null_mut(), + } +} + +struct Listener { + vm: JavaVM, + target: GlobalRef, +} + +impl Listener { + fn with_env(&self, fallback: R, f: impl FnOnce(&mut JNIEnv) -> R) -> R { + let Ok(mut env) = self.vm.attach_current_thread_as_daemon() else { + return fallback; + }; + let out = f(&mut env); + if env.exception_check().unwrap_or(false) { + let _ = env.exception_clear(); + } + out + } + + fn text(&self, method: &str, text: &str) { + self.with_env((), |env| { + let Ok(s) = env.new_string(text) else { return }; + let s = JObject::from(s); + let _ = env.call_method(self.target.as_obj(), method, "(Ljava/lang/String;)V", &[JValue::Object(&s)]); + let _ = env.delete_local_ref(s); + }); + } + + fn counts(&self, method: &str, a: u64, b: u64, c: u32, d: u32) { + self.with_env((), |env| { + let _ = env.call_method( + self.target.as_obj(), + method, + "(JJII)V", + &[ + JValue::Long(a.min(i64::MAX as u64) as i64), + JValue::Long(b.min(i64::MAX as u64) as i64), + JValue::Int(c.min(i32::MAX as u32) as i32), + JValue::Int(d.min(i32::MAX as u32) as i32), + ], + ); + }); + } + + fn complete(&self, success: bool, cancelled: bool, error: &str, result: &str) { + self.with_env((), |env| { + let (Ok(e), Ok(r)) = (env.new_string(error), env.new_string(result)) else { return }; + let (e, r) = (JObject::from(e), JObject::from(r)); + let _ = env.call_method( + self.target.as_obj(), + "onComplete", + "(ZZLjava/lang/String;Ljava/lang/String;)V", + &[ + JValue::Bool(if success { JNI_TRUE } else { JNI_FALSE }), + JValue::Bool(if cancelled { JNI_TRUE } else { JNI_FALSE }), + JValue::Object(&e), + JValue::Object(&r), + ], + ); + let _ = env.delete_local_ref(e); + let _ = env.delete_local_ref(r); + }); + } +} + +impl Events for Listener { + fn log(&self, line: &str) { + self.text("onLog", &crate::amazon::net::scrub_urls(line)); + } + + fn status(&self, text: &str) { + self.text("onStatus", text); + } + + fn checking(&self, done_bytes: u64, total_bytes: u64, files: u32, files_total: u32) { + self.counts("onCheck", done_bytes, total_bytes, files, files_total); + } + + fn sizes(&self, pending_bytes: u64, total_bytes: u64) { + self.with_env((), |env| { + let _ = env.call_method( + self.target.as_obj(), + "onSizes", + "(JJ)V", + &[ + JValue::Long(pending_bytes.min(i64::MAX as u64) as i64), + JValue::Long(total_bytes.min(i64::MAX as u64) as i64), + ], + ); + }); + } + + fn progress(&self, done: u64, total: u64, files: u32, files_total: u32) { + self.counts("onProgress", done, total, files, files_total); + } + + fn before_replace(&self) -> bool { + self.with_env(false, |env| match env.call_method(self.target.as_obj(), "beforeReplace", "()Z", &[]) { + Ok(v) => v.z().unwrap_or(false), + Err(_) => false, + }) + } +} + +#[no_mangle] +pub extern "system" fn Java_com_droiddeck_launcher_stores_ea_EaNative_nativeInstall( + mut env: JNIEnv, + _class: JClass, + request: JString, + listener: JObject, +) -> jlong { + if listener.is_null() { + return 0; + } + let Ok(vm) = env.get_java_vm() else { return 0 }; + let Ok(target) = env.new_global_ref(&listener) else { return 0 }; + let listener = Listener { vm, target }; + let text = read_string(&mut env, &request); + let parsed = serde_json::from_str::(&text) + .map_err(|_| "The install request could not be read".to_string()) + .and_then(|v| install::Request::from_json(&v)); + let request = match parsed { + Ok(r) => r, + Err(e) => { + listener.complete(false, false, &e, ""); + return 0; + } + }; + let cancel = Arc::new(AtomicBool::new(false)); + let worker_cancel = Arc::clone(&cancel); + let spawned = std::thread::Builder::new().name("ea-install".into()).spawn(move || { + crate::priority::background(); + let result = catch_unwind(AssertUnwindSafe(|| install::run(&request, &worker_cancel, &listener))) + .unwrap_or_else(|_| Err(Stop::Failed("The EA install stopped on an internal error".into()))); + match result { + Ok(done) => listener.complete(true, false, "", &done.to_json().to_string()), + Err(Stop::Cancelled) => listener.complete(false, true, "cancelled", ""), + Err(Stop::Failed(e)) => listener.complete(false, false, &e, ""), + } + }); + if spawned.is_err() { + return 0; + } + Box::into_raw(Box::new(cancel)) as jlong +} + +#[no_mangle] +pub extern "system" fn Java_com_droiddeck_launcher_stores_ea_EaNative_nativeCancel(_env: JNIEnv, _class: JClass, handle: jlong) { + let ptr = handle as *const Arc; + if let Some(cancel) = unsafe { ptr.as_ref() } { + cancel.store(true, Ordering::SeqCst); + } +} + +#[no_mangle] +pub extern "system" fn Java_com_droiddeck_launcher_stores_ea_EaNative_nativeRelease(_env: JNIEnv, _class: JClass, handle: jlong) { + let ptr = handle as *mut Arc; + if !ptr.is_null() { + drop(unsafe { Box::from_raw(ptr) }); + } +} diff --git a/app/src/main/rust/stores/src/ea/install.rs b/app/src/main/rust/stores/src/ea/install.rs new file mode 100644 index 0000000000..fb2cd80ef5 --- /dev/null +++ b/app/src/main/rust/stores/src/ea/install.rs @@ -0,0 +1,850 @@ +// SPDX-License-Identifier: GPL-3.0-or-later +//! Installs or updates an EA game from its build archive: files whose size and CRC already match +//! are kept, everything else is fetched entry by entry with ranged reads and inflated in place. + +use std::collections::{HashMap, HashSet}; +use std::fs::{self, File, OpenOptions}; +use std::io::{Read, Write}; +use std::os::unix::fs::FileExt; +use std::path::{Path, PathBuf}; +use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering}; +use std::sync::Mutex; +use std::time::{Duration, Instant, UNIX_EPOCH}; + +use flate2::{Crc, Decompress, FlushDecompress, Status}; +use serde_json::{json, Value}; + +use super::net; +use super::zip::{self, Entry}; +use crate::amazon::install::check::{free_bytes, space_problem}; +use crate::amazon::install::{Events, ReplaceGate, Stop}; +use crate::fetch_core::{distinct_host_count, run_fetch, FetchItem, FetchOptions, FetchSink, SinkError}; + +pub const LEDGER: &str = ".droiddeck-ea-files"; +pub const IN_PROGRESS_MARKER: &str = ".droiddeck-ea-downloading"; +const TEMP_SUFFIX: &str = ".ddpart"; +const PROGRESS_EVERY_MS: u64 = 50; +const CHECK_REPORT_EVERY: Duration = Duration::from_millis(200); +const REQUEST_TIMEOUT: Duration = Duration::from_secs(120); +const INFLATE_BUFFER: usize = 256 * 1024; +/// Records larger than this are fetched as parallel ranges into a scratch file, then inflated, +/// so one big file does not ride a single connection. +pub const PART_BYTES: u64 = 16 * 1024 * 1024; +const SPLIT_SUFFIX: &str = ".ddzip"; + +struct Split { + tmp: PathBuf, + file: Mutex>, + received: Vec, + left: AtomicUsize, +} + +#[derive(Clone, Copy)] +enum Work { + Whole(usize), + Part { job: usize, part: usize, start: u64, len: u64 }, +} + +/// The fetches for each job: whole records, or byte ranges of one when it is large. +fn works(jobs: &[&Planned], part_bytes: u64) -> Vec { + let mut out = Vec::new(); + for (i, p) in jobs.iter().enumerate() { + let span = p.range_end - p.entry.local_offset + 1; + if span <= part_bytes * 2 { + out.push(Work::Whole(i)); + continue; + } + let mut start = 0; + let mut part = 0; + while start < span { + let len = part_bytes.min(span - start); + out.push(Work::Part { job: i, part, start, len }); + start += len; + part += 1; + } + } + out +} +pub const REPLACE_REFUSED: &str = "The install record could not be switched to updating; nothing was replaced"; + +pub struct Request { + pub url: String, + pub game_dir: PathBuf, + pub max_workers: usize, + pub process_workers: usize, + pub ca_bundle: String, + pub part_bytes: u64, +} + +impl Request { + pub fn from_json(v: &Value) -> Result { + let text = |k: &str| v.get(k).and_then(|x| x.as_str()).unwrap_or("").to_string(); + let game_dir = text("gameDir"); + if game_dir.is_empty() || !game_dir.starts_with('/') { + return Err("No install folder was given".into()); + } + let url = text("url"); + if !url.starts_with("https://") && !url.starts_with("http://") { + return Err("EA gave no download for this game".into()); + } + Ok(Request { + url, + game_dir: PathBuf::from(game_dir), + max_workers: v.get("maxWorkers").and_then(|n| n.as_u64()).unwrap_or(8) as usize, + process_workers: v.get("processWorkers").and_then(|n| n.as_u64()).unwrap_or(2) as usize, + ca_bundle: text("caBundle"), + part_bytes: v.get("partBytes").and_then(|n| n.as_u64()).filter(|n| *n > 0).unwrap_or(PART_BYTES), + }) + } +} + +#[derive(Debug, Default)] +pub struct Finished { + pub total_bytes: u64, + pub download_bytes: u64, + pub file_count: usize, + pub files_written: usize, + pub bytes_written: u64, + pub removed: usize, +} + +impl Finished { + pub fn to_json(&self) -> Value { + json!({ + "totalBytes": self.total_bytes, + "downloadBytes": self.download_bytes, + "fileCount": self.file_count, + "filesWritten": self.files_written, + "bytesWritten": self.bytes_written, + "removed": self.removed, + }) + } +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +struct Known { + crc: u32, + size: u64, + modified: u64, +} + +fn modified_ms(path: &Path) -> u64 { + fs::metadata(path) + .and_then(|m| m.modified()) + .ok() + .and_then(|t| t.duration_since(UNIX_EPOCH).ok()) + .map(|d| d.as_millis() as u64) + .unwrap_or(0) +} + +fn read_ledger(dir: &Path) -> HashMap { + let Ok(text) = fs::read_to_string(dir.join(LEDGER)) else { return HashMap::new() }; + let mut out = HashMap::new(); + for line in text.lines() { + let mut parts = line.splitn(4, '\t'); + let (Some(crc), Some(size), Some(modified), Some(path)) = (parts.next(), parts.next(), parts.next(), parts.next()) else { + continue; + }; + let (Ok(crc), Ok(size), Ok(modified)) = (u32::from_str_radix(crc, 16), size.parse(), modified.parse()) else { + continue; + }; + out.insert(path.to_string(), Known { crc, size, modified }); + } + out +} + +fn ledger_line(path: &str, k: Known) -> String { + format!("{:08x}\t{}\t{}\t{path}\n", k.crc, k.size, k.modified) +} + +fn crc_of(path: &Path, cancel: &AtomicBool) -> Result, ()> { + let Ok(mut f) = File::open(path) else { return Ok(None) }; + let mut crc = Crc::new(); + let mut buf = vec![0u8; 1024 * 1024]; + loop { + if cancel.load(Ordering::Relaxed) { + return Err(()); + } + match f.read(&mut buf) { + Ok(0) => return Ok(Some(crc.sum())), + Ok(n) => crc.update(&buf[..n]), + Err(e) if e.kind() == std::io::ErrorKind::Interrupted => {} + Err(_) => return Ok(None), + } + } +} + +/// Whether two paths name one file, as they do for a case-only rename on case-insensitive storage. +fn same_file(a: &Path, b: &Path) -> bool { + use std::os::unix::fs::MetadataExt; + match (fs::metadata(a), fs::metadata(b)) { + (Ok(x), Ok(y)) => x.dev() == y.dev() && x.ino() == y.ino(), + _ => false, + } +} + +fn temp_path(dest: &Path) -> PathBuf { + let mut name = dest.as_os_str().to_owned(); + name.push(TEMP_SUFFIX); + PathBuf::from(name) +} + +pub struct Planned { + pub entry: Entry, + pub path: String, + pub range_end: u64, +} + +/// Every file entry with its safe path and the last byte its local record can occupy. +pub fn plan(entries: &[Entry], directory_offset: u64) -> Result, String> { + let mut offsets: Vec = entries.iter().map(|e| e.local_offset).collect(); + offsets.push(directory_offset); + offsets.sort_unstable(); + offsets.dedup(); + let mut seen = HashSet::new(); + let mut out = Vec::new(); + for e in entries.iter().filter(|e| !e.is_dir()) { + if e.method != zip::STORED && e.method != zip::DEFLATED { + return Err(format!("{} uses an unsupported compression method ({})", e.name, e.method)); + } + let path = zip::safe_path(&e.name).ok_or_else(|| format!("The archive names a file outside the game folder: {}", e.name))?; + if !seen.insert(path.to_lowercase()) { + continue; + } + let at = offsets.partition_point(|&o| o <= e.local_offset); + let next = offsets.get(at).copied().unwrap_or(directory_offset); + let minimum = e.local_offset + zip::LOCAL_FIXED as u64 + e.compressed; + if next < minimum { + return Err(format!("{} overlaps the next record in the archive", e.name)); + } + out.push(Planned { entry: e.clone(), path, range_end: next - 1 }); + } + Ok(out) +} + +struct Slot { + header: Vec, + payload_from: Option, + consumed: u64, + file: File, + tmp: PathBuf, + crc: Crc, + written: u64, + inflate: Option, + buffer: Vec, +} + +struct Placer<'a> { + jobs: &'a [&'a Planned], + game_dir: &'a Path, + slots: Vec>>, + splits: Vec>, + works: Vec, + placed: Vec, + ledger: Mutex>, + events: &'a dyn Events, + gate: &'a ReplaceGate, + stop: &'a AtomicBool, + failure: Mutex>, + base_done: u64, + base_files: u32, + total: u64, + total_files: u32, + placed_bytes: AtomicU64, + in_flight: AtomicU64, + shown: AtomicU64, + bytes_written: AtomicU64, + files_placed: AtomicUsize, + last_emit: AtomicU64, + started: Instant, +} + +fn discard(slot: Slot) { + drop(slot.file); + let _ = fs::remove_file(&slot.tmp); +} + +impl Placer<'_> { + fn fail(&self, message: String) -> String { + let mut slot = self.failure.lock().expect("failure lock"); + if slot.is_none() { + *slot = Some(message.clone()); + } + drop(slot); + self.stop.store(true, Ordering::SeqCst); + message + } + + fn emit(&self, force: bool) { + let now = self.started.elapsed().as_millis() as u64; + let last = self.last_emit.load(Ordering::Relaxed); + if !force && now < last + PROGRESS_EVERY_MS { + return; + } + if !force && self.last_emit.compare_exchange(last, now, Ordering::Relaxed, Ordering::Relaxed).is_err() { + return; + } + self.last_emit.store(now, Ordering::Relaxed); + let value = self.base_done + self.placed_bytes.load(Ordering::Relaxed) + self.in_flight.load(Ordering::Relaxed); + let shown = self.shown.fetch_max(value, Ordering::Relaxed).max(value); + self.events.progress( + shown.min(self.total), + self.total, + self.base_files + self.files_placed.load(Ordering::Relaxed) as u32, + self.total_files, + ); + } + + fn open(&self, job: &Planned) -> Result { + let dest = self.game_dir.join(&job.path); + if let Some(parent) = dest.parent() { + fs::create_dir_all(parent).map_err(|e| format!("Could not create the folder for {}: {e}", job.path))?; + } + let tmp = temp_path(&dest); + let file = File::create(&tmp).map_err(|e| format!("Could not write {}: {e}", job.path))?; + Ok(Slot { + header: Vec::new(), + payload_from: None, + consumed: 0, + file, + tmp, + crc: Crc::new(), + written: 0, + inflate: (job.entry.method == zip::DEFLATED).then(|| Decompress::new(false)), + buffer: Vec::new(), + }) + } + + fn write_out(&self, job: &Planned, slot: &mut Slot, data: &[u8]) -> Result<(), SinkError> { + if slot.written + data.len() as u64 > job.entry.size { + return Err(SinkError::Retry(format!("{}: more data than the archive lists", job.path))); + } + slot.file + .write_all(data) + .map_err(|e| SinkError::Fatal(self.fail(format!("Could not write {}: {e}", job.path))))?; + slot.crc.update(data); + slot.written += data.len() as u64; + self.bytes_written.fetch_add(data.len() as u64, Ordering::Relaxed); + Ok(()) + } + + fn feed(&self, job: &Planned, slot: &mut Slot, payload: &[u8], finish: bool) -> Result<(), SinkError> { + let Some(mut inflate) = slot.inflate.take() else { + return self.write_out(job, slot, payload); + }; + let mut out = std::mem::take(&mut slot.buffer); + out.resize(INFLATE_BUFFER, 0); + let result = self.inflate_into(job, slot, &mut inflate, &mut out, payload, finish); + slot.inflate = Some(inflate); + slot.buffer = out; + result + } + + fn inflate_into(&self, job: &Planned, slot: &mut Slot, inflate: &mut Decompress, out: &mut [u8], mut input: &[u8], finish: bool) -> Result<(), SinkError> { + let mode = if finish { FlushDecompress::Finish } else { FlushDecompress::None }; + loop { + let (in_before, out_before) = (inflate.total_in(), inflate.total_out()); + let status = inflate + .decompress(input, out, mode) + .map_err(|e| SinkError::Retry(format!("{}: the compressed data is damaged ({e})", job.path)))?; + let used = (inflate.total_in() - in_before) as usize; + let produced = (inflate.total_out() - out_before) as usize; + input = &input[used..]; + if produced > 0 { + self.write_out(job, slot, &out[..produced])?; + } + if status == Status::StreamEnd || (used == 0 && produced == 0) { + return Ok(()); + } + if input.is_empty() && !finish && produced < out.len() { + return Ok(()); + } + } + } + + fn piece(&self, i: usize, offset: u64, data: &[u8]) -> Result<(), SinkError> { + let job = self.jobs[i]; + let mut guard = self.slots[i].lock().expect("slot lock"); + if offset == 0 { + if let Some(old) = guard.take() { + self.in_flight.fetch_sub(old.consumed, Ordering::Relaxed); + discard(old); + } + *guard = Some(self.open(job).map_err(|e| SinkError::Fatal(self.fail(e)))?); + } + let Some(slot) = guard.as_mut() else { + return Err(SinkError::Retry(format!("{}: data arrived before the start of the record", job.path))); + }; + self.consume(job, slot, data) + } + + fn consume(&self, job: &Planned, slot: &mut Slot, data: &[u8]) -> Result<(), SinkError> { + if slot.payload_from.is_none() { + slot.header.extend_from_slice(data); + match zip::local_header_len(&slot.header) { + None => return Ok(()), + Some(Err(e)) => return Err(SinkError::Retry(format!("{}: {e}", job.path))), + Some(Ok(len)) if slot.header.len() < len => return Ok(()), + Some(Ok(len)) => { + slot.payload_from = Some(len); + let header = std::mem::take(&mut slot.header); + let rest = header[len..].to_vec(); + return self.payload(job, slot, &rest); + } + } + } + self.payload(job, slot, data) + } + + fn payload(&self, job: &Planned, slot: &mut Slot, data: &[u8]) -> Result<(), SinkError> { + let left = job.entry.compressed.saturating_sub(slot.consumed); + let take = &data[..(left.min(data.len() as u64) as usize)]; + if take.is_empty() { + return Ok(()); + } + slot.consumed += take.len() as u64; + self.in_flight.fetch_add(take.len() as u64, Ordering::Relaxed); + self.feed(job, slot, take, false)?; + self.emit(false); + Ok(()) + } + + fn finish(&self, i: usize) -> Result { + let job = self.jobs[i]; + let taken = self.slots[i].lock().expect("slot lock").take(); + let Some(slot) = taken else { + return Err(SinkError::Retry(format!("{}: the record arrived empty", job.path))); + }; + self.complete(i, slot) + } + + fn complete(&self, i: usize, mut slot: Slot) -> Result { + let job = self.jobs[i]; + self.in_flight.fetch_sub(slot.consumed, Ordering::Relaxed); + if slot.consumed != job.entry.compressed { + let got = slot.consumed; + discard(slot); + return Err(SinkError::Retry(format!("{}: {got} of {} compressed bytes arrived", job.path, job.entry.compressed))); + } + if slot.inflate.is_some() { + if let Err(e) = self.feed(job, &mut slot, &[], true) { + discard(slot); + return Err(e); + } + } + if slot.written != job.entry.size || slot.crc.sum() != job.entry.crc32 { + let got = slot.written; + discard(slot); + return Err(SinkError::Retry(format!("{}: {got} bytes inflated with a CRC mismatch", job.path))); + } + let Slot { file, tmp, .. } = slot; + if let Err(e) = file.sync_all() { + drop(file); + let _ = fs::remove_file(&tmp); + return Err(SinkError::Fatal(self.fail(format!("Could not write {}: {e}", job.path)))); + } + drop(file); + if self.stop.load(Ordering::SeqCst) { + let _ = fs::remove_file(&tmp); + return Ok(0); + } + if !self.gate.allow(self.events) { + let _ = fs::remove_file(&tmp); + return Err(SinkError::Fatal(self.fail(REPLACE_REFUSED.into()))); + } + let dest = self.game_dir.join(&job.path); + if let Err(e) = fs::rename(&tmp, &dest) { + let _ = fs::remove_file(&tmp); + return Err(SinkError::Fatal(self.fail(format!("Could not put {} in place: {e}", job.path)))); + } + self.record(job, &dest); + self.placed[i].store(true, Ordering::SeqCst); + self.placed_bytes.fetch_add(job.entry.compressed, Ordering::Relaxed); + self.files_placed.fetch_add(1, Ordering::Relaxed); + self.emit(true); + Ok(0) + } + + fn part_chunk(&self, i: usize, part: usize, start: u64, offset: u64, data: &[u8]) -> Result<(), SinkError> { + let job = self.jobs[i]; + let Some(split) = self.splits[i].as_ref() else { + return Err(SinkError::Fatal(format!("{}: no split state", job.path))); + }; + let mut file = split.file.lock().expect("split lock"); + if file.is_none() { + let dest = self.game_dir.join(&job.path); + if let Some(parent) = dest.parent() { + fs::create_dir_all(parent).map_err(|e| SinkError::Fatal(self.fail(format!("Could not create the folder for {}: {e}", job.path))))?; + } + *file = Some(File::create(&split.tmp).map_err(|e| SinkError::Fatal(self.fail(format!("Could not write {}: {e}", job.path))))?); + } + let handle = file.as_ref().expect("split file"); + if offset == 0 { + let old = split.received[part].swap(0, Ordering::Relaxed); + self.in_flight.fetch_sub(old, Ordering::Relaxed); + } + handle + .write_all_at(data, start + offset) + .map_err(|e| SinkError::Fatal(self.fail(format!("Could not write {}: {e}", job.path))))?; + drop(file); + split.received[part].fetch_add(data.len() as u64, Ordering::Relaxed); + self.in_flight.fetch_add(data.len() as u64, Ordering::Relaxed); + self.emit(false); + Ok(()) + } + + fn part_finish(&self, i: usize, part: usize, len: u64) -> Result { + let job = self.jobs[i]; + let Some(split) = self.splits[i].as_ref() else { + return Err(SinkError::Fatal(format!("{}: no split state", job.path))); + }; + let got = split.received[part].load(Ordering::Relaxed); + if got != len { + return Err(SinkError::Retry(format!("{}: part {part} got {got} of {len} bytes", job.path))); + } + if split.left.fetch_sub(1, Ordering::SeqCst) != 1 { + return Ok(0); + } + let received: u64 = split.received.iter().map(|r| r.swap(0, Ordering::Relaxed)).sum(); + self.in_flight.fetch_sub(received, Ordering::Relaxed); + let result = self.assemble(i, split); + let _ = fs::remove_file(&split.tmp); + *split.file.lock().expect("split lock") = None; + result.map_err(|e| match e { + SinkError::Retry(m) => SinkError::Fatal(self.fail(m)), + fatal => fatal, + }) + } + + fn assemble(&self, i: usize, split: &Split) -> Result { + let job = self.jobs[i]; + let mut source = File::open(&split.tmp).map_err(|e| SinkError::Fatal(self.fail(format!("Could not read {}: {e}", job.path))))?; + let mut slot = self.open(job).map_err(|e| SinkError::Fatal(self.fail(e)))?; + let mut buf = vec![0u8; 1024 * 1024]; + loop { + if self.stop.load(Ordering::Relaxed) { + self.in_flight.fetch_sub(slot.consumed, Ordering::Relaxed); + discard(slot); + return Ok(0); + } + let n = match source.read(&mut buf) { + Ok(0) => break, + Ok(n) => n, + Err(e) if e.kind() == std::io::ErrorKind::Interrupted => continue, + Err(e) => { + self.in_flight.fetch_sub(slot.consumed, Ordering::Relaxed); + discard(slot); + return Err(SinkError::Fatal(self.fail(format!("Could not read {}: {e}", job.path)))); + } + }; + if let Err(e) = self.consume(job, &mut slot, &buf[..n]) { + self.in_flight.fetch_sub(slot.consumed, Ordering::Relaxed); + discard(slot); + return Err(e); + } + if slot.consumed >= job.entry.compressed { + break; + } + } + self.complete(i, slot) + } + + fn record(&self, job: &Planned, dest: &Path) { + let known = Known { crc: job.entry.crc32, size: job.entry.size, modified: modified_ms(dest) }; + if let Some(file) = self.ledger.lock().expect("ledger lock").as_mut() { + let _ = file.write_all(ledger_line(&job.path, known).as_bytes()); + } + } +} + +struct Sink<'p, 'a>(&'p Placer<'a>); + +impl FetchSink for Sink<'_, '_> { + fn process(&self, item: &FetchItem, _body: Vec) -> Result { + Err(SinkError::Fatal(format!("item {} arrived whole; streaming was expected", item.id))) + } + + fn on_chunk(&self, item: &FetchItem, offset: u64, data: &[u8]) -> Result<(), SinkError> { + match self.0.works[item.id as usize] { + Work::Whole(i) => self.0.piece(i, offset, data), + Work::Part { job, part, start, .. } => self.0.part_chunk(job, part, start, offset, data), + } + } + + fn on_finish(&self, item: &FetchItem, _total_len: u64) -> Result { + match self.0.works[item.id as usize] { + Work::Whole(i) => self.0.finish(i), + Work::Part { job, part, len, .. } => self.0.part_finish(job, part, len), + } + } +} + +fn origin(url: &str) -> String { + let after = url.find("://").map(|i| i + 3).unwrap_or(0); + let end = url[after..].find('/').map(|i| after + i).unwrap_or(url.len()); + url[..end].to_string() +} + +fn cancelled(cancel: &AtomicBool) -> Result<(), Stop> { + if cancel.load(Ordering::SeqCst) { + Err(Stop::Cancelled) + } else { + Ok(()) + } +} + +pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result { + let failed = Stop::Failed; + let started = Instant::now(); + fs::create_dir_all(&req.game_dir).map_err(|e| failed(format!("Could not create the install folder: {e}")))?; + let _ = File::create(req.game_dir.join(IN_PROGRESS_MARKER)); + + ev.status("Reading the build…"); + let archive = net::read_archive(&req.url).map_err(|e| { + ev.log(&format!("archive: {e}")); + failed(format!("The EA build could not be read: {e}")) + })?; + cancelled(cancel)?; + let planned = plan(&archive.entries, archive.directory.offset).map_err(failed)?; + let total_size: u64 = planned.iter().map(|p| p.entry.size).sum(); + let total_compressed: u64 = planned.iter().map(|p| p.entry.compressed).sum(); + ev.log(&format!( + "archive bytes={} entries={} files={} size={total_size} compressed={total_compressed}", + archive.total, + archive.entries.len(), + planned.len() + )); + + for p in &planned { + let dest = req.game_dir.join(&p.path); + let _ = fs::remove_file(temp_path(&dest)); + let mut split = dest.into_os_string(); + split.push(SPLIT_SUFFIX); + let _ = fs::remove_file(split); + } + + ev.status("Checking files…"); + let mut ledger = read_ledger(&req.game_dir); + let mut pending: Vec<&Planned> = Vec::new(); + let mut kept: Vec<(String, Known)> = Vec::new(); + let mut checked = 0u64; + let mut last_report = Instant::now(); + for (n, p) in planned.iter().enumerate() { + let dest = req.game_dir.join(&p.path); + let size_ok = fs::symlink_metadata(&dest).map(|m| m.is_file() && m.len() == p.entry.size).unwrap_or(false); + let mut complete = false; + if size_ok { + let modified = modified_ms(&dest); + let known = ledger.get(&p.path).copied(); + if known == Some(Known { crc: p.entry.crc32, size: p.entry.size, modified }) { + complete = true; + } else { + match crc_of(&dest, cancel) { + Err(()) => return Err(Stop::Cancelled), + Ok(Some(crc)) if crc == p.entry.crc32 => { + complete = true; + kept.push((p.path.clone(), Known { crc, size: p.entry.size, modified })); + } + Ok(_) => {} + } + } + } + if !complete { + pending.push(p); + } + checked += p.entry.size; + if last_report.elapsed() >= CHECK_REPORT_EVERY || n + 1 == planned.len() { + ev.checking(checked, total_size, (n + 1) as u32, planned.len() as u32); + last_report = Instant::now(); + } + cancelled(cancel)?; + } + for (path, known) in kept { + ledger.insert(path, known); + } + + let pending_size: u64 = pending.iter().map(|p| p.entry.size).sum(); + let pending_compressed: u64 = pending.iter().map(|p| p.entry.compressed).sum(); + ev.log(&format!( + "resume kept_files={} pending_files={} pending_bytes={pending_size} pending_download={pending_compressed}", + planned.len() - pending.len(), + pending.len() + )); + ev.sizes(pending_size, total_size); + if let Some(message) = space_problem(pending_size, free_bytes(&req.game_dir)) { + return Err(failed(message)); + } + + let gate = ReplaceGate::new(); + let (empty, remote): (Vec<&Planned>, Vec<&Planned>) = pending.into_iter().partition(|p| p.entry.size == 0 && p.entry.crc32 == 0); + for p in &empty { + let dest = req.game_dir.join(&p.path); + if let Some(parent) = dest.parent() { + fs::create_dir_all(parent).map_err(|e| failed(format!("Could not create the folder for {}: {e}", p.path)))?; + } + if !gate.allow(ev) { + return Err(failed(REPLACE_REFUSED.into())); + } + File::create(&dest).map_err(|e| failed(format!("Could not write {}: {e}", p.path)))?; + ledger.insert(p.path.clone(), Known { crc: 0, size: 0, modified: modified_ms(&dest) }); + } + + let mut text = String::new(); + for (path, known) in &ledger { + text.push_str(&ledger_line(path, *known)); + } + fs::write(req.game_dir.join(LEDGER), text).map_err(|e| failed(format!("Could not write the install record: {e}")))?; + let ledger_file = OpenOptions::new().append(true).open(req.game_dir.join(LEDGER)).ok(); + + let host = origin(&req.url); + let works = works(&remote, req.part_bytes); + let splits: Vec> = remote + .iter() + .enumerate() + .map(|(i, p)| { + let parts = works.iter().filter(|w| matches!(w, Work::Part { job, .. } if *job == i)).count(); + (parts > 0).then(|| { + let mut name = req.game_dir.join(&p.path).into_os_string(); + name.push(SPLIT_SUFFIX); + Split { + tmp: PathBuf::from(name), + file: Mutex::new(None), + received: (0..parts).map(|_| AtomicU64::new(0)).collect(), + left: AtomicUsize::new(parts), + } + }) + }) + .collect(); + let placer = Placer { + jobs: &remote, + game_dir: &req.game_dir, + slots: remote.iter().map(|_| Mutex::new(None)).collect(), + splits, + works: works.clone(), + placed: remote.iter().map(|_| AtomicBool::new(false)).collect(), + ledger: Mutex::new(ledger_file), + events: ev, + gate: &gate, + stop: cancel, + failure: Mutex::new(None), + base_done: total_compressed - pending_compressed, + base_files: (planned.len() - remote.len()) as u32, + total: total_compressed, + total_files: planned.len() as u32, + placed_bytes: AtomicU64::new(0), + in_flight: AtomicU64::new(0), + shown: AtomicU64::new(0), + bytes_written: AtomicU64::new(0), + files_placed: AtomicUsize::new(0), + last_emit: AtomicU64::new(0), + started: Instant::now(), + }; + let cores = std::thread::available_parallelism().map(|n| n.get()).unwrap_or(2); + let window = req.max_workers.clamp(1, 64); + let hosts = vec![host.clone()]; + let options = FetchOptions { + max_workers: window, + per_host_cap: window, + timeout: REQUEST_TIMEOUT, + headers: vec![("User-Agent".to_string(), net::user_agent())], + ca_bundle_path: req.ca_bundle.clone(), + process_workers: req.process_workers.max(cores / 2).max(1), + label: "ea".to_string(), + stream: true, + }; + let items: Vec = works + .iter() + .enumerate() + .map(|(n, w)| { + let range = match *w { + Work::Whole(i) => (remote[i].entry.local_offset, remote[i].range_end), + Work::Part { job, start, len, .. } => { + let at = remote[job].entry.local_offset + start; + (at, at + len - 1) + } + }; + FetchItem { id: n as u64, urls: vec![req.url.clone()], reserve: 0, range: Some(range) } + }) + .collect(); + ev.status("Downloading…"); + ev.log(&format!("engine files={} requests={} window={window} hosts={}", remote.len(), items.len(), distinct_host_count(&hosts))); + placer.emit(true); + let log = |line: &str| ev.log(line); + let outcome = if items.is_empty() { + None + } else { + Some(run_fetch(items, &hosts, &options, &Sink(&placer), cancel, &|_: u64, _: u64| {}, &log)) + }; + for slot in &placer.slots { + if let Some(active) = slot.lock().expect("slot lock").take() { + discard(active); + } + } + for split in placer.splits.iter().flatten() { + *split.file.lock().expect("split lock") = None; + let _ = fs::remove_file(&split.tmp); + } + placer.emit(true); + let placed_all = placer.placed.iter().all(|p| p.load(Ordering::SeqCst)); + let bytes_written = placer.bytes_written.load(Ordering::Relaxed); + let files_written = placer.files_placed.load(Ordering::Relaxed) + empty.len(); + let elapsed = started.elapsed().as_secs_f64().max(0.001); + ev.log(&format!( + "summary files_written={files_written} bytes_written={bytes_written} elapsed_s={elapsed:.1} avg_mbps={:.1}", + bytes_written as f64 / 1_048_576.0 / elapsed + )); + if let Some(message) = placer.failure.lock().expect("failure lock").take() { + return Err(Stop::Failed(message)); + } + if !placed_all { + if let Some(error) = outcome.as_ref().and_then(|o| o.error.clone()) { + ev.log(&format!("download failed: {error}")); + return Err(Stop::Failed("A file failed to download".into())); + } + if cancel.load(Ordering::SeqCst) { + return Err(Stop::Cancelled); + } + return Err(Stop::Failed("The download ended before every file was written".into())); + } + + let wanted: HashSet<&str> = planned.iter().map(|p| p.path.as_str()).collect(); + let by_case: HashMap = planned.iter().map(|p| (p.path.to_lowercase(), p.path.as_str())).collect(); + let mut removed = 0; + let current = read_ledger(&req.game_dir); + let mut text = String::new(); + for (path, known) in ¤t { + if wanted.contains(path.as_str()) { + text.push_str(&ledger_line(path, *known)); + } else if by_case.get(&path.to_lowercase()).is_some_and(|kept| same_file(&req.game_dir.join(kept), &req.game_dir.join(path))) { + continue; + } else if zip::safe_path(path).as_deref() == Some(path.as_str()) && fs::remove_file(req.game_dir.join(path)).is_ok() { + removed += 1; + } + } + let _ = fs::write(req.game_dir.join(LEDGER), text); + if removed > 0 { + ev.log(&format!("removed {removed} files the new build no longer has")); + } + let _ = fs::remove_file(req.game_dir.join(IN_PROGRESS_MARKER)); + Ok(Finished { + total_bytes: total_size, + download_bytes: total_compressed, + file_count: planned.len(), + files_written, + bytes_written, + removed, + }) +} + +pub fn size(url: &str) -> Result { + let archive = net::read_archive(url)?; + let planned = plan(&archive.entries, archive.directory.offset)?; + Ok(json!({ + "totalBytes": planned.iter().map(|p| p.entry.size).sum::(), + "downloadBytes": planned.iter().map(|p| p.entry.compressed).sum::(), + "fileCount": planned.len(), + })) +} + +#[cfg(test)] +mod tests; diff --git a/app/src/main/rust/stores/src/ea/install/tests.rs b/app/src/main/rust/stores/src/ea/install/tests.rs new file mode 100644 index 0000000000..baf15a4345 --- /dev/null +++ b/app/src/main/rust/stores/src/ea/install/tests.rs @@ -0,0 +1,258 @@ +use std::io::{BufRead, BufReader, Write}; +use std::net::{TcpListener, TcpStream}; +use std::sync::atomic::{AtomicBool, AtomicUsize}; +use std::sync::{Arc, Mutex}; + +use flate2::write::DeflateEncoder; +use flate2::Compression; + +use super::*; + +struct Built { + bytes: Vec, +} + +fn build_zip(files: &[(&str, Vec, bool)]) -> Built { + let mut out = Vec::new(); + let mut central = Vec::new(); + for (name, data, deflate) in files { + let mut crc = Crc::new(); + crc.update(data); + let body = if *deflate { + let mut enc = DeflateEncoder::new(Vec::new(), Compression::default()); + enc.write_all(data).unwrap(); + enc.finish().unwrap() + } else { + data.clone() + }; + let method: u16 = if *deflate { 8 } else { 0 }; + let offset = out.len() as u32; + let extra = [0xAAu8, 0xBB, 2, 0, 1, 2]; + out.extend_from_slice(&0x0403_4b50u32.to_le_bytes()); + out.extend_from_slice(&[20, 0, 0, 0]); + out.extend_from_slice(&method.to_le_bytes()); + out.extend_from_slice(&[0, 0, 0, 0]); + out.extend_from_slice(&crc.sum().to_le_bytes()); + out.extend_from_slice(&(body.len() as u32).to_le_bytes()); + out.extend_from_slice(&(data.len() as u32).to_le_bytes()); + out.extend_from_slice(&(name.len() as u16).to_le_bytes()); + out.extend_from_slice(&(extra.len() as u16).to_le_bytes()); + out.extend_from_slice(name.as_bytes()); + out.extend_from_slice(&extra); + out.extend_from_slice(&body); + + central.extend_from_slice(&0x0201_4b50u32.to_le_bytes()); + central.extend_from_slice(&[20, 0, 20, 0, 0, 0]); + central.extend_from_slice(&method.to_le_bytes()); + central.extend_from_slice(&[0, 0, 0, 0]); + central.extend_from_slice(&crc.sum().to_le_bytes()); + central.extend_from_slice(&(body.len() as u32).to_le_bytes()); + central.extend_from_slice(&(data.len() as u32).to_le_bytes()); + central.extend_from_slice(&(name.len() as u16).to_le_bytes()); + central.extend_from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]); + central.extend_from_slice(&offset.to_le_bytes()); + central.extend_from_slice(name.as_bytes()); + } + let cd_offset = out.len() as u32; + let count = files.len() as u16; + out.extend_from_slice(¢ral); + out.extend_from_slice(&0x0605_4b50u32.to_le_bytes()); + out.extend_from_slice(&[0, 0, 0, 0]); + out.extend_from_slice(&count.to_le_bytes()); + out.extend_from_slice(&count.to_le_bytes()); + out.extend_from_slice(&(central.len() as u32).to_le_bytes()); + out.extend_from_slice(&cd_offset.to_le_bytes()); + out.extend_from_slice(&[0, 0]); + Built { bytes: out } +} + +struct Server { + url: String, + requests: Arc, +} + +fn serve(body: Vec) -> Server { + let listener = TcpListener::bind("127.0.0.1:0").unwrap(); + let addr = listener.local_addr().unwrap(); + let body = Arc::new(body); + let requests = Arc::new(AtomicUsize::new(0)); + let counter = Arc::clone(&requests); + std::thread::spawn(move || { + for stream in listener.incoming() { + let Ok(stream) = stream else { continue }; + let body = Arc::clone(&body); + counter.fetch_add(1, Ordering::SeqCst); + std::thread::spawn(move || answer(stream, &body)); + } + }); + Server { url: format!("http://{addr}/build/game.zip?sig=abc"), requests } +} + +fn answer(mut stream: TcpStream, body: &[u8]) { + let mut reader = BufReader::new(stream.try_clone().unwrap()); + let mut first = String::new(); + if reader.read_line(&mut first).is_err() { + return; + } + let mut range = None; + loop { + let mut line = String::new(); + match reader.read_line(&mut line) { + Ok(0) | Err(_) => break, + Ok(_) if line == "\r\n" => break, + Ok(_) => { + if let Some(v) = line.to_ascii_lowercase().strip_prefix("range: bytes=") { + range = Some(v.trim().to_string()); + } + } + } + } + let total = body.len() as u64; + let Some(range) = range else { + let _ = stream.write_all(format!("HTTP/1.1 200 OK\r\nContent-Length: {total}\r\nConnection: close\r\n\r\n").as_bytes()); + let _ = stream.write_all(body); + return; + }; + let (a, b) = range.split_once('-').unwrap(); + let (start, end) = if a.is_empty() { + let n: u64 = b.parse().unwrap(); + (total.saturating_sub(n), total - 1) + } else { + let start: u64 = a.parse().unwrap(); + let end = if b.is_empty() { total - 1 } else { b.parse::().unwrap().min(total - 1) }; + (start, end) + }; + let slice = &body[start as usize..=end as usize]; + let head = format!( + "HTTP/1.1 206 Partial Content\r\nContent-Length: {}\r\nContent-Range: bytes {start}-{end}/{total}\r\nConnection: close\r\n\r\n", + slice.len() + ); + let _ = stream.write_all(head.as_bytes()); + let _ = stream.write_all(slice); +} + +#[derive(Default)] +struct Recorder { + logs: Mutex>, + gates: AtomicUsize, + last: Mutex<(u64, u64)>, +} + +impl Events for Recorder { + fn log(&self, line: &str) { + self.logs.lock().unwrap().push(line.to_string()); + } + fn status(&self, _text: &str) {} + fn checking(&self, _d: u64, _t: u64, _f: u32, _ft: u32) {} + fn sizes(&self, _pending: u64, _total: u64) {} + fn progress(&self, done: u64, total: u64, _files: u32, _files_total: u32) { + *self.last.lock().unwrap() = (done, total); + } + fn before_replace(&self) -> bool { + self.gates.fetch_add(1, Ordering::SeqCst); + true + } +} + +fn sample() -> Vec<(&'static str, Vec, bool)> { + let mut seed = 0x1234_5678u32; + let big: Vec = (0..900_000u32).map(|_| { seed = seed.wrapping_mul(1_103_515_245).wrapping_add(12_345); (seed >> 16) as u8 }).collect(); + vec![ + ("__Installer/installerdata.xml", b"".to_vec(), true), + ("Game.exe", big, true), + ("Data\\stored.bin", vec![9u8; 4096], false), + ("Data/", Vec::new(), false), + ("empty.txt", Vec::new(), false), + ] +} + +fn request(url: &str, dir: &Path) -> Request { + Request { url: url.to_string(), game_dir: dir.to_path_buf(), max_workers: 4, process_workers: 2, ca_bundle: String::new(), part_bytes: 64 * 1024 } +} + +fn temp_dir(name: &str) -> PathBuf { + let dir = std::env::temp_dir().join(format!("droiddeck-ea-{name}-{}", std::process::id())); + let _ = fs::remove_dir_all(&dir); + fs::create_dir_all(&dir).unwrap(); + dir +} + +#[test] +fn installs_every_file_and_keeps_them_on_the_next_run() { + let files = sample(); + let zip = build_zip(&files); + let server = serve(zip.bytes); + let dir = temp_dir("install"); + let ev = Recorder::default(); + let done = run(&request(&server.url, &dir), &AtomicBool::new(false), &ev).unwrap(); + assert_eq!(done.file_count, 4); + assert_eq!(fs::read(dir.join("Game.exe")).unwrap(), files[1].1); + assert_eq!(fs::read(dir.join("Data/stored.bin")).unwrap(), vec![9u8; 4096]); + assert!(dir.join("empty.txt").is_file()); + assert!(dir.join("__Installer/installerdata.xml").is_file()); + assert!(!dir.join(IN_PROGRESS_MARKER).exists()); + let (shown, total) = *ev.last.lock().unwrap(); + assert_eq!(shown, total); + + let before = server.requests.load(Ordering::SeqCst); + let again = run(&request(&server.url, &dir), &AtomicBool::new(false), &Recorder::default()).unwrap(); + assert_eq!(again.files_written, 0); + assert!(server.requests.load(Ordering::SeqCst) - before <= 2); + let _ = fs::remove_dir_all(&dir); +} + +#[test] +fn an_update_replaces_changed_files_and_drops_removed_ones() { + let dir = temp_dir("update"); + let first = serve(build_zip(&sample()).bytes); + run(&request(&first.url, &dir), &AtomicBool::new(false), &Recorder::default()).unwrap(); + + let mut next = sample(); + next[1].1[10] ^= 0xFF; + next.retain(|f| f.0 != "Data\\stored.bin"); + let second = serve(build_zip(&next).bytes); + let ev = Recorder::default(); + let done = run(&request(&second.url, &dir), &AtomicBool::new(false), &ev).unwrap(); + assert_eq!(done.files_written, 1); + assert_eq!(done.removed, 1); + assert_eq!(fs::read(dir.join("Game.exe")).unwrap(), next[1].1); + assert!(!dir.join("Data/stored.bin").exists()); + assert_eq!(ev.gates.load(Ordering::SeqCst), 1); + let _ = fs::remove_dir_all(&dir); +} + +#[test] +fn a_damaged_file_on_disk_is_downloaded_again() { + let dir = temp_dir("repair"); + let server = serve(build_zip(&sample()).bytes); + run(&request(&server.url, &dir), &AtomicBool::new(false), &Recorder::default()).unwrap(); + let mut data = fs::read(dir.join("Game.exe")).unwrap(); + data[5] ^= 1; + fs::write(dir.join("Game.exe"), &data).unwrap(); + let done = run(&request(&server.url, &dir), &AtomicBool::new(false), &Recorder::default()).unwrap(); + assert_eq!(done.files_written, 1); + assert_eq!(fs::read(dir.join("Game.exe")).unwrap(), sample()[1].1); + let _ = fs::remove_dir_all(&dir); +} + +#[test] +fn reports_the_archive_size() { + let server = serve(build_zip(&sample()).bytes); + let answer = size(&server.url).unwrap(); + assert_eq!(answer["fileCount"], 4); + let expected: usize = sample().iter().map(|f| f.1.len()).sum(); + assert_eq!(answer["totalBytes"], expected as u64); +} + +#[test] +fn large_records_arrive_in_parallel_parts() { + let dir = temp_dir("parts"); + let server = serve(build_zip(&sample()).bytes); + let before = server.requests.load(Ordering::SeqCst); + let done = run(&request(&server.url, &dir), &AtomicBool::new(false), &Recorder::default()).unwrap(); + assert_eq!(done.files_written, 4); + assert!(server.requests.load(Ordering::SeqCst) - before > 6); + assert_eq!(fs::read(dir.join("Game.exe")).unwrap(), sample()[1].1); + assert!(fs::read_dir(&dir).unwrap().all(|e| !e.unwrap().file_name().to_string_lossy().ends_with(".ddzip"))); + let _ = fs::remove_dir_all(&dir); +} diff --git a/app/src/main/rust/stores/src/ea/mod.rs b/app/src/main/rust/stores/src/ea/mod.rs new file mode 100644 index 0000000000..73ccb48ad4 --- /dev/null +++ b/app/src/main/rust/stores/src/ea/mod.rs @@ -0,0 +1,4 @@ +pub mod ffi; +pub mod install; +pub mod net; +pub mod zip; diff --git a/app/src/main/rust/stores/src/ea/net.rs b/app/src/main/rust/stores/src/ea/net.rs new file mode 100644 index 0000000000..8b31895472 --- /dev/null +++ b/app/src/main/rust/stores/src/ea/net.rs @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-3.0-or-later +//! Ranged reads of EA's build archives. + +use std::time::Duration; + +use super::zip::{self, Directory, Entry}; + +const CONNECT_TIMEOUT: Duration = Duration::from_secs(30); +const READ_TIMEOUT: Duration = Duration::from_secs(60); +const MAX_DIRECTORY: u64 = 512 * 1024 * 1024; + +pub fn user_agent() -> String { + crate::amazon::net::user_agent() +} + +pub struct Ranged { + pub body: Vec, + pub start: u64, + pub total: u64, +} + +fn content_range(value: &str) -> Option<(u64, u64)> { + let rest = value.trim().strip_prefix("bytes")?.trim_start(); + let (span, total) = rest.split_once('/')?; + let start = span.split_once('-')?.0.trim().parse().ok()?; + Some((start, total.trim().parse().ok()?)) +} + +pub fn get_range(url: &str, range: &str) -> Result { + let runtime = tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + .map_err(|e| format!("runtime: {e}"))?; + runtime.block_on(async { + let client = reqwest::Client::builder() + .user_agent(user_agent()) + .connect_timeout(CONNECT_TIMEOUT) + .read_timeout(READ_TIMEOUT) + .build() + .map_err(|e| format!("http client: {}", e.without_url()))?; + let response = client + .get(url) + .header(reqwest::header::RANGE, format!("bytes={range}")) + .send() + .await + .map_err(|e| format!("request failed: {}", e.without_url()))?; + let status = response.status().as_u16(); + if status == 403 || status == 404 { + return Err(format!("the download link was refused ({status})")); + } + if status != 206 { + return Err(format!("the server did not answer a ranged read ({status})")); + } + let (start, total) = response + .headers() + .get(reqwest::header::CONTENT_RANGE) + .and_then(|v| v.to_str().ok()) + .and_then(content_range) + .ok_or("the server gave no content range")?; + let body = response.bytes().await.map_err(|e| format!("answer could not be read: {}", e.without_url()))?.to_vec(); + Ok(Ranged { body, start, total }) + }) +} + +pub struct Archive { + pub total: u64, + pub directory: Directory, + pub entries: Vec, +} + +pub fn read_archive(url: &str) -> Result { + let tail = get_range(url, &format!("-{}", zip::TAIL_LEN))?; + let directory = zip::locate(&tail.body, tail.start)?; + if directory.size > MAX_DIRECTORY || directory.offset + directory.size > tail.total { + return Err("The archive directory is out of bounds".into()); + } + let bytes = if directory.offset >= tail.start { + let at = (directory.offset - tail.start) as usize; + let end = at + directory.size as usize; + tail.body.get(at..end).ok_or("The archive directory is cut short")?.to_vec() + } else { + let end = directory.offset + directory.size - 1; + get_range(url, &format!("{}-{end}", directory.offset))?.body + }; + let entries = zip::parse(&bytes, directory.entries)?; + Ok(Archive { total: tail.total, directory, entries }) +} + +#[cfg(test)] +mod tests { + use super::content_range; + + #[test] + fn reads_content_range() { + assert_eq!(content_range("bytes 100-199/5000"), Some((100, 5000))); + assert_eq!(content_range("bytes */5000"), None); + } +} diff --git a/app/src/main/rust/stores/src/ea/zip.rs b/app/src/main/rust/stores/src/ea/zip.rs new file mode 100644 index 0000000000..d7a8203e73 --- /dev/null +++ b/app/src/main/rust/stores/src/ea/zip.rs @@ -0,0 +1,288 @@ +// SPDX-License-Identifier: GPL-3.0-or-later +//! The central directory of a remote ZIP archive, which is how EA publishes a game build. + +const EOCD: u32 = 0x0605_4b50; +const EOCD64: u32 = 0x0606_4b50; +const EOCD64_LOCATOR: u32 = 0x0706_4b50; +const CENTRAL: u32 = 0x0201_4b50; +const LOCAL: u32 = 0x0403_4b50; +const EOCD_LEN: usize = 22; +const LOCATOR_LEN: usize = 20; +const EOCD64_LEN: usize = 56; +pub const LOCAL_FIXED: usize = 30; +pub const TAIL_LEN: u64 = 128 * 1024; + +pub const STORED: u16 = 0; +pub const DEFLATED: u16 = 8; + +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Entry { + pub name: String, + pub crc32: u32, + pub method: u16, + pub compressed: u64, + pub size: u64, + pub local_offset: u64, +} + +impl Entry { + pub fn is_dir(&self) -> bool { + self.name.ends_with('/') || self.name.ends_with('\\') + } +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub struct Directory { + pub offset: u64, + pub size: u64, + pub entries: u64, +} + +fn u16_at(b: &[u8], at: usize) -> Option { + b.get(at..at + 2).map(|s| u16::from_le_bytes([s[0], s[1]])) +} + +fn u32_at(b: &[u8], at: usize) -> Option { + b.get(at..at + 4).map(|s| u32::from_le_bytes([s[0], s[1], s[2], s[3]])) +} + +fn u64_at(b: &[u8], at: usize) -> Option { + b.get(at..at + 8).map(|s| u64::from_le_bytes(s.try_into().unwrap_or([0; 8]))) +} + +/// Finds the central directory from the last bytes of the archive. `tail_start` is where `tail` +/// begins in the whole file. +pub fn locate(tail: &[u8], tail_start: u64) -> Result { + if tail.len() < EOCD_LEN { + return Err("The archive is too short to be a ZIP".into()); + } + let mut at = tail.len() - EOCD_LEN; + let found = loop { + if u32_at(tail, at) == Some(EOCD) { + let comment = u16_at(tail, at + 20).unwrap_or(0) as usize; + if at + EOCD_LEN + comment <= tail.len() { + break at; + } + } + if at == 0 { + return Err("The archive has no end of central directory".into()); + } + at -= 1; + }; + let entries = u16_at(tail, found + 10).unwrap_or(0) as u64; + let size = u32_at(tail, found + 12).unwrap_or(0) as u64; + let offset = u32_at(tail, found + 16).unwrap_or(0) as u64; + let wide = entries == 0xFFFF || size == 0xFFFF_FFFF || offset == 0xFFFF_FFFF; + if !wide { + return Ok(Directory { offset, size, entries }); + } + let locator = found.checked_sub(LOCATOR_LEN).filter(|&l| u32_at(tail, l) == Some(EOCD64_LOCATOR)); + let Some(locator) = locator else { + return Err("The archive needs ZIP64 but has no ZIP64 locator".into()); + }; + let record_at = u64_at(tail, locator + 8).unwrap_or(0); + let Some(rel) = record_at.checked_sub(tail_start).map(|r| r as usize) else { + return Err("The ZIP64 directory record lies before the fetched tail".into()); + }; + if u32_at(tail, rel) != Some(EOCD64) || rel + EOCD64_LEN > tail.len() { + return Err("The ZIP64 directory record is damaged".into()); + } + Ok(Directory { + entries: u64_at(tail, rel + 32).unwrap_or(0), + size: u64_at(tail, rel + 40).unwrap_or(0), + offset: u64_at(tail, rel + 48).unwrap_or(0), + }) +} + +fn wide_values(extra: &[u8], need_size: bool, need_compressed: bool, need_offset: bool) -> (Option, Option, Option) { + let mut at = 0; + while at + 4 <= extra.len() { + let id = u16_at(extra, at).unwrap_or(0); + let len = u16_at(extra, at + 2).unwrap_or(0) as usize; + let body = &extra[(at + 4).min(extra.len())..(at + 4 + len).min(extra.len())]; + if id == 0x0001 { + let mut p = 0; + let mut take = |want: bool| { + if !want { + return None; + } + let v = u64_at(body, p); + p += 8; + v + }; + let size = take(need_size); + let compressed = take(need_compressed); + let offset = take(need_offset); + return (size, compressed, offset); + } + at += 4 + len; + } + (None, None, None) +} + +pub fn parse(directory: &[u8], expected: u64) -> Result, String> { + let mut entries = Vec::with_capacity(expected.min(1 << 20) as usize); + let mut at = 0usize; + while at + 46 <= directory.len() { + if u32_at(directory, at) != Some(CENTRAL) { + break; + } + let flags = u16_at(directory, at + 8).unwrap_or(0); + let method = u16_at(directory, at + 10).unwrap_or(0); + let crc32 = u32_at(directory, at + 16).unwrap_or(0); + let compressed32 = u32_at(directory, at + 20).unwrap_or(0); + let size32 = u32_at(directory, at + 24).unwrap_or(0); + let name_len = u16_at(directory, at + 28).unwrap_or(0) as usize; + let extra_len = u16_at(directory, at + 30).unwrap_or(0) as usize; + let comment_len = u16_at(directory, at + 32).unwrap_or(0) as usize; + let offset32 = u32_at(directory, at + 42).unwrap_or(0); + let name_at = at + 46; + let end = name_at + name_len + extra_len + comment_len; + if end > directory.len() { + return Err("The archive directory is cut short".into()); + } + let raw = &directory[name_at..name_at + name_len]; + let name = if flags & 0x0800 != 0 { + String::from_utf8_lossy(raw).into_owned() + } else { + raw.iter().map(|&b| b as char).collect() + }; + let extra = &directory[name_at + name_len..name_at + name_len + extra_len]; + let (size, compressed, offset) = + wide_values(extra, size32 == 0xFFFF_FFFF, compressed32 == 0xFFFF_FFFF, offset32 == 0xFFFF_FFFF); + if flags & 0x0001 != 0 { + return Err(format!("{name} is encrypted")); + } + entries.push(Entry { + name, + crc32, + method, + compressed: compressed.unwrap_or(compressed32 as u64), + size: size.unwrap_or(size32 as u64), + local_offset: offset.unwrap_or(offset32 as u64), + }); + at = end; + } + if expected != 0 && entries.len() as u64 != expected { + return Err(format!("The archive directory lists {} of {expected} entries", entries.len())); + } + Ok(entries) +} + +/// Bytes before the compressed data of an entry, read from its local header. +pub fn local_header_len(header: &[u8]) -> Option> { + if header.len() < LOCAL_FIXED { + return None; + } + if u32_at(header, 0) != Some(LOCAL) { + return Some(Err("An entry has no local header where the directory points".into())); + } + let name = u16_at(header, 26).unwrap_or(0) as usize; + let extra = u16_at(header, 28).unwrap_or(0) as usize; + Some(Ok(LOCAL_FIXED + name + extra)) +} + +/// A relative path inside the install folder, or None for names that would leave it. +pub fn safe_path(name: &str) -> Option { + let unified = name.replace('\\', "/"); + if unified.starts_with('/') || unified.contains(':') || unified.contains('\0') { + return None; + } + let parts: Vec<&str> = unified.split('/').filter(|p| !p.is_empty() && *p != ".").collect(); + if parts.is_empty() || parts.iter().any(|p| *p == "..") { + return None; + } + Some(parts.join("/")) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn central(name: &str, method: u16, crc: u32, compressed: u32, size: u32, offset: u32, extra: &[u8]) -> Vec { + let mut v = Vec::new(); + v.extend_from_slice(&CENTRAL.to_le_bytes()); + v.extend_from_slice(&[20, 0, 20, 0, 0, 0]); + v.extend_from_slice(&method.to_le_bytes()); + v.extend_from_slice(&[0, 0, 0, 0]); + v.extend_from_slice(&crc.to_le_bytes()); + v.extend_from_slice(&compressed.to_le_bytes()); + v.extend_from_slice(&size.to_le_bytes()); + v.extend_from_slice(&(name.len() as u16).to_le_bytes()); + v.extend_from_slice(&(extra.len() as u16).to_le_bytes()); + v.extend_from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0]); + v.extend_from_slice(&offset.to_le_bytes()); + v.extend_from_slice(name.as_bytes()); + v.extend_from_slice(extra); + v + } + + #[test] + fn reads_a_plain_directory() { + let mut dir = central("Game.exe", DEFLATED, 7, 10, 20, 0, &[]); + dir.extend(central("__Installer/", STORED, 0, 0, 0, 40, &[])); + let mut tail = vec![0u8; 5]; + tail.extend_from_slice(&dir); + let cd_size = dir.len() as u32; + tail.extend_from_slice(&EOCD.to_le_bytes()); + tail.extend_from_slice(&[0, 0, 0, 0, 2, 0, 2, 0]); + tail.extend_from_slice(&cd_size.to_le_bytes()); + tail.extend_from_slice(&1000u32.to_le_bytes()); + tail.extend_from_slice(&[0, 0]); + let found = locate(&tail, 995).unwrap(); + assert_eq!(found, Directory { offset: 1000, size: cd_size as u64, entries: 2 }); + let entries = parse(&dir, 2).unwrap(); + assert_eq!(entries[0].name, "Game.exe"); + assert_eq!(entries[0].size, 20); + assert!(entries[1].is_dir()); + } + + #[test] + fn reads_zip64_values() { + let mut extra = vec![1, 0, 24, 0]; + extra.extend_from_slice(&6_000_000_000u64.to_le_bytes()); + extra.extend_from_slice(&5_000_000_000u64.to_le_bytes()); + extra.extend_from_slice(&7_000_000_000u64.to_le_bytes()); + let dir = central("big.pak", DEFLATED, 1, 0xFFFF_FFFF, 0xFFFF_FFFF, 0xFFFF_FFFF, &extra); + let e = &parse(&dir, 1).unwrap()[0]; + assert_eq!((e.size, e.compressed, e.local_offset), (6_000_000_000, 5_000_000_000, 7_000_000_000)); + + let mut tail = Vec::new(); + let record_at = 9_000_000_000u64; + tail.extend_from_slice(&EOCD64.to_le_bytes()); + tail.extend_from_slice(&44u64.to_le_bytes()); + tail.extend_from_slice(&[45, 0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0]); + tail.extend_from_slice(&3u64.to_le_bytes()); + tail.extend_from_slice(&3u64.to_le_bytes()); + tail.extend_from_slice(&500u64.to_le_bytes()); + tail.extend_from_slice(&8_000_000_000u64.to_le_bytes()); + tail.extend_from_slice(&EOCD64_LOCATOR.to_le_bytes()); + tail.extend_from_slice(&0u32.to_le_bytes()); + tail.extend_from_slice(&record_at.to_le_bytes()); + tail.extend_from_slice(&1u32.to_le_bytes()); + tail.extend_from_slice(&EOCD.to_le_bytes()); + tail.extend_from_slice(&[0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0]); + let found = locate(&tail, record_at).unwrap(); + assert_eq!(found, Directory { offset: 8_000_000_000, size: 500, entries: 3 }); + } + + #[test] + fn refuses_paths_that_leave_the_folder() { + assert_eq!(safe_path("Data\\Win32\\a.big").as_deref(), Some("Data/Win32/a.big")); + assert_eq!(safe_path("./x//y").as_deref(), Some("x/y")); + assert!(safe_path("../evil").is_none()); + assert!(safe_path("/etc/passwd").is_none()); + assert!(safe_path("C:/x").is_none()); + assert!(safe_path("a/../../b").is_none()); + } + + #[test] + fn local_header_length_counts_name_and_extra() { + let mut h = LOCAL.to_le_bytes().to_vec(); + h.extend_from_slice(&[0u8; 22]); + h.extend_from_slice(&5u16.to_le_bytes()); + h.extend_from_slice(&9u16.to_le_bytes()); + assert_eq!(local_header_len(&h), Some(Ok(44))); + assert_eq!(local_header_len(&h[..10]), None); + } +} diff --git a/app/src/main/rust/stores/src/lib.rs b/app/src/main/rust/stores/src/lib.rs index 87d278ab06..be82128449 100644 --- a/app/src/main/rust/stores/src/lib.rs +++ b/app/src/main/rust/stores/src/lib.rs @@ -3,6 +3,7 @@ #![allow(clippy::missing_safety_doc, clippy::result_large_err)] pub mod amazon; +pub mod ea; pub mod epic; pub mod fetch_core; pub mod fetch_tuning; diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt new file mode 100644 index 0000000000..a52485035e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -0,0 +1,323 @@ +package com.droiddeck.launcher.stores.ea + +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreLaunch +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import java.io.File +import java.nio.file.Files +import java.time.LocalDate + +@RunWith(RobolectricTestRunner::class) +class EaTest { + private val wine = EaOoa.Hardware( + boardManufacturer = "Wine", boardSerial = "None", biosManufacturer = "The Wine Project", biosSerial = "0", + osInstallDate = "20240101000000.000000+000", osSerial = "12345-OEM", volumeSerial = "43000000", + gpuPnpId = "PCI\\VEN_5143&DEV_0001&SUBSYS_00000000&REV_00\\0&DEADBEEF&0&DEAD", + cpuVendor = "GenuineIntel", cpuEdx = "BFEBFBFF", cpuEax = "000906EA", cpuEcx = "7ffafbbf", brand = "FEX CPU", hostname = "myhost", + ) + + @Test fun machineHashFollowsTheActivationVersion() { + assertEquals("01804062be939efcd4462c65de292af3a56359b5", EaOoa.machineHash(wine, 4)) + assertEquals("41fa9c614390c5a82534becd338b798197cc5b", EaOoa.machineHash(wine, 3)) + } + + @Test fun launchCodeAndSessionKeyMatchTheProtocol() { + assertEquals(1196115787L, EaCrypto.rtpCode(LocalDate.of(2026, 11, 7))) + assertEquals("f057eb86a0bf8c57537b1aa6b98c6495", EaCrypto.hex(EaCrypto.lsxKey(0x6162))) + assertEquals(EaCrypto.hex(EaCrypto.LSX_DEFAULT_KEY), EaCrypto.hex(EaCrypto.lsxKey(0))) + val answer = EaCrypto.challengeAnswer("abc") + assertEquals("abc", String(EaCrypto.ecbDecrypt(EaCrypto.unhex(answer), EaCrypto.LSX_DEFAULT_KEY))) + assertEquals((answer[0].code shl 8) or answer[1].code, EaCrypto.challengeSeed("3", answer)) + assertNull(EaCrypto.challengeSeed("9", answer)) + } + + @Test fun licenceRoundTripsThroughTheFileFormat() { + val xml = "kh" + + "12349tokgsn" + val l = EaOoa.parseLicense(xml, "c2ln") + assertEquals("tok", l.gameToken) + assertEquals("1234", l.contentId) + val blob = EaOoa.licenseBlob(l, encoded = true) + assertEquals("c2ln", String(blob.copyOfRange(0, 4))) + assertEquals(0, blob[64].toInt()) + val back = String(EaCrypto.licenseDecrypt(blob.copyOfRange(65, blob.size))) + assertTrue(back.contains("tok")) + assertEquals("sig", String(EaOoa.licenseBlob(l, encoded = false).copyOfRange(0, 3))) + } + + @Test fun readsTheVersionOfTheActivationLibrary() { + val pe = ByteArray(64) + val fixed = byteArrayOf(0xBD.toByte(), 0x04, 0xEF.toByte(), 0xFE.toByte(), 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 4, 0, 0, 0, 6, 0) + System.arraycopy(fixed, 0, pe, 10, fixed.size) + assertEquals(Triple(4, 7, 6), EaOoa.productVersion(pe)) + } + + @Test fun manifestNamesTheLauncherAndTouchup() { + val xml = """ + + + + [HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Game\Install Dir]trial.exetrue + [HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Game\Install Dir]bin\Game.exe-dx12false + + /__Installer/Touchup.exe-locale {locale} -installPath "{installLocation}" + """ + val m = EaManifest.parse(xml) + assertEquals("1.0.64.43203", m.version) + assertEquals("bin/Game.exe", EaPaths.relative(m.launcher()!!.path)) + assertEquals("-dx12", m.launcher()!!.parameters) + assertEquals("/__Installer/Touchup.exe", m.touchupPath) + val r = EaPaths.registered(m.launcher()!!.path)!! + assertEquals("HKEY_LOCAL_MACHINE\\SOFTWARE\\EA Games\\Game", r.key) + assertEquals("Install Dir", r.value) + val utf16 = byteArrayOf(0xFF.toByte(), 0xFE.toByte()) + "".toByteArray(Charsets.UTF_16LE) + assertEquals("1.0", EaManifest.parse(EaManifest.decode(utf16)).version) + } + + @Test fun findsFilesWhateverTheirCase() { + val dir = Files.createTempDirectory("ea").toFile() + File(dir, "Bin").mkdirs() + File(dir, "Bin/GAME.exe").writeText("x") + assertEquals("Bin/GAME.exe", EaPaths.relativeOnDisk(dir, "bin/game.exe")) + assertNull(EaPaths.relativeOnDisk(dir, "bin/other.exe")) + assertEquals(listOf("-a", "two words", "-c"), EaPaths.splitArgs("-a \"two words\" -c")) + dir.deleteRecursively() + } + + @Test fun lsxRequestsAreParsed() { + val m = EaLsx.parse("")!! + assertEquals("GetSetting", m.name) + assertEquals("4", m.id) + assertEquals("ENVIRONMENT", m.attrs["SettingId"]) + val c = EaLsx.parse("1Game")!! + assertEquals(listOf("ContentId" to "1", "Title" to "Game"), c.children) + assertNull(EaLsx.parse("")) + } + + @Test fun socketOwnerIsReadFromTheProcTable() { + val rows = listOf( + " sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode", + " 0: 0100007F:C350 0100007F:0C90 01 00000000:00000000 00:00000000 00000000 10234 0 1 1 0", + ) + assertEquals(10234, EaLsx.owner(rows, 0xC350)) + assertNull(EaLsx.owner(rows, 1234)) + assertNull(EaLsx.owner(emptyList(), 0xC350)) + } + + @Test fun rapidConnectionsNeverPassTheClientCap() { + fun session() = EaLsx.Session(java.net.Socket(), java.io.ByteArrayOutputStream(), false) + EaLsx.sessions.clear() + val first = (1..8).map { session().also { s -> assertTrue(EaLsx.admit(s)) } } + first[0].claimed = true + repeat(20) { assertTrue(EaLsx.admit(session())) } + assertEquals(8, EaLsx.sessions.count { !it.evicted }) + assertFalse(first[0].evicted) + EaLsx.sessions.forEach { it.trusted = true } + assertFalse(EaLsx.admit(session())) + EaLsx.sessions.clear() + } + + @Test fun anEvictedSessionCannotBecomeTrusted() { + val s = EaLsx.Session(java.net.Socket(), java.io.ByteArrayOutputStream(), true) + s.evicted = true + EaLsx.promote(s, true) + assertFalse(s.trusted) + val ok = EaLsx.Session(java.net.Socket(), java.io.ByteArrayOutputStream(), true) + EaLsx.promote(ok, true) + assertTrue(ok.trusted) + EaLsx.stop() + } + + @Test fun aPeerAndroidCannotNameIsTrustedOnlyForTheClaimedGame() { + val hidden = EaLsx.Session(java.net.Socket(), java.io.ByteArrayOutputStream(), false, unverifiable = true) + assertFalse(hidden.mayTrust) + hidden.claimed = true + assertTrue(hidden.mayTrust) + val other = EaLsx.Session(java.net.Socket(), java.io.ByteArrayOutputStream(), false) + other.claimed = true + assertFalse(other.mayTrust) + } + + @Test fun aSessionFromAnOlderLaunchCannotBecomeTrusted() { + val old = EaLsx.Session(java.net.Socket(), java.io.ByteArrayOutputStream(), true) + EaLsx.generation++ + EaLsx.promote(old, true) + assertFalse(old.trusted) + EaLsx.stop() + } + + @Test fun lateExitDoesNotStopANewerLaunch() { + val game = EaLsx.Game("Origin.OFR.2", "2", "Two", "1", "en_US", null, 0) + EaLsx.game = game + EaLsx.stop("Origin.OFR.1") + assertEquals(game, EaLsx.game) + EaLsx.stop("Origin.OFR.2") + assertNull(EaLsx.game) + } + + @Test fun redirectCarriesTheCode() { + assertEquals("QUOX", EaAuth.redirectValue("qrc:///html/login_successful.html?code=QUOX&state=1", "code")) + assertEquals("tok", EaAuth.redirectValue("qrc:/html/login_successful.html#access_token=tok&token_type=Bearer", "access_token")) + assertNull(EaAuth.redirectValue("https://signin.ea.com/p/x", "code")) + } + + @Test fun pcSignIsSigned() { + val sign = EaAuth.pcSign("ab12", java.util.Date(0), "v1") + val (payload, signature) = sign.split('.') + val json = JSONObject(String(java.util.Base64.getUrlDecoder().decode(payload))) + assertEquals("v1", json.getString("sv")) + assertEquals("1970-01-01 00:00:00:000", json.getString("ts")) + assertEquals(EaCrypto.base64Url(EaCrypto.hmacSha256("ISa3dpGOc8wW7Adn4auACSQmaccrOyR2".toByteArray(), payload.toByteArray())), signature) + } + + @Test fun libraryKeepsOneEntryPerGame() { + fun owned(id: String, slug: String, base: String = "", type: String = "BASE_GAME", trial: Boolean = false) = + EaApi.OwnedProduct(id, "p$id", "Game $id", slug, base, type, true, trial, emptyList()) + fun offer(id: String, type: String = "FullGame") = EaApi.Offer(id, "c$id", "", type, true, "", "", "", "", "", "1.0", "", emptyList()) + val list = listOf(owned("1", "game"), owned("2", "game-deluxe", base = "game"), owned("3", "other"), owned("4", "trial", trial = true), owned("5", "dlc", type = "EXTRA_CONTENT")) + val picked = EaLibrary.pick(list, list.associate { it.offerId to offer(it.offerId) }) + assertEquals(listOf("1", "3"), picked.map { it.first.offerId }) + } + + @Test fun ownedPageParses() { + val page = JSONObject( + """{"me":{"ownedGameProducts":{"next":"100","items":[{"originOfferId":"Origin.OFR.50.0001","product":{"id":"x","name":"N","downloadable":true,"gameSlug":"titanfall-2", + "baseItem":{"title":"Titanfall 2","gameType":"BASE_GAME","baseGameSlug":null},"gameProductUser":{"ownershipMethods":["PURCHASE"]}}}]}}}""", + ) + val (items, next) = EaApi.parseOwned(page) + assertEquals("100", next) + assertEquals("Titanfall 2", items.single().name) + assertEquals("", items.single().baseSlug) + val offers = EaApi.parseOffers(JSONObject("""{"legacyOffers":[{"offerId":"Origin.OFR.50.0001","contentId":"1035052","displayType":"FullGame","isDownloadable":true, + "downloads":[{"downloadType":"LIVE","gameVersion":"2.0.11.0"}],"softwareLocales":["en_US","fr_FR"],"executeParameters":null}]}""")) + assertEquals("2.0.11.0", offers.single().gameVersion) + assertEquals("", offers.single().executeParameters) + assertNotNull(EaApi.query("getPreloadedOwnedGames")) + } + + @Test fun launcherReadsTheSessionFileOnce() { + val text = StoreLaunch.launcherText(StoreGameSidecar(Store.EA, "Origin.OFR.1", "Game", exe = "bin/Game.exe", args = listOf("-dx12"))) + assertTrue(text.contains("for /f \"usebackq tokens=1,* delims==\" %%a in (\"%~dp0.droiddeck-ea-env\") do set \"%%a=%%b\"")) + assertTrue(text.contains("del \"%~dp0.droiddeck-ea-env\"")) + assertTrue(text.contains("start \"\" \"${StoreLaunch.EA_ORIGIN}\"\r\n\"%~dp0bin\\Game.exe\" -dx12\r\n")) + assertTrue(text.trimEnd().endsWith("taskkill /f /im Origin.exe >nul 2>&1")) + } + + @Test fun environmentCarriesTheSession() { + val account = EaAuth.Account("a", "r", 0, "1001", "2002", "Name", "EaId") + val env = EaLaunch.environment("Origin.OFR.1", "1035052", "fr_FR", "generic", "jwt", "opaque", account, "session") + assertEquals("generic", env["EAGenericAuthToken"]) + assertEquals("jwt", env["EAAccessTokenJWS"]) + assertEquals("3216", env["EALsxPort"]) + assertEquals("opaque", env["EALaunchUserAuthToken"]) + assertEquals("EaId", env["EALaunchEAID"]) + assertEquals("1035052", env["ContentId"]) + assertEquals("fr_FR", env["EAGameLocale"]) + } + + @Test fun activationCoreSitsBesideTheExe() { + val dir = Files.createTempDirectory("ea").toFile() + File(dir, "Binaries/Win32/Core").mkdirs() + File(dir, "Binaries/Win32/Core/EACore.dll").writeText("x") + val core = EaOoa.coreDir(dir, "Binaries/Win32/MassEffect3.exe") + assertEquals(File(dir, "Binaries/Win32/Core").canonicalPath, core?.canonicalPath) + assertTrue(EaOoa.legacyCore(core)) + assertNull(EaOoa.coreDir(dir, "Game.exe")) + File(dir, "Core").mkdirs() + assertEquals(File(dir, "Core").canonicalPath, EaOoa.coreDir(dir, "Game.exe")?.canonicalPath) + dir.deleteRecursively() + } + + @Test fun anIncompleteProbeIsNotHashed() { + val empty = EaOoa.Hardware.fromJson(JSONObject()) + assertTrue(!empty.complete(0) && !empty.complete(4)) + val wmiOnly = EaOoa.Hardware.fromJson(JSONObject().put("boardManufacturer", "Intel Corporation").put("biosManufacturer", "The Wine Project") + .put("osSerial", "00330").put("osInstallDate", "2026").put("hostname", "DROIDDECK")) + assertTrue(wmiOnly.complete(0)) + assertTrue(!wmiOnly.complete(4)) + assertTrue(wine.complete(4)) + assertTrue(wine.complete(2)) + val noInstallDate = EaOoa.Hardware.fromJson(JSONObject().put("boardManufacturer", "Wine").put("biosManufacturer", "Wine").put("osSerial", "1") + .put("volumeSerial", "43000000").put("cpuVendor", "GenuineIntel").put("cpuEdx", "BFEBFBFF").put("cpuEax", "000906EA").put("cpuEcx", "7ffafbbf")) + assertTrue(!noInstallDate.complete(2)) + assertTrue(noInstallDate.complete(3) && noInstallDate.complete(4)) + } + + @Test fun legacyManifestNamesItsContentAndTitle() { + val xml = """7107371183 + RUMass Effect 3 + /__Installer/touchup.exeinstall -locale {locale}""" + val m = EaManifest.parse(xml) + assertEquals(listOf("71073", "71183"), m.contentIds) + assertEquals("Mass Effect 3", m.title("en_US")) + assertEquals("RU", m.title("ru_RU")) + assertEquals("Mass Effect 3", m.title("de_DE")) + assertEquals("/__Installer/touchup.exe", m.touchupPath) + } + + @Test fun aNumericTrialFlagKeepsTheTrialExeOut() { + val xml = """ + [HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Need for Speed Heat\Install Dir]NeedForSpeedHeatTrial.exe1 + [HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Need for Speed Heat\Install Dir]NeedForSpeedHeat.exe0 + """ + assertTrue(EaManifest.parse(xml).launcher()!!.path.endsWith("NeedForSpeedHeat.exe")) + } + + @Test fun aSyncRequestedWhileOneRunsIsNotLost() { + val gate = SyncGate() + assertTrue(gate.enter()) + assertTrue(!gate.enter()) + assertTrue(gate.leave()) + assertTrue(!gate.leave()) + assertTrue(gate.enter()) + assertTrue(!gate.leave()) + } + + @Test fun aRequestRacingTheRunnersExitIsPickedUpBySomeone() { + repeat(200) { + val gate = SyncGate() + val runs = java.util.concurrent.atomic.AtomicInteger() + assertTrue(gate.enter()) + val latch = java.util.concurrent.CountDownLatch(1) + val requester = Thread { latch.await(); if (gate.enter()) { runs.incrementAndGet(); while (gate.leave()) runs.incrementAndGet() } } + requester.start() + latch.countDown() + while (gate.leave()) runs.incrementAndGet() + requester.join() + assertTrue("the second request was dropped", runs.get() >= 1) + } + } + + @Test fun aSyncThatSnapshottedBeforeSignOutCannotWriteItsLibrary() { + val app = org.robolectric.RuntimeEnvironment.getApplication() + val game = EaGame("Origin.OFR.1", "1", "Old account game", "old") + val (gen, _) = EaLibrary.snapshot(app) + EaLibrary.reset(app) + assertTrue(!EaLibrary.storeCache(app, listOf(game), gen)) + assertTrue(EaLibrary.cached(app).isEmpty()) + val (fresh, cache) = EaLibrary.snapshot(app) + assertTrue(cache.isEmpty()) + assertTrue(EaLibrary.storeCache(app, listOf(game), fresh)) + assertEquals("Old account game", EaLibrary.cached(app).single().title) + EaLibrary.reset(app) + } + + @Test fun aRefreshFinishingAfterSignOutDoesNotRestoreTheSignIn() { + val app = org.robolectric.RuntimeEnvironment.getApplication() + com.droiddeck.launcher.stores.StoreAccounts.write(app, Store.EA, JSONObject().put("access_token", "old").put("refresh_token", "r").put("user_id", "1")) + assertTrue(EaAuth.storeRefreshed(app, "newer", 3600, "r2")) + assertEquals("newer", EaAuth.load(app)?.accessToken) + EaAuth.signOut(app) + assertTrue(!EaAuth.storeRefreshed(app, "late", 3600, "r3")) + assertNull(EaAuth.load(app)) + } +} diff --git a/docs/development/ea-store.md b/docs/development/ea-store.md new file mode 100644 index 0000000000..89a345c80f --- /dev/null +++ b/docs/development/ea-store.md @@ -0,0 +1,31 @@ +# EA store + +EA games install, update and start without the EA app. The research behind it is in +[ea-ubisoft-stores.md](ea-ubisoft-stores.md). + +## Pieces + +| Piece | Where | What it does | +|---|---|---| +| Sign-in | `stores/ea/EaAuth.kt`, `EaLogin` in `EaBackend.kt` | `JUNO_PC_CLIENT` OAuth with PKCE in the store login WebView; the code comes back on EA's `qrc:///html/login_successful.html` redirect. Tokens refresh with the refresh token. | +| Library | `EaApi.kt`, `EaLibrary.kt` | Owned games (`getPreloadedOwnedGames`, EA storefront), their offers (`getLegacyCatalogDefs`) and art (`GameImages`, SteamGridDB when EA has no portrait). Editions of one game collapse onto the base offer; trials, DLC and non-downloadable offers are left out. | +| Queries | `app/src/main/resources/ea/graphql/*.gql` | EA's own query texts, byte for byte. The gateway matches persisted queries by SHA-256, so these files must not be reformatted (`-text` in `.gitattributes`). | +| Downloads | Rust `src/ea/` in `libdroiddeckstores.so`, `EaInstaller.kt` | A build is one ZIP on EA's CDN. The engine reads its central directory with ranged reads, keeps files whose size and CRC match, and streams every other entry through inflate into place. `.droiddeck-ea-files` records what it placed, so a resume or update does not re-hash those files; files a new build drops are removed. | +| Updates | `EaUpdates` in `EaBackend.kt` | The game page compares the installed version with the offer's live `gameVersion` (every 30 minutes at most). Update runs the same install, which only fetches changed files. | +| Launch, guest | `droiddeck-store-launch` (`prepare_ea`) | Creates the prefix, reads the machine as Wine reports it (`wmic`, `vol`, `hostname`; cached in `pfx/.droiddeck-ea-hw.json`), writes EA app presence keys and the game's `Install Dir` keys in both registry views, runs the build's Touchup once per installed build, then asks the app for the session and writes any licence files. | +| Launch, app | `EaLaunch.kt`, `EaOoa.kt`, `EaLsx.kt` | Answers `ea-prepare`: starts the LSX endpoint on `127.0.0.1:3216`, mints the short-lived opaque token, writes `.droiddeck-ea-env` (read once and deleted by the launcher `.bat`), and for games with a `Core` folder requests an online-activation licence for the machine hash. | +| LSX | `EaLsx.kt` | The local endpoint EA's SDK talks to instead of the EA app: challenge, AES session key, config, profile, settings, game info, auth codes for the game's own client ids, licences with Denuvo tokens, entitlements. Friends, presence and the overlay answer empty. | + +## Machine hash + +The licence names a hash of the machine the game's activation layer computes itself. The hash +version follows the activation library's product version (`Core/activation.dll` or `awc.dll`): +5.x → 4, 4.7.6+ → 3, 4.7.x → 2, 4.x → 1. Versions 2 and 3 also need CPUID leaf 1 ECX, which Wine's +WMI does not expose, so those use `00000000` unless the probe learns it. + +## Not done yet + +- Cloud saves (`cloudsync.juno.ea.com`). +- Steam copies of EA games still install the EA app (#2036). +- Pre-DiP games (no `installerdata.xml`) fall back to the exe picker. +- Javelin anti-cheat games do not run under Proton. diff --git a/docs/development/ea-ubisoft-stores.md b/docs/development/ea-ubisoft-stores.md new file mode 100644 index 0000000000..4d13710a3d --- /dev/null +++ b/docs/development/ea-ubisoft-stores.md @@ -0,0 +1,245 @@ +# EA app and Ubisoft Connect as stores: research and plan + +Research as of 2026-11-07, against `origin/main` at `914b3588e`. Nothing here is implemented yet. + +## Summary + +Both stores can follow the path Battle.net took (#979, then #1602): first the vendor client in its own +Proton prefix, then more of it done by DroidDeck itself. Unlike Battle.net, both now have open-source +clients that already handle sign-in, library and downloads without the vendor app. So the second step +can go further than Battle.net's did. + +| | EA | Ubisoft | +|---|---|---| +| Sign-in without the client | Yes: OAuth `JUNO_PC_CLIENT` in a WebView | Yes: UbiServices session (ticket + remember-me) through Ubisoft's WebAuth page | +| Owned library without the client | Yes: juno GraphQL `ownedGameProducts` | Yes: Demux ownership service (protobuf over TLS), or the GraphQL library | +| Downloads without the client | Yes: a build is one ZIP on EA's CDN, read with HTTP Range per entry (Maxima) | Yes: Demux download service → manifest → zstd/deflate slices (Optima, ubi-cli-mvp) | +| Launch without the client | **Yes, legitimately**: LSX server on `127.0.0.1:3216` plus a real OOA licence from `proxy.novafusion.ea.com` (Maxima) | **Only by replacing Ubisoft's DRM DLLs** (Optima, Re0xCat loaders). Don't ship that. Modern titles need the real Connect anyway | +| Cloud saves without the client | Yes: `cloudsync.juno.ea.com` (Maxima) | Not researched; Connect handles them | +| Effectively out of scope | Javelin kernel anti-cheat titles (Battlefield, FC, Apex) | Kernel AC and online-only titles that misbehave under Proton | + +**Recommendation** + +- **EA should go fully native in-app**: sign-in, library, downloads, launch and cloud saves in Kotlin + and Rust, with no EA app in the prefix. The EA app stays as an optional fallback, like the Epic + launcher option (`EpicClient`). The LSX and licence half also fixes Steam's EA titles, which today + install the whole EA app (#2036) just to answer `link2ea://`. +- **Ubisoft should be hybrid**: native sign-in, library and downloads in Rust, then **register the + files with the real Ubisoft Connect and launch through `uplay://`**. That means a Connect prefix + managed the way Battle.net's is. +- Ubisoft's launch step is the biggest open question (see "Unknowns"). If Connect can't be made to + adopt natively downloaded files cleanly, start with the Connect-driven download, as #979 did for + Battle.net. + +## What DroidDeck already has, and how much of it each store reuses + +| Existing piece | Where | EA | Ubisoft | +|---|---|---|---| +| `Store` enum + `StoreBackend` (signIn, syncLibrary, loadShelves, install, uninstall) | `stores/Store.kt`, `stores/StoresState.kt:355` | Reuse as is: new `EA` entry | Reuse as is: new `UBISOFT` entry | +| WebView sign-in with redirect capture (`StoreLoginActivity.Flow`) | `stores/LoginFlows.kt`, `StoreLoginActivity.kt` | Reuse: the redirect is `qrc:///html/login_successful.html?code=…`, caught in `isRedirect` | Reuse: capture the `ubi_v1` ticket from the WebAuth page, then exchange it for a full session | +| Keystore-backed account store | `stores/StoreAccounts.kt`, `CredentialCipher.kt` | Reuse | Reuse | +| Rust store engine `libdroiddeckstores.so` (JNI, `fetch_core.rs`, hand-rolled protobuf in `amazon/proto.rs`) | `app/src/main/rust/stores` | Reuse: ZIP central directory + Range fetch + inflate (`flate2` is already a dependency) | Reuse `fetch_core`. **New:** a TLS socket client for Demux, a protobuf schema, and a zstd decoder (`ruzstd` is pure Rust; the `zstd` crate needs `cc`, which the crate already has) | +| Download queue: pause, resume, cancel, tiers, Downloads tab | `stores/download/*` | Reuse | Reuse | +| Install roots: internal, other storage, Games folder | `StoreInstallRoot.kt` | Reuse | Reuse | +| Cloud saves: plan, paths, transport | `stores/CloudSaves.kt`, `CloudPlan.kt`, `CloudSavePaths.kt` | Reuse with a new EA transport | Later, or leave to Connect | +| Vendor client in its own prefix, a guest Python driver, a headless helper under gamescope, FEX choice, memory policy | `runtime/BattleNet.kt`, `tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet` | Fallback only | **Needed**: `droiddeck-ubisoft` modelled on `droiddeck-battlenet` | +| "Use the vendor launcher instead" option | `stores/epic/EpicClient*.kt` | Pattern for the EA app fallback | Pattern for "Open Ubisoft Connect" | +| Steam install-script seeding that lets EA app and Ubisoft Connect installers run | `droiddeck-seed-redists` (#1449, #2036) | Replaced by the LSX stub for Steam EA titles | Unchanged | +| Ubisoft registry handoff for Ubisoft titles bought on Epic | open PR #1445 | n/a | Same registry key (`HKLM\SOFTWARE\WOW6432Node\Ubisoft\Launcher\Installs\\InstallDir`); merge or share it | +| Library, Steam shortcuts, art, game page, sidecars | `frontend/Library.kt`, `SteamLiveShortcuts.kt`, `StoreArt.kt`, `StoreGameSidecar.kt` | Reuse | Reuse | +| Clean-room process for store modules | `docs/development/epic-cleanroom.md`, `amazon-cleanroom.md` | Use: spec from Maxima, then implement from the spec | Use: spec from Optima/ubi-cli-mvp/YoobieRE | + +Genuinely new engineering: + +1. **An LSX server (EA).** EA's local SDK protocol is XML over TCP on 3216, with a challenge handshake, + GetConfig, GetProfile, GetGameInfo, license and entitlement requests. Add a Wine-side stub registered + as the `link2ea://` / `origin2://` handler with EA app presence keys, plus OOA licence requests. + This half is new; the other EA parts are the familiar store pattern. +2. **The EA machine hash.** Licences are bound to a `machineHash` built from WMI/BIOS/disk/CPUID + values. They have to match what the game computes inside Wine under FEX on the phone. + Nobody has shown that on Android yet, so it has to be measured on device. +3. **A Demux client (Ubisoft).** This is a TLS socket to `dmx.upc.ubisoft.com` speaking protobuf, with + patch negotiation, auth, ownership tokens and download-service URL signing. No store we have uses + a socket protocol. +4. **A way for Connect to adopt files (Ubisoft).** Connect keeps its own DPAPI-encrypted sign-in, tied + to the Wine `MachineGuid`. Our session can't be handed to it (ubi-cli-mvp checked). Connect also has + to consider the game installed before `uplay://launch` works. + +## Prior art + +### EA + +| Project | Licence | State | What it gives us | +|---|---|---|---| +| [ArmchairDevelopers/Maxima](https://github.com/ArmchairDevelopers/Maxima) (Rust, `maxima-lib`) | GPL-3.0 | Pre-alpha by its own README; last commit 2026-01; open issues through 2026-11. Backs KYBER | The whole stack: OAuth (`JUNO_PC_CLIENT`, localhost 31033 redirect), juno GraphQL (`.gql` files for owned games, `downloadUrl`, `availableBuilds`, achievements), the ZIP/Range downloader, OOA licences (`ooa/mod.rs`, `machineHash`), the LSX server (`lsx/`), cloud sync, the hardware hash (`auth/hardware.rs`), Wine registry setup. Unsupported: Battlefield 3/4 (Battlelog), pre-DiP games (Dead Space 2, BFBC2), DLC installs | +| [Maxima #71](https://github.com/ArmchairDevelopers/Maxima/issues/71) | | 2026-11 | Games never connect to LSX unless `HKLM\SOFTWARE\WOW6432Node\Origin` is right, and `INSTALLED_LANGUAGE` must be answered. Check ours against it | +| [Maxima #49](https://github.com/ArmchairDevelopers/Maxima/issues/49) | | | ARM64: the hash must match what `Activation.dll` reads from CPUID under Rosetta/Box64/FEX. Directly our problem | +| unifideck `docs/feasibility/ea.md` | GPL-3.0 | 2026-07 | EA app installer runs unattended (`/quiet`), login renders on GE-Proton11-1, `origin2://game/launch?offerIds=&autoDownload=1` is the install idiom, ~2.5 GB client, aggressive self-update | +| Lutris `services/ea_app.py` | GPL-3.0 | Maintained | juno queries, `installerdata.xml` scan for installed games | +| BellezaEmporium/galaxy-integration-ead | **none** | Maintained | Facts only: OAuth params, `pc_sign` fallback | +| erri120/GameFinder wiki | GPL-3.0 | | Encrypted `IS` file format (only for reading EA app installs) | +| Heroic | | wontfix #352 | No EA support beyond Epic-hosted EA titles | + +### Ubisoft + +| Project | Licence | State | What it gives us | +|---|---|---|---| +| [xXJSONDeruloXx/ubi-cli-mvp](https://github.com/xXJSONDeruloXx/ubi-cli-mvp) (yours, TypeScript) | MIT | 2026-07 | The best-tested data plane: session login with `Ubi-Challenge` replay, `ubi_2fa_v1`, refresh; Demux ownership, ownership tokens and signed URLs; manifest decode; slice layouts (`slices_v3//` and flat `slices/`); zstd and both deflates; integrity and path safety. On the Connect side: `connect-install` (`uplay://install/`), **`connect-seed`** (let Connect start the official download, pause, exit, then fill the staging area with verified files), remembered-auth migration between prefixes, `ubi play` via `uplay://`. Docs: `research.md`, `validation.md`, `DEMUX_JOURNAL.md`, `optima-comparison.md` | +| [Starkka15/Optima](https://github.com/Starkka15/Optima) (Rust) | GPL-3.0 | 0.2.0, 2026-08 | Rust version of the same data plane (`auth.rs`, `demux.rs`, `install.rs`, `proto/*.proto`), plus launcherless launch through replacement `uplay_r1_loader` / `ubiorbitapi_r2_loader` DLLs, a self-signed certificate that mimics Ubisoft's (imported into the prefix's Root store so Watch_Dogs accepts it), and an EAX shim. Powers GameVault's Ubisoft extension | +| YoobieRE: `ubisoft-demux-node`, `ubisoft-dmx-decode`, `ubisoft-manifest-downloader`, `uplay-install-reverse`, `product-db-archive` | mixed or none | 2022–2024 | The original protocol reversing that both of the above build on | +| Re0xCat `uplay-r1-loader`, `ubiorbitapi-r2-loader` | | | The DRM-DLL replacements (see Risks) | +| [mubaraknumann/unifideck](https://github.com/mubaraknumann/unifideck) `stores/ubisoft/` | GPL-3.0 | Shipping, active | The full Connect-wrapper archetype in Python: three-prefix model (auth / template / per-game, shared `MachineGuid`), credential capture and fan-out, parsing Connect's binary `configurations` and `ownership` catalogs, leveldb `spaceId ↔ ubisoftConnectGameId`, a manual-install watcher, `uplay://launch//0`, session capture after exit. `docs/ubisoft-store-spec.md` is a good map of what breaks | +| Heroic | | | Installs Ubisoft Connect automatically for Ubisoft titles from Epic; no Ubisoft store | +| DroidDeck #1445 (open), #1449, #2286 / #2295 / #2317 / #2292 / #2050 | | | Our own Ubisoft-under-Proton knowledge: the `Installs` registry key, `UplayLaunch.exe` being a stub, the bundled `UplayInstaller.exe`, legacy installer layouts, SD-card staging, helper processes during the exit watch | + +Licences: Maxima, Optima, unifideck and Lutris are GPL-3.0, which is compatible with +DroidDeck (GPL-3.0). ubi-cli-mvp is MIT. Even so, the Epic and Amazon modules were written clean-room, +so do the same here: write the spec from these sources, implement from the spec, and credit them in +the README the way #1602 does. + +## Design + +### EA + +```text +StoreLoginActivity (OAuth JUNO_PC_CLIENT) ─► EaAccount (access + refresh token, persona) +EaLibrary ── juno GraphQL ownedGameProducts / legacyOffers ─► CatalogItem(offerId, contentId, slug) +EaInstaller (DownloadQueue job) ── downloadUrl ─► build ZIP ─► Rust: central directory, Range per entry, inflate, CRC + └─ writes __Installer/installerdata.xml as EA's own layout expects +Launch: droiddeck-ea (guest) ── registers stub for link2ea:// origin2:// + Origin/EA Desktop keys + app-side EaLsxServer on 3216 ◄── game (OriginSDK / EA SDK) + before launch: OOA licence (novafusion, machineHash) → ProgramData/Electronic Arts/EA Services/License + before/after: cloudsync pull / push through CloudSaves +``` + +- **Where the LSX server runs.** In the Android app. DroidDeck's guest shares + the network namespace, so an app-side server on 127.0.0.1:3216 is reachable from Wine. Keeping it + in Kotlin or Rust, not a guest daemon, matches how DroidDeck owns other store logic. Check this + against proot networking first. +- **The stub.** A protocol handler for `link2ea://` / `origin2://` that hands the request to DroidDeck. +- **Steam's EA titles.** Use the same stub and LSX path, keyed by `link2ea://` in the launch config, + plus entitlement refresh and Steam account linking. #2036's EA app install becomes + the fallback. +- **The EA app fallback.** Its own prefix (a `compatdata` id like Battle.net's `2596113170`), installed + with `EAappInstaller.exe /quiet`, opened from the store row. That's for titles the LSX path can't + start (pre-DiP, Battlelog) and for buying games. + +### Ubisoft + +```text +StoreLoginActivity (Ubisoft WebAuth) ─► ticket ─► full session (expiry, rememberMe); refresh ~3 h +UbisoftLibrary ── Demux ownership ─► products + config YAML (name, exe, uplay id, space id) +UbisoftInstaller (DownloadQueue job) ── Rust Demux: ownership token → download_service urlReq + → manifest (356-byte header, zlib) → slices (zstd/deflate) → files, verified +Register + launch: droiddeck-ubisoft (guest, like droiddeck-battlenet) + Connect in its own prefix, signed in once in its own window (DPAPI/MachineGuid bound) + adopt files: Installs\\InstallDir registry (+ whatever state Connect checks) + or ubi-cli-mvp's connect-seed: official download starts, pause, seed, let Connect verify + launch: upc.exe uplay://launch//0, Connect closed or minimised once the game runs (#979's 20 s rule) +``` + +- **One Connect prefix, not one per game.** unifideck uses per-game prefixes because Steam on the + Deck gives each shortcut its own. DroidDeck already runs Battle.net games inside Battle.net's prefix, + which avoids unifideck's whole credential fan-out problem. +- **Two stages, like Battle.net:** + 1. Connect in its prefix, install by `uplay://install/`, and Downloads shows an indeterminate + "Installing in Ubisoft Connect" until the folder settles. That is #979's level. + 2. Native downloads in the Rust engine with real progress, pause and resume, then Connect adopts the + files. Like #1602, but we own the transfer instead of driving the vendor's downloader. If Connect + has a scriptable local API (Battle.net's Agent had one), that's a cheaper middle stage, but none is + known. +- **Launcherless DRM shims: don't ship them.** See Risks. + +## Known + +- EA sign-in, library, downloads, licences, LSX and cloud sync all work outside the EA app on Linux + (Maxima). +- The EA app installs unattended and its login renders under GE-Proton 11 on x86 (unifideck). +- Ubisoft sign-in, refresh, Demux ownership, signed URLs, manifests and slice reconstruction work + (ubi-cli-mvp `validation.md`, Optima). A session ticket lasts about 3 hours and remember-me renews it. +- Connect's sign-in can't be created from our session. It is DPAPI-encrypted and tied to + `MachineGuid`, but it can be copied between prefixes that share that identity. +- Connect has repeatedly broken under Proton after its own updates (2023, and a single-source April 2026 + report). #1449 and the open Ubisoft PRs show the same churn here. +- Javelin titles don't run under Proton. EA's March 2026 job listing mentions future Linux/Proton work; + nothing has shipped. + +## Unknowns, in the order to settle them + +| # | Question | How to find out | Blocks | +|---|---|---|---| +| U1 | Does an EA OOA licence fetched with our `machineHash` validate inside DroidDeck-Proton under FEX on Adreno phones? Which WMI/CPUID values does the game see? | Prototype: Maxima's hash code against values read through Wine in our prefix; one DiP single-player title and one Denuvo title. | EA launch | +| U2 | Can the app-side LSX server on 127.0.0.1:3216 be reached from proot + Wine, and do games connect with our registry keys (Maxima #71)? | Spike with a Steam EA title already in the library | EA launch, Steam EA titles | +| U3 | What does EA's CDN serve for a current title: one ZIP, multiple, or delta? How do language selection and `installerdata.xml` work? | Maxima `content/` + `downloadUrl.gql`, one real download through the Rust engine | EA install | +| U4 | Does Connect accept a tree we downloaded once the `Installs` registry key is written, or does it re-verify or re-download? Does `connect-seed` work under FEX on a phone? | Spike with a small owned title (ubi-cli-mvp used Splinter Cell / product 109). #1445's registry work is the start | Ubisoft stage 2 | +| U5 | Does Ubisoft Connect (Qt + CEF) run acceptably under FEX in our prefix? How much RAM does it hold while a game runs? | Install it like Battle.net; measure with the Memory readout from #979 | Ubisoft stage 1 | +| U6 | Ubisoft's WebAuth page in an Android WebView: captcha, 2FA, `Ubi-Challenge` | Real sign-in on device | Ubisoft sign-in | +| U7 | Demux over TLS from Android (certificate pinning, patch-version negotiation drift) | Rust spike against `dmx.upc.ubisoft.com` | Ubisoft library and downloads | +| U8 | Ubisoft+ subscription entitlements in Demux ownership | Account with Ubisoft+ | Library completeness | +| U9 | EA Play subscription entitlements in `ownedGameProducts` | Account with EA Play | Library completeness | +| U10 | Ubisoft cloud saves outside Connect | Not researched; Connect handles them while it's in the path | Later | + +## Plan + +Each step is its own PR, tested on device as usual (REDMAGIC tablet, Fold7, Thor). + +### EA + +1. **Spike (no PR):** settle U1–U3 with throwaway code against one owned DiP title and one Steam EA title. +2. **Steam EA titles without the EA app:** the `link2ea` stub, app-side LSX server, OOA licence and + entitlement refresh. It replaces #2036's EA app install where it works and falls back to it otherwise. + This ships value first and proves the hard half. +3. **EA store: sign-in, library, shelves:** a `Store.EA` entry, OAuth flow, juno library, art, + a "not installable here" flag for Javelin titles. +4. **EA downloads:** a Rust `ea` module (ZIP/Range/inflate on `fetch_core`), with Downloads progress, + pause, resume, cancel, updates and uninstall. +5. **EA cloud saves** through `CloudSaves`. +6. **EA app fallback** prefix and store-row button, for pre-DiP and Battlelog titles. +7. Clean-room record: `docs/development/ea-cleanroom.md`. + +### Ubisoft + +1. **Spike (no PR):** U4, U5 and U7. +2. **Ubisoft Connect in its prefix (#979 level):** `droiddeck-ubisoft`, the store row, sign-in inside + Connect, the installed-games scan (registry `Installs` keys), Play by `uplay://launch`, Connect closed + once the game runs, install handed to Connect with indeterminate progress. Fold in #1445. +3. **Ubisoft store sign-in and library natively:** the WebAuth flow, session refresh, a Rust Demux + client, the owned library and art, without opening Connect. +4. **Native Ubisoft downloads:** a Rust `ubisoft` module (manifest, slices, zstd), then hand off to + Connect for registration (U4). Updates come from the manifest version. +5. Clean-room record: `docs/development/ubisoft-cleanroom.md`. + +The two stores share almost nothing beyond the existing store layer, so they can run in parallel. +EA step 2 has the best ratio of value to risk and could start first. + +## Risks + +- **DRM circumvention.** Optima's launcherless mode replaces Ubisoft's DRM loader DLLs, answers the + game's ownership calls itself, and installs a certificate mimicking Ubisoft's so Authenticode checks + pass. Gating it on real ownership doesn't change that it bypasses Ubisoft's access control. Keep it + out of DroidDeck. EA is different: Maxima requests real licences from EA's licence + service and speak EA's documented-by-reversing launcher protocol. Nothing is forged. +- **Terms of service.** Both publishers' terms broadly forbid unofficial clients. No bans are known + for Linux or alt-launcher users (Maxima, Lutris, unifideck, GameVault). This is the same position as + our Epic, GOG and Amazon modules. +- **Vendor churn:** juno schema changes (EA already killed the Origin-era integrations once), Demux + patch versions, and Connect or EA app updates that break under Proton. Plan for tests on recorded + responses, as Epic has. +- **Memory.** A resident Connect costs a phone RAM, so reuse #979's close-on-launch policy and zRAM work + (#1882). EA's native path avoids the client entirely. +- **FEX hardware fingerprint (EA, U1)**, if FEX's CPUID differs from what licences are bound to. +- **Kernel anti-cheat:** Javelin, and whatever Ubisoft titles use one. Flag them in the catalog + instead of letting launches fail. + +## Sources + +- DroidDeck: #979, #1602, #1610, #1611, #1662, #2087 (Battle.net); #1449, #2036 (Steam Ubisoft/EA + installers); #1445, #2050, #2286, #2292, #2295, #2317 (Ubisoft); `docs/development/epic-cleanroom.md`. +- Maxima: README, `maxima-lib/src/{core/launch.rs, core/endpoints.rs, ooa/mod.rs, core/auth/*, content/*, lsx/*}`, issues #49, #71. +- Optima: README, `TODO-hardening.md`, `src/install.rs`, `src/launch.rs`. +- ubi-cli-mvp: README, `docs/optima-comparison.md`, `research.md`, `validation.md`. +- unifideck: `docs/feasibility/{README,ea,battlenet}.md`, `docs/ubisoft-store-spec.md`. +- [Heroic: Ubisoft Connect on Linux and Mac](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/wiki/How-to-install-Ubisoft-Connect-on-Linux-and-Mac). +- [GamingOnLinux: EA Javelin job listing mentions Linux and Proton (2026-03)](https://gamingonlinux.com/2026/03/ea-javelin-anticheat-job-listing-mentions-future-support-for-linux-and-proton). +- [GamingOnLinux: KYBER goes open source (2026-01)](https://www.gamingonlinux.com/2026/01/star-wars-battlefront-ii-private-server-and-mod-launcher-kyber-goes-open-source). +- [PC Gamer: Ubisoft's launcher broke Steam games on Linux and Steam Deck](https://www.pcgamer.com/ubisofts-launcher-broke-steam-games-on-linux-and-steam-deck). diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index b2e2b870e0..1f7c12bd67 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -5,6 +5,7 @@ import binascii import json import os import re +import shlex import shutil import sys import time @@ -276,6 +277,10 @@ def exited(argv, code=0): subprocess.run([EPIC_CLIENT, "exited", "--code", str(code)], stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, timeout=10) except (OSError, subprocess.TimeoutExpired): pass + if found is not None and launch_dir and str(found[1].get("store")) == "ea": + ask(Path(launch_dir) / "stores", {"op": "ea-exited", "store": "ea", "id": str(found[1].get("id"))}, timeout=1.0) + log("ea %s exited" % found[1].get("id")) + return 0 if found is None or not launch_dir or not cloud_on(found[1]): return 0 store, game = str(found[1].get("store")), str(found[1].get("id")) @@ -613,6 +618,344 @@ def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=Non return "import-failed" + note +EA_HARDWARE = ".droiddeck-ea-hw.json" +EA_CLIENT = "C:\\Program Files (x86)\\Origin\\Origin.exe" +EA_WMI = ( + ("boardManufacturer", "Win32_BaseBoard", "Manufacturer"), + ("boardSerial", "Win32_BaseBoard", "SerialNumber"), + ("biosManufacturer", "Win32_BIOS", "Manufacturer"), + ("biosSerial", "Win32_BIOS", "SerialNumber"), + ("osInstallDate", "Win32_OperatingSystem", "InstallDate"), + ("osSerial", "Win32_OperatingSystem", "SerialNumber"), + ("gpuPnpId", "Win32_VideoController", "PNPDeviceID"), + ("cpuManufacturer", "Win32_Processor", "Manufacturer"), + ("processorId", "Win32_Processor", "ProcessorId"), + ("brand", "Win32_Processor", "Name"), +) +EA_ROOTS = {"HKLM": "HKEY_LOCAL_MACHINE", "HKCU": "HKEY_CURRENT_USER"} + + +def decode_output(data): + if data[:2] in (b"\xff\xfe", b"\xfe\xff") or (len(data) > 1 and data[1:2] == b"\x00"): + return data.decode("utf-16", "replace") + return data.decode("utf-8", "replace") + + +def wmi_value(text): + rows = [row.strip() for row in text.replace("\r", "\n").split("\n") if row.strip()] + return rows[1] if len(rows) > 1 else "" + + +CPUID_LEAVES = (0, 1, 0x80000002, 0x80000003, 0x80000004) + + +def cpuid_exe(): + """A 32-bit console program that writes the raw CPUID leaves an x86 game sees under the emulator.""" + import struct + base, rva = 0x400000, 0x1000 + buf, written = base + rva + 0x180, base + rva + 0x1D0 + iat = base + rva + 0x138 + code = b"\x53\x57\xbf" + struct.pack(" "%s"' % (cls, prop, windows_path(str(folder / (key + ".txt"))))) + lines.append('vol C: > "%s"' % windows_path(str(folder / "volume.txt"))) + lines.append('hostname > "%s"' % windows_path(str(folder / "hostname.txt"))) + (folder / "cpuid.exe").write_bytes(cpuid_exe()) + lines.append('"%s" > "%s"' % (windows_path(str(folder / "cpuid.exe")), windows_path(str(folder / "cpuid.bin")))) + bat = folder / "probe.bat" + bat.write_bytes(("\r\n".join(lines) + "\r\n").encode()) + try: + subprocess.run([proton, "run", "cmd.exe", "/d", "/c", windows_path(str(bat))], stdin=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=timeout) + except subprocess.TimeoutExpired: + return {}, "timeout" + except OSError: + return {}, "failed" + for key, _, _ in EA_WMI: + try: + values[key] = wmi_value(decode_output((folder / (key + ".txt")).read_bytes())) + except OSError: + values[key] = "" + try: + found = re.search(r"([0-9A-Fa-f]{4})-([0-9A-Fa-f]{4})", decode_output((folder / "volume.txt").read_bytes())) + values["volumeSerial"] = (found.group(1) + found.group(2)).lower() if found else "" + except OSError: + values["volumeSerial"] = "" + try: + values["hostname"] = decode_output((folder / "hostname.txt").read_bytes()).strip().splitlines()[0].strip() + except (OSError, IndexError): + values["hostname"] = "" + try: + values.update(cpuid_values((folder / "cpuid.bin").read_bytes())) + except OSError: + pass + if probe_complete(values): + try: + cache.write_text(json.dumps(values)) + except OSError: + pass + return values, "probed" + return values, "incomplete" + + +def ea_registry_entries(folder, sidecar): + install = windows_path(str(folder)).rstrip("\\") + "\\" + extra = sidecar.get("extra") if isinstance(sidecar.get("extra"), dict) else {} + title = str(extra.get("displayName") or sidecar.get("title") or folder.name).strip() + locale = str(extra.get("locale") or "en_US") + entries = [ + ("HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Desktop", "InstallSuccessful", "true"), + ("HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\Origin", "InstallSuccessful", "true"), + ("HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\Origin", "ClientPath", EA_CLIENT), + ("HKEY_LOCAL_MACHINE\\SOFTWARE\\Origin", "ClientPath", EA_CLIENT), + ] + for content in [c.strip() for c in str(extra.get("contentIds") or extra.get("contentId") or "").split(",")]: + if re.fullmatch(r"[A-Za-z0-9._-]{1,64}", content): + key = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Origin Games\\" + content + entries += [(key, "DisplayName", title), (key, "Install Dir", install), (key, "Locale", locale)] + try: + keys = json.loads(extra.get("registry") or "[]") + except ValueError: + keys = [] + for pair in keys if isinstance(keys, list) else []: + if not isinstance(pair, list) or len(pair) != 2: + continue + key, name = str(pair[0]), str(pair[1]) + root, _, rest = key.partition("\\") + key = EA_ROOTS.get(root.upper(), root) + ("\\" + rest if rest else "") + if key.upper().startswith(("HKEY_LOCAL_MACHINE\\", "HKEY_CURRENT_USER\\")) and name and "\n" not in key + name: + entries.append((key, name, install)) + if title: + entries.append((key, "DisplayName", title)) + entries.append((key, "Locale", locale)) + return entries + + +def ea_registry(folder, sidecar, compat_data, proton, timeout=90): + if not compat_data or not proton or not Path(proton).is_file(): + return "no-proton" + pfx = Path(compat_data) / "pfx" + text = "Windows Registry Editor Version 5.00\r\n\r\n" + "".join( + '[%s]\r\n"%s"="%s"\r\n\r\n' % (key, reg_escape(name), reg_escape(value)) for key, name, value in ea_registry_entries(folder, sidecar)) + stamp = hashlib.sha256(text.encode("utf-8")).hexdigest() + marker = pfx / (".droiddeck-ea-registry-" + re.sub(r"[^A-Za-z0-9._-]", "_", str(sidecar.get("id")))) + try: + if marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file(): + return "ready" + with tempfile.TemporaryDirectory(prefix="droiddeck-ea-") as tmp: + source = Path(tmp) / "registry.reg" + source.write_bytes(b"\xff\xfe" + text.encode("utf-16-le")) + executable = pfx / "drive_c/windows/system32/reg.exe" + for view in ("/reg:32", "/reg:64"): + run = subprocess.run([proton, "run", str(executable) if executable.is_file() else "reg.exe", "import", windows_path(str(source)), view], + stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=timeout) + if run.returncode: + return "import-failed" + marker.write_text(stamp) + return "written" + except subprocess.TimeoutExpired: + return "timeout" + except OSError: + return "import-failed" + + +def find_case(folder, relative): + current = Path(folder) + for part in [p for p in relative.replace("\\", "/").split("/") if p and p != "."]: + exact = current / part + if exact.exists(): + current = exact + continue + try: + current = next(c for c in current.iterdir() if c.name.lower() == part.lower()) + except (OSError, StopIteration): + return None + return current if current != Path(folder) else None + + +def touchup_args(raw, locale, install): + raw = raw.replace("{locale}", locale) + raw = raw.replace('"{installLocation}"', '"%s"' % install).replace("{installLocation}", install) + try: + return shlex.split(raw.replace("\\", "\\\\")) + except ValueError: + return raw.split() + + +def ea_touchup(folder, sidecar, compat_data, proton, timeout=900): + extra = sidecar.get("extra") if isinstance(sidecar.get("extra"), dict) else {} + relative = str(extra.get("touchup") or "") + if not relative: + return "none" + exe = find_case(folder, relative) + if exe is None or not exe.is_file(): + return "missing" + if not compat_data or not proton or not Path(proton).is_file(): + return "no-proton" + pfx = Path(compat_data) / "pfx" + stamp = str(sidecar.get("installVersion") or "") + " " + str(sidecar.get("installedAt") or "") + marker = pfx / (".droiddeck-ea-touchup-" + re.sub(r"[^A-Za-z0-9._-]", "_", str(sidecar.get("id")))) + try: + if marker.is_file() and marker.read_text() == stamp: + return "done" + except OSError: + pass + args = touchup_args(str(extra.get("touchupArgs") or ""), str(extra.get("locale") or "en_US"), windows_path(str(folder)).rstrip("\\")) + try: + run = subprocess.run([proton, "run", str(exe)] + args, cwd=str(exe.parent), stdin=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=timeout) + result = "ok" if run.returncode == 0 else "exit-%d" % run.returncode + except subprocess.TimeoutExpired: + result = "timeout" + except OSError: + return "failed" + try: + marker.write_text(stamp) + except OSError: + pass + return result + + +def write_licenses(compat_data, licenses): + if not compat_data: + return 0 + root = Path(compat_data) / "pfx/drive_c" + written = 0 + for item in licenses or []: + relative = str(item.get("path") or "") if isinstance(item, dict) else "" + if not relative or relative.startswith("/") or ".." in relative.split("/"): + continue + target = root / relative + try: + target.parent.mkdir(parents=True, exist_ok=True) + target.write_bytes(base64.b64decode(item.get("data") or "")) + written += 1 + except (OSError, binascii.Error): + pass + return written + + +def prepare_ea(folder, sidecar, compat_data, launch_dir): + game = str(sidecar.get("id")) + proton = os.environ.get("BL_STORE_PROTON", "") + made = create_prefix(compat_data, proton) + ready = made in ("present", "created") or (compat_data and (Path(compat_data) / "pfx/user.reg").is_file()) + stub = install_origin_stub(compat_data) if ready else "no-prefix" + hardware, probe = ea_hardware(compat_data, proton) if ready else ({}, "no-prefix") + answer = None + if launch_dir: + answer = ask(Path(launch_dir) / "stores", {"op": "ea-prepare", "store": "ea", "id": game, "hardware": hardware}, timeout=40.0) + sidecar = sidecar_at(Path(folder)) or sidecar + log("ea %s prefix=%s stub=%s hardware=%s registry=%s touchup=%s" % ( + game, made, stub, probe, ea_registry(folder, sidecar, compat_data, proton), ea_touchup(folder, sidecar, compat_data, proton))) + if answer is None: + log("ea %s session=no reason=%s" % (game, "timeout" if launch_dir else "no-channel")) + return + written = write_licenses(compat_data, answer.get("licenses")) + log("ea %s session=%s reason=%s lsx=%s licence=%s files=%d" % ( + game, "yes" if answer.get("ok") else "no", answer.get("reason", ""), answer.get("lsx"), answer.get("license", ""), written)) + + def gog_support_actions(folder): found = [] for script in sorted(Path(folder).glob(GOG_SCRIPTS)): @@ -808,6 +1151,9 @@ def main(argv): got = bool(answer.get("code")) log("epic launch id=%s code=%s reason=%s" % (game, "yes" if got else "no", answer.get("reason", ""))) log("epic prefix=%s %s" % (prefix_id or "?", provision_prefix(compat_data))) + if store == "ea": + prepare_ea(folder, sidecar, compat_data, launch_dir) + return STORE_GAME if not cloud_on(sidecar): if store in CLOUD_STORES: log("cloud %s %s down result=skipped reason=off" % (store, game)) diff --git a/tools/tests/test_store_launch_ea.py b/tools/tests/test_store_launch_ea.py new file mode 100644 index 0000000000..2dd72b324b --- /dev/null +++ b/tools/tests/test_store_launch_ea.py @@ -0,0 +1,129 @@ +import base64 +import importlib.machinery +import importlib.util +import json +from pathlib import Path +import tempfile +import unittest +from unittest.mock import patch + +BIN = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin' +loader = importlib.machinery.SourceFileLoader('droiddeck_store_launch_ea', str(BIN / 'droiddeck-store-launch')) +spec = importlib.util.spec_from_loader(loader.name, loader) +store = importlib.util.module_from_spec(spec) +loader.exec_module(store) + + +class EaHook(unittest.TestCase): + def test_wmi_output_reads_the_value_under_the_header(self): + text = 'Manufacturer \r\r\nThe Wine Project \r\r\n\r\r\n' + self.assertEqual(store.wmi_value(text), 'The Wine Project') + self.assertEqual(store.wmi_value(store.decode_output('Name\r\nFEX CPU\r\n'.encode('utf-16'))), 'FEX CPU') + self.assertEqual(store.wmi_value(''), '') + + def test_registry_points_the_game_keys_at_the_install_folder(self): + sidecar = {'id': 'Origin.OFR.50.0001', 'title': 'Mass Effect 3', 'extra': {'registry': json.dumps([ + [r'HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Game', 'Install Dir'], + [r'HKLM\SOFTWARE\Respawn\Titanfall2', 'Install Dir'], + [r'HKEY_CLASSES_ROOT\x', 'y'], + ])}} + entries = store.ea_registry_entries(Path('/root/Games/Stores/EA/Game'), sidecar) + self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\Origin', 'ClientPath', store.EA_CLIENT), entries) + game = [e for e in entries if e[1] == 'Install Dir'] + self.assertEqual([e[0] for e in game], [r'HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Game', r'HKEY_LOCAL_MACHINE\SOFTWARE\Respawn\Titanfall2']) + self.assertEqual(game[0][2], 'Z:' + '\\'.join(['', 'root', 'Games', 'Stores', 'EA', 'Game', ''])) + self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Game', 'DisplayName', 'Mass Effect 3'), entries) + self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\Respawn\Titanfall2', 'DisplayName', 'Mass Effect 3'), entries) + + def test_legacy_games_are_registered_by_content_id(self): + sidecar = {'id': 'Origin.OFR.50.0005237', 'title': 'Mass Effect 3 (2012)', + 'extra': {'contentIds': '71073,71183, bad id', 'displayName': 'Mass Effect 3', 'locale': 'fr_FR'}} + entries = store.ea_registry_entries(Path('/root/Games/ME3'), sidecar) + key = r'HKEY_LOCAL_MACHINE\SOFTWARE\Origin Games' + '\\' + self.assertIn((key + '71073', 'DisplayName', 'Mass Effect 3'), entries) + self.assertIn((key + '71183', 'Locale', 'fr_FR'), entries) + self.assertFalse(any('bad id' in e[0] for e in entries)) + + def test_cpuid_probe_is_a_32_bit_console_program(self): + import struct + exe = store.cpuid_exe() + self.assertEqual(exe[:2], b'MZ') + self.assertEqual(exe[0x40:0x44], b'PE\0\0') + self.assertEqual(struct.unpack_from(' Date: Tue, 10 Nov 2026 15:08:37 -0500 Subject: [PATCH 002/101] feat(ubisoft): Ubisoft Connect store with native sign-in, library, downloads and launch (#2322) * feat(ubisoft): sign in to Ubisoft Connect and list the owned library * feat(ubisoft): download games natively through Demux and Ubisoft's CDN * fix(ubisoft): show the owned games on the store page * fix(ctl): reach the agent bridge by broadcast when the shell has no content command * feat(ubisoft): run Ubisoft games in one prefix with Ubisoft Connect installed and the game registered * feat(ubisoft): launch games through a native stand-in for Ubisoft Connect's local service * feat(ubisoft): document the launcher pipes, log why owned games have no download, drop the installer after extraction * feat(ubisoft): Steam-owned Ubisoft games install through Steam, and the launch session carries the game's application id * feat(ubisoft): answer Denuvo activations through Ubisoft's activation service and log unanswered pipe traffic * feat(ubisoft): report installed chunks to the game and skip add-ons the account does not own * fix(ubisoft): the overlay stays off, Ubisoft's install steps pick Windows components, and shared-prefix games keep their own settings * fix(ubisoft): write the manifest's registry values, and pick the game's exe over Ubisoft's installer stubs * fix(ubisoft): stream download slices, guard the launch hook, and keep per-game components in the shared prefix * fix(ubisoft): direct launches in the shared prefix keep their own game id * ci(ubisoft): build the launcher service after the prepared components are verified * fix(ubisoft): verify reused files, drop syncs from a signed-out account, and clear activation requests before launch * fix(ubisoft): fetch again a reused file whose slices cannot be checked --- .github/workflows/build.yml | 9 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/frontend/AddedGames.kt | 8 +- .../launcher/frontend/WinCompSources.kt | 15 +- .../launcher/session/SessionFiles.kt | 1 + .../droiddeck/launcher/stores/CloudSaves.kt | 6 +- .../droiddeck/launcher/stores/LoginFlows.kt | 2 + .../com/droiddeck/launcher/stores/Store.kt | 1 + .../com/droiddeck/launcher/stores/StoreExe.kt | 5 +- .../droiddeck/launcher/stores/StoreLaunch.kt | 22 +- .../launcher/stores/StoreLaunchRequests.kt | 9 + .../launcher/stores/StoreLoginActivity.kt | 19 +- .../droiddeck/launcher/stores/StoreSizes.kt | 4 +- .../stores/ubisoft/UbisoftActivation.kt | 74 ++++ .../launcher/stores/ubisoft/UbisoftAuth.kt | 175 ++++++++ .../launcher/stores/ubisoft/UbisoftBackend.kt | 246 +++++++++++ .../launcher/stores/ubisoft/UbisoftConnect.kt | 18 + .../stores/ubisoft/UbisoftInstaller.kt | 104 +++++ .../launcher/stores/ubisoft/UbisoftLaunch.kt | 86 ++++ .../launcher/stores/ubisoft/UbisoftNative.kt | 57 +++ .../com/droiddeck/launcher/ui/StoreChips.kt | 2 + .../com/droiddeck/launcher/ui/StoresPage.kt | 1 + .../launcher/ui/WinComponentsEditor.kt | 3 +- app/src/main/rust/stores/Cargo.lock | 18 + app/src/main/rust/stores/Cargo.toml | 5 +- app/src/main/rust/stores/src/lib.rs | 1 + app/src/main/rust/stores/src/ubisoft/demux.rs | 154 +++++++ app/src/main/rust/stores/src/ubisoft/ffi.rs | 269 ++++++++++++ .../main/rust/stores/src/ubisoft/install.rs | 408 ++++++++++++++++++ .../main/rust/stores/src/ubisoft/manifest.rs | 230 ++++++++++ app/src/main/rust/stores/src/ubisoft/mod.rs | 6 + app/src/main/rust/stores/src/ubisoft/pb.rs | 104 +++++ .../main/rust/stores/src/ubisoft/service.rs | 206 +++++++++ .../launcher/stores/ubisoft/UbisoftTest.kt | 60 +++ docs/development/ubisoft-launch.md | 90 ++++ tools/build_local.sh | 9 + .../overlay/usr/local/bin/droiddeck-game-env | 32 +- .../usr/local/bin/droiddeck-store-launch | 221 ++++++++++ .../overlay/usr/local/bin/steam-compatibility | 7 + tools/tests/test_game_environment.py | 21 + tools/tests/test_store_launch.py | 99 +++++ tools/ubisoft-launcher/.gitignore | 2 + tools/ubisoft-launcher/Cargo.lock | 105 +++++ tools/ubisoft-launcher/Cargo.toml | 19 + tools/ubisoft-launcher/build.sh | 10 + tools/ubisoft-launcher/src/launcher.rs | 358 +++++++++++++++ tools/ubisoft-launcher/src/main.rs | 331 ++++++++++++++ tools/ubisoft-launcher/src/pb.rs | 168 ++++++++ tools/ubisoft-launcher/src/win.rs | 183 ++++++++ 49 files changed, 3960 insertions(+), 24 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftConnect.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftInstaller.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftNative.kt create mode 100644 app/src/main/rust/stores/src/ubisoft/demux.rs create mode 100644 app/src/main/rust/stores/src/ubisoft/ffi.rs create mode 100644 app/src/main/rust/stores/src/ubisoft/install.rs create mode 100644 app/src/main/rust/stores/src/ubisoft/manifest.rs create mode 100644 app/src/main/rust/stores/src/ubisoft/mod.rs create mode 100644 app/src/main/rust/stores/src/ubisoft/pb.rs create mode 100644 app/src/main/rust/stores/src/ubisoft/service.rs create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt create mode 100644 docs/development/ubisoft-launch.md create mode 100644 tools/ubisoft-launcher/.gitignore create mode 100644 tools/ubisoft-launcher/Cargo.lock create mode 100644 tools/ubisoft-launcher/Cargo.toml create mode 100755 tools/ubisoft-launcher/build.sh create mode 100644 tools/ubisoft-launcher/src/launcher.rs create mode 100644 tools/ubisoft-launcher/src/main.rs create mode 100644 tools/ubisoft-launcher/src/pb.rs create mode 100644 tools/ubisoft-launcher/src/win.rs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d225b45c9..97a659744d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -555,6 +555,12 @@ jobs: SOURCE_TREE: ${{ needs.source.outputs.tree-sha }} run: python3 tools/components/prepare.py unpack --tree "$SOURCE_TREE" + - name: Ubisoft launcher service (x86_64-pc-windows-gnu) + run: | + set -euo pipefail + command -v x86_64-w64-mingw32-gcc >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq gcc-mingw-w64-x86-64; } + bash tools/ubisoft-launcher/build.sh + - uses: actions/download-artifact@v4 with: name: xbox-arm64 @@ -791,6 +797,9 @@ jobs: set -o pipefail cd app/src/main/rust/stores cargo test --locked 2>&1 | tail -60 + - name: Ubisoft launcher service host unit tests + timeout-minutes: 10 + run: cargo test --locked --manifest-path tools/ubisoft-launcher/Cargo.toml python-tests: name: Python and native regression tests diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 7235bf95c4..2137828dd7 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -61,6 +61,7 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.xbox.XboxBackend) com.droiddeck.launcher.sync.Syncthing.init(this) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.battlenet.BattleNetBackend) + com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.ubisoft.UbisoftBackend) com.droiddeck.launcher.stores.ea.EaBackend.app = this com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.ea.EaBackend) } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 7057cadd39..c7d774bf2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -417,7 +417,7 @@ object AddedGames { private fun scanGame(context: Context, folder: File, out: MutableList, single: AddedExes.Entry? = null, reuse: Boolean = false) { run { - val sidecar = StoreGameSidecar.read(folder) + val sidecar = StoreGameSidecar.read(folder)?.let { com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, it) } sidecar?.takeIf { it.id.isNotEmpty() }?.let { SessionPrefs.followStoreGame(context, "${it.store.id}:${it.id}", folder.path) { old -> !File(old).exists() } } val ranking = rank(folder, reuse) val candidates = ranking.exes @@ -457,7 +457,11 @@ object AddedGames { steamId?.toLong() ?: ((appId shl 32) or 0x02000000L), candidates, steamId, source = sidecar?.store?.id ?: Library.ADDED, storeId = sidecar?.id, exeUncertain = sidecar == null && chosen == null && adopted == null && ranking.uncertain, - launchOptions = if (sidecar == null) SessionPrefs.addedGameLaunch(context, folder.path) else "", + launchOptions = when { + sidecar == null -> SessionPrefs.addedGameLaunch(context, folder.path) + sidecar.store == Store.UBISOFT -> com.droiddeck.launcher.stores.ubisoft.UbisoftConnect.launchOptions(context) + else -> "" + }, single = single != null)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt index 22044c76d4..e9910a67df 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt @@ -9,7 +9,7 @@ import java.io.File import java.util.Locale object WinCompSources { - enum class Origin { STEAM, GOG, EPIC, AMAZON, STEAM_NAME, FOLDER, XBOX } + enum class Origin { STEAM, GOG, EPIC, AMAZON, STEAM_NAME, FOLDER, XBOX, UBISOFT } data class Finding(val component: String?, val original: String, val origin: Origin, val auto: Boolean, val args: List = emptyList()) @@ -83,6 +83,13 @@ object WinCompSources { } } + /** The prerequisite installers a Ubisoft manifest lists, with `$INSTALL_DIR` dropped. */ + internal fun ubisoftInstallRuns(setup: String?): List { + val runs = setup?.let { runCatching { org.json.JSONObject(it).optJSONArray("installRuns") }.getOrNull() } ?: return emptyList() + return (0 until runs.length()).mapNotNull { runs.optJSONObject(it)?.optString("exe") } + .map { it.replace('\\', '/').removePrefix("\$INSTALL_DIR").trimStart('/') }.filter { it.isNotEmpty() } + } + fun forGame(context: Context, game: Library.SteamGame): List { val folder = game.gameFiles val out = ArrayList() @@ -112,6 +119,12 @@ object WinCompSources { if (parts.isEmpty()) out += Finding(null, original, Origin.AMAZON, false) parts.forEach { out += Finding(it, original, Origin.AMAZON, true) } } + store == Store.UBISOFT -> ubisoftInstallRuns(sidecar?.extra?.get(com.droiddeck.launcher.stores.ubisoft.UbisoftLaunch.SETUP)).forEach { exe -> + val parts = installer(exe) + val original = exe.substringAfterLast('/') + if (parts.isEmpty()) out += Finding(null, original, Origin.UBISOFT, false) + parts.forEach { out += Finding(it, original, Origin.UBISOFT, true) } + } else -> {} } if (game.library == Library.ADDED && folder != null) SteamMatch.get(context, folder.path)?.let { match -> diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index f3b8478a21..1984f8c93c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -196,6 +196,7 @@ object SessionFiles { "usr/local/lib/droiddeck-pipewire.tzst" to "usr/local/lib/droiddeck-pipewire.tzst", "usr/local/share/licenses/uruntime/LICENSE" to "usr/local/share/licenses/uruntime/LICENSE", "usr/local/lib/droiddeck-dirt/ws2_32.dll" to "usr/local/lib/droiddeck-dirt/ws2_32.dll", + "usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe" to "usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe", ) + mangoapp + xclipse.map { it to it } + maliCompat + msitools.map { it to it } + vr + gpuLoad + fexPreloads).filter { (asset, _) -> val dir = asset.substringBeforeLast('/') runCatching { context.assets.list("linuxfs/$dir")?.contains(asset.substringAfterLast('/')) == true }.getOrDefault(false) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index 389caee48a..f68ab0ce62 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -87,7 +87,7 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA -> "" + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -148,7 +148,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -173,7 +173,7 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { 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 640635788d..980f496b26 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -13,12 +13,14 @@ internal object LoginFlows { Store.EPIC -> epicFlow() Store.AMAZON -> amazonFlow() Store.GAMEJOLT -> gameJoltFlow(browserUserAgent) + Store.UBISOFT -> ubisoftFlow(browserUserAgent) Store.EA -> eaFlow(browserUserAgent) Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @Volatile var epicFlow: () -> StoreLoginActivity.Flow? = { null } @Volatile var amazonFlow: () -> StoreLoginActivity.Flow? = { null } + @Volatile var ubisoftFlow: (String) -> StoreLoginActivity.Flow? = { null } @Volatile var eaFlow: (String) -> StoreLoginActivity.Flow? = { null } @Volatile var gameJoltFlow: (String) -> StoreLoginActivity.Flow? = { null } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index 8813675b22..b8a6e8931e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -8,6 +8,7 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { ITCH("itch", "Itch.io", "Itch.io"), GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"), BATTLENET("battlenet", "Battle.net", "Battle.net"), + UBISOFT("ubisoft", "Ubisoft Connect", "Ubisoft"), EA("ea", "EA", "EA"); val folder: String get() = if (this == ITCH) "itch" else shortLabel diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreExe.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreExe.kt index ad2d478c18..0e9792edc7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreExe.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreExe.kt @@ -3,7 +3,8 @@ package com.droiddeck.launcher.stores import java.io.File object StoreExe { - private val SKIP = listOf("redist", "unins", "setup", "crash", "report", "helper", "dotnet", "vcredist", "directx", "eac", "easyanticheat", "battleye", "launcher", "updater", "config") + private val SKIP = listOf("redist", "unins", "setup", "crash", "report", "helper", "dotnet", "vcredist", "directx", "eac", "easyanticheat", "battleye", "launcher", "updater", "config", "installer", "autorun") + private val SKIP_DIRS = setOf("installer_resources", "redist", "_commonredist", "support") fun pick(folder: File, hint: String?, title: String): String { val hinted = hint?.takeIf { it.isNotBlank() }?.replace('\\', '/')?.trimStart('/')?.let { File(folder, it) } @@ -28,7 +29,7 @@ object StoreExe { if (SKIP.none { lower.contains(it) }) out.add(f) } } - for (f in files) if (f.isDirectory && !f.name.startsWith(".")) collect(f, out, depth + 1) + for (f in files) if (f.isDirectory && !f.name.startsWith(".") && f.name.lowercase() !in SKIP_DIRS) collect(f, out, depth + 1) } private fun depth(root: File, f: File): Int = relative(root, f).count { it == '/' } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt index f1a527a396..222b53702e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt @@ -11,12 +11,14 @@ object StoreLaunch { const val LAUNCHER = ".droiddeck-launch.bat" const val EPIC_CODE = ".droiddeck-epic-code" const val EPIC_ARGS = ".droiddeck-epic-args" + const val UBISOFT_LAUNCH = ".droiddeck-ubisoft.json" + private const val UBISOFT_SERVICE = "Z:\\usr\\local\\lib\\droiddeck-ubisoft\\droiddeck-upc.exe" const val EA_ENV = ".droiddeck-ea-env" /** A sleeping stand-in that the launch hook installs; older EA SDKs require a running Origin process. */ const val EA_ORIGIN = "C:\\Program Files (x86)\\Origin\\Origin.exe" fun writeLauncher(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { - val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA + val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA || sidecar.store == Store.UBISOFT val file = File(folder, LAUNCHER) if (!needs) { file.delete(); return sidecar.copy(launcher = null) } file.writeText(launcherText(sidecar)) @@ -52,6 +54,13 @@ object StoreLaunch { lines += "del \"%~dp0$EPIC_ARGS\"" lines += "if exist \"%~dp0$EPIC_CODE\" del \"%~dp0$EPIC_CODE\"" lines += "set \"$CLIENT_VAR=\" & \"%~dp0$exe\" %$CLIENT_VAR%" + } else if (sidecar.store == Store.UBISOFT) { + lines += "if not exist \"%~dp0$UBISOFT_LAUNCH\" goto direct" + lines += "if not exist \"$UBISOFT_SERVICE\" goto direct" + lines += "\"$UBISOFT_SERVICE\" \"%~dp0$UBISOFT_LAUNCH\"" + lines += "goto :eof" + lines += ":direct" + lines += run } else if (sidecar.store == Store.EA) { lines += "if not exist \"%~dp0$EA_ENV\" goto run" lines += "for /f \"usebackq tokens=1,* delims==\" %%a in (\"%~dp0$EA_ENV\") do set \"%%a=%%b\"" @@ -84,6 +93,17 @@ object StoreLaunch { return Library.addedGame(context, game) } + /** Gives a Ubisoft game installed before it needed one the launcher that starts the launcher service. */ + fun adopt(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { + if (sidecar.store != Store.UBISOFT || !sidecar.isInstalled) return sidecar + val wrongExe = !sidecar.exeFile(folder).isFile || sidecar.exe.contains("installer", ignoreCase = true) || sidecar.exe.contains("autorun", ignoreCase = true) + if (sidecar.launcher == LAUNCHER && !wrongExe) return sidecar + val exe = if (wrongExe) StoreExe.pick(folder, null, sidecar.title).ifEmpty { sidecar.exe } else sidecar.exe + if (exe == sidecar.exe && sidecar.launcher == LAUNCHER && + runCatching { File(folder, LAUNCHER).readText() }.getOrNull() == launcherText(sidecar)) return sidecar + return runCatching { writeLauncher(folder, sidecar.copy(exe = exe)).also { it.write(folder) } }.getOrDefault(sidecar) + } + fun refreshLauncher(folder: File, sidecar: StoreGameSidecar) { if (sidecar.launcher != LAUNCHER) return val file = File(folder, LAUNCHER) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index dbfa4a80dd..18f5a161e3 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -76,6 +76,15 @@ object StoreLaunchRequests { JSONObject().put("ok", true).put("code", code.written).put("reason", code.reason) } } + "ubisoft-launch" -> { + val id = request.optString("id") + if (id.isEmpty()) JSONObject().put("ok", false).put("reason", "no-id") + else { + lastLaunched = Store.UBISOFT to id + runCatching { com.droiddeck.launcher.stores.ubisoft.UbisoftLaunch.prepare(app, id) } + .getOrElse { JSONObject().put("ok", false).put("reason", it.javaClass.simpleName) } + } + } "cloud-down" -> { val store = Store.byId(request.optString("store")) val id = request.optString("id") 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 228d97cd78..a07e0be855 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -47,6 +47,9 @@ class StoreLoginActivity : ComponentActivity() { ?.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" + private const val PAGE_TRIES = 20 + private const val PAGE_RETRY_MS = 500L + fun generateState(): String { val bytes = ByteArray(24) java.security.SecureRandom().nextBytes(bytes) @@ -60,6 +63,8 @@ class StoreLoginActivity : ComponentActivity() { fun isRedirect(url: String): Boolean fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? val readsPage: Boolean get() = false + val pageScript: String get() = "(function(){ try { return document.body.innerText; } catch(e){ return ''; } })()" + fun pageReady(result: String): Boolean = true fun forgetSignIn(done: () -> Unit) = done() } @@ -323,6 +328,14 @@ class StoreLoginActivity : ComponentActivity() { } } + private fun readPage(view: WebView, f: Flow, left: Int) { + view.evaluateJavascript(f.pageScript) { json -> + val result = json ?: "" + if (!f.pageReady(result) && left > 0) view.postDelayed({ readPage(view, f, left - 1) }, PAGE_RETRY_MS) + else Thread({ settle(f.finish(this, view, result)) }, "store-login").start() + } + } + private fun complete(view: WebView, url: String) { if (!captured.compareAndSet(false, true)) return val f = flow ?: return @@ -332,11 +345,7 @@ class StoreLoginActivity : ComponentActivity() { titleText.text = getString(R.string.stores_login_finishing) if (!f.readsPage) view.stopLoading() } - if (f.readsPage) { - view.evaluateJavascript("(function(){ try { return document.body.innerText; } catch(e){ return ''; } })()") { json -> - Thread({ settle(f.finish(this, view, json ?: "")) }, "store-login").start() - } - } else Thread({ settle(f.finish(this, view, url)) }, "store-login").start() + if (f.readsPage) readPage(view, f, PAGE_TRIES) else Thread({ settle(f.finish(this, view, url)) }, "store-login").start() } private fun settle(problem: String?) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 65d72c6d91..5e8ce7c6d7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -56,7 +56,7 @@ object StoreSizes { Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.ITCH, Store.GAMEJOLT -> {} Store.EA -> com.droiddeck.launcher.stores.ea.EaPrefs.get(app).edit().putLong("size_${item.id}", it).apply() - Store.GOG, Store.XBOX, Store.BATTLENET -> {} + Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT -> {} } } }, pool).exceptionally { error -> @@ -113,7 +113,7 @@ object StoreSizes { AmazonManifest.parse(bytes).totalInstallSize } Store.EA -> com.droiddeck.launcher.stores.ea.EaSizes.size(context, item) - Store.GOG, Store.XBOX, Store.BATTLENET -> 0L + Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds.size(context, item) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt new file mode 100644 index 0000000000..d11fde4210 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.content.Context +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONObject +import java.io.File + +/** + * Answers Denuvo activations for a running Ubisoft game. droiddeck-upc.exe writes the challenge + * the game's aux DLL sends to `bridge-/denuvo-.req`; the answer goes to `.rsp`. + */ +object UbisoftActivation { + private const val POLL_MS = 250L + private const val IDLE_MS = 60_000L + private val watching = HashMap() + + fun bridge(context: Context, product: Long) = File(LinuxRuntime.rootDir(context), "root/.cache/droiddeck/ubisoft/bridge-$product") + + /** Starts answering the product's activations; stale requests are cleared before this returns. */ + fun watch(app: Context, product: Long) { + val dir = bridge(app, product) + synchronized(watching) { + val running = watching.containsKey(product) + watching[product] = System.currentTimeMillis() + if (running) return + dir.mkdirs() + dir.listFiles()?.forEach { it.delete() } + } + Thread({ + var idleSince = 0L + while (true) { + runCatching { dir.listFiles { f -> f.name.startsWith("denuvo-") && f.name.endsWith(".req") }?.forEach { answer(app, product, it) } } + .onFailure { StoresState.logLine("Ubisoft: activation for $product: ${it.javaClass.simpleName}") } + val now = System.currentTimeMillis() + if (SessionState.running) idleSince = 0L + else if (idleSince == 0L) idleSince = now + else if (now - idleSince > IDLE_MS) synchronized(watching) { + if (now - (watching[product] ?: 0L) > IDLE_MS) { watching.remove(product); return@Thread } + } + runCatching { Thread.sleep(POLL_MS) } + } + }, "ubisoft-activation-$product").start() + } + + private fun answer(app: Context, product: Long, request: File) { + val challenge = runCatching { request.readBytes() }.getOrNull() ?: return + request.delete() + val reply = File(request.parentFile, request.name.removeSuffix(".req") + ".rsp") + val token = activate(app, product, challenge) + val part = File(reply.path + ".part") + part.writeBytes(token ?: ByteArray(0)) + part.renameTo(reply) + } + + private fun activate(app: Context, product: Long, challenge: ByteArray): ByteArray? { + val s = UbisoftAuth.current(app) ?: return null.also { StoresState.logLine("Ubisoft: activation for $product: signed out") } + val answer = UbisoftNative.call("denuvo", JSONObject().put("ticket", s.ticket).put("sessionId", s.sessionId) + .put("productId", product).put("challenge", hex(challenge))) + answer?.optString("error")?.takeIf { it.isNotEmpty() }?.let { + StoresState.logLine("Ubisoft: activation for $product: $it") + return null + } + val token = answer?.optString("token")?.takeIf { it.isNotEmpty() }?.let(::unhex) + StoresState.logLine("Ubisoft: activation for $product: ${token?.size ?: 0} B game token") + return token + } + + internal fun hex(b: ByteArray): String = b.joinToString("") { "%02x".format(it) } + + internal fun unhex(s: String): ByteArray? = + if (s.length % 2 != 0) null else runCatching { ByteArray(s.length / 2) { s.substring(it * 2, it * 2 + 2).toInt(16).toByte() } }.getOrNull() +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt new file mode 100644 index 0000000000..5de002dade --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt @@ -0,0 +1,175 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import org.json.JSONArray +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder + +/** UbiServices sessions: a ticket from Ubisoft's own web sign-in, exchanged for a launcher session that remember-me renews. */ +object UbisoftAuth { + private const val TAG = "UbisoftAuth" + const val SESSIONS = "https://public-ubiservices.ubi.com/v3/profiles/sessions" + + /** The web app and genome connect.ubisoft.com's sign-in page accepts. */ + private const val WEB_APP_ID = "f35adcb5-1911-440c-b1c9-48fdc1701c68" + private const val WEB_GENOME_ID = "5b36b900-65d8-47f3-93c8-86bdaa48ab50" + + /** The Ubisoft Connect PC app id; its sessions are accepted by the library GraphQL and Demux. */ + const val APP_ID = "f68a4bb5-608a-4ff2-8123-be8ef797e0a6" + private const val REFRESH_MARGIN_MS = 10 * 60 * 1000L + private val lock = Any() + + class Session( + val ticket: String, + val sessionId: String, + val profileId: String, + val userId: String, + val name: String, + val expiresAt: Long, + val rememberMe: String, + ) + + class Reply(val status: Int, val body: String, val headers: Map) { + val ok get() = status in 200..299 + } + + private val loggedIn = "https://connect.ubisoft.com/logged-in.html?appId=$WEB_APP_ID&lang=en-US&genomeId=$WEB_GENOME_ID" + val loginUrl = "https://connect.ubisoft.com/login?appId=$WEB_APP_ID&genomeId=$WEB_GENOME_ID&lang=en-US&nextUrl=" + URLEncoder.encode(loggedIn, "UTF-8") + val SIGN_IN_URLS = listOf("https://connect.ubisoft.com", "https://account.ubisoft.com", "https://ubisoft.com") + + fun isLoggedInPage(url: String) = url.startsWith("https://connect.ubisoft.com/logged-in.html") + + /** Reads connect.ubisoft.com's stored sign-in; the WebAuth SDK keeps it under keys holding `loginData` and `rememberMe`. */ + const val PAGE_SCRIPT = "(function(){try{var o={};for(var i=0;i = emptyMap()): Reply { + val c = URL(url).openConnection() as HttpURLConnection + c.requestMethod = method + c.connectTimeout = 15_000 + c.readTimeout = 25_000 + c.setRequestProperty("Ubi-AppId", APP_ID) + c.setRequestProperty("Ubi-RequestedPlatformType", "uplay") + c.setRequestProperty("Content-Type", "application/json") + c.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36") + authorization?.let { c.setRequestProperty("Authorization", it) } + sessionId?.let { c.setRequestProperty("Ubi-SessionId", it) } + for ((k, v) in extra) c.setRequestProperty(k, v) + try { + if (body != null) { + c.doOutput = true + c.outputStream.use { it.write(body.toByteArray()) } + } + val status = c.responseCode + val text = (if (status in 200..299) c.inputStream else c.errorStream)?.use { it.readBytes().toString(Charsets.UTF_8) }.orEmpty() + val headers = c.headerFields.filterKeys { it != null }.mapKeys { it.key.lowercase() }.mapValues { it.value.joinToString(",") } + return Reply(status, text, headers) + } finally { + c.disconnect() + } + } + + /** POSTs a session request, replaying it once when UbiServices answers with a challenge. */ + private fun session(authorization: String): Reply { + val body = JSONObject().put("rememberMe", true).toString() + val first = request(SESSIONS, "POST", authorization, body = body) + val challenge = first.headers["ubi-challenge"] ?: return first + return request(SESSIONS, "POST", authorization, body = body, extra = mapOf("Ubi-Challenge" to challenge)) + } + + internal fun parseSession(body: String, rememberFallback: String = ""): Session? { + val o = runCatching { JSONObject(body) }.getOrNull() ?: return null + val ticket = o.optString("ticket").takeIf { it.isNotEmpty() && it != "null" } ?: return null + return Session( + ticket = ticket, + sessionId = o.optString("sessionId"), + profileId = o.optString("profileId"), + userId = o.optString("userId"), + name = o.optString("nameOnPlatform"), + expiresAt = parseTime(o.optString("expiration")), + rememberMe = o.optString("rememberMeTicket").takeIf { it.isNotEmpty() && it != "null" } ?: rememberFallback, + ) + } + + internal fun parseTime(s: String): Long = runCatching { java.time.OffsetDateTime.parse(s).toInstant().toEpochMilli() } + .recoverCatching { java.time.Instant.parse(s).toEpochMilli() }.getOrDefault(System.currentTimeMillis() + 60 * 60 * 1000L) + + /** Values the web sign-in stored, found wherever the SDK nests them. */ + internal fun webValues(dump: String): Map { + val out = HashMap() + fun walk(v: Any?) { + when (v) { + is JSONObject -> v.keys().forEach { k -> + val x = v.opt(k) + if (x is String && x.isNotEmpty() && k !in out) { + val nested = if (x.startsWith("{") || x.startsWith("[")) runCatching { org.json.JSONTokener(x).nextValue() }.getOrNull() else null + if (nested != null) walk(nested) else out[k] = x + } else walk(x) + } + is JSONArray -> for (i in 0 until v.length()) walk(v.opt(i)) + } + } + val top = runCatching { org.json.JSONTokener(dump).nextValue() }.getOrNull() + walk(if (top is String) runCatching { JSONObject(top) }.getOrNull() else top) + return out + } + + /** Turns the page's stored sign-in into a launcher session; returns null on success or a reason. */ + fun completeWebSignIn(context: Context, dump: String): String? { + val web = webValues(dump) + val ticket = web["ticket"] + val remember = web["rememberMeTicket"].orEmpty() + val fresh = when { + ticket != null -> session("ubi_v1 t=$ticket").let { r -> + parseSession(r.body, remember) ?: run { Log.w(TAG, "ticket exchange: ${r.status} ${r.body.take(200)}"); null } + } + else -> null + } ?: remember.takeIf { it.isNotEmpty() }?.let { rm -> parseSession(session("rm_v1 t=$rm").body, rm) } + ?: return "no ticket" + save(context, fresh) + return null + } + + private fun save(context: Context, s: Session) { + val name = s.name.ifEmpty { profileName(s) } + StoreAccounts.write(context.applicationContext, Store.UBISOFT, JSONObject() + .put("access_token", s.ticket) + .put("session_id", s.sessionId) + .put("profile_id", s.profileId) + .put("user_id", s.userId) + .put("display_name", name) + .put("expires_at", s.expiresAt) + .put("remember_me", s.rememberMe)) + } + + private fun profileName(s: Session): String = runCatching { + JSONObject(request("https://public-ubiservices.ubi.com/v3/profiles/me", authorization = "ubi_v1 t=${s.ticket}", sessionId = s.sessionId).body).optString("nameOnPlatform") + }.getOrDefault("") + + fun load(context: Context): Session? { + val o = StoreAccounts.read(context.applicationContext, Store.UBISOFT) ?: return null + val ticket = o.optString("access_token").takeIf { it.isNotEmpty() } ?: return null + return Session(ticket, o.optString("session_id"), o.optString("profile_id"), o.optString("user_id"), o.optString("display_name"), o.optLong("expires_at"), o.optString("remember_me")) + } + + /** A live session, renewed through remember-me shortly before it expires. */ + fun current(context: Context): Session? = synchronized(lock) { + val s = load(context) ?: return null + if (s.expiresAt - System.currentTimeMillis() > REFRESH_MARGIN_MS || s.rememberMe.isEmpty()) return s + val renewed = runCatching { session("rm_v1 t=${s.rememberMe}") }.getOrNull()?.let { parseSession(it.body, s.rememberMe) } + if (renewed == null) { + Log.w(TAG, "remember-me renewal failed") + return if (s.expiresAt > System.currentTimeMillis()) s else null + } + save(context, Session(renewed.ticket, renewed.sessionId, renewed.profileId.ifEmpty { s.profileId }, renewed.userId.ifEmpty { s.userId }, + renewed.name.ifEmpty { s.name }, renewed.expiresAt, renewed.rememberMe)) + load(context) + } + + fun signOut(context: Context) = synchronized(lock) { StoreAccounts.clear(context.applicationContext, Store.UBISOFT) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt new file mode 100644 index 0000000000..09008e1927 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt @@ -0,0 +1,246 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.content.Context +import android.content.Intent +import android.util.Log +import android.webkit.WebView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.LoginFlows +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.WebCookies +import org.json.JSONObject + +object UbisoftBackend : StoreBackend { + override val store: Store = Store.UBISOFT + + init { + LoginFlows.ubisoftFlow = { ua -> UbisoftLogin(ua) } + } + + override fun signIn(context: Context) { + context.startActivity( + Intent(context, StoreLoginActivity::class.java) + .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) + } + + override fun signOut(context: Context) { + UbisoftAuth.signOut(context.applicationContext) + UbisoftLibrary.reset() + runCatching { WebCookies.expire(UbisoftAuth.SIGN_IN_URLS, ".ubisoft.com", listOf("/")) {} } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + Thread({ UbisoftLibrary.sync(app, force) }, "ubisoft-sync").start() + } + + override fun loadShelves(context: Context, force: Boolean) {} + + override fun install(context: Context, item: CatalogItem, root: java.io.File) { + val app = context.applicationContext + item.extra[STEAM_APP]?.takeIf { item.extra["productId"] == null }?.let { steam -> + StoresState.logLine("Ubisoft: ${item.title} is owned on Steam; installing Steam app $steam") + installInSteam(app, steam) + return + } + if (!UbisoftNative.ready()) { + StoresState.logLine(UbisoftNative.ENGINE_MISSING) + StoresState.post { StoresState.problems[store] = UbisoftNative.ENGINE_MISSING } + return + } + val folder = StoreInstallRoot.folderFor(app, store, item.id, item.title, root) + val entry = DownloadEntry(store, item.id, item.title, cover = item.tallImageUrl ?: item.imageUrl, + bytesTotal = item.sizeBytes, location = StoreInstallRoot.labelFor(app, folder)) + DownloadQueue.enqueue(app, entry) { UbisoftInstaller(app, item, folder) } + } + + override fun uninstall(context: Context, game: InstalledStoreGame) {} + + const val STEAM_APP = "steamAppId" + + /** Steam asks to install a game it does not have when told to run it. */ + private fun installInSteam(app: Context, steamAppId: String) { + if (com.droiddeck.launcher.session.SessionState.running) { + if (!com.droiddeck.launcher.session.SessionService.launchGame(app, steamAppId)) StoresState.logLine("Ubisoft: Steam is busy; install Steam app $steamAppId there") + return + } + app.startActivity(Intent(app, com.droiddeck.launcher.SessionActivity::class.java) + .putExtra(com.droiddeck.launcher.session.SessionService.EXTRA_STEAM_URL, com.droiddeck.launcher.frontend.GameLaunchLink.steamUrl(steamAppId)) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } +} + +internal class UbisoftLogin(override val userAgent: String) : StoreLoginActivity.Flow { + override val startUrl: String get() = UbisoftAuth.loginUrl + override val readsPage: Boolean get() = true + override val pageScript: String get() = UbisoftAuth.PAGE_SCRIPT + override fun pageReady(result: String): Boolean = result.contains("ticket", ignoreCase = true) + override fun isRedirect(url: String): Boolean = UbisoftAuth.isLoggedInPage(url) + + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(UbisoftAuth.SIGN_IN_URLS, ".ubisoft.com", listOf("/")) { done() } }.onFailure { done() } + } + + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? = try { + UbisoftAuth.completeWebSignIn(activity, url)?.let { + Log.w("UbisoftLogin", "sign-in incomplete: $it") + activity.getString(R.string.stores_login_error_verification) + } + } catch (e: Exception) { + Log.w("UbisoftLogin", "sign-in failed: ${e.javaClass.simpleName}") + activity.getString(R.string.stores_login_error_generic) + } +} + +object UbisoftLibrary { + private const val GRAPHQL = "https://public-ubiservices.ubi.com/v1/profiles/me/uplay/graphql" + private const val PAGE = 50 + private const val QUERY = "query OwnedGames(\$limit: Int, \$offset: Int) { viewer { games(limit: \$limit, offset: \$offset) { totalCount nodes { id spaceId name coverUrl backgroundUrl bannerUrl releaseDate } } } }" + private val generation = java.util.concurrent.atomic.AtomicInteger() + private val running = java.util.concurrent.atomic.AtomicReference(null) + + /** Forgets the signed-out account: its sync results are dropped and a new account may sync at once. */ + fun reset() { + generation.incrementAndGet() + StoresState.post { StoresState.shelves.remove(Store.UBISOFT) } + } + + private fun post(gen: Int, block: () -> Unit) = StoresState.post { if (generation.get() == gen) block() } + + internal fun parsePage(body: String): Pair, Int> { + val o = JSONObject(body) + o.optJSONArray("errors")?.optJSONObject(0)?.let { throw IllegalStateException(it.optString("message")) } + val games = o.optJSONObject("data")?.optJSONObject("viewer")?.optJSONObject("games") ?: return emptyList() to 0 + val nodes = games.optJSONArray("nodes") + val items = (0 until (nodes?.length() ?: 0)).mapNotNull { nodes!!.optJSONObject(it) }.mapNotNull { n -> + val space = n.optString("spaceId").takeIf { it.isNotEmpty() } ?: return@mapNotNull null + fun s(k: String) = n.optString(k).takeIf { it.isNotEmpty() && it != "null" } + CatalogItem( + Store.UBISOFT, space, n.optString("name").trim(), s("backgroundUrl") ?: s("bannerUrl"), + tallImageUrl = s("coverUrl"), releaseDate = s("releaseDate")?.take(10).orEmpty(), owned = true, + extra = mapOf("spaceId" to space, "gameId" to n.optString("id")), + ) + } + return items to games.optInt("totalCount", items.size) + } + + /** Base games with a manifest, by UbiServices space; add-ons and bundles share spaces with their game. */ + internal fun ownedBySpace(owned: JSONObject?): Map { + val list = owned?.optJSONArray("games") ?: return emptyMap() + val games = (0 until list.length()).mapNotNull { list.optJSONObject(it) } + .filter { it.optString("manifest").isNotEmpty() && it.optInt("productType") == 0 && it.optBoolean("owned", true) } + val out = LinkedHashMap() + for (key in listOf("spaceId")) for (g in games) { + val space = g.optString(key).takeIf { it.isNotEmpty() } ?: continue + out.putIfAbsent(space, g) + } + return out + } + + private val STEAM_ID = Regex("""^\s*steam_app_id:\s*['"]?(\d+)""", RegexOption.MULTILINE) + private val THIRD_PARTY = Regex("""^\s*third_party_platform:\s*\r?\n\s+name:\s*['"]?Steam\b""", setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE)) + + /** The Steam app of a product Ubisoft says is owned and installed through Steam. */ + internal fun steamApp(configuration: String): String? = + if (THIRD_PARTY.containsMatchIn(configuration)) STEAM_ID.find(configuration)?.groupValues?.get(1) else null + + /** Owned games Ubisoft delivers through Steam, by UbiServices space. */ + internal fun steamBySpace(owned: JSONObject?): Map { + val list = owned?.optJSONArray("games") ?: return emptyMap() + return (0 until list.length()).mapNotNull { list.optJSONObject(it) } + .filter { it.optInt("productType") == 0 && it.optBoolean("owned", true) && it.optString("spaceId").isNotEmpty() } + .mapNotNull { o -> steamApp(o.optString("configuration"))?.let { o.optString("spaceId") to it } }.toMap() + } + + private val RELATIVE = Regex("""relative:\s*['"]?([^'"\r\n]+?)['"]?\s*$""", RegexOption.MULTILINE) + + private val NAME = Regex("""^\s{1,4}name:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE) + + /** The product's name from its configuration, following a localisation key such as `l1` to its default text. */ + internal fun title(configuration: String): String? { + val raw = NAME.find(configuration)?.groupValues?.get(1)?.trim()?.takeIf { it.isNotEmpty() } ?: return null + if (!Regex("""l\d+""").matches(raw)) return raw + val local = configuration.indexOf("localizations:").takeIf { it >= 0 } ?: return raw + return Regex("""^\s+${raw}:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE).find(configuration, local)?.groupValues?.get(1)?.trim() ?: raw + } + + /** The first launch path under `start_game` in a product's configuration. */ + internal fun executable(configuration: String): String? { + val start = configuration.indexOf("start_game").takeIf { it >= 0 } ?: return null + return RELATIVE.find(configuration, start)?.groupValues?.get(1)?.trim()?.takeIf { it.endsWith(".exe", true) } + } + + fun sync(app: Context, force: Boolean) { + val gen = generation.get() + if (running.getAndSet(gen) == gen) return + try { + val s = UbisoftAuth.current(app) + if (s == null) { + post(gen) { StoresState.status.remove(Store.UBISOFT); StoresState.problems[Store.UBISOFT] = app.getString(R.string.stores_sync_sign_in) } + return + } + if (StoresState.library[Store.UBISOFT].isNullOrEmpty()) post(gen) { StoresState.status[Store.UBISOFT] = app.getString(R.string.stores_sync_game_list) } + val all = ArrayList() + var offset = 0 + while (true) { + val body = JSONObject().put("operationName", "OwnedGames").put("query", QUERY) + .put("variables", JSONObject().put("limit", PAGE).put("offset", offset)).toString() + val reply = UbisoftAuth.request(GRAPHQL, "POST", "Ubi_v1 t=${s.ticket}", s.sessionId, body) + if (reply.status == 401) StoresState.markSignInExpired(Store.UBISOFT) + if (!reply.ok) throw IllegalStateException("library ${reply.status}") + val (items, total) = parsePage(reply.body) + all += items + offset += PAGE + if (items.isEmpty() || offset >= total) break + } + val owned = UbisoftNative.call("owned", JSONObject().put("ticket", s.ticket).put("sessionId", s.sessionId)) + owned?.optString("error")?.takeIf { it.isNotEmpty() }?.let { StoresState.logLine("Ubisoft: ownership: $it") } + val bySpace = ownedBySpace(owned) + owned?.takeIf { it.optInt("manifestsAsked") > 0 }?.let { + StoresState.logLine("Ubisoft: latest manifests: ${it.optInt("manifestsFound")} of ${it.optInt("manifestsAsked")} ${it.optString("manifestError")}".trim()) + } + fun download(o: JSONObject) = listOfNotNull( + "productId" to o.optLong("productId").toString(), + o.optString("manifest").takeIf { it.isNotEmpty() }?.let { "manifest" to it }, + o.optString("appId").takeIf { it.isNotEmpty() }?.let { "appId" to it }, + executable(o.optString("configuration"))?.let { "exe" to it }, + ) + val listed = all.distinctBy { it.id } + val onSteam = steamBySpace(owned) + val matched = listed.map { g -> bySpace[g.id]?.let { g.copy(extra = g.extra + download(it)) } ?: onSteam[g.id]?.let { g.copy(extra = g.extra + (UbisoftBackend.STEAM_APP to it)) } ?: g } + .let { games -> games.filter { g -> g.extra["productId"] == null || games.first { it.extra["productId"] == g.extra["productId"] } === g } } + .let { games -> games.filter { g -> g.extra["productId"] != null || games.none { it !== g && it.title == g.title && it.extra["productId"] != null } } } + val products = matched.mapNotNull { it.extra["productId"] }.toSet() + val unlisted = bySpace.filterKeys { space -> listed.none { it.id == space } }.filterValues { it.optLong("productId").toString() !in products }.mapNotNull { (space, o) -> + val title = title(o.optString("configuration")) ?: return@mapNotNull null + CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)) + } + val games = (matched + unlisted).sortedBy { it.title.lowercase() } + StoresState.logLine("Ubisoft: ${bySpace.size} downloadable products; " + + games.filter { it.extra.containsKey("productId") }.joinToString(", ") { "${it.title}=${it.extra["productId"]}" }) + post(gen) { + StoresState.status.remove(Store.UBISOFT) + StoresState.problems.remove(Store.UBISOFT) + StoresState.library[Store.UBISOFT] = games + StoresState.shelves[Store.UBISOFT] = com.droiddeck.launcher.stores.StoreShelves( + trending = games.sortedByDescending { it.extra.containsKey("productId") }, art = games.mapNotNull { it.imageUrl }) + } + StoresState.logLine("Ubisoft: ${games.size} owned games; on Steam: " + games.filter { it.extra.containsKey(UbisoftBackend.STEAM_APP) }.joinToString(", ") { "${it.title}=${it.extra[UbisoftBackend.STEAM_APP]}" }) + } catch (e: Exception) { + StoresState.logLine("Ubisoft: library sync failed: ${e.javaClass.simpleName} ${e.message.orEmpty().take(200)}") + post(gen) { StoresState.status.remove(Store.UBISOFT); StoresState.problems[Store.UBISOFT] = app.getString(R.string.stores_sync_failed) } + } finally { + running.compareAndSet(gen, null) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftConnect.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftConnect.kt new file mode 100644 index 0000000000..23cc92cd20 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftConnect.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.content.Context +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File + +/** The one prefix every Ubisoft game runs in, so Ubisoft Connect is installed and signed in once. */ +object UbisoftConnect { + const val APP_ID = 2929927072L + + fun prefix(context: Context) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/compatdata/$APP_ID") + + fun installed(context: Context) = File(prefix(context), "pfx/drive_c/Program Files (x86)/Ubisoft/Ubisoft Game Launcher/upc.exe").isFile + + fun launchOptions(context: Context): String = + AddedGames.guestPath(context, prefix(context))?.let { "STEAM_COMPAT_DATA_PATH=$it %command%" }.orEmpty() +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftInstaller.kt new file mode 100644 index 0000000000..1bf4c4e360 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftInstaller.kt @@ -0,0 +1,104 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreExe +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.amazon.AmazonNative +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import org.json.JSONObject +import java.io.File +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicLong + +internal class UbisoftInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + + override fun run(handle: DownloadQueue.JobHandle): String? { + handle.stage(DownloadStage.MANIFEST, app.getString(R.string.stores_sync_sign_in)) + val s = UbisoftAuth.current(app) ?: throw IllegalStateException("Not signed in to Ubisoft") + val product = item.extra["productId"]?.toLongOrNull() ?: throw IllegalStateException("Ubisoft lists no download for ${item.title} on this account") + val cover = item.tallImageUrl ?: item.imageUrl + StoreInstalls.begin(folder, Store.UBISOFT, item.id, item.title, cover, item.imageUrl) + if (cancelled.get()) return null + val locale = StoreLanguage.localeFor(null, app) + val request = JSONObject() + .put("ticket", s.ticket) + .put("sessionId", s.sessionId) + .put("productId", product) + .put("manifest", item.extra["manifest"].orEmpty()) + .put("folder", folder.absolutePath) + .put("language", "${locale.language}-${locale.country}") + val shown = AtomicLong(-1) + val downloading = AtomicBoolean(false) + val listener = object : AmazonNative.InstallListener { + override fun onStatus(text: String) { handle.stage(DownloadStage.MANIFEST, text) } + override fun onCheck(doneBytes: Long, totalBytes: Long, files: Int, filesTotal: Int) { + handle.stageProgress(doneBytes, totalBytes, files, filesTotal, bytes = true) + } + override fun onSizes(pendingBytes: Long, totalBytes: Long) { handle.diskSize(totalBytes) } + override fun onProgress(done: Long, total: Long, files: Int, filesTotal: Int) { + if (downloading.compareAndSet(false, true)) handle.stage(DownloadStage.DOWNLOAD) + while (true) { + val before = shown.get() + if (done < before) return + if (shown.compareAndSet(before, done)) break + } + handle.progress(done, total, "Downloading ($files/$filesTotal files)") + } + override fun onLog(line: String) { handle.log(line) } + override fun beforeReplace(): Boolean = true + override fun onComplete(success: Boolean, cancelled: Boolean, error: String, result: String) = Unit + } + val outcome = UbisoftNative.install(request, listener, cancelled) + if (outcome.cancelled || cancelled.get() && !outcome.success) return null + if (!outcome.success) throw IllegalStateException(outcome.error.ifEmpty { "The Ubisoft install failed" }) + + handle.stage(DownloadStage.INSTALL, app.getString(R.string.stores_registering)) + val configured = resolve(folder, item.extra["exe"].orEmpty()) + val exe = configured ?: StoreExe.pick(folder, null, item.title).ifEmpty { "game.exe" } + handle.log("ubisoft: exe=$exe") + val sidecar = StoreGameSidecar( + Store.UBISOFT, item.id, item.title, exe = exe, + installVersion = item.extra["manifest"].orEmpty(), installedAt = System.currentTimeMillis(), + cover = cover, hero = item.imageUrl, cloud = false, + extra = item.extra.filterKeys { it in KEPT } + listOfNotNull( + outcome.result?.optJSONArray("chunks")?.let { UbisoftLaunch.CHUNKS to it.toString() }, + outcome.result?.optJSONObject("setup")?.let { UbisoftLaunch.SETUP to it.toString() }, + ), + ) + StoreInstalls.complete(app, folder, sidecar, onStep = { done, steps -> handle.stageProgress(done.toLong(), steps.toLong()) }) + return folder.path + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (deleteFiles) StoreInstalls.discard(app, folder, emptyList()) + } + + internal companion object { + val KEPT = setOf("productId", "spaceId", "manifest", "appId") + + /** A configured exe the way Windows finds it: any letter case, else the same file name anywhere in the install. */ + fun resolve(folder: File, configured: String): String? { + val rel = configured.replace('\\', '/').trimStart('/').takeIf { it.isNotEmpty() } ?: return null + var at = folder + for (part in rel.split('/')) { + at = at.listFiles()?.firstOrNull { it.name.equals(part, ignoreCase = true) } ?: return byName(folder, rel.substringAfterLast('/')) + } + return if (at.isFile) at.relativeTo(folder).invariantSeparatorsPath else byName(folder, rel.substringAfterLast('/')) + } + + private fun byName(folder: File, name: String): String? = + folder.walkTopDown().maxDepth(5).firstOrNull { it.isFile && it.name.equals(name, ignoreCase = true) }?.relativeTo(folder)?.invariantSeparatorsPath + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt new file mode 100644 index 0000000000..279d3b3e43 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt @@ -0,0 +1,86 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.content.Context +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject + +/** What the launcher service hands a starting Ubisoft game: the account, its products and a fresh game ticket. */ +object UbisoftLaunch { + private const val ENTITLEMENTS = "https://public-ubiservices.ubi.com/v1/profiles/me/global/ubiconnect/entitlement/api/entitlements" + private const val ME = "https://public-ubiservices.ubi.com/v3/users/me" + + fun prepare(app: Context, id: String): JSONObject { + val folder = StoreInstallRoot.gameFolders(app).firstOrNull { f -> + StoreGameSidecar.read(f)?.let { it.store == Store.UBISOFT && it.id == id } == true + } ?: return failure("not-installed") + val sidecar = StoreGameSidecar.read(folder) ?: return failure("not-installed") + val product = sidecar.extra["productId"]?.toLongOrNull() ?: return failure("no-product") + val s = UbisoftAuth.current(app) ?: return failure("signed-out") + val native = UbisoftNative.call("launch", JSONObject().put("ticket", s.ticket).put("sessionId", s.sessionId).put("productId", product)) + ?: return failure("engine-missing") + native.optString("error").takeIf { it.isNotEmpty() }?.let { + StoresState.logLine("Ubisoft: launch ticket for $product: $it") + return failure("ticket: $it") + } + val auth = "Ubi_v1 t=${s.ticket}" + val me = runCatching { UbisoftAuth.request(ME, "GET", auth, s.sessionId) }.getOrNull()?.takeIf { it.ok } + ?.let { runCatching { JSONObject(it.body) }.getOrNull() } + val account = JSONObject() + .put("userId", s.userId) + .put("username", me?.optString("username")?.takeIf { it.isNotEmpty() } ?: s.name) + .put("nameOnPlatform", me?.optString("nameOnPlatform")?.takeIf { it.isNotEmpty() } ?: s.name) + .put("email", me?.optString("email").orEmpty()) + .put("country", me?.optString("country")?.takeIf { it.isNotEmpty() } ?: "US") + val appId = runCatching { UbisoftAuth.request(ENTITLEMENTS, "GET", auth, s.sessionId) }.getOrNull()?.takeIf { it.ok } + ?.let { applicationId(it.body, product) } ?: sidecar.extra["appId"].orEmpty() + StoresState.logLine("Ubisoft: launch ticket for $product ready (${native.optJSONArray("owned")?.length() ?: 0} products, appId ${if (appId.isEmpty()) "unknown" else "found"})") + val language = com.droiddeck.launcher.stores.StoreLanguage.localeFor(null, app).let { "${it.language}-${it.country}" } + val cached = sidecar.extra[CHUNKS]?.let { runCatching { JSONArray(it) }.getOrNull() } + var setup = sidecar.extra[SETUP]?.let { runCatching { JSONObject(it) }.getOrNull() } + val chunks = if (cached != null && setup != null) cached else + UbisoftNative.call("chunks", JSONObject().put("ticket", s.ticket).put("sessionId", s.sessionId).put("productId", product) + .put("manifest", sidecar.extra["manifest"] ?: sidecar.installVersion).put("folder", folder.path).put("language", language)) + ?.let { r -> + r.optString("error").takeIf { it.isNotEmpty() }?.let { StoresState.logLine("Ubisoft: manifest for $product: $it") } + setup = r.optJSONObject("setup") + r.optJSONArray("chunks") + }?.also { c -> + runCatching { + StoreGameSidecar.read(folder)?.let { sc -> + sc.copy(extra = sc.extra + (CHUNKS to c.toString()) + listOfNotNull(setup?.let { SETUP to it.toString() })).write(folder) + } + com.droiddeck.launcher.stores.StoreLaunch.installedGame(app, Store.UBISOFT, id) + ?.let { com.droiddeck.launcher.frontend.AutoComponents.refreshLater(app, it) } + } + } ?: cached + setup?.let { StoresState.logLine("Ubisoft: setup for $product: ${it.toString().take(1500)}") } + UbisoftActivation.watch(app, product) + return JSONObject().put("ok", true) + .put("productId", product) + .put("ticket", native.optString("ticket")) + .put("owned", native.optJSONArray("owned") ?: JSONArray()) + .put("products", native.optJSONArray("products") ?: JSONArray()) + .put("account", account) + .put("appId", appId) + .put("language", language) + .put("chunks", chunks ?: JSONArray()) + .put("registry", setup?.optJSONArray("registry") ?: JSONArray()) + } + + const val CHUNKS = "chunks" + const val SETUP = "setup" + + /** The entitlement's `applicationId` for the product; the list sits under one of a few keys depending on the API version. */ + internal fun applicationId(body: String, product: Long): String? { + val root = runCatching { JSONObject(body) }.getOrNull() ?: return null + val list = sequenceOf("items", "entitlements", "products", "games", "results").firstNotNullOfOrNull { root.optJSONArray(it) } ?: return null + return (0 until list.length()).mapNotNull { list.optJSONObject(it) } + .firstOrNull { it.optLong("productId") == product }?.optString("applicationId")?.takeIf { it.isNotEmpty() } + } + + private fun failure(reason: String) = JSONObject().put("ok", false).put("reason", reason) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftNative.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftNative.kt new file mode 100644 index 0000000000..7a7d2eb881 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftNative.kt @@ -0,0 +1,57 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.util.Log +import com.droiddeck.launcher.stores.StoresNative +import com.droiddeck.launcher.stores.amazon.AmazonNative +import org.json.JSONObject +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +object UbisoftNative { + private const val TAG = "UbisoftNative" + const val ENGINE_MISSING = "Ubisoft: the store engine is not available" + + fun ready(): Boolean = StoresNative.ensureLoaded() + + fun call(op: String, request: JSONObject): JSONObject? { + if (!ready()) return null + val text = try { nativeCall(op, request.toString()) } catch (t: Throwable) { + Log.w(TAG, "$op: ${t.javaClass.simpleName}") + null + } ?: return null + return runCatching { JSONObject(text) }.getOrNull() + } + + fun install(request: JSONObject, events: AmazonNative.InstallListener, cancelled: AtomicBoolean): AmazonNative.InstallOutcome { + if (!ready()) return AmazonNative.InstallOutcome(false, false, ENGINE_MISSING, null) + val done = CountDownLatch(1) + val holder = arrayOfNulls(1) + val bridge = object : AmazonNative.InstallListener by events { + override fun onComplete(success: Boolean, cancelled: Boolean, error: String, result: String) { + holder[0] = AmazonNative.InstallOutcome(success, cancelled, error, result.takeIf { it.isNotEmpty() }?.let { runCatching { JSONObject(it) }.getOrNull() }) + done.countDown() + } + } + val handle = try { nativeInstall(request.toString(), bridge) } catch (t: Throwable) { + return AmazonNative.InstallOutcome(false, false, "The Ubisoft install could not start: ${t.javaClass.simpleName}", null) + } + if (handle == 0L) return holder[0] ?: AmazonNative.InstallOutcome(false, false, "The Ubisoft install could not start", null) + try { + var forwarded = false + while (true) { + val finished = try { done.await(250, TimeUnit.MILLISECONDS) } catch (e: InterruptedException) { cancelled.set(true); false } + if (finished) break + if (!forwarded && cancelled.get()) { nativeCancel(handle); forwarded = true } + } + } finally { + nativeRelease(handle) + } + return holder[0] ?: AmazonNative.InstallOutcome(false, false, "The Ubisoft install ended without a result", null) + } + + @JvmStatic private external fun nativeCall(op: String, request: String): String? + @JvmStatic private external fun nativeInstall(request: String, listener: AmazonNative.InstallListener): Long + @JvmStatic private external fun nativeCancel(handle: Long) + @JvmStatic private external fun nativeRelease(handle: Long) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index 3eede9da18..2fea8fc891 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -33,6 +33,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.ITCH.id -> SourceColours(Color(0xFF3A1A1E), Color(0xFFFFB3B3), Color(0xFFFF5C5C)) Store.GAMEJOLT.id -> SourceColours(Color(0xFF232E00), Color(0xFFE3FF66), Color(0xFFCCFF00)) Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) + Store.UBISOFT.id -> SourceColours(Color(0xFF0B1E44), Color(0xFFA8C6FF), Color(0xFF2E7DFF)) Store.EA.id -> SourceColours(Color(0xFF3A0E12), Color(0xFFFF9A9A), Color(0xFFFF4747)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) @@ -49,6 +50,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.ITCH.id -> Store.ITCH.label Store.GAMEJOLT.id -> Store.GAMEJOLT.label Store.BATTLENET.id -> Store.BATTLENET.label + Store.UBISOFT.id -> Store.UBISOFT.shortLabel Store.EA.id -> Store.EA.label else -> stringResource(R.string.source_added) } 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 88e473285b..7bc7c186d0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1157,6 +1157,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.ITCH -> Color(0xFFFF5C5C) to Color(0xFFD93B3B) Store.GAMEJOLT -> Color(0xFFCCFF00) to Color(0xFFA3CC00) Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) + Store.UBISOFT -> Color(0xFF2E7DFF) to Color(0xFF1A5BD6) Store.EA -> Color(0xFFFF4747) to Color(0xFFE03030) null -> return base } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt index 4dff5d4d60..3fd3c9477c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt @@ -56,7 +56,7 @@ import java.io.File private fun installable(name: String, all: Map): String = WinComponents.installable(name, all) @Composable -private fun originName(origin: String): String = if (origin == WinCompSources.Origin.XBOX.name) "Xbox" else stringResource( +private fun originName(origin: String): String = if (origin == WinCompSources.Origin.XBOX.name) "Xbox" else if (origin == WinCompSources.Origin.UBISOFT.name) "Ubisoft Connect" else stringResource( when (origin) { WinCompSources.Origin.GOG.name -> R.string.wincomp_src_gog WinCompSources.Origin.EPIC.name -> R.string.wincomp_src_epic @@ -71,6 +71,7 @@ private fun autoReason(r: WinComponents.AutoReason): String = when (r.kind) { WinCompSources.Origin.GOG.name -> stringResource(R.string.wincomp_auto_gog) WinCompSources.Origin.EPIC.name -> stringResource(R.string.wincomp_auto_epic) WinCompSources.Origin.AMAZON.name -> stringResource(R.string.wincomp_auto_amazon) + WinCompSources.Origin.UBISOFT.name -> "From Ubisoft's install steps for this game" WinCompSources.Origin.XBOX.name -> "Xbox games install it with the game (${r.args.getOrElse(0) { "VC14" }})" else -> "" } diff --git a/app/src/main/rust/stores/Cargo.lock b/app/src/main/rust/stores/Cargo.lock index 2fac37c5aa..6a470b3bea 100644 --- a/app/src/main/rust/stores/Cargo.lock +++ b/app/src/main/rust/stores/Cargo.lock @@ -195,10 +195,13 @@ dependencies = [ "libc", "lzma-rs", "reqwest", + "ruzstd", "serde_json", "sha1", "sha2", "tokio", + "tokio-rustls", + "webpki-roots", ] [[package]] @@ -897,6 +900,15 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "ruzstd" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8" +dependencies = [ + "twox-hash", +] + [[package]] name = "ryu" version = "1.0.23" @@ -1243,6 +1255,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "twox-hash" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86a801b3cea342a06d468c8710662aa29e5e05e4f5c0d62f00bbb7f2ad7941c2" + [[package]] name = "typenum" version = "1.20.0" diff --git a/app/src/main/rust/stores/Cargo.toml b/app/src/main/rust/stores/Cargo.toml index 61d121a22a..97a27659a1 100644 --- a/app/src/main/rust/stores/Cargo.toml +++ b/app/src/main/rust/stores/Cargo.toml @@ -15,11 +15,14 @@ libc = "0.2" lzma-rs = { version = "0.3", default-features = false } flate2 = { version = "1", default-features = false, features = ["rust_backend"] } reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "gzip"] } -tokio = { version = "1", default-features = false, features = ["rt", "net", "time", "sync"] } +tokio = { version = "1", default-features = false, features = ["rt", "net", "time", "sync", "io-util"] } futures-util = { version = "0.3", default-features = false, features = ["std"] } serde_json = { version = "1", features = ["preserve_order"] } sha1 = "0.10" sha2 = "0.10" +tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } +webpki-roots = "1" +ruzstd = "0.8" [build-dependencies] cc = "1" diff --git a/app/src/main/rust/stores/src/lib.rs b/app/src/main/rust/stores/src/lib.rs index be82128449..12a351138f 100644 --- a/app/src/main/rust/stores/src/lib.rs +++ b/app/src/main/rust/stores/src/lib.rs @@ -3,6 +3,7 @@ #![allow(clippy::missing_safety_doc, clippy::result_large_err)] pub mod amazon; +pub mod ubisoft; pub mod ea; pub mod epic; pub mod fetch_core; diff --git a/app/src/main/rust/stores/src/ubisoft/demux.rs b/app/src/main/rust/stores/src/ubisoft/demux.rs new file mode 100644 index 0000000000..b54fee4430 --- /dev/null +++ b/app/src/main/rust/stores/src/ubisoft/demux.rs @@ -0,0 +1,154 @@ +use std::sync::Arc; +use std::time::Duration; + +use tokio::io::{AsyncReadExt, AsyncWriteExt}; +use tokio::net::TcpStream; +use tokio_rustls::client::TlsStream; +use tokio_rustls::rustls::{self, pki_types::ServerName, ClientConfig, RootCertStore}; +use tokio_rustls::TlsConnector; + +use super::pb::{self, Msg}; + +const HOST: &str = "dmx.upc.ubisoft.com"; +const PORT: u16 = 443; +const CLIENT_ID: &str = "uplay_pc"; +/// The Connect build number Demux expects first on a socket; older ones get ClientOutdatedPush and a closed socket. +pub const CLIENT_VERSION: u32 = 13247; +const READ_TIMEOUT: Duration = Duration::from_secs(20); +const MAX_FRAME: usize = 64 << 20; + +pub struct Demux { + tls: TlsStream, + next_id: u32, +} + +impl Demux { + pub async fn connect(ticket: &str) -> Result { + let mut roots = RootCertStore::empty(); + roots.extend(webpki_roots::TLS_SERVER_ROOTS.iter().cloned()); + let provider = Arc::new(rustls::crypto::ring::default_provider()); + let config = ClientConfig::builder_with_provider(provider) + .with_safe_default_protocol_versions() + .map_err(|e| format!("TLS setup: {e}"))? + .with_root_certificates(roots) + .with_no_client_auth(); + let tcp = tokio::time::timeout(READ_TIMEOUT, TcpStream::connect((HOST, PORT))) + .await + .map_err(|_| "Ubisoft's download service did not answer".to_string())? + .map_err(|e| format!("Could not reach Ubisoft's download service: {e}"))?; + let name = ServerName::try_from(HOST).map_err(|e| e.to_string())?.to_owned(); + let tls = TlsConnector::from(Arc::new(config)) + .connect(name, tcp) + .await + .map_err(|e| format!("TLS with Ubisoft's download service failed: {e}"))?; + let mut d = Demux { tls, next_id: 1 }; + d.send(Msg::new().msg(2, Msg::new().msg(4, Msg::new().uint(1, CLIENT_VERSION as u64)))).await?; + let id = d.id(); + let auth = Msg::new().uint(1, id as u64).msg( + 2, + Msg::new() + .msg(1, Msg::new().text(3, ticket)) + .text(2, CLIENT_ID) + .flag(4, false), + ); + d.send(Msg::new().msg(1, auth)).await?; + let rsp = d.response(id).await?; + let a = pb::fields(pb::sub(&pb::fields(&rsp)?, 2).ok_or("Ubisoft did not answer the sign-in")?)?; + if pb::num(&a, 1) != Some(1) { + let expired = pb::num(&a, 2) == Some(1); + return Err(if expired { "The Ubisoft sign-in expired".into() } else { "Ubisoft refused the sign-in".into() }); + } + Ok(d) + } + + fn id(&mut self) -> u32 { + let id = self.next_id; + self.next_id += 1; + id + } + + async fn send(&mut self, up: Msg) -> Result<(), String> { + let len = (up.0.len() as u32).to_be_bytes(); + self.tls.write_all(&len).await.map_err(|e| e.to_string())?; + self.tls.write_all(&up.0).await.map_err(|e| e.to_string())?; + self.tls.flush().await.map_err(|e| e.to_string()) + } + + async fn frame(&mut self) -> Result, String> { + let read = async { + let mut len = [0u8; 4]; + self.tls.read_exact(&mut len).await.map_err(|e| format!("Ubisoft closed the connection: {e}"))?; + let n = u32::from_be_bytes(len) as usize; + if n > MAX_FRAME { + return Err(format!("Ubisoft sent a {n}-byte frame")); + } + let mut body = vec![0u8; n]; + self.tls.read_exact(&mut body).await.map_err(|e| e.to_string())?; + Ok(body) + }; + tokio::time::timeout(READ_TIMEOUT, read).await.map_err(|_| "Ubisoft's download service stopped answering".to_string())? + } + + fn check_push(down: &[(u32, pb::Value<'_>)]) -> Result<(), String> { + if let Some(push) = pb::sub(down, 2) { + let p = pb::fields(push)?; + if pb::first(&p, 5).is_some() { + return Err("Ubisoft says this client version is outdated".into()); + } + } + Ok(()) + } + + async fn response(&mut self, id: u32) -> Result, String> { + for _ in 0..64 { + let frame = self.frame().await?; + let down = pb::fields(&frame)?; + Self::check_push(&down)?; + if let Some(rsp) = pb::sub(&down, 1) { + if pb::num(&pb::fields(rsp)?, 1) == Some(id as u64) { + return Ok(rsp.to_vec()); + } + } + } + Err("Ubisoft never answered the request".into()) + } + + pub async fn open(&mut self, service: &str) -> Result { + let id = self.id(); + self.send(Msg::new().msg(1, Msg::new().uint(1, id as u64).msg(3, Msg::new().text(2, service)))).await?; + let rsp = self.response(id).await?; + let o = pb::fields(pb::sub(&pb::fields(&rsp)?, 3).ok_or("no connection answer")?)?; + if pb::num(&o, 2) != Some(1) { + return Err(format!("Ubisoft refused the {service} connection")); + } + pb::num(&o, 1).map(|c| c as u32).ok_or_else(|| "no connection id".into()) + } + + /// One service request on a connection; the payload is length-prefixed inside the DataMessage both ways. + pub async fn call(&mut self, connection: u32, payload: Msg) -> Result, String> { + let mut framed = (payload.0.len() as u32).to_be_bytes().to_vec(); + framed.extend_from_slice(&payload.0); + self.send(Msg::new().msg(2, Msg::new().msg(1, Msg::new().uint(1, connection as u64).bytes(2, &framed)))).await?; + for _ in 0..64 { + let frame = self.frame().await?; + let down = pb::fields(&frame)?; + Self::check_push(&down)?; + let Some(push) = pb::sub(&down, 2) else { continue }; + let p = pb::fields(push)?; + if let Some(closed) = pb::sub(&p, 2) { + let c = pb::fields(closed)?; + if pb::num(&c, 1) == Some(connection as u64) { + return Err(format!("Ubisoft closed the service connection (code {})", pb::num(&c, 2).unwrap_or(0))); + } + } + let Some(data) = pb::sub(&p, 1) else { continue }; + let d = pb::fields(data)?; + if pb::num(&d, 1) != Some(connection as u64) { + continue; + } + let body = pb::sub(&d, 2).unwrap_or_default(); + return Ok(if body.len() >= 4 { body[4..].to_vec() } else { body.to_vec() }); + } + Err("Ubisoft never answered the service request".into()) + } +} diff --git a/app/src/main/rust/stores/src/ubisoft/ffi.rs b/app/src/main/rust/stores/src/ubisoft/ffi.rs new file mode 100644 index 0000000000..30df1ccd4f --- /dev/null +++ b/app/src/main/rust/stores/src/ubisoft/ffi.rs @@ -0,0 +1,269 @@ +use std::panic::{catch_unwind, AssertUnwindSafe}; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::Arc; + +use jni::objects::{GlobalRef, JClass, JObject, JString, JValue}; +use jni::sys::{jlong, jstring, JNI_FALSE, JNI_TRUE}; +use jni::{JNIEnv, JavaVM}; +use serde_json::json; + +use super::install; +use crate::amazon::install::{Events, Stop}; + +fn read_string(env: &mut JNIEnv, value: &JString) -> String { + if value.is_null() { + return String::new(); + } + env.get_string(value).map(|s| s.to_string_lossy().into_owned()).unwrap_or_default() +} + +fn new_string(env: &mut JNIEnv, text: &str) -> jstring { + env.new_string(text).map(|s| s.into_raw()).unwrap_or(std::ptr::null_mut()) +} + +fn owned(ticket: &str, session: &str) -> Result { + let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().map_err(|e| e.to_string())?; + rt.block_on(async { + let mut d = super::demux::Demux::connect(ticket).await?; + let (mut ownership, mut games) = super::service::Ownership::open(&mut d, ticket, session).await?; + let missing: Vec = games.iter().filter(|g| g.owned && g.product_type == 0 && g.manifest.is_empty()).map(|g| g.product_id).collect(); + let (found, manifest_error) = match ownership.latest_manifests(&mut d, &missing).await { + Ok(m) => (m, String::new()), + Err(e) => (Vec::new(), e), + }; + for (product, manifest) in &found { + if let Some(g) = games.iter_mut().find(|g| g.product_id == *product) { + g.manifest = manifest.clone(); + } + } + Ok(json!({ "games": games.iter().map(|g| g.to_json()).collect::>(), + "manifestsAsked": missing.len(), "manifestsFound": found.len(), "manifestError": manifest_error })) + }) +} + +fn launch(ticket: &str, session: &str, product: u32) -> Result { + let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().map_err(|e| e.to_string())?; + rt.block_on(async { + let mut d = super::demux::Demux::connect(ticket).await?; + let (mut ownership, games) = super::service::Ownership::open(&mut d, ticket, session).await?; + if !games.iter().any(|g| g.product_id == product && g.owned) { + return Err("Ubisoft says this account does not own the game".into()); + } + let pc_ticket = ownership.pc_ticket(&mut d, product, ticket, session).await?; + let owned: Vec = games.iter().filter(|g| g.in_session()).map(|g| g.product_id).collect(); + let products: Vec<_> = games.iter().filter(|g| g.in_session()).map(|g| json!({ "id": g.product_id, "type": g.product_type })).collect(); + Ok(json!({ "ticket": pc_ticket, "owned": owned, "products": products })) + }) +} + +fn unhex(s: &str) -> Result, String> { + if s.len() % 2 != 0 { + return Err("odd hex length".into()); + } + (0..s.len()).step_by(2).map(|i| u8::from_str_radix(&s[i..i + 2], 16).map_err(|e| e.to_string())).collect() +} + +fn denuvo(ticket: &str, session: &str, product: u32, challenge: &str) -> Result { + let challenge = unhex(challenge).map_err(|e| format!("challenge: {e}"))?; + let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().map_err(|e| e.to_string())?; + rt.block_on(async { + let mut d = super::demux::Demux::connect(ticket).await?; + let (mut ownership, _) = super::service::Ownership::open(&mut d, ticket, session).await?; + let token = ownership.token(&mut d, product).await?; + let game = super::service::denuvo_token(&mut d, &token, &challenge).await?; + Ok(json!({ "token": game.iter().map(|b| format!("{b:02x}")).collect::() })) + }) +} + +fn call(op: &str, request: &str) -> String { + let parsed: serde_json::Value = serde_json::from_str(request).unwrap_or(serde_json::Value::Null); + let s = |k: &str| parsed.get(k).and_then(|v| v.as_str()).unwrap_or("").to_string(); + let answer = match op { + "owned" => owned(&s("ticket"), &s("sessionId")).unwrap_or_else(|e| json!({ "error": e })), + "denuvo" => denuvo(&s("ticket"), &s("sessionId"), parsed.get("productId").and_then(|v| v.as_u64()).unwrap_or(0) as u32, &s("challenge")) + .unwrap_or_else(|e| json!({ "error": e })), + "chunks" => install::Request::from_json(&parsed) + .and_then(|r| install::chunks(&r)) + .map(|m| json!({ "chunks": install::chunks_json(&m.chunks), "setup": install::setup_json(&m) })) + .unwrap_or_else(|e| json!({ "error": e })), + "launch" => launch(&s("ticket"), &s("sessionId"), parsed.get("productId").and_then(|v| v.as_u64()).unwrap_or(0) as u32) + .unwrap_or_else(|e| json!({ "error": e })), + _ => json!({ "error": format!("unknown operation {op}") }), + }; + answer.to_string() +} + +#[no_mangle] +pub extern "system" fn Java_com_droiddeck_launcher_stores_ubisoft_UbisoftNative_nativeCall( + mut env: JNIEnv, + _class: JClass, + op: JString, + request: JString, +) -> jstring { + let op = read_string(&mut env, &op); + let request = read_string(&mut env, &request); + match catch_unwind(AssertUnwindSafe(|| call(&op, &request))) { + Ok(text) => new_string(&mut env, &text), + Err(_) => std::ptr::null_mut(), + } +} + +struct Listener { + vm: JavaVM, + target: GlobalRef, +} + +impl Listener { + fn with_env(&self, fallback: R, f: impl FnOnce(&mut JNIEnv) -> R) -> R { + let Ok(mut env) = self.vm.attach_current_thread_as_daemon() else { + return fallback; + }; + let out = f(&mut env); + if env.exception_check().unwrap_or(false) { + let _ = env.exception_clear(); + } + out + } + + fn text(&self, method: &str, text: &str) { + self.with_env((), |env| { + let Ok(s) = env.new_string(text) else { return }; + let s = JObject::from(s); + let _ = env.call_method(self.target.as_obj(), method, "(Ljava/lang/String;)V", &[JValue::Object(&s)]); + let _ = env.delete_local_ref(s); + }); + } + + fn counts(&self, method: &str, a: u64, b: u64, c: u32, d: u32) { + self.with_env((), |env| { + let _ = env.call_method( + self.target.as_obj(), + method, + "(JJII)V", + &[ + JValue::Long(a.min(i64::MAX as u64) as i64), + JValue::Long(b.min(i64::MAX as u64) as i64), + JValue::Int(c.min(i32::MAX as u32) as i32), + JValue::Int(d.min(i32::MAX as u32) as i32), + ], + ); + }); + } + + fn complete(&self, success: bool, cancelled: bool, error: &str, result: &str) { + self.with_env((), |env| { + let (Ok(e), Ok(r)) = (env.new_string(error), env.new_string(result)) else { return }; + let (e, r) = (JObject::from(e), JObject::from(r)); + let _ = env.call_method( + self.target.as_obj(), + "onComplete", + "(ZZLjava/lang/String;Ljava/lang/String;)V", + &[ + JValue::Bool(if success { JNI_TRUE } else { JNI_FALSE }), + JValue::Bool(if cancelled { JNI_TRUE } else { JNI_FALSE }), + JValue::Object(&e), + JValue::Object(&r), + ], + ); + let _ = env.delete_local_ref(e); + let _ = env.delete_local_ref(r); + }); + } +} + +impl Events for Listener { + fn log(&self, line: &str) { + self.text("onLog", &crate::amazon::net::scrub_urls(line)); + } + + fn status(&self, text: &str) { + self.text("onStatus", text); + } + + fn checking(&self, done_bytes: u64, total_bytes: u64, files: u32, files_total: u32) { + self.counts("onCheck", done_bytes, total_bytes, files, files_total); + } + + fn sizes(&self, pending_bytes: u64, total_bytes: u64) { + self.with_env((), |env| { + let _ = env.call_method( + self.target.as_obj(), + "onSizes", + "(JJ)V", + &[ + JValue::Long(pending_bytes.min(i64::MAX as u64) as i64), + JValue::Long(total_bytes.min(i64::MAX as u64) as i64), + ], + ); + }); + } + + fn progress(&self, done: u64, total: u64, files: u32, files_total: u32) { + self.counts("onProgress", done, total, files, files_total); + } + + fn before_replace(&self) -> bool { + self.with_env(false, |env| match env.call_method(self.target.as_obj(), "beforeReplace", "()Z", &[]) { + Ok(v) => v.z().unwrap_or(false), + Err(_) => false, + }) + } +} + +#[no_mangle] +pub extern "system" fn Java_com_droiddeck_launcher_stores_ubisoft_UbisoftNative_nativeInstall( + mut env: JNIEnv, + _class: JClass, + request: JString, + listener: JObject, +) -> jlong { + if listener.is_null() { + return 0; + } + let Ok(vm) = env.get_java_vm() else { return 0 }; + let Ok(target) = env.new_global_ref(&listener) else { return 0 }; + let listener = Listener { vm, target }; + let text = read_string(&mut env, &request); + let parsed = serde_json::from_str::(&text) + .map_err(|_| "The install request could not be read".to_string()) + .and_then(|v| install::Request::from_json(&v)); + let request = match parsed { + Ok(r) => r, + Err(e) => { + listener.complete(false, false, &e, ""); + return 0; + } + }; + let cancel = Arc::new(AtomicBool::new(false)); + let worker_cancel = Arc::clone(&cancel); + let spawned = std::thread::Builder::new().name("ubisoft-install".into()).spawn(move || { + crate::priority::background(); + let result = catch_unwind(AssertUnwindSafe(|| install::run(&request, &worker_cancel, &listener))) + .unwrap_or_else(|_| Err(Stop::Failed("The Ubisoft install stopped on an internal error".into()))); + match result { + Ok(done) => listener.complete(true, false, "", &done.to_json().to_string()), + Err(Stop::Cancelled) => listener.complete(false, true, "cancelled", ""), + Err(Stop::Failed(e)) => listener.complete(false, false, &e, ""), + } + }); + if spawned.is_err() { + return 0; + } + Box::into_raw(Box::new(cancel)) as jlong +} + +#[no_mangle] +pub extern "system" fn Java_com_droiddeck_launcher_stores_ubisoft_UbisoftNative_nativeCancel(_env: JNIEnv, _class: JClass, handle: jlong) { + let ptr = handle as *const Arc; + if let Some(cancel) = unsafe { ptr.as_ref() } { + cancel.store(true, Ordering::SeqCst); + } +} + +#[no_mangle] +pub extern "system" fn Java_com_droiddeck_launcher_stores_ubisoft_UbisoftNative_nativeRelease(_env: JNIEnv, _class: JClass, handle: jlong) { + let ptr = handle as *mut Arc; + if !ptr.is_null() { + drop(unsafe { Box::from_raw(ptr) }); + } +} diff --git a/app/src/main/rust/stores/src/ubisoft/install.rs b/app/src/main/rust/stores/src/ubisoft/install.rs new file mode 100644 index 0000000000..fdb4357fab --- /dev/null +++ b/app/src/main/rust/stores/src/ubisoft/install.rs @@ -0,0 +1,408 @@ +use std::collections::HashMap; +use std::io::{Read, Seek, SeekFrom, Write}; +use std::path::{Component, Path, PathBuf}; +use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; +use std::sync::Mutex; +use std::time::{Duration, Instant}; + +use futures_util::stream::{self, StreamExt}; +use serde_json::{json, Value as Json}; +use sha1::{Digest, Sha1}; + +use super::demux::Demux; +use super::manifest::{self, File}; +use super::service::{Downloads, Ownership}; +use crate::amazon::install::{Events, Stop}; + +const SIGN_BATCH: usize = 200; +const WINDOW: usize = 16; +const TRIES: usize = 4; + +pub struct Request { + pub ticket: String, + pub session_id: String, + pub product_id: u32, + pub manifest: String, + pub folder: PathBuf, + pub language: String, +} + +impl Request { + pub fn from_json(v: &Json) -> Result { + let s = |k: &str| v.get(k).and_then(|x| x.as_str()).unwrap_or("").to_string(); + let product_id = v.get("productId").and_then(|x| x.as_u64()).ok_or("no product id")? as u32; + let folder = PathBuf::from(s("folder")); + if s("ticket").is_empty() || folder.as_os_str().is_empty() { + return Err("The install request is incomplete".into()); + } + Ok(Request { ticket: s("ticket"), session_id: s("sessionId"), product_id, manifest: s("manifest"), folder, language: s("language") }) + } +} + +pub struct Done { + pub files: usize, + pub bytes: u64, + pub chunks: Vec, + pub setup: Json, +} + +pub fn chunks_json(chunks: &[manifest::Chunk]) -> Json { + Json::Array(chunks.iter().map(|c| json!({ "id": c.id, "tags": c.tags })).collect()) +} + +pub fn setup_json(m: &manifest::Manifest) -> Json { + json!({ + "installRuns": m.install_runs.iter().map(|(exe, args, what)| json!({ "exe": exe, "arguments": args, "description": what })).collect::>(), + "registry": m.registry.iter().map(|(key, values)| json!({ "key": key, "values": values.iter().map(|(n, v)| json!({ "name": n, "value": v })).collect::>() })).collect::>(), + }) +} + +impl Done { + pub fn to_json(&self) -> Json { + json!({ "files": self.files, "bytes": self.bytes, "chunks": chunks_json(&self.chunks), "setup": self.setup.clone() }) + } +} + +pub fn safe_path(root: &Path, name: &str) -> Result { + let rel = Path::new(name.trim_start_matches('/')); + if rel.components().any(|c| !matches!(c, Component::Normal(_))) { + return Err(format!("The manifest names an unsafe path: {name}")); + } + Ok(root.join(rel)) +} + +fn sha1(b: &[u8]) -> Vec { + Sha1::digest(b).to_vec() +} + +/// The slice as served and as unpacked must both match the manifest, so a bad proxy or a truncated body never lands in the game. +pub fn checked(method: u64, raw: &[u8], s: &manifest::Slice) -> Result, String> { + if let Some(n) = s.download_size { + if raw.len() as u32 != n { + return Err(format!("a slice is {} bytes, the manifest says {n}", raw.len())); + } + } + if !s.download_sha1.is_empty() && sha1(raw) != s.download_sha1 { + return Err("a slice failed its download checksum".into()); + } + let out = manifest::decompress(method, raw)?; + if s.size != 0 && out.len() as u32 != s.size { + return Err(format!("a slice unpacked to {} bytes, the manifest says {}", out.len(), s.size)); + } + if s.content_sha1.len() == 20 && sha1(&out) != s.content_sha1 { + return Err("a slice failed its content checksum".into()); + } + Ok(out) +} + +/// Whether a file of the right size already holds every slice the manifest lists for it; a file that cannot be checked is fetched again. +fn already_installed(path: &Path, f: &File) -> bool { + if f.slices.iter().any(|s| s.content_sha1.len() != 20 || s.size == 0) { + return false; + } + let Ok(mut file) = std::fs::File::open(path) else { return false }; + let mut buf = Vec::new(); + f.slices.iter().all(|s| { + buf.resize(s.size as usize, 0); + file.seek(SeekFrom::Start(s.offset)).is_ok() && file.read_exact(&mut buf).is_ok() && sha1(&buf) == s.content_sha1 + }) +} + +fn slice_hash(s: &manifest::Slice) -> String { + manifest::hex_upper(if s.download_sha1.is_empty() { &s.content_sha1 } else { &s.download_sha1 }) +} + +struct Job { + file: usize, + slice: usize, + path: String, +} + +async fn fetch(client: &reqwest::Client, urls: &[String]) -> Result, String> { + let mut last = String::from("no URL"); + for attempt in 0..TRIES { + for u in urls { + match client.get(u).send().await { + Ok(r) if r.status().is_success() => match r.bytes().await { + Ok(b) => return Ok(b.to_vec()), + Err(e) => last = e.to_string(), + }, + Ok(r) => last = format!("HTTP {}", r.status().as_u16()), + Err(e) => last = e.to_string(), + } + } + tokio::time::sleep(Duration::from_millis(500 << attempt)).await; + } + Err(format!("a slice could not be downloaded ({last})")) +} + +/// A Demux login holding a download_service connection for one product. Ubisoft drops idle sockets +/// while slices download, so signing reconnects and retries when the connection is gone. +struct Session { + d: Demux, + dl: Downloads, +} + +const RECONNECTS: usize = 4; + +impl Session { + /// Opens a session, retrying a few times: Demux drops a connection now and then right after another closes. + async fn open(req: &Request) -> Result<(Self, Vec), String> { + let mut last = String::new(); + for attempt in 0..3u32 { + if attempt > 0 { + tokio::time::sleep(Duration::from_secs(2 << attempt)).await; + } + match Self::open_once(req).await { + Ok(s) => return Ok(s), + Err(e) => last = e, + } + } + Err(last) + } + + async fn open_once(req: &Request) -> Result<(Self, Vec), String> { + let mut d = Demux::connect(&req.ticket).await?; + let (mut own, owned) = Ownership::open(&mut d, &req.ticket, &req.session_id).await?; + let token = own.token(&mut d, req.product_id).await?; + let dl = Downloads::open(&mut d, &token).await?; + Ok((Session { d, dl }, owned)) + } + + async fn sign(&mut self, req: &Request, paths: &[String], events: &dyn Events) -> Result>, String> { + let mut last = String::new(); + for attempt in 0..=RECONNECTS { + if attempt > 0 { + events.log(&format!("ubisoft: reconnecting after: {last}")); + tokio::time::sleep(Duration::from_millis(500 << attempt.min(4))).await; + match Session::open(req).await { + Ok((fresh, _)) => *self = fresh, + Err(e) => { + last = e; + continue; + } + } + } + match self.dl.sign(&mut self.d, req.product_id, paths).await { + Ok(urls) => return Ok(urls), + Err(e) if e.contains("does not own") => return Err(e), + Err(e) => last = e, + } + } + Err(last) + } +} + +/// The manifest of an install, without downloading the game. +pub fn chunks(req: &Request) -> Result { + let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().map_err(|e| e.to_string())?; + rt.block_on(async { + let (mut sess, owned) = Session::open(req).await?; + let manifest_id = if req.manifest.is_empty() { + owned.iter().find(|o| o.product_id == req.product_id).map(|o| o.manifest.clone()).unwrap_or_default() + } else { + req.manifest.clone() + }; + if manifest_id.is_empty() { + return Err("Ubisoft lists no download for this game".to_string()); + } + let client = reqwest::Client::builder().timeout(Duration::from_secs(120)).build().map_err(|e| e.to_string())?; + struct Quiet; + impl Events for Quiet { + fn log(&self, _: &str) {} + fn status(&self, _: &str) {} + fn checking(&self, _: u64, _: u64, _: u32, _: u32) {} + fn sizes(&self, _: u64, _: u64) {} + fn progress(&self, _: u64, _: u64, _: u32, _: u32) {} + fn before_replace(&self) -> bool { false } + } + let urls = sess.sign(req, &[format!("manifests/{manifest_id}.manifest")], &Quiet).await?; + let raw = fetch(&client, urls.first().map(|v| v.as_slice()).unwrap_or_default()).await?; + let language = if req.language.is_empty() { "en-US" } else { req.language.as_str() }; + let mut owned_ids: Vec = owned.iter().filter(|o| o.owned).map(|o| o.product_id).collect(); + owned_ids.push(req.product_id); + Ok(manifest::parse_owned(&manifest::decode(&raw)?, language, &owned_ids)?) + }) +} + +pub fn run(req: &Request, cancel: &AtomicBool, events: &dyn Events) -> Result { + let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().map_err(|e| Stop::Failed(e.to_string()))?; + rt.block_on(install(req, cancel, events)) +} + +async fn install(req: &Request, cancel: &AtomicBool, events: &dyn Events) -> Result { + let fail = Stop::Failed; + events.status("Connecting to Ubisoft"); + let (mut sess, owned) = Session::open(req).await.map_err(fail)?; + let manifest_id = if req.manifest.is_empty() { + owned.iter().find(|o| o.product_id == req.product_id).map(|o| o.manifest.clone()).unwrap_or_default() + } else { + req.manifest.clone() + }; + if manifest_id.is_empty() { + return Err(Stop::Failed("Ubisoft lists no download for this game".into())); + } + let client = reqwest::Client::builder().timeout(Duration::from_secs(120)).build().map_err(|e| Stop::Failed(e.to_string()))?; + + events.status("Reading the game's file list"); + let urls = sess.sign(req, &[format!("manifests/{manifest_id}.manifest")], events).await.map_err(fail)?; + let raw = fetch(&client, urls.first().map(|v| v.as_slice()).unwrap_or_default()).await.map_err(fail)?; + let decoded = manifest::decode(&raw).map_err(fail)?; + let language = if req.language.is_empty() { "en-US" } else { req.language.as_str() }; + let mut owned_ids: Vec = owned.iter().filter(|o| o.owned).map(|o| o.product_id).collect(); + owned_ids.push(req.product_id); + let m = manifest::parse_owned(&decoded, language, &owned_ids).map_err(fail)?; + events.log(&format!("ubisoft: manifest {manifest_id} files={} chunks={} skipped={} compression={}", m.files.len(), m.chunks.len(), m.skipped.len(), m.compression)); + for name in &m.skipped { + if let Ok(path) = safe_path(&req.folder, name) { + if path.is_file() && std::fs::remove_file(&path).is_ok() { + events.log(&format!("ubisoft: removed {name}, which this install leaves out")); + } + } + } + + std::fs::create_dir_all(&req.folder).map_err(|e| Stop::Failed(format!("Could not create the game folder: {e}")))?; + let total: u64 = m.files.iter().map(|f| f.size).sum(); + let files_total = m.files.len() as u32; + let mut pending: Vec = Vec::new(); + let mut done_bytes = 0u64; + let mut done_files = 0u32; + for (i, f) in m.files.iter().enumerate() { + let path = safe_path(&req.folder, &f.name).map_err(fail)?; + if f.dir { + std::fs::create_dir_all(&path).map_err(|e| Stop::Failed(e.to_string()))?; + done_files += 1; + continue; + } + if std::fs::metadata(&path).map(|md| md.len() == f.size).unwrap_or(false) && already_installed(&path, f) { + done_bytes += f.size; + done_files += 1; + continue; + } + pending.push(i); + } + let pending_bytes: u64 = pending.iter().map(|&i| m.files[i].size).sum(); + events.sizes(pending_bytes, total); + events.log(&format!("ubisoft: {} of {} files to fetch, {pending_bytes} bytes", pending.len(), m.files.len())); + + let bucketed = match pending.iter().flat_map(|&i| m.files[i].slices.first()).next() { + None => true, + Some(s) => { + let h = slice_hash(s); + let probe = sess.sign(req, &[manifest::slice_path(true, &h), manifest::slice_path(false, &h)], events).await.map_err(fail)?; + let mut v3 = true; + for (layout, list) in [true, false].into_iter().zip(probe.iter()) { + if let Some(u) = list.first() { + if client.get(u).send().await.map(|r| r.status().is_success()).unwrap_or(false) { + v3 = layout; + break; + } + } + } + v3 + } + }; + + let mut parts: HashMap> = HashMap::new(); + let mut remaining: HashMap = HashMap::new(); + let mut jobs = Vec::new(); + for &i in &pending { + let f: &File = &m.files[i]; + let path = safe_path(&req.folder, &f.name).map_err(fail)?; + if let Some(parent) = path.parent() { + std::fs::create_dir_all(parent).map_err(|e| Stop::Failed(e.to_string()))?; + } + let part = path.with_extension(format!("{}part", path.extension().map(|e| format!("{}.", e.to_string_lossy())).unwrap_or_default())); + let file = std::fs::File::create(&part).map_err(|e| Stop::Failed(format!("Could not write {}: {e}", f.name)))?; + file.set_len(f.size).map_err(|e| Stop::Failed(e.to_string()))?; + parts.insert(i, Mutex::new(file)); + remaining.insert(i, f.slices.len()); + for (si, s) in f.slices.iter().enumerate() { + jobs.push(Job { file: i, slice: si, path: manifest::slice_path(bucketed, &slice_hash(s)) }); + } + } + + let progress = AtomicU64::new(done_bytes); + let mut finished_files = done_files; + let mut last_report = Instant::now(); + events.status("Downloading"); + for batch in jobs.chunks(SIGN_BATCH) { + if cancel.load(Ordering::SeqCst) { + return Err(Stop::Cancelled); + } + let paths: Vec = batch.iter().map(|j| j.path.clone()).collect(); + let signed = sess.sign(req, &paths, events).await.map_err(fail)?; + let mut slices = stream::iter(batch.iter().zip(signed.into_iter())) + .map(|(job, urls)| { + let client = &client; + let m = &m; + async move { + let s = &m.files[job.file].slices[job.slice]; + let raw = fetch(client, &urls).await?; + let out = checked(m.compression, &raw, s).map_err(|e| format!("{}: {e}", m.files[job.file].name))?; + Ok::<_, String>((job.file, job.slice, out)) + } + }) + .buffer_unordered(WINDOW); + while let Some(r) = slices.next().await { + if cancel.load(Ordering::SeqCst) { + return Err(Stop::Cancelled); + } + let (fi, si, data) = r.map_err(fail)?; + let s = &m.files[fi].slices[si]; + { + let mut f = parts[&fi].lock().unwrap(); + f.seek(SeekFrom::Start(s.offset)).and_then(|_| f.write_all(&data)).map_err(|e| Stop::Failed(format!("Could not write {}: {e}", m.files[fi].name)))?; + } + progress.fetch_add(data.len() as u64, Ordering::Relaxed); + let left = remaining.get_mut(&fi).unwrap(); + *left -= 1; + if *left == 0 { + let f = parts.remove(&fi).unwrap().into_inner().unwrap(); + f.sync_all().map_err(|e| Stop::Failed(e.to_string()))?; + drop(f); + let path = safe_path(&req.folder, &m.files[fi].name).map_err(fail)?; + let part = path.with_extension(format!("{}part", path.extension().map(|e| format!("{}.", e.to_string_lossy())).unwrap_or_default())); + std::fs::rename(&part, &path).map_err(|e| Stop::Failed(format!("Could not finish {}: {e}", m.files[fi].name)))?; + finished_files += 1; + } + if last_report.elapsed() > Duration::from_millis(250) { + events.progress(progress.load(Ordering::Relaxed), total, finished_files, files_total); + last_report = Instant::now(); + } + } + } + for i in pending.iter().copied().filter(|i| m.files[*i].slices.is_empty()) { + let path = safe_path(&req.folder, &m.files[i].name).map_err(fail)?; + parts.remove(&i); + let part = path.with_extension(format!("{}part", path.extension().map(|e| format!("{}.", e.to_string_lossy())).unwrap_or_default())); + std::fs::rename(&part, &path).map_err(|e| Stop::Failed(e.to_string()))?; + finished_files += 1; + } + events.progress(total, total, finished_files, files_total); + Ok(Done { files: m.files.len(), bytes: total, chunks: m.chunks.clone(), setup: setup_json(&m) }) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn refuses_paths_that_leave_the_folder() { + let root = Path::new("/games/x"); + assert!(safe_path(root, "../evil").is_err()); + assert!(safe_path(root, "a/../../evil").is_err()); + assert_eq!(safe_path(root, "/bin/game.exe").unwrap(), root.join("bin/game.exe")); + } + + #[test] + fn checks_a_slice_as_served_and_unpacked() { + let data = b"slice".to_vec(); + let ok = manifest::Slice { size: 5, download_size: Some(5), download_sha1: sha1(&data), content_sha1: Vec::new(), offset: 0 }; + assert_eq!(checked(0, &data, &ok).unwrap(), data); + let bad = manifest::Slice { download_sha1: vec![0; 20], ..ok.clone() }; + assert!(checked(0, &data, &bad).is_err()); + let short = manifest::Slice { download_size: Some(4), ..ok }; + assert!(checked(0, &data, &short).is_err()); + } +} diff --git a/app/src/main/rust/stores/src/ubisoft/manifest.rs b/app/src/main/rust/stores/src/ubisoft/manifest.rs new file mode 100644 index 0000000000..0487a58564 --- /dev/null +++ b/app/src/main/rust/stores/src/ubisoft/manifest.rs @@ -0,0 +1,230 @@ +use std::io::Read; + +use super::pb; + +/// Bytes Ubisoft prepends to a downloaded `.manifest` before the zlib stream. +pub const HEADER: usize = 356; +pub const DEFLATE: u64 = 1; +pub const ZSTD: u64 = 3; + +#[derive(Clone, Debug, PartialEq)] +pub struct Slice { + pub size: u32, + pub download_size: Option, + pub download_sha1: Vec, + pub content_sha1: Vec, + pub offset: u64, +} + +#[derive(Clone, Debug, PartialEq)] +pub struct File { + pub name: String, + pub size: u64, + pub dir: bool, + pub slices: Vec, +} + +/// A chunk the install keeps, as the game's launcher session reports it. +#[derive(Clone, Debug, PartialEq)] +pub struct Chunk { + pub id: u32, + pub tags: String, +} + +#[derive(Debug)] +pub struct Manifest { + pub compression: u64, + pub files: Vec, + pub chunks: Vec, + /// Files of chunks left out: other languages, and add-ons the account does not own. + pub skipped: Vec, + /// Prerequisite installers Connect runs after an install: exe, arguments, description. + pub install_runs: Vec<(String, String, String)>, + /// Registry keys Connect writes for the game, with their string values as (name, value). + pub registry: Vec<(String, Vec<(String, String)>)>, +} + +fn file(b: &[u8]) -> Result { + let f = pb::fields(b)?; + let hashes = pb::subs(&f, 4); + let mut offset = 0u64; + let mut slices = Vec::new(); + for (i, s) in pb::subs(&f, 7).into_iter().enumerate() { + let s = pb::fields(s)?; + let size = pb::num(&s, 1).unwrap_or(0) as u32; + let at = pb::num(&s, 4).unwrap_or(offset); + slices.push(Slice { + size, + download_size: pb::num(&s, 2).map(|v| v as u32), + download_sha1: pb::sub(&s, 3).unwrap_or_default().to_vec(), + content_sha1: hashes.get(i).map(|h| h.to_vec()).unwrap_or_default(), + offset: at, + }); + offset = at + size as u64; + } + if slices.is_empty() { + for h in &hashes { + slices.push(Slice { size: 0, download_size: None, download_sha1: Vec::new(), content_sha1: h.to_vec(), offset: 0 }); + } + } + Ok(File { + name: pb::string(&f, 1).unwrap_or_default().replace('\\', "/"), + size: pb::num(&f, 2).unwrap_or(0), + dir: pb::num(&f, 3) == Some(1), + slices, + }) +} + +/// Files of the chunks to install: those for every language plus the language asked for, of the +/// game itself or an optional add-on in `owned` (every add-on when `owned` is empty). +pub fn parse(decoded: &[u8], language: &str) -> Result { + parse_owned(decoded, language, &[]) +} + +pub fn parse_owned(decoded: &[u8], language: &str, owned: &[u32]) -> Result { + let m = pb::fields(decoded)?; + let wanted = language.to_ascii_lowercase(); + let prefix = wanted.split(['-', '_']).next().unwrap_or("").to_string(); + let mut files = Vec::new(); + let mut chunks = Vec::new(); + let mut skipped = Vec::new(); + for c in pb::subs(&m, 4) { + let c = pb::fields(c)?; + let lang = pb::string(&c, 5).unwrap_or_default().to_ascii_lowercase(); + let mut products: Vec = c.iter().filter_map(|(n, v)| match v { pb::Value::Varint(x) if *n == 8 => Some(*x as u32), _ => None }).collect(); + products.extend(pb::num(&c, 4).map(|v| v as u32)); + let in_language = lang.is_empty() || lang == wanted || (!prefix.is_empty() && lang.split(['-', '_']).next() == Some(prefix.as_str())); + let optional = pb::num(&c, 2) == Some(1); + let owned_product = !optional || owned.is_empty() || products.is_empty() || products.iter().any(|p| owned.contains(p)); + if !(in_language && owned_product) { + for f in pb::subs(&c, 3) { + skipped.push(file(f)?.name); + } + continue; + } + chunks.push(Chunk { id: pb::num(&c, 1).unwrap_or(0) as u32, tags: pb::string(&c, 7).unwrap_or_default() }); + for f in pb::subs(&c, 3) { + files.push(file(f)?); + } + } + let kept: std::collections::HashSet<&str> = files.iter().map(|f| f.name.as_str()).collect(); + skipped.retain(|n| !kept.contains(n.as_str())); + let mut install_runs = Vec::new(); + for r in pb::subs(&m, 2) { + let r = pb::fields(r)?; + install_runs.push((pb::string(&r, 1).unwrap_or_default(), pb::string(&r, 3).unwrap_or_default(), pb::string(&r, 4).unwrap_or_default())); + } + let mut registry = Vec::new(); + for r in pb::subs(&m, 5) { + let r = pb::fields(r)?; + let mut values = Vec::new(); + for e in pb::subs(&r, 3) { + let e = pb::fields(e)?; + values.push((pb::string(&e, 1).unwrap_or_default(), pb::string(&e, 2).unwrap_or_default())); + } + registry.push((pb::string(&r, 1).unwrap_or_default(), values)); + } + Ok(Manifest { compression: pb::num(&m, 21).unwrap_or(0), files, chunks, skipped, install_runs, registry }) +} + +pub fn decode(downloaded: &[u8]) -> Result, String> { + if downloaded.len() <= HEADER { + return Err(format!("the manifest is only {} bytes", downloaded.len())); + } + let mut out = Vec::new(); + flate2::read::ZlibDecoder::new(&downloaded[HEADER..]).read_to_end(&mut out).map_err(|e| format!("the manifest did not inflate: {e}"))?; + Ok(out) +} + +pub fn hex_upper(b: &[u8]) -> String { + b.iter().map(|x| format!("{x:02X}")).collect() +} + +/// The CDN bucket of a slice: the first byte of its hash with nibbles swapped, mapped onto base32. +pub fn bucket(hash_upper: &str) -> char { + const BASE32: &[u8; 32] = b"0123456789abcdefghijklmnopqrstuv"; + let b = hash_upper.as_bytes(); + let swapped = format!("{}{}", *b.get(1).unwrap_or(&b'0') as char, *b.first().unwrap_or(&b'0') as char); + let v = u8::from_str_radix(&swapped, 16).unwrap_or(0); + BASE32[(v / 16) as usize + if v % 2 == 0 { 0 } else { 16 }] as char +} + +pub fn slice_path(bucketed: bool, hash_upper: &str) -> String { + if bucketed { format!("slices_v3/{}/{}", bucket(hash_upper), hash_upper) } else { format!("slices/{hash_upper}") } +} + +pub fn decompress(method: u64, data: &[u8]) -> Result, String> { + match method { + ZSTD => { + let mut out = Vec::new(); + ruzstd::decoding::StreamingDecoder::new(data).map_err(|e| format!("zstd: {e}"))?.read_to_end(&mut out).map_err(|e| format!("zstd: {e}"))?; + Ok(out) + } + DEFLATE => { + let zlib = data.len() >= 2 && data[0] == 0x78; + let inflate = |z: bool| { + let mut out = Vec::new(); + let r = if z { flate2::read::ZlibDecoder::new(data).read_to_end(&mut out) } else { flate2::read::DeflateDecoder::new(data).read_to_end(&mut out) }; + r.map(|_| out) + }; + inflate(zlib).or_else(|_| inflate(!zlib)).map_err(|e| format!("deflate: {e}")) + } + _ => Ok(data.to_vec()), + } +} + +#[cfg(test)] +mod tests { + use super::super::pb::Msg; + use super::*; + + #[test] + fn buckets_follow_the_swapped_first_byte() { + assert_eq!(bucket("10ABCDEF"), 'g'); + assert_eq!(bucket("01ABCDEF"), '1'); + assert_eq!(slice_path(true, "01AB"), "slices_v3/1/01AB"); + assert_eq!(slice_path(false, "01AB"), "slices/01AB"); + } + + #[test] + fn keeps_shared_and_wanted_language_chunks() { + let f = |name: &str| Msg::new().text(1, name).uint(2, 10).flag(3, false) + .bytes(4, &[0xAA]).msg(7, Msg::new().uint(1, 10).uint(2, 4).bytes(3, &[0xBB])); + let m = Msg::new() + .msg(4, Msg::new().uint(1, 1).uint(2, 0).msg(3, f("Game\\game.exe"))) + .msg(4, Msg::new().uint(1, 2).uint(2, 1).msg(3, f("en.pak")).text(5, "en-US")) + .msg(4, Msg::new().uint(1, 3).uint(2, 1).msg(3, f("fr.pak")).text(5, "fr-FR")) + .uint(21, ZSTD); + let parsed = parse(&m.0, "en-US").unwrap(); + let names: Vec<_> = parsed.files.iter().map(|f| f.name.as_str()).collect(); + assert_eq!(names, ["Game/game.exe", "en.pak"]); + assert_eq!(parsed.compression, ZSTD); + assert_eq!(parsed.files[0].slices[0], Slice { size: 10, download_size: Some(4), download_sha1: vec![0xBB], content_sha1: vec![0xAA], offset: 0 }); + } + + #[test] + fn leaves_out_add_ons_the_account_does_not_own() { + let f = |name: &str| Msg::new().text(1, name).uint(2, 10).flag(3, false); + let m = Msg::new() + .msg(4, Msg::new().uint(1, 1).uint(2, 0).msg(3, f("base.forge")).uint(4, 9999)) + .msg(4, Msg::new().uint(1, 2).uint(2, 1).msg(3, f("dlc_24/east.forge")).uint(4, 5450)) + .msg(4, Msg::new().uint(1, 3).uint(2, 1).msg(3, f("dlc_25/west.forge")).uint(8, 5451).uint(8, 5452)) + .uint(21, ZSTD); + let parsed = parse_owned(&m.0, "en-US", &[5405, 5452]).unwrap(); + let names: Vec<_> = parsed.files.iter().map(|f| f.name.as_str()).collect(); + assert_eq!(names, ["base.forge", "dlc_25/west.forge"]); + assert_eq!(parsed.skipped, ["dlc_24/east.forge"]); + assert_eq!(parsed.chunks.iter().map(|c| c.id).collect::>(), [1, 3]); + } + + #[test] + fn inflates_both_deflate_framings() { + use std::io::Write; + let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default()); + z.write_all(b"hello").unwrap(); + assert_eq!(decompress(DEFLATE, &z.finish().unwrap()).unwrap(), b"hello"); + let mut r = flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::default()); + r.write_all(b"hello").unwrap(); + assert_eq!(decompress(DEFLATE, &r.finish().unwrap()).unwrap(), b"hello"); + } +} diff --git a/app/src/main/rust/stores/src/ubisoft/mod.rs b/app/src/main/rust/stores/src/ubisoft/mod.rs new file mode 100644 index 0000000000..eff0a806f0 --- /dev/null +++ b/app/src/main/rust/stores/src/ubisoft/mod.rs @@ -0,0 +1,6 @@ +pub mod demux; +pub mod ffi; +pub mod install; +pub mod manifest; +pub mod pb; +pub mod service; diff --git a/app/src/main/rust/stores/src/ubisoft/pb.rs b/app/src/main/rust/stores/src/ubisoft/pb.rs new file mode 100644 index 0000000000..f967cb60ca --- /dev/null +++ b/app/src/main/rust/stores/src/ubisoft/pb.rs @@ -0,0 +1,104 @@ +pub use crate::amazon::proto::{Fields, Value}; + +#[derive(Default)] +pub struct Msg(pub Vec); + +impl Msg { + pub fn new() -> Self { + Msg(Vec::new()) + } + + fn varint(&mut self, mut v: u64) { + loop { + let b = (v & 0x7f) as u8; + v >>= 7; + if v == 0 { + self.0.push(b); + return; + } + self.0.push(b | 0x80); + } + } + + fn key(&mut self, field: u32, wire: u8) { + self.varint((field as u64) << 3 | wire as u64); + } + + pub fn uint(mut self, field: u32, v: u64) -> Self { + self.key(field, 0); + self.varint(v); + self + } + + pub fn flag(self, field: u32, v: bool) -> Self { + self.uint(field, v as u64) + } + + pub fn bytes(mut self, field: u32, data: &[u8]) -> Self { + self.key(field, 2); + self.varint(data.len() as u64); + self.0.extend_from_slice(data); + self + } + + pub fn text(self, field: u32, s: &str) -> Self { + self.bytes(field, s.as_bytes()) + } + + pub fn msg(self, field: u32, m: Msg) -> Self { + self.bytes(field, &m.0) + } +} + +/// Every field of a message, in wire order; repeated fields appear once per value. +pub fn fields(data: &[u8]) -> Result)>, String> { + let mut out = Vec::new(); + let mut f = Fields::new(data); + while let Some(v) = f.next_field()? { + out.push(v); + } + Ok(out) +} + +pub fn first<'a>(all: &[(u32, Value<'a>)], field: u32) -> Option> { + all.iter().find(|(n, _)| *n == field).map(|(_, v)| *v) +} + +pub fn sub<'a>(all: &[(u32, Value<'a>)], field: u32) -> Option<&'a [u8]> { + match first(all, field) { + Some(Value::Bytes(b)) => Some(b), + _ => None, + } +} + +pub fn subs<'a>(all: &[(u32, Value<'a>)], field: u32) -> Vec<&'a [u8]> { + all.iter().filter_map(|(n, v)| match (n, v) { (n, Value::Bytes(b)) if *n == field => Some(*b), _ => None }).collect() +} + +pub fn num(all: &[(u32, Value<'_>)], field: u32) -> Option { + match first(all, field) { + Some(Value::Varint(v)) | Some(Value::Fixed64(v)) => Some(v), + Some(Value::Fixed32(v)) => Some(v as u64), + _ => None, + } +} + +pub fn string(all: &[(u32, Value<'_>)], field: u32) -> Option { + sub(all, field).map(|b| String::from_utf8_lossy(b).into_owned()) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn round_trips_nested_messages() { + let m = Msg::new().uint(1, 300).msg(2, Msg::new().text(1, "a").text(1, "b")).flag(3, true); + let all = fields(&m.0).unwrap(); + assert_eq!(num(&all, 1), Some(300)); + assert_eq!(num(&all, 3), Some(1)); + let inner = fields(sub(&all, 2).unwrap()).unwrap(); + let texts: Vec<_> = subs(&inner, 1).iter().map(|b| String::from_utf8_lossy(b).into_owned()).collect(); + assert_eq!(texts, ["a", "b"]); + } +} diff --git a/app/src/main/rust/stores/src/ubisoft/service.rs b/app/src/main/rust/stores/src/ubisoft/service.rs new file mode 100644 index 0000000000..bfdddc29a9 --- /dev/null +++ b/app/src/main/rust/stores/src/ubisoft/service.rs @@ -0,0 +1,206 @@ +use serde_json::{json, Value as Json}; + +use super::demux::Demux; +use super::pb::{self, Msg}; + +pub struct Owned { + pub product_id: u32, + pub space_id: String, + pub manifest: String, + pub product_type: u32, + pub state: u32, + pub owned: bool, + pub configuration: String, + pub app_id: String, + pub partner: u32, + pub activation: u32, + pub locked_by_subscription: bool, + pub associations: Vec, + pub download_id: u32, +} + +impl Owned { + /// Whether Connect lists the product among the session's owned ids: owned games and add-ons that are released. + pub fn in_session(&self) -> bool { + self.owned && self.product_type <= 1 && (self.state == 0 || self.state == 3) + } + + pub fn to_json(&self) -> Json { + json!({ + "productId": self.product_id, "spaceId": self.space_id, "manifest": self.manifest, + "productType": self.product_type, "state": self.state, "owned": self.owned, + "configuration": self.configuration, "appId": self.app_id, + "partner": self.partner, "activation": self.activation, "lockedBySubscription": self.locked_by_subscription, + "associations": self.associations, "downloadId": self.download_id, + }) + } +} + +pub struct Ownership { + conn: u32, + next: u64, +} + +fn owned_game(b: &[u8]) -> Result { + let f = pb::fields(b)?; + Ok(Owned { + product_id: pb::num(&f, 1).unwrap_or(0) as u32, + space_id: pb::string(&f, 30).unwrap_or_default(), + manifest: pb::string(&f, 21).unwrap_or_default(), + product_type: pb::num(&f, 8).unwrap_or(0) as u32, + state: pb::num(&f, 13).unwrap_or(0) as u32, + owned: pb::num(&f, 20).map(|v| v == 1).unwrap_or(true), + configuration: pb::string(&f, 17).unwrap_or_default(), + app_id: pb::string(&f, 31).unwrap_or_default(), + partner: pb::num(&f, 38).unwrap_or(0) as u32, + activation: pb::num(&f, 36).unwrap_or(0) as u32, + locked_by_subscription: pb::num(&f, 37) == Some(1), + associations: f.iter().filter_map(|(n, v)| match v { pb::Value::Varint(x) if *n == 16 => Some(*x as u32), _ => None }).collect(), + download_id: pb::num(&f, 5).unwrap_or(0) as u32, + }) +} + +impl Ownership { + /// Opens ownership_service and initializes it, which also returns the account's products. + pub async fn open(d: &mut Demux, ticket: &str, session_id: &str) -> Result<(Self, Vec), String> { + let conn = d.open("ownership_service").await?; + let init = Msg::new().flag(2, true).uint(3, 7); + let mut req = Msg::new().uint(1, 1).msg(2, init).text(30, ticket); + if !session_id.is_empty() { + req = req.text(31, session_id); + } + let raw = d.call(conn, Msg::new().msg(1, req)).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no ownership answer")?)?; + let init = pb::fields(pb::sub(&rsp, 2).ok_or("no ownership initialize answer")?)?; + if pb::num(&init, 1) != Some(1) { + return Err("Ubisoft would not list the account's games".into()); + } + let mut games = Vec::new(); + if let Some(list) = pb::sub(&init, 2) { + for g in pb::subs(&pb::fields(list)?, 1) { + games.push(owned_game(g)?); + } + } + Ok((Ownership { conn, next: 2 }, games)) + } + + /// The latest manifest of each product that has one, for games whose ownership entry leaves it out. + pub async fn latest_manifests(&mut self, d: &mut Demux, products: &[u32]) -> Result, String> { + if products.is_empty() { + return Ok(Vec::new()); + } + let id = self.next; + self.next += 1; + let mut req = Msg::new(); + for p in products { + req = req.uint(1, *p as u64); + } + let raw = d.call(self.conn, Msg::new().msg(1, Msg::new().uint(1, id).msg(10, req))).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no ownership answer")?)?; + let m = pb::fields(pb::sub(&rsp, 10).ok_or("no manifest answer")?)?; + if pb::num(&m, 1) != Some(1) { + return Err("Ubisoft would not list the latest manifests".into()); + } + let mut out = Vec::new(); + for entry in pb::subs(&m, 2) { + let e = pb::fields(entry)?; + if pb::num(&e, 1) != Some(1) { + continue; + } + if let (Some(product), Some(manifest)) = (pb::num(&e, 2), pb::string(&e, 3).filter(|s| !s.is_empty())) { + out.push((product as u32, manifest)); + } + } + Ok(out) + } + + /// The ticket a game receives in its launcher session (`GetUplayPCTicket`). + pub async fn pc_ticket(&mut self, d: &mut Demux, product_id: u32, ticket: &str, session_id: &str) -> Result { + let id = self.next; + self.next += 1; + let info = Msg::new().uint(1, product_id as u64).uint(2, 0).uint(3, product_id as u64); + let mut req = Msg::new().uint(1, id).msg(14, info).text(30, ticket); + if !session_id.is_empty() { + req = req.text(31, session_id); + } + let raw = d.call(self.conn, Msg::new().msg(1, req)).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no ownership answer")?)?; + let t = pb::fields(pb::sub(&rsp, 13).ok_or("no game ticket answer")?)?; + if pb::num(&t, 1) != Some(1) { + return Err(format!("Ubisoft would not issue a game ticket (code {})", pb::num(&t, 3).unwrap_or(0))); + } + pb::string(&t, 2).filter(|s| !s.is_empty()).ok_or_else(|| "Ubisoft sent an empty game ticket".into()) + } + + pub async fn token(&mut self, d: &mut Demux, product_id: u32) -> Result { + let id = self.next; + self.next += 1; + let raw = d.call(self.conn, Msg::new().msg(1, Msg::new().uint(1, id).msg(28, Msg::new().uint(1, product_id as u64)))).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no ownership answer")?)?; + let t = pb::fields(pb::sub(&rsp, 27).ok_or("no ownership token answer")?)?; + if pb::num(&t, 1) != Some(1) { + return Err("Ubisoft says this account does not own the game".into()); + } + pb::string(&t, 2).filter(|s| !s.is_empty()).ok_or_else(|| "Ubisoft sent an empty ownership token".into()) + } +} + +pub struct Downloads { + conn: u32, + next: u64, +} + +impl Downloads { + pub async fn open(d: &mut Demux, ownership_token: &str) -> Result { + let conn = d.open("download_service").await?; + let raw = d.call(conn, Msg::new().msg(1, Msg::new().uint(1, 1).msg(2, Msg::new().text(5, ownership_token)))).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no download service answer")?)?; + let ok = pb::sub(&rsp, 2).map(pb::fields).transpose()?.and_then(|i| pb::num(&i, 1)) == Some(1); + if !ok { + return Err("Ubisoft's download service refused the ownership token".into()); + } + Ok(Downloads { conn, next: 2 }) + } + + /// Signed CDN URLs for paths under the product's download root, in request order; empty where none was given. + pub async fn sign(&mut self, d: &mut Demux, product_id: u32, paths: &[String]) -> Result>, String> { + let id = self.next; + self.next += 1; + let mut request = Msg::new().uint(1, product_id as u64); + for p in paths { + request = request.text(2, p); + } + let raw = d.call(self.conn, Msg::new().msg(1, Msg::new().uint(1, id).msg(3, Msg::new().msg(1, request)))).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no download service answer")?)?; + let urls = pb::fields(pb::sub(&rsp, 3).ok_or("no signed URLs")?)?; + let mut out = Vec::new(); + for r in pb::subs(&urls, 1) { + let r = pb::fields(r)?; + if pb::num(&r, 1).unwrap_or(0) != 0 { + return Err("Ubisoft says this account does not own the game".into()); + } + for group in pb::subs(&r, 2) { + out.push(pb::subs(&pb::fields(group)?, 1).iter().map(|u| String::from_utf8_lossy(u).into_owned()).collect()); + } + } + if out.len() != paths.len() { + return Err(format!("Ubisoft signed {} of {} paths", out.len(), paths.len())); + } + Ok(out) + } +} + +/// Denuvo's activation for a game the account owns: the game's challenge and the product's ownership +/// token go to `denuvo_service`, which answers with the game token the game's aux DLL waits for. +pub async fn denuvo_token(d: &mut Demux, ownership_token: &str, challenge: &[u8]) -> Result, String> { + let conn = d.open("denuvo_service").await?; + let req = Msg::new().uint(1, 1).msg(2, Msg::new().text(1, ownership_token).bytes(2, challenge)); + let raw = d.call(conn, Msg::new().msg(1, req)).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no denuvo answer")?)?; + let result = pb::num(&rsp, 2).unwrap_or(0); + if result != 0 { + return Err(format!("Ubisoft's activation service refused the game (result {result})")); + } + let t = pb::fields(pb::sub(&rsp, 3).ok_or("no game token answer")?)?; + pb::sub(&t, 1).filter(|b| !b.is_empty()).map(<[u8]>::to_vec).ok_or_else(|| "Ubisoft sent an empty game token".into()) +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt new file mode 100644 index 0000000000..58e361db81 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.stores.ubisoft + +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreLaunch +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertArrayEquals +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = android.app.Application::class) +class UbisoftTest { + private val steamConfig = "version: 2.0\r\nroot:\r\n name: Assassin's Creed Syndicate\r\n start_game:\r\n steam:\r\n steam_app_id: 368500\r\n" + + " third_party_platform:\r\n name: Steam\r\n override_uplayid: 1875\r\n" + + @Test fun aProductUbisoftDeliversThroughSteamNamesItsSteamApp() { + assertEquals("368500", UbisoftLibrary.steamApp(steamConfig)) + assertNull(UbisoftLibrary.steamApp("root:\n start_game:\n online:\n executables:\n - path:\n relative: bin/game.exe\n")) + } + + @Test fun steamOwnedGamesAreKeyedByTheirSpace() { + val owned = JSONObject().put("games", JSONArray() + .put(JSONObject().put("productId", 1957).put("spaceId", "space-s").put("productType", 0).put("owned", true).put("configuration", steamConfig)) + .put(JSONObject().put("productId", 109).put("spaceId", "space-sc").put("productType", 0).put("owned", true).put("manifest", "AB").put("configuration", "root: {}")) + .put(JSONObject().put("productId", 1961).put("spaceId", "space-addon").put("productType", 1).put("owned", true).put("configuration", steamConfig))) + assertEquals(mapOf("space-s" to "368500"), UbisoftLibrary.steamBySpace(owned)) + assertEquals(setOf("space-sc"), UbisoftLibrary.ownedBySpace(owned).keys) + } + + @Test fun theEntitlementNamesTheGamesApplication() { + val body = JSONObject().put("items", JSONArray() + .put(JSONObject().put("productId", 82).put("applicationId", "app-82")) + .put(JSONObject().put("productId", 109).put("applicationId", "app-109"))).toString() + assertEquals("app-109", UbisoftLaunch.applicationId(body, 109)) + assertNull(UbisoftLaunch.applicationId(body, 1651)) + } + + @Test fun theLauncherStartsTheServiceOnlyWithAFreshLaunchFile() { + val text = StoreLaunch.launcherText(StoreGameSidecar(Store.UBISOFT, "space-sc", "Splinter Cell", "system/SplinterCell.exe")) + val lines = text.trimEnd().split("\r\n") + assertTrue(lines.contains("if not exist \"%~dp0.droiddeck-ubisoft.json\" goto direct")) + assertTrue(lines.contains("\"Z:\\usr\\local\\lib\\droiddeck-ubisoft\\droiddeck-upc.exe\" \"%~dp0.droiddeck-ubisoft.json\"")) + assertEquals("\"%~dp0system\\SplinterCell.exe\"", lines.last()) + assertTrue(lines.indexOf(":direct") < lines.lastIndex) + } + + @Test fun activationPayloadsSurviveTheHexHop() { + val bytes = byteArrayOf(0, 1, 0x7f, -1, -128, 42) + assertEquals("00017fff802a", UbisoftActivation.hex(bytes)) + assertArrayEquals(bytes, UbisoftActivation.unhex("00017fff802a")) + assertNull(UbisoftActivation.unhex("abc")) + } +} diff --git a/docs/development/ubisoft-launch.md b/docs/development/ubisoft-launch.md new file mode 100644 index 0000000000..0fb49d23bc --- /dev/null +++ b/docs/development/ubisoft-launch.md @@ -0,0 +1,90 @@ +# Ubisoft launch without Ubisoft Connect + +A Ubisoft game never holds its own ticket. Its DRM loader opens Ubisoft's API DLL from the Connect +folder, and that DLL asks the running launcher for the session over local named pipes. DroidDeck +answers those pipes with `droiddeck-upc.exe`, a small Windows program that runs in the game's prefix. +The game and every Ubisoft DLL stay unmodified, and there is no Connect client, CEF or background +service. The session the game receives is real: its ticket comes from Ubisoft's ownership service for +the signed-in account. + +This file is the specification `tools/ubisoft-launcher` was written from. The facts come from the +protobuf descriptors embedded in Ubisoft's own `uplay_r1.dll` (`proto_uplaydll/UplayDll.proto`) and +from the public notes in [Foxtrot47/Ubisoft-Connect-RE](https://github.com/Foxtrot47/Ubisoft-Connect-RE) +(`docs/06-launch.md`, `docs/10-denuvo.md`). No code was taken from either. + +## Pieces + +| Piece | Where | Job | +|---|---|---| +| Ubisoft runtime | `C:\Program Files (x86)\Ubisoft\Ubisoft Game Launcher\` in the shared prefix | Ubisoft's own `uplay_r1(64).dll`, `uplay_aux_r1(64).dll`, `uplay_r2(64).dll`, `ubiorbitapi_r2(64).dll`, `UbisoftGameLauncher(64).exe`, the starter's imports (`discord-rpc.x86/x64.dll`, `steam_api(64).dll`) and `overlay(64).dll`. `droiddeck-store-launch` extracts exactly these 16 files with `7z` from the official `UbisoftConnectInstaller.exe`, then deletes the installer | +| Registry | `HKLM\Software\[Wow6432Node\]Ubisoft\Launcher` | `InstallDir` points at the runtime folder in both views; `Installs\\InstallDir` points at the game, with forward slashes and a trailing slash, as Connect writes it | +| Shared prefix | `compatdata/2929927072` | Every Ubisoft game runs here (`UbisoftConnect.launchOptions` sets `STEAM_COMPAT_DATA_PATH`), so the runtime is extracted once | +| Launch file | `/.droiddeck-ubisoft.json` | Written by `droiddeck-store-launch` before every launch from the app's `ubisoft-launch` answer: the account, the owned product ids, a fresh PC ticket, the entitlement's application id and the save folder. Removed first, so a failed refresh falls back to starting the game directly | +| Launcher | `/.droiddeck-launch.bat` | Runs `Z:\usr\local\lib\droiddeck-ubisoft\droiddeck-upc.exe ` when both exist | +| Tickets | app, Rust `ubisoft/service.rs` | Demux `ownership_service`: initialize (owned products), then `GetUplayPCTicketReq` (field 14) answered in field 13 `{1: success, 2: ticket}` | + +## Pipes + +All pipes are `\\.\pipe\terminal__`, where `` is +`ProcessIdToSessionId(GetCurrentProcessId())` (1 under Wine). They are byte-mode duplex pipes with +unlimited instances, created before the game starts. Every message is a 4-byte big-endian length +followed by a proto2 message, except on `uplay_service_ipc_pipe_`. + +| Pipe | Client | Exchange | +|---|---|---| +| `game_start_ipc_pipe_` | `UbisoftGameLauncher.exe` | `game_starter.Upstream{1:{1:{1: build, 2: product, 10: exe, 11: arguments, ...}}}` → `Downstream{2:{1:{1:0 (overlay off), 2:0, 3: / + "/" + , 4: /, 8:3, 9:{1:{1,113,0,1,0} 1:{3,123,0,0,0}}}}}` | +| `uplay_api_process_ipc_pipe_` | game | `Req.initProcessReq{1: product, 2: game pid, 5: env set}` → `Rsp.initProcessRsp(13){1:1, 3:0 (overlay off), 4:3, 6:0}`. Kept open. Answering it is what releases the starter (below) | +| `uplay_ipc_pipe_` | game (`uplay_r1.dll`) | `Req.initReq(1)` → `Rsp.initRsp(1)`, answered every time it is asked. `Req.installerReq(13)` with `initInstallerReq` → `Rsp.installerRsp(10){1:{1:1, 2:"", 3: language}}` | +| `uplay_aux_ipc_pipe_` | `uplay_aux_r1(64).dll` (Denuvo) | `{1: rid, 2: init}` → `{1: rid, 2:{1:1, 2: pid, 3:3367, 3:3368, 3:3962}}`; `{1: rid, 3:{2:{2: challenge}}}` → `{1: rid, 3:{2:{2:1, 3:0, 4: game token, 5:""}}}` | +| `uplay_service_ipc_pipe_` | Ubisoft helpers | Server sends `{3:{1:1, 3:{1: }}}` once, then only reads, unframed | +| `upc_api_process_ipc_pipe_standard`, `uplay_protocol_ipc_pipe_`, `uplay_overlay_ipc_pipe_`, `orbit_ipc_pipe_`, `uplay_crash_reporter_ipc_pipe_` | — | Held open, never answered | + +### The session (`InitRsp`) + +| Field | Value | +|---|---| +| 1 result | 1 (`InitResult_Success`) | +| 2 account | `{1: userId, 2: username, 3: nameOnPlatform, 4: email, 5: "" (password), 6: country}` | +| 3 connected | 1 | +| 4 gameUplayId | the product | +| 5 uplayIds | every owned product whose ownership entry is owned, of type 0 or 1, in state 0 or 3 | +| 6 gameCdKeys | `{1: product, 2: ""}` | +| 7 isInOfflineMode | 0 | +| 8 upcTicket | the PC ticket from `GetUplayPCTicket`, never the Denuvo token | +| 11, 12, 15, 16, 18, 19, 21, 23 | the values a real launch carries (`{1:0}`, 0, overlay `{1:0, 2:3}`, hardware score `{6211, 22395, 1.0f}`, empty, `{1:1, 2:1}`, `{2:1}`, empty) | +| 17 storage | `{1: "C:/users/steamuser/Saved Games/Ubisoft///"}`; the game appends file names directly, so the trailing slash matters | +| 22 ubiServices | `{1: applicationId}` from the account's entitlements, left out when unknown | + +The overlay is reported off in all three places. `uplay_r1.dll` still loads `overlay.dll` from the +runtime folder right after the session arrives, whatever the session says; without that file it gives up +with `UplayAPI [ERROR]: Startup failed: cannot load uplay library` (Assassin's Creed Chronicles: China +then sits on a black screen and aborts with code 3 after about 160 s), so the runtime includes it. + +## Start sequence + +1. `droiddeck-upc.exe` creates the pipes and an auto-reset event marked inheritable, then starts the + game's own exe with handle inheritance, in the install folder, with no extra arguments. +2. The exe sees it was not started by Connect and starts `UbisoftGameLauncher.exe + -gamelauncher_wait_handle -upc_uplay_id ...` (it exits with code 3; that is normal). +3. The starter asks `game_start` and starts the real game from the reply. +4. The game announces itself on `uplay_api_process`; the answer sets the event, which lets the starter + exit. Without it the starter times out and its job object ends the game after about 15 seconds. +5. `uplay_r1.dll` asks `uplay_ipc` for the session. +6. `droiddeck-upc.exe` waits for the announced process, allows 15 s for a restart, then exits with the + game's code so Steam sees the game end. + +A log of every exchange is written to `~/.cache/droiddeck/ubisoft/upc-.log` in the guest. + +## Denuvo + +For protected titles the aux pipe carries the activation challenge. `droiddeck-upc.exe` writes it to +`~/.cache/droiddeck/ubisoft/bridge-/denuvo-.req` and waits 90 s for `.rsp`. Answering it +needs `denuvo_service` with an ownership token (`OwnershipTokenReq`, field 28) and is the next step; +titles without Denuvo never open the aux pipe. + +## Not covered yet + +- R2 (`UPC_*`) titles use `uplay_r2.dll`; their pipe traffic has not been captured, so whether the + same server answers them is unverified. +- Orbit (`ubiorbitapi_r2`) titles. +- Achievements, friends, overlay, cloud saves. diff --git a/tools/build_local.sh b/tools/build_local.sh index 041d6b3131..d7f2ca2a21 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -424,6 +424,15 @@ if ! restore_step comet "${comet_key}" "${comet_out}"; then DROIDDECK_BUILD_IMAGE="${image_name}" bash tools/comet/build-local.sh save_step comet "${comet_key}" "${comet_out}" fi +if [[ "${DROIDDECK_SKIP_RUST:-0}" != 1 ]]; then + upc_out="${linuxfs_dir}/usr/local/lib/droiddeck-ubisoft" + upc_key=$(inputs_hash "x86_64-pc-windows-gnu" tools/ubisoft-launcher/src tools/ubisoft-launcher/Cargo.toml tools/ubisoft-launcher/Cargo.lock tools/ubisoft-launcher/build.sh) + if ! restore_step ubisoft "${upc_key}" "${upc_out}"; then + command -v x86_64-w64-mingw32-gcc >/dev/null 2>&1 || { echo "x86_64-w64-mingw32-gcc is required for the Ubisoft launcher service (droiddeck-upc.exe)." >&2; exit 1; } + CARGO_TARGET_DIR="${cache_dir}/ubisoft-target" bash tools/ubisoft-launcher/build.sh "${upc_out}" + save_step ubisoft "${upc_key}" "${upc_out}" + fi +fi python3 tools/powervr/fetch.py bash tools/packs/build.sh app/build/packs python3 tools/release/runtime_inputs.py record diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 5ed1f7f11d..16b12bfe3d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -17,12 +17,12 @@ SEED_REDISTS = "/usr/local/bin/droiddeck-seed-redists" PACK_KEYS = ("WINESERVER", "BL_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC") -def game_id(env): - prefix = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") - if not prefix: - return None - value = prefix.rsplit("/", 1)[-1] - if not re.fullmatch(r"-?[0-9]+", value): +# Prefixes several games share; the game itself is the Steam app being launched. +SHARED_PREFIXES = {"2929927072"} + + +def app_number(value): + if not re.fullmatch(r"-?[0-9]+", value or ""): return None number = int(value) if not -(2**31) <= number < 2**32 or number == 0: @@ -30,6 +30,26 @@ def game_id(env): return str(number % 2**32) +def game_id(env): + prefix = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") + if not prefix: + return None + found = app_number(prefix.rsplit("/", 1)[-1]) + if found in SHARED_PREFIXES: + return app_number(env.get("SteamAppId", "")) or shortcut_number(env.get("SteamGameId", "")) or found + return found + + +def shortcut_number(value): + """The shortcut appid inside Steam's 64-bit shortcut game id `(appid << 32) | 0x02000000`.""" + if not re.fullmatch(r"[0-9]{1,20}", value or ""): + return None + number = int(value) + if number >= 2**64 or number & 0xFFFFFFFF != 0x02000000: + return None + return app_number(str(number >> 32)) + + DOTNET_FEX = { "FEX_TSOENABLED": "1", "FEX_VECTORTSOENABLED": "1", diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 1f7c12bd67..ca6ddebc84 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -289,6 +289,218 @@ def exited(argv, code=0): return 0 +UBISOFT_DIR = "drive_c/Program Files (x86)/Ubisoft/Ubisoft Game Launcher" +UBISOFT_WINDOWS_DIR = "C:\\Program Files (x86)\\Ubisoft\\Ubisoft Game Launcher\\" +UBISOFT_INSTALLER_URL = "https://static3.cdn.ubi.com/orbit/launcher_installer/UbisoftConnectInstaller.exe" +UBISOFT_CACHE = Path("/root/.cache/droiddeck/ubisoft") +UBISOFT_LAUNCH = ".droiddeck-ubisoft.json" +UBISOFT_SERVICE = Path("/usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe") +UBISOFT_ASK_WAIT = 45.0 +UBISOFT_EXTRACT_WAIT = 300 +# Ubisoft's own game-side runtime from the Connect installer, unmodified: the API and aux DLLs the +# game's loader opens from InstallDir, the starter it re-executes into and its imports, and the overlay +# DLLs uplay_r1.dll loads even with the overlay off (its startup fails without them). +UBISOFT_RUNTIME = ("uplay_r1.dll", "uplay_r164.dll", "uplay_aux_r1.dll", "uplay_aux_r164.dll", + "uplay_r2.dll", "uplay_r264.dll", "ubiorbitapi_r2.dll", "ubiorbitapi_r264.dll", + "UbisoftGameLauncher.exe", "UbisoftGameLauncher64.exe", "discord-rpc.x86.dll", + "discord-rpc.x64.dll", "steam_api.dll", "steam_api64.dll", "overlay.dll", "overlay64.dll") +UBISOFT_VIEWS = ("[Software\\\\Ubisoft\\\\Launcher%s]", "[Software\\\\Wow6432Node\\\\Ubisoft\\\\Launcher%s]") +MIN_INSTALLER = 1 << 20 + + +def ubisoft_runtime_dir(compat_data): + return Path(compat_data) / "pfx" / UBISOFT_DIR + + +def ubisoft_runtime_ready(compat_data): + folder = ubisoft_runtime_dir(compat_data) + return all((folder / name).is_file() for name in UBISOFT_RUNTIME) + + +def fetch_installer(url=UBISOFT_INSTALLER_URL, folder=UBISOFT_CACHE): + target = folder / "UbisoftConnectInstaller.exe" + if target.is_file() and target.stat().st_size >= MIN_INSTALLER: + return target + import urllib.request + folder.mkdir(parents=True, exist_ok=True) + part = target.with_name(target.name + ".part") + request = urllib.request.Request(url, headers={"User-Agent": "Mozilla/5.0"}) + with urllib.request.urlopen(request, timeout=60) as reply, open(part, "wb") as out: + shutil.copyfileobj(reply, out) + if part.stat().st_size < MIN_INSTALLER: + part.unlink() + raise OSError("installer too small") + os.replace(part, target) + return target + + +def install_runtime(compat_data, wait=UBISOFT_EXTRACT_WAIT): + if ubisoft_runtime_ready(compat_data): + return "present" + if not (Path(compat_data) / "pfx").is_dir(): + return "no-prefix" + try: + installer = fetch_installer() + except OSError as error: + return "download-failed-" + type(error).__name__ + target = ubisoft_runtime_dir(compat_data) + target.mkdir(parents=True, exist_ok=True) + with tempfile.TemporaryDirectory(prefix="droiddeck-ubisoft-", dir=str(UBISOFT_CACHE)) as tmp: + try: + subprocess.run(["7z", "e", "-y", "-o" + tmp, str(installer)] + list(UBISOFT_RUNTIME), stdin=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=wait) + except subprocess.TimeoutExpired: + return "extract-timeout" + except OSError: + return "no-7z" + missing = [name for name in UBISOFT_RUNTIME if not (Path(tmp) / name).is_file()] + if missing: + return "extract-missing-" + ",".join(missing) + for name in UBISOFT_RUNTIME: + shutil.copyfile(Path(tmp) / name, target / name) + if not ubisoft_runtime_ready(compat_data): + return "copy-failed" + try: + installer.unlink() + except OSError: + pass + return "installed" + + +def ubisoft_product(sidecar): + extra = sidecar.get("extra") if isinstance(sidecar.get("extra"), dict) else {} + try: + return int(str(extra.get("productId") or "")) + except ValueError: + return None + + +def ubisoft_install_dir(folder): + return windows_path(str(folder)).replace("\\", "/").rstrip("/") + "/" + + +def register_ubisoft(folder, product, compat_data): + reg = Path(compat_data) / "pfx" / "system.reg" + if not reg.is_file(): + return "no-registry" + if not wait_for_server(reg.parent): + return "server-running" + for view in UBISOFT_VIEWS: + set_value(reg, view % "", "InstallDir", UBISOFT_WINDOWS_DIR) + set_value(reg, view % ("\\\\Installs\\\\%d" % product), "InstallDir", ubisoft_install_dir(folder)) + return "registered %d" % product + + +UBISOFT_HIVES = {"HKEY_LOCAL_MACHINE": "system.reg", "HKEY_CURRENT_USER": "user.reg"} + + +def manifest_value(values, folder, language): + """The value Connect writes for a manifest registry entry: the install folder, the entry for the + language being played, or the only entry there is.""" + entries = [v for v in values if isinstance(v, dict)] + if not entries: + return None + names = [str(v.get("name") or "") for v in entries] + if "$INSTALL_DIR" in names: + return windows_path(str(folder)).rstrip("\\") + "\\" + for v in entries: + if str(v.get("value") or "").lower() == language.lower(): + return str(v.get("value")) + prefix = language.split("-")[0].lower() + for v in entries: + if str(v.get("value") or "").lower().split("-")[0] == prefix: + return str(v.get("value")) + return str(entries[0].get("value") or entries[0].get("name") or "") + + +def apply_manifest_registry(compat_data, registry, folder, language): + written = 0 + for item in registry or []: + if not isinstance(item, dict): + continue + path = str(item.get("key") or "").replace("/", "\\") + hive, _, rest = path.partition("\\") + target = UBISOFT_HIVES.get(hive.upper()) + if not target or "\\" not in rest: + continue + subkey, _, name = rest.rpartition("\\") + value = manifest_value(item.get("values"), folder, language) + if value is None or not name: + continue + reg = Path(compat_data) / "pfx" / target + parts = subkey.split("\\") + views = [parts] + if target == "system.reg" and len(parts) > 1 and parts[0].lower() == "software" and parts[1].lower() != "wow6432node": + views.append(parts[:1] + ["Wow6432Node"] + parts[1:]) + for view in views: + key = "[" + "\\\\".join(view) + "]" + if set_value(reg, key, name, value): + written += 1 + return written + + +def ubisoft_launch(folder, sidecar, product, compat_data, answer): + """The launch file droiddeck-upc.exe reads: the game, the account and this launch's ticket.""" + account = answer.get("account") if isinstance(answer.get("account"), dict) else {} + user = str(account.get("userId") or "user") + saves = Path(compat_data) / "pfx" / "drive_c/users/steamuser/Saved Games/Ubisoft" / user / str(product) + saves.mkdir(parents=True, exist_ok=True) + exe = str(sidecar.get("exe") or "").replace("\\", "/") + workdir = folder / str(sidecar.get("workdir")) if sidecar.get("workdir") else folder + UBISOFT_CACHE.mkdir(parents=True, exist_ok=True) + return { + "productId": product, + "exe": windows_path(str(folder / exe)), + "args": " ".join(str(a) for a in sidecar.get("args") or []), + "workdir": windows_path(str(workdir)), + "account": account, + "ticket": str(answer.get("ticket") or ""), + "owned": [int(i) for i in answer.get("owned") or [] if str(i).isdigit()], + "products": [p for p in answer.get("products") or [] if isinstance(p, dict) and isinstance(p.get("id"), int)], + "appId": str(answer.get("appId") or ""), + "chunks": [c for c in answer.get("chunks") or [] if isinstance(c, dict) and isinstance(c.get("id"), int)], + "saves": "C:/users/steamuser/Saved Games/Ubisoft/%s/%d/" % (user, product), + "language": str(answer.get("language") or "en-US"), + "bridge": windows_path(str(UBISOFT_CACHE / ("bridge-%d" % product))), + "log": windows_path(str(UBISOFT_CACHE / ("upc-%d.log" % product))), + } + + +def prepare_ubisoft(folder, sidecar, compat_data, launch_dir, proton="", ask_app=None): + launch = folder / UBISOFT_LAUNCH + try: + launch.unlink() + except OSError: + pass + if not compat_data: + return "no-prefix" + product = ubisoft_product(sidecar) + if product is None: + return "no-product" + if not UBISOFT_SERVICE.is_file(): + return "no-service" + made = create_prefix(compat_data, proton) if not (Path(compat_data) / "pfx/user.reg").is_file() else "present" + if made not in ("present", "created"): + return "prefix " + made + runtime = install_runtime(compat_data) + if not ubisoft_runtime_ready(compat_data): + return "runtime " + runtime + registry = register_ubisoft(folder, product, compat_data) + if not launch_dir: + return "runtime %s, %s, no-channel" % (runtime, registry) + answer = (ask_app or ask)(Path(launch_dir) / "stores", {"op": "ubisoft-launch", "store": "ubisoft", "id": str(sidecar.get("id"))}, + timeout=UBISOFT_ASK_WAIT) + if not isinstance(answer, dict) or not answer.get("ok") or not answer.get("ticket"): + reason = "timeout" if answer is None else str(answer.get("reason") or "refused") + return "runtime %s, %s, session %s" % (runtime, registry, reason) + written = 0 + if answer.get("registry") and wait_for_server(Path(compat_data) / "pfx"): + written = apply_manifest_registry(compat_data, answer.get("registry"), folder, str(answer.get("language") or "en-US")) + tmp = launch.with_name(launch.name + ".tmp") + tmp.write_text(json.dumps(ubisoft_launch(folder, sidecar, product, compat_data, answer))) + os.replace(tmp, launch) + return "runtime %s, %s, %d manifest value(s), session ready" % (runtime, registry, written) + COMET_DIR = Path("/usr/local/lib/droiddeck-comet") @@ -1114,6 +1326,15 @@ def main(argv): prepare_gog(sidecar, compat_data, launch_dir) log("gog registry: " + apply_gog_registry(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) log("gog support data: " + gog_support_data(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) + if store == "ubisoft": + try: + log("ubisoft %s: %s" % (game, prepare_ubisoft(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")))) + except OSError as e: + try: + (folder / UBISOFT_LAUNCH).unlink() + except OSError: + pass + log("ubisoft %s: not prepared (%s), starting directly" % (game, e)) if store == "epic": handled = os.environ.get(EPIC_HANDLED) == "1" and (folder / EPIC_ARGS).is_file() if not handled: diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 4a2cbcb15b..426b6c173b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -152,6 +152,13 @@ bl_components() { else cm_app="" fi + if [ "$cm_app" = 2929927072 ] && [[ "${SteamAppId:-}" =~ ^[0-9]{1,10}$ ]] && (( 10#$SteamAppId > 0 && 10#$SteamAppId <= 4294967295 )); then + cm_app=$((10#$SteamAppId)) + elif [ "$cm_app" = 2929927072 ] && [[ "${SteamGameId:-}" =~ ^[1-9][0-9]{9,19}$ ]] && + { [ ${#SteamGameId} -lt 20 ] || [[ ! "$SteamGameId" > 18446744073709551615 ]]; } && + (( (10#$SteamGameId & 0xFFFFFFFF) == 0x02000000 && ((10#$SteamGameId >> 32) & 0xFFFFFFFF) != 0 )); then + cm_app=$(( (10#$SteamGameId >> 32) & 0xFFFFFFFF )) + fi if [ -z "$cm_app" ]; then echo "droiddeck-proton: components: invalid game prefix, left as it is" >&2 return 0 diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index ce902817a0..b1cdcedad9 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1124,6 +1124,23 @@ class GameEnvironmentTest(unittest.TestCase): scope = MODULE["game_id"](env) expected = "untouched" if scope is None else scope if scope in {"42", "4294967295", "2147483648"} else "*" self.assertEqual(target.read_text(), expected) + for app, expected in (("42", "42"), ("4294967295", "4294967295"), ("43", "*"), ("", "*"), ("x", "*")): + with self.subTest(shared=app): + env = dict(os.environ, HOME=str(root), STEAM_COMPAT_DATA_PATH="/steam/compatdata/2929927072", SteamAppId=app) + target.write_text("untouched") + subprocess.run(["bash", "-c", script, "test", str(base)], env=env, check=True, capture_output=True) + self.assertEqual(MODULE["game_id"](env), app if app in {"42", "4294967295", "43"} else "2929927072") + self.assertEqual(target.read_text(), expected) + for game, expected in ( + (str(42 << 32 | 0x02000000), "42"), (str(4294967295 << 32 | 0x02000000), "4294967295"), + (str(42 << 32 | 0x02000001), "*"), (str(42 << 32 | 0x02000000 | 1 << 64), "*"), ("33554432", "*"), ("x", "*"), + ): + with self.subTest(direct=game): + env = dict(os.environ, HOME=str(root), STEAM_COMPAT_DATA_PATH="/steam/compatdata/2929927072", SteamAppId="0", SteamGameId=game) + target.write_text("untouched") + subprocess.run(["bash", "-c", script, "test", str(base)], env=env, check=True, capture_output=True) + self.assertEqual(MODULE["game_id"](env), expected if expected != "*" else "2929927072") + self.assertEqual(target.read_text(), expected) def test_engine_fixes_follow_the_games_files(self): with tempfile.TemporaryDirectory() as tmp: @@ -1628,6 +1645,10 @@ class GameEnvironmentTest(unittest.TestCase): self.assertIsNone(MODULE["game_id"]({"STEAM_COMPAT_DATA_PATH": prefix})) self.assertEqual(MODULE["game_id"]({"STEAM_COMPAT_DATA_PATH": "/a/compatdata/42/"}), "42") self.assertEqual(MODULE["game_id"]({"STEAM_COMPAT_DATA_PATH": "/a/compatdata/-1"}), "4294967295") + shared = {"STEAM_COMPAT_DATA_PATH": "/a/compatdata/2929927072", "SteamAppId": "2424921676"} + self.assertEqual(MODULE["game_id"](shared), "2424921676") + self.assertEqual(MODULE["game_id"]({"STEAM_COMPAT_DATA_PATH": "/a/compatdata/2929927072"}), "2929927072") + self.assertEqual(MODULE["game_id"]({"STEAM_COMPAT_DATA_PATH": "/a/compatdata/42", "SteamAppId": "7"}), "42") def test_launch_reads_updates_preserves_argv_and_does_not_execute_values(self): with tempfile.TemporaryDirectory() as tmp: diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 863eb679a9..36a1b7c9a1 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -797,3 +797,102 @@ class GogRegistry(unittest.TestCase): store.main([str(folder / store.LAUNCHER)]) apply.assert_called_once_with(folder, root + '/compat', '/chosen/proton') support.assert_called_once_with(folder, root + '/compat', '/chosen/proton') + + +class Ubisoft(unittest.TestCase): + def setUp(self): + self.tmp = tempfile.TemporaryDirectory() + self.root = Path(self.tmp.name) + self.compat_data = self.root / 'compatdata/2929927072' + (self.compat_data / 'pfx').mkdir(parents=True) + (self.compat_data / 'pfx/system.reg').write_text('WINE REGISTRY Version 2\n') + (self.compat_data / 'pfx/user.reg').write_text('WINE REGISTRY Version 2\n') + self.folder = self.root / 'Games/Stores/Ubisoft/Splinter Cell' + (self.folder / 'system').mkdir(parents=True) + self.sidecar = {'store': 'ubisoft', 'id': 'space-1', 'exe': 'system/SplinterCell.exe', 'extra': {'productId': '109'}} + service = self.root / 'droiddeck-upc.exe' + service.write_bytes(b'MZ') + for patcher in (patch.object(store, 'UBISOFT_SERVICE', service), patch.object(store, 'UBISOFT_CACHE', self.root / 'cache'), + patch.object(store, 'wait_for_server', return_value=True)): + patcher.start() + self.addCleanup(patcher.stop) + + def tearDown(self): + self.tmp.cleanup() + + def runtime(self): + folder = store.ubisoft_runtime_dir(self.compat_data) + folder.mkdir(parents=True, exist_ok=True) + for name in store.UBISOFT_RUNTIME: + (folder / name).write_bytes(b'MZ') + + def answer(self, *_args, **_kwargs): + return {'ok': True, 'ticket': 'PC', 'owned': [82, 109], 'appId': 'app', + 'account': {'userId': 'u1', 'username': 'name', 'nameOnPlatform': 'name', 'email': 'e@x', 'country': 'US'}} + + def prepare(self, ask_app): + return store.prepare_ubisoft(self.folder, self.sidecar, str(self.compat_data), str(self.root / 'launch'), '/proton', ask_app=ask_app) + + def test_an_extracted_runtime_is_not_extracted_again(self): + self.runtime() + with patch.object(store.subprocess, 'run') as run: + self.assertEqual('present', store.install_runtime(str(self.compat_data))) + run.assert_not_called() + + def test_the_runtime_comes_from_the_installer_through_7z(self): + installer = self.root / 'UbisoftConnectInstaller.exe' + + def run(command, **_kwargs): + self.assertEqual(['7z', 'e', '-y'], command[:3]) + self.assertEqual(str(installer), command[4]) + out = Path(command[3][2:]) + for name in command[5:]: + (out / name).write_bytes(b'MZ') + + (self.root / 'cache').mkdir() + with patch.object(store, 'fetch_installer', return_value=installer), patch.object(store.subprocess, 'run', side_effect=run): + self.assertEqual('installed', store.install_runtime(str(self.compat_data))) + self.assertTrue(store.ubisoft_runtime_ready(str(self.compat_data))) + + def test_a_launch_registers_the_game_and_writes_the_session_for_the_service(self): + self.runtime() + result = self.prepare(self.answer) + self.assertEqual('runtime present, registered 109, 0 manifest value(s), session ready', result) + reg = (self.compat_data / 'pfx/system.reg').read_text() + for view in ('[Software\\\\Ubisoft\\\\Launcher]', '[Software\\\\Wow6432Node\\\\Ubisoft\\\\Launcher]'): + self.assertIn(view, reg) + self.assertIn('[Software\\\\Wow6432Node\\\\Ubisoft\\\\Launcher\\\\Installs\\\\109]', reg) + self.assertIn('"InstallDir"="C:\\\\Program Files (x86)\\\\Ubisoft\\\\Ubisoft Game Launcher\\\\"', reg) + launch = json.loads((self.folder / store.UBISOFT_LAUNCH).read_text()) + self.assertEqual(109, launch['productId']) + self.assertEqual('PC', launch['ticket']) + self.assertEqual([82, 109], launch['owned']) + self.assertEqual(store.windows_path(str(self.folder / 'system/SplinterCell.exe')), launch['exe']) + self.assertEqual('C:/users/steamuser/Saved Games/Ubisoft/u1/109/', launch['saves']) + self.assertTrue((self.compat_data / 'pfx/drive_c/users/steamuser/Saved Games/Ubisoft/u1/109').is_dir()) + + def test_without_a_session_the_launch_file_is_removed_and_the_game_starts_as_is(self): + self.runtime() + (self.folder / store.UBISOFT_LAUNCH).write_text('{}') + result = self.prepare(lambda *_a, **_k: {'ok': False, 'reason': 'signed-out'}) + self.assertEqual('runtime present, registered 109, session signed-out', result) + self.assertFalse((self.folder / store.UBISOFT_LAUNCH).exists()) + + def test_a_game_without_a_product_is_left_alone(self): + self.sidecar['extra'] = {} + self.assertEqual('no-product', self.prepare(self.answer)) + + def test_the_manifest_registry_lands_in_both_views_with_the_install_folder_and_language(self): + self.runtime() + registry = [{'key': r'HKEY_LOCAL_MACHINE\SOFTWARE\Ubisoft\Launcher\Installs\109\Language', + 'values': [{'name': 'French', 'value': 'fr-FR'}, {'name': 'English', 'value': 'en-US'}]}, + {'key': r'HKEY_LOCAL_MACHINE\SOFTWARE\Ubisoft\Splinter Cell\GamePath', 'values': [{'name': '$INSTALL_DIR', 'value': ''}]}] + answer = dict(self.answer(), registry=registry, language='en-US') + result = self.prepare(lambda *_a, **_k: answer) + self.assertEqual('runtime present, registered 109, 4 manifest value(s), session ready', result) + reg = (self.compat_data / 'pfx/system.reg').read_text() + self.assertIn(r'[SOFTWARE\\Wow6432Node\\Ubisoft\\Launcher\\Installs\\109]', reg) + self.assertIn(r'[SOFTWARE\\Ubisoft\\Launcher\\Installs\\109]', reg) + self.assertIn('"Language"="en-US"', reg) + folder = store.windows_path(str(self.folder)).replace('\\', '\\\\') + self.assertIn('"GamePath"="%s\\\\"' % folder, reg) diff --git a/tools/ubisoft-launcher/.gitignore b/tools/ubisoft-launcher/.gitignore new file mode 100644 index 0000000000..90de6fc989 --- /dev/null +++ b/tools/ubisoft-launcher/.gitignore @@ -0,0 +1,2 @@ +target/ +out/ diff --git a/tools/ubisoft-launcher/Cargo.lock b/tools/ubisoft-launcher/Cargo.lock new file mode 100644 index 0000000000..a2bc2229ea --- /dev/null +++ b/tools/ubisoft-launcher/Cargo.lock @@ -0,0 +1,105 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "droiddeck-ubisoft-launcher" +version = "0.1.0" +dependencies = [ + "serde_json", +] + +[[package]] +name = "itoa" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" + +[[package]] +name = "memchr" +version = "2.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" + +[[package]] +name = "proc-macro2" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "serde" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" +dependencies = [ + "itoa", + "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "syn" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" + +[[package]] +name = "zmij" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/tools/ubisoft-launcher/Cargo.toml b/tools/ubisoft-launcher/Cargo.toml new file mode 100644 index 0000000000..e90819761e --- /dev/null +++ b/tools/ubisoft-launcher/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "droiddeck-ubisoft-launcher" +version = "0.1.0" +edition = "2021" +license = "GPL-3.0-only" +publish = false + +[[bin]] +name = "droiddeck-upc" +path = "src/main.rs" + +[dependencies] +serde_json = "1" + +[profile.release] +opt-level = "s" +lto = true +panic = "abort" +strip = true diff --git a/tools/ubisoft-launcher/build.sh b/tools/ubisoft-launcher/build.sh new file mode 100755 index 0000000000..437d2c2df0 --- /dev/null +++ b/tools/ubisoft-launcher/build.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +# Builds droiddeck-upc.exe for Wine and stages it with the guest scripts. +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +out=${1:-"$here/../../app/src/main/assets/linuxfs/usr/local/lib/droiddeck-ubisoft"} +target=x86_64-pc-windows-gnu +rustup target add "$target" >/dev/null 2>&1 || true +cargo build --manifest-path "$here/Cargo.toml" --release --locked --target "$target" +mkdir -p "$out" +install -m644 "${CARGO_TARGET_DIR:-$here/target}/$target/release/droiddeck-upc.exe" "$out/droiddeck-upc.exe" diff --git a/tools/ubisoft-launcher/src/launcher.rs b/tools/ubisoft-launcher/src/launcher.rs new file mode 100644 index 0000000000..c58a69c8cf --- /dev/null +++ b/tools/ubisoft-launcher/src/launcher.rs @@ -0,0 +1,358 @@ +//! What Ubisoft Connect answers on its local pipes, built from the launch configuration. +//! +//! Field numbers follow `mg.protocol.uplaydll` and `game_starter` as embedded in Ubisoft's own +//! `uplay_r1.dll`; see docs/development/ubisoft-launch.md. + +use crate::pb::{self, Msg, Value}; +use serde_json::Value as Json; + +pub const GAME_START: &str = "game_start_ipc_pipe_"; +pub const API_PROCESS: &str = "uplay_api_process_ipc_pipe_"; +pub const SESSION: &str = "uplay_ipc_pipe_"; +pub const AUX: &str = "uplay_aux_ipc_pipe_"; +pub const SERVICE: &str = "uplay_service_ipc_pipe_"; +/// Pipes Connect creates that the game may open; they are held open without answers. +pub const QUIET: &[&str] = &[ + "upc_api_process_ipc_pipe_standard", + "uplay_protocol_ipc_pipe_", + "uplay_overlay_ipc_pipe_", + "orbit_ipc_pipe_", + "uplay_crash_reporter_ipc_pipe_", +]; +/// The add-on list Connect returns from the aux init; the game echoes it back. +const AUX_ADDONS: [u64; 3] = [3367, 3368, 3962]; +/// `OverlayInjectionMethod_None`. +const OVERLAY_NONE: u64 = 1; +const HWSCORE: &str = "C:/ProgramData/Ubisoft/Ubisoft Game Launcher/cache//statistics/hwscore"; + +pub struct Config { + pub product: u32, + pub exe: String, + pub args: String, + pub workdir: String, + pub user_id: String, + pub username: String, + pub name_on_platform: String, + pub email: String, + pub country: String, + pub ticket: String, + pub owned: Vec, + pub app_id: String, + pub saves: String, + pub language: String, + pub bridge: String, + pub log: String, + /// Installed chunks of the game's manifest: id and tags. + pub chunks: Vec<(u32, String)>, + /// Owned products and their ownership type (0 game, 1 add-on). + pub products: Vec<(u32, u32)>, +} + +fn s(j: &Json, k: &str) -> String { + j.get(k).and_then(|v| v.as_str()).unwrap_or_default().to_string() +} + +impl Config { + pub fn parse(text: &str) -> Result { + let j: Json = serde_json::from_str(text).map_err(|e| format!("config: {e}"))?; + let product = j.get("productId").and_then(|v| v.as_u64()).ok_or("config: no productId")? as u32; + let account = j.get("account").cloned().unwrap_or(Json::Null); + let mut owned: Vec = j.get("owned").and_then(|v| v.as_array()).map(|a| a.iter().filter_map(|v| v.as_u64()).map(|v| v as u32).collect()).unwrap_or_default(); + if !owned.contains(&product) { + owned.push(product); + } + let mut saves = s(&j, "saves").replace('\\', "/"); + if !saves.ends_with('/') { + saves.push('/'); + } + let c = Config { + product, + exe: s(&j, "exe"), + args: s(&j, "args"), + workdir: s(&j, "workdir"), + user_id: s(&account, "userId"), + username: s(&account, "username"), + name_on_platform: s(&account, "nameOnPlatform"), + email: s(&account, "email"), + country: s(&account, "country"), + ticket: s(&j, "ticket"), + owned, + app_id: s(&j, "appId"), + saves, + language: Some(s(&j, "language")).filter(|l| !l.is_empty()).unwrap_or_else(|| "en-US".into()), + bridge: s(&j, "bridge"), + log: s(&j, "log"), + chunks: j.get("chunks").and_then(|v| v.as_array()).map(|a| a.iter().filter_map(|c| { + Some((c.get("id")?.as_u64()? as u32, c.get("tags").and_then(|t| t.as_str()).unwrap_or("").to_string())) + }).collect()).unwrap_or_default(), + products: j.get("products").and_then(|v| v.as_array()).map(|a| a.iter().filter_map(|p| { + Some((p.get("id")?.as_u64()? as u32, p.get("type").and_then(|t| t.as_u64()).unwrap_or(0) as u32)) + }).collect()).unwrap_or_default(), + }; + if c.exe.is_empty() || c.ticket.is_empty() { + return Err("config: exe and ticket are required".into()); + } + Ok(c) + } + + fn root(&self) -> String { + let mut r = self.workdir.replace('\\', "/"); + if !r.ends_with('/') { + r.push('/'); + } + r + } + + /// The executable the way Connect hands it back: the install root, a slash, then the path under it. + pub fn reply_exe(&self, requested: &str) -> String { + let root = self.root(); + let base = root.trim_end_matches('/'); + let exe = requested.replace('\\', "/"); + let rel = if !base.is_empty() && exe.to_lowercase().starts_with(&(base.to_lowercase() + "/")) { &exe[base.len() + 1..] } else { &exe[..] }; + format!("{root}/{rel}") + } + + /// `game_starter.Downstream` granting the start the starter asked for. + pub fn game_start(&self, request: &[u8]) -> Vec { + let requested = pb::find(request, 10, 4).map(|b| String::from_utf8_lossy(b).into_owned()).unwrap_or_else(|| self.exe.clone()); + let progress = Msg::new() + .msg(1, Msg::new().uint(1, 1).uint(2, 113).uint(3, 0).uint(4, 1).uint(5, 0)) + .msg(1, Msg::new().uint(1, 3).uint(2, 123).uint(3, 0).uint(4, 0).uint(5, 0)); + let granted = Msg::new() + .uint(1, 0) + .uint(2, 0) + .text(3, &self.reply_exe(&requested)) + .text(4, &self.root()) + .uint(8, 3) + .msg(9, progress); + Msg::new().msg(2, Msg::new().msg(1, granted)).0 + } + + /// `Chunks`: every installed chunk, marked downloaded. + fn chunks(&self) -> Msg { + let mut m = Msg::new(); + for (id, tags) in &self.chunks { + m = m.msg(1, Msg::new().uint(1, *id as u64).uint(2, 1).text(3, tags)); + } + m + } + + /// `Rsp.initProcessRsp` for the game announcing its process. The overlay is reported off + /// everywhere: with it on, `uplay_r1.dll` loads `overlay.dll` and fails its startup without it. + pub fn init_process(&self) -> Vec { + Msg::new().msg(13, Msg::new().uint(1, 1).uint(3, 0).uint(4, OVERLAY_NONE).uint(6, 0)).0 + } + + /// `Rsp.initRsp`: the account, its products and the PC ticket. + pub fn session(&self) -> Vec { + let account = Msg::new() + .text(1, &self.user_id) + .text(2, &self.username) + .text(3, &self.name_on_platform) + .text(4, &self.email) + .text(5, "") + .text(6, &self.country); + let mut body = Msg::new().uint(1, 1).msg(2, account).uint(3, 1).uint(4, self.product as u64); + for id in &self.owned { + body = body.uint(5, *id as u64); + } + body = body + .msg(6, Msg::new().uint(1, self.product as u64).text(2, "")) + .uint(7, 0) + .text(8, &self.ticket) + .msg(14, Msg::new().uint(1, 1).msg(2, self.chunks()).text(3, &self.language)) + .msg(11, Msg::new().uint(1, 0)) + .uint(12, 0) + .msg(15, Msg::new().uint(1, 0).uint(2, OVERLAY_NONE)) + .msg(16, Msg::new().uint(1, 6211).uint(2, 22395).float(3, 1.0)) + .msg(17, Msg::new().text(1, &self.saves)) + .bytes(18, b"") + .msg(19, Msg::new().uint(1, 1).uint(2, 1)) + .msg(21, Msg::new().uint(2, 1)); + if !self.app_id.is_empty() { + body = body.msg(22, Msg::new().text(1, &self.app_id)); + } + Msg::new().msg(1, body.bytes(23, b"")).0 + } + + /// `Rsp.installerRsp.initInstallerRsp`. + pub fn installer(&self) -> Vec { + Msg::new().msg(10, Msg::new().msg(1, Msg::new().uint(1, 1).msg(2, self.chunks()).text(3, &self.language))).0 + } + + /// `Rsp.productRsp.getProductListRsp`: every owned product as owned, playable and purchased. + pub fn product_list(&self, request_id: u64) -> Vec { + let mut list = Msg::new().uint(1, request_id).uint(2, 1); + let products: Vec<(u32, u32)> = if self.products.is_empty() { self.owned.iter().map(|id| (*id, 0)).collect() } else { self.products.clone() }; + for (id, kind) in products { + list = list.msg(3, Msg::new().uint(1, id as u64).uint(2, if kind == 1 { 2 } else { 1 }).uint(3, 1).uint(4, 3).uint(6, 1)); + } + Msg::new().msg(15, Msg::new().msg(1, list)).0 + } + + pub fn service_hello(&self) -> Vec { + Msg::new().msg(3, Msg::new().uint(1, 1).msg(3, Msg::new().text(1, HWSCORE))).0 + } +} + +/// Requests answered with only their id and a result: (`Req` field, its request) to (`Rsp` field, its +/// response, `OperationResult`). 1 is ok and 4 not found. +const ACKNOWLEDGED: &[(u32, u32, u32, u32, u64)] = &[ + (8, 1, 5, 1, 1), // achievements: list (none) + (8, 2, 5, 2, 4), // achievements: image + (8, 3, 5, 3, 1), // achievements: earn + (9, 1, 6, 1, 1), // overlay: show + (9, 2, 6, 2, 1), // overlay: shop url + (9, 4, 6, 3, 1), // overlay: browser url + (9, 5, 6, 4, 1), // overlay: notification + (9, 6, 6, 5, 1), // overlay: friend invitation + (9, 7, 6, 6, 1), // overlay: friend selection + (9, 8, 6, 8, 1), // overlay: micro app + (10, 1, 7, 1, 4), // avatar + (20, 1, 14, 1, 1), // store products (none) + (23, 3, 15, 5, 1), // track add-on + (25, 1, 17, 1, 4), // user lookup + (25, 3, 17, 3, 1), // rich presence + (25, 4, 17, 4, 1), // played with +]; + +/// The id-and-result answer to a request in [ACKNOWLEDGED], with a name for the log. +pub fn acknowledge(body: &[u8]) -> Option<(Vec, String)> { + let f = pb::fields(body)?; + for &(req, sub, rsp, rsp_sub, result) in ACKNOWLEDGED { + let Some(inner) = pb::sub(&f, req).and_then(pb::fields) else { continue }; + let Some(leaf) = pb::sub(&inner, sub).and_then(pb::fields) else { continue }; + let id = pb::num(&leaf, 1).unwrap_or(0); + let answer = Msg::new().msg(rsp, Msg::new().msg(rsp_sub, Msg::new().uint(1, id).uint(2, result))).0; + return Some((answer, format!("{req}.{sub} id {id} -> {result}"))); + } + None +} + +pub enum SessionReq { + Init, + Installer, + ProductList(u64), + Other, +} + +pub fn session_request(body: &[u8]) -> SessionReq { + match pb::fields(body) { + Some(f) if pb::sub(&f, 13).and_then(pb::fields).is_some_and(|i| pb::has(&i, 1)) => SessionReq::Installer, + Some(f) if pb::has(&f, 1) => SessionReq::Init, + Some(f) => match pb::sub(&f, 23).and_then(pb::fields).and_then(|p| pb::sub(&p, 1).and_then(pb::fields)) { + Some(list) => SessionReq::ProductList(pb::num(&list, 1).unwrap_or(0)), + None => SessionReq::Other, + }, + _ => SessionReq::Other, + } +} + +/// The product and game process the game announces on the api-process pipe. +pub fn announced(body: &[u8]) -> Option<(u32, u32)> { + let f = pb::fields(body)?; + let r = pb::fields(pb::sub(&f, 2)?)?; + Some((pb::num(&r, 1)? as u32, pb::num(&r, 2)? as u32)) +} + +pub enum AuxReq<'a> { + Init(u64), + Activate(u64, &'a [u8]), + Other(u64), +} + +/// `UplayAuxDll.Req`: an init, or an activation carrying the game's Denuvo request token. +pub fn aux_request(body: &[u8]) -> AuxReq<'_> { + let Some(f) = pb::fields(body) else { return AuxReq::Other(0) }; + let rid = pb::num(&f, 1).unwrap_or(0); + let Some(activate) = pb::sub(&f, 3) else { + return if pb::has(&f, 2) { AuxReq::Init(rid) } else { AuxReq::Other(rid) }; + }; + let token = pb::fields(activate) + .and_then(|a| pb::sub(&a, 2).and_then(pb::fields)) + .and_then(|t| t.iter().find_map(|(n, v)| match v { Value::Bytes(b) if *n == 2 => Some(*b), _ => None })); + match token { + Some(t) => AuxReq::Activate(rid, t), + None => AuxReq::Other(rid), + } +} + +pub fn aux_init(rid: u64, pid: u32) -> Vec { + let mut init = Msg::new().uint(1, 1).uint(2, pid as u64); + for a in AUX_ADDONS { + init = init.uint(3, a); + } + Msg::new().uint(1, rid).msg(2, init).0 +} + +pub fn aux_token(rid: u64, game_token: &[u8]) -> Vec { + let answer = Msg::new().uint(2, 1).uint(3, 0).bytes(4, game_token).bytes(5, b""); + Msg::new().uint(1, rid).msg(3, Msg::new().msg(2, answer)).0 +} + +#[cfg(test)] +mod tests { + use super::*; + + fn config() -> Config { + Config::parse(r#"{"productId":109,"exe":"Z:/games/sc/system/splintercell.exe","workdir":"Z:/games/sc","ticket":"T", + "account":{"userId":"u1","username":"name","nameOnPlatform":"name","email":"e@x","country":"US"}, + "owned":[82],"appId":"a-b","saves":"Z:/saves/u1/109","chunks":[{"id":0,"tags":""},{"id":64,"tags":"custo05"}]}"#).unwrap() + } + + #[test] + fn the_owned_list_always_holds_the_game_and_saves_end_with_a_slash() { + let c = config(); + assert_eq!(c.owned, vec![82, 109]); + assert_eq!(c.saves, "Z:/saves/u1/109/"); + } + + #[test] + fn the_start_reply_names_the_exe_under_the_root_with_connects_double_slash() { + let c = config(); + assert_eq!(c.reply_exe("Z:\\games\\sc\\system\\splintercell.exe"), "Z:/games/sc//system/splintercell.exe"); + let req = Msg::new().msg(1, Msg::new().msg(1, Msg::new().uint(1, 13389).uint(2, 109).text(10, "Z:/games/sc/system/splintercell.exe"))); + let rsp = c.game_start(&req.0); + let granted = pb::fields(pb::sub(&pb::fields(pb::sub(&pb::fields(&rsp).unwrap(), 2).unwrap()).unwrap(), 1).unwrap()).unwrap(); + assert_eq!(pb::num(&granted, 1), Some(0)); + assert_eq!(pb::sub(&granted, 3), Some(&b"Z:/games/sc//system/splintercell.exe"[..])); + assert_eq!(pb::sub(&granted, 4), Some(&b"Z:/games/sc/"[..])); + assert_eq!(pb::num(&granted, 8), Some(3)); + } + + #[test] + fn the_session_carries_the_ticket_products_and_save_root() { + let rsp = config().session(); + let init = pb::fields(pb::sub(&pb::fields(&rsp).unwrap(), 1).unwrap()).unwrap(); + assert_eq!(pb::num(&init, 1), Some(1)); + assert_eq!(pb::num(&init, 4), Some(109)); + let owned: Vec = init.iter().filter_map(|(n, v)| match v { Value::Int(x) if *n == 5 => Some(*x), _ => None }).collect(); + assert_eq!(owned, vec![82, 109]); + assert_eq!(pb::sub(&init, 8), Some(&b"T"[..])); + let saves = pb::fields(pb::sub(&init, 17).unwrap()).unwrap(); + assert_eq!(pb::sub(&saves, 1), Some(&b"Z:/saves/u1/109/"[..])); + let account = pb::fields(pb::sub(&init, 2).unwrap()).unwrap(); + assert_eq!(pb::sub(&account, 1), Some(&b"u1"[..])); + assert_eq!(pb::sub(&account, 5), Some(&b""[..])); + let install = pb::fields(pb::sub(&init, 14).unwrap()).unwrap(); + assert_eq!(pb::num(&install, 1), Some(1)); + let chunks = pb::fields(pb::sub(&install, 2).unwrap()).unwrap(); + let second = pb::fields(match &chunks[1].1 { Value::Bytes(b) => b, _ => panic!() }).unwrap(); + assert_eq!((pb::num(&second, 1), pb::num(&second, 2), pb::sub(&second, 3)), (Some(64), Some(1), Some(&b"custo05"[..]))); + } + + #[test] + fn requests_are_told_apart() { + assert!(matches!(session_request(&Msg::new().msg(1, Msg::new().uint(1, 109)).0), SessionReq::Init)); + assert!(matches!(session_request(&Msg::new().msg(13, Msg::new().bytes(1, b"")).0), SessionReq::Installer)); + assert!(matches!(session_request(&[0xba, 0x01, 0x06, 0x0a, 0x04, 0x08, 0x80, 0x80, 0x04]), SessionReq::ProductList(65536))); + let (answer, _) = acknowledge(&[0x42, 0x08, 0x0a, 0x06, 0x08, 0x80, 0x80, 0x08, 0x10, 0x00]).unwrap(); + let rsp = pb::fields(pb::sub(&pb::fields(pb::sub(&pb::fields(&answer).unwrap(), 5).unwrap()).unwrap(), 1).unwrap()).unwrap(); + assert_eq!((pb::num(&rsp, 1), pb::num(&rsp, 2)), (Some(0x20000), Some(1))); + assert!(acknowledge(&Msg::new().msg(1, Msg::new().uint(1, 1)).0).is_none()); + assert_eq!(announced(&Msg::new().msg(2, Msg::new().uint(1, 109).uint(2, 4242).uint(5, 1)).0), Some((109, 4242))); + let activate = Msg::new().uint(1, 2).msg(3, Msg::new().msg(2, Msg::new().bytes(2, b"challenge").uint(3, 0))); + assert!(matches!(aux_request(&activate.0), AuxReq::Activate(2, b"challenge"))); + assert!(matches!(aux_request(&Msg::new().uint(1, 1).msg(2, Msg::new().uint(1, 109)).0), AuxReq::Init(1))); + } +} diff --git a/tools/ubisoft-launcher/src/main.rs b/tools/ubisoft-launcher/src/main.rs new file mode 100644 index 0000000000..6677a4a071 --- /dev/null +++ b/tools/ubisoft-launcher/src/main.rs @@ -0,0 +1,331 @@ +//! Stands in for Ubisoft Connect on the local pipes a Ubisoft game talks to, and starts the game. +//! +//! Usage: droiddeck-upc.exe + +#![cfg_attr(windows, windows_subsystem = "windows")] + +mod launcher; +mod pb; +#[cfg(windows)] +mod win; + +#[cfg(not(windows))] +fn main() { + eprintln!("droiddeck-upc runs inside Wine"); + std::process::exit(2); +} + +#[cfg(windows)] +fn main() { + std::process::exit(service::run()); +} + +#[cfg(windows)] +mod service { + use crate::launcher::{self, AuxReq, Config, SessionReq}; + use crate::win::{self, Handle}; + use std::fs::OpenOptions; + use std::io::Write; + use std::path::PathBuf; + use std::sync::atomic::{AtomicU32, Ordering}; + use std::sync::{Arc, Mutex}; + use std::thread; + use std::time::{Duration, Instant}; + + const MAX_FRAME: usize = 16 << 20; + const ANNOUNCE_WAIT: Duration = Duration::from_secs(120); + const RESTART_WAIT: Duration = Duration::from_secs(15); + const DENUVO_WAIT: Duration = Duration::from_secs(90); + + struct State { + cfg: Config, + prefix: String, + log: Mutex>, + event: Handle, + game: AtomicU32, + started: Instant, + } + + impl State { + fn say(&self, line: &str) { + let text = format!("[{:7.2}] {line}\n", self.started.elapsed().as_secs_f32()); + eprint!("droiddeck-upc: {text}"); + if let Some(f) = self.log.lock().unwrap().as_mut() { + let _ = f.write_all(text.as_bytes()); + } + } + } + + struct Frames<'a> { + pipe: &'a Handle, + buf: Vec, + } + + impl<'a> Frames<'a> { + fn new(pipe: &'a Handle) -> Self { + Frames { pipe, buf: Vec::new() } + } + + fn fill(&mut self) -> bool { + let mut chunk = vec![0u8; 65536]; + match self.pipe.read(&mut chunk) { + Some(n) => { + self.buf.extend_from_slice(&chunk[..n]); + true + } + None => false, + } + } + + /// The next message without its 4-byte big-endian length. + fn next(&mut self) -> Option> { + while self.buf.len() < 4 { + if !self.fill() { + return None; + } + } + let n = u32::from_be_bytes(self.buf[..4].try_into().unwrap()) as usize; + if n > MAX_FRAME { + return None; + } + while self.buf.len() < 4 + n { + if !self.fill() { + return None; + } + } + let body = self.buf[4..4 + n].to_vec(); + self.buf.drain(..4 + n); + Some(body) + } + } + + fn send(pipe: &Handle, body: &[u8]) -> bool { + let mut framed = (body.len() as u32).to_be_bytes().to_vec(); + framed.extend_from_slice(body); + pipe.write_all(&framed) + } + + fn hold(state: &State, name: &str, frames: &mut Frames) { + while let Some(body) = frames.next() { + state.say(&format!("{name}: {} B left unanswered", body.len())); + } + } + + fn game_start(state: &State, pipe: Handle) { + let mut frames = Frames::new(&pipe); + let Some(req) = frames.next() else { return }; + send(&pipe, &state.cfg.game_start(&req)); + state.say("game_start: start granted"); + hold(state, "game_start", &mut frames); + } + + fn api_process(state: &State, pipe: Handle) { + let mut frames = Frames::new(&pipe); + let Some(req) = frames.next() else { return }; + match launcher::announced(&req) { + Some((product, pid)) => { + state.say(&format!("api_process: product {product} is process {pid}")); + if pid != 0 { + state.game.store(pid, Ordering::SeqCst); + } + } + None => state.say(&format!("api_process: {} B announcement not understood", req.len())), + } + send(&pipe, &state.cfg.init_process()); + state.event.set(); + hold(state, "api_process", &mut frames); + } + + fn session(state: &State, pipe: Handle) { + let mut frames = Frames::new(&pipe); + let mut pushes = 0; + while let Some(req) = frames.next() { + match launcher::session_request(&req) { + SessionReq::Init => { + pushes += 1; + send(&pipe, &state.cfg.session()); + state.say(&format!("session: init answered ({pushes})")); + } + SessionReq::Installer => { + send(&pipe, &state.cfg.installer()); + state.say("session: installer init answered"); + } + SessionReq::ProductList(id) => { + send(&pipe, &state.cfg.product_list(id)); + state.say(&format!("session: product list {id} answered")); + } + SessionReq::Other => match launcher::acknowledge(&req) { + Some((answer, what)) => { + send(&pipe, &answer); + state.say(&format!("session: {what}")); + } + None => state.say(&format!("session: {} B request {} not handled", req.len(), hex(&req, 24))), + }, + } + } + state.say("session: closed"); + } + + fn denuvo(state: &State, rid: u64, challenge: &[u8]) -> Option> { + if state.cfg.bridge.is_empty() { + return None; + } + let dir = PathBuf::from(&state.cfg.bridge); + let _ = std::fs::create_dir_all(&dir); + let rsp = dir.join(format!("denuvo-{rid}.rsp")); + let _ = std::fs::remove_file(&rsp); + let part = dir.join(format!("denuvo-{rid}.req.part")); + std::fs::write(&part, challenge).ok()?; + std::fs::rename(&part, dir.join(format!("denuvo-{rid}.req"))).ok()?; + let deadline = Instant::now() + DENUVO_WAIT; + while Instant::now() < deadline { + if let Ok(token) = std::fs::read(&rsp) { + let _ = std::fs::remove_file(&rsp); + return (!token.is_empty()).then_some(token); + } + thread::sleep(Duration::from_millis(200)); + } + None + } + + fn aux(state: &State, pipe: Handle) { + let mut frames = Frames::new(&pipe); + while let Some(req) = frames.next() { + match launcher::aux_request(&req) { + AuxReq::Init(rid) => { + send(&pipe, &launcher::aux_init(rid, win::pid())); + state.say("aux: init answered"); + } + AuxReq::Activate(rid, challenge) => { + state.say(&format!("aux: activation {rid} with a {} B challenge", challenge.len())); + match denuvo(state, rid, challenge) { + Some(token) => { + send(&pipe, &launcher::aux_token(rid, &token)); + state.say(&format!("aux: activation {rid} answered ({} B)", token.len())); + } + None => state.say(&format!("aux: no game token for activation {rid}")), + } + } + AuxReq::Other(rid) => state.say(&format!("aux: request {rid} not handled ({} B)", req.len())), + } + } + } + + fn service(state: &State, pipe: Handle) { + send(&pipe, &state.cfg.service_hello()); + let mut chunk = vec![0u8; 65536]; + while pipe.read(&mut chunk).is_some() {} + } + + fn quiet(state: &State, name: &str, pipe: Handle) { + state.say(&format!("{name}: connected")); + let mut chunk = vec![0u8; 65536]; + while let Some(n) = pipe.read(&mut chunk) { + state.say(&format!("{name}: {n} B unanswered {}", hex(&chunk[..n], 64))); + } + } + + fn serve(state: Arc, name: &'static str) { + thread::spawn(move || { + let full = format!("{}{name}", state.prefix); + loop { + let Some(pipe) = win::accept(&full) else { + state.say(&format!("{name}: cannot serve the pipe (error {})", win::last_error())); + return; + }; + let s = state.clone(); + thread::spawn(move || match name { + launcher::GAME_START => game_start(&s, pipe), + launcher::API_PROCESS => api_process(&s, pipe), + launcher::SESSION => session(&s, pipe), + launcher::AUX => aux(&s, pipe), + launcher::SERVICE => service(&s, pipe), + _ => quiet(&s, name, pipe), + }); + } + }); + } + + fn hex(b: &[u8], n: usize) -> String { + b.iter().take(n).map(|x| format!("{x:02x}")).collect() + } + + fn command_line(cfg: &Config) -> String { + let mut c = format!("\"{}\"", cfg.exe); + if !cfg.args.trim().is_empty() { + c.push(' '); + c.push_str(cfg.args.trim()); + } + c + } + + pub fn run() -> i32 { + let Some(path) = std::env::args().nth(1) else { + eprintln!("usage: droiddeck-upc "); + return 2; + }; + let parsed = std::fs::read_to_string(&path).map_err(|e| e.to_string()).and_then(|t| Config::parse(&t)); + let _ = std::fs::remove_file(&path); + let cfg = match parsed { + Ok(c) => c, + Err(e) => { + eprintln!("droiddeck-upc: {e}"); + return 2; + } + }; + let log = (!cfg.log.is_empty()).then(|| OpenOptions::new().create(true).append(true).open(&cfg.log).ok()).flatten(); + let state = Arc::new(State { + prefix: format!(r"\\.\pipe\terminal_{}_", win::session_id()), + cfg, + log: Mutex::new(log), + event: win::inheritable_event(), + game: AtomicU32::new(0), + started: Instant::now(), + }); + state.say(&format!("product {} on {}*", state.cfg.product, state.prefix)); + for name in [launcher::GAME_START, launcher::API_PROCESS, launcher::SESSION, launcher::AUX, launcher::SERVICE] + .into_iter() + .chain(launcher::QUIET.iter().copied()) + { + serve(state.clone(), name); + } + thread::sleep(Duration::from_millis(300)); + + let (child, pid) = match win::spawn(&command_line(&state.cfg), &state.cfg.workdir) { + Ok(c) => c, + Err(e) => { + state.say(&format!("cannot start {} (error {e})", state.cfg.exe)); + return 1; + } + }; + state.say(&format!("started {} as process {pid}", state.cfg.exe)); + while !child.wait(1000) {} + let mut code = child.exit_code(); + state.say(&format!("process {pid} exited with 0x{code:08x}")); + + let mut waiting = Instant::now(); + let mut limit = ANNOUNCE_WAIT; + loop { + let game = state.game.swap(0, Ordering::SeqCst); + if game != 0 { + match win::open_process(game) { + Some(h) => { + while !h.wait(1000) {} + code = h.exit_code(); + state.say(&format!("game process {game} exited with 0x{code:08x}")); + } + None => state.say(&format!("game process {game} is already gone")), + } + waiting = Instant::now(); + limit = RESTART_WAIT; + continue; + } + if waiting.elapsed() >= limit { + break; + } + thread::sleep(Duration::from_millis(500)); + } + state.say("done"); + code as i32 + } +} diff --git a/tools/ubisoft-launcher/src/pb.rs b/tools/ubisoft-launcher/src/pb.rs new file mode 100644 index 0000000000..d0ae27d160 --- /dev/null +++ b/tools/ubisoft-launcher/src/pb.rs @@ -0,0 +1,168 @@ +//! The protobuf wire format, enough to build and read the launcher messages by field number. + +pub fn varint(mut n: u64, out: &mut Vec) { + loop { + let b = (n & 0x7f) as u8; + n >>= 7; + if n == 0 { + out.push(b); + return; + } + out.push(b | 0x80); + } +} + +#[derive(Default, Clone)] +pub struct Msg(pub Vec); + +impl Msg { + pub fn new() -> Self { + Msg(Vec::new()) + } + + fn key(mut self, field: u32, wire: u8) -> Self { + varint(((field as u64) << 3) | wire as u64, &mut self.0); + self + } + + pub fn uint(self, field: u32, value: u64) -> Self { + let mut m = self.key(field, 0); + varint(value, &mut m.0); + m + } + + pub fn bytes(self, field: u32, value: &[u8]) -> Self { + let mut m = self.key(field, 2); + varint(value.len() as u64, &mut m.0); + m.0.extend_from_slice(value); + m + } + + pub fn text(self, field: u32, value: &str) -> Self { + self.bytes(field, value.as_bytes()) + } + + pub fn msg(self, field: u32, value: Msg) -> Self { + self.bytes(field, &value.0) + } + + pub fn float(self, field: u32, value: f32) -> Self { + let mut m = self.key(field, 5); + m.0.extend_from_slice(&value.to_le_bytes()); + m + } +} + +#[derive(Debug, Clone, PartialEq)] +pub enum Value<'a> { + Int(u64), + Bytes(&'a [u8]), +} + +fn read_varint(b: &[u8], i: &mut usize) -> Option { + let mut r = 0u64; + let mut shift = 0; + loop { + let c = *b.get(*i)?; + *i += 1; + if shift >= 64 { + return None; + } + r |= ((c & 0x7f) as u64) << shift; + if c & 0x80 == 0 { + return Some(r); + } + shift += 7; + } +} + +/// The top-level fields of a message, or `None` when it does not parse. +pub fn fields(b: &[u8]) -> Option)>> { + let mut out = Vec::new(); + let mut i = 0; + while i < b.len() { + let key = read_varint(b, &mut i)?; + let field = (key >> 3) as u32; + match key & 7 { + 0 => out.push((field, Value::Int(read_varint(b, &mut i)?))), + 1 => { + let v = b.get(i..i + 8)?; + i += 8; + out.push((field, Value::Int(u64::from_le_bytes(v.try_into().ok()?)))); + } + 2 => { + let n = read_varint(b, &mut i)? as usize; + let v = b.get(i..i.checked_add(n)?)?; + i += n; + out.push((field, Value::Bytes(v))); + } + 5 => { + let v = b.get(i..i + 4)?; + i += 4; + out.push((field, Value::Int(u32::from_le_bytes(v.try_into().ok()?) as u64))); + } + _ => return None, + } + } + Some(out) +} + +pub fn sub<'a>(f: &[(u32, Value<'a>)], field: u32) -> Option<&'a [u8]> { + f.iter().find_map(|(n, v)| match v { + Value::Bytes(b) if *n == field => Some(*b), + _ => None, + }) +} + +pub fn num(f: &[(u32, Value<'_>)], field: u32) -> Option { + f.iter().find_map(|(n, v)| match v { + Value::Int(x) if *n == field => Some(*x), + _ => None, + }) +} + +pub fn has(f: &[(u32, Value<'_>)], field: u32) -> bool { + f.iter().any(|(n, _)| *n == field) +} + +/// The first length-delimited `field` at any depth up to `depth`, searching breadth first. +pub fn find(b: &[u8], field: u32, depth: u32) -> Option<&[u8]> { + let f = fields(b)?; + if let Some(v) = sub(&f, field) { + return Some(v); + } + if depth == 0 { + return None; + } + f.iter().find_map(|(_, v)| match v { + Value::Bytes(inner) => find(inner, field, depth - 1), + _ => None, + }) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn round_trip() { + let m = Msg::new().uint(1, 300).text(2, "hi").msg(3, Msg::new().uint(4, 1)).float(5, 1.0); + let f = fields(&m.0).unwrap(); + assert_eq!(num(&f, 1), Some(300)); + assert_eq!(sub(&f, 2), Some(&b"hi"[..])); + assert_eq!(num(&fields(sub(&f, 3).unwrap()).unwrap(), 4), Some(1)); + assert_eq!(num(&f, 5), Some(0x3f80_0000)); + } + + #[test] + fn finds_nested_fields() { + let m = Msg::new().msg(1, Msg::new().msg(1, Msg::new().uint(2, 109).text(10, "C:/game.exe"))); + assert_eq!(find(&m.0, 10, 4), Some(&b"C:/game.exe"[..])); + assert_eq!(find(&m.0, 11, 4), None); + } + + #[test] + fn rejects_truncated_input() { + assert!(fields(&[0x0a, 0x05, 1, 2]).is_none()); + } +} diff --git a/tools/ubisoft-launcher/src/win.rs b/tools/ubisoft-launcher/src/win.rs new file mode 100644 index 0000000000..aa08c76a7f --- /dev/null +++ b/tools/ubisoft-launcher/src/win.rs @@ -0,0 +1,183 @@ +//! The handful of kernel32 calls the launcher needs. + +#![allow(non_snake_case, clippy::upper_case_acronyms)] + +use std::ffi::c_void; +use std::os::windows::ffi::OsStrExt; + +pub type HANDLE = *mut c_void; +pub const INVALID: HANDLE = -1isize as HANDLE; +const PIPE_ACCESS_DUPLEX: u32 = 3; +const PIPE_TYPE_BYTE: u32 = 0; +const PIPE_READMODE_BYTE: u32 = 0; +const PIPE_WAIT: u32 = 0; +const PIPE_UNLIMITED_INSTANCES: u32 = 255; +const ERROR_PIPE_CONNECTED: u32 = 535; +const HANDLE_FLAG_INHERIT: u32 = 1; +const SYNCHRONIZE: u32 = 0x0010_0000; +const PROCESS_QUERY_LIMITED_INFORMATION: u32 = 0x1000; +pub const WAIT_OBJECT_0: u32 = 0; +const BUFFER: u32 = 65536; + +#[repr(C)] +struct STARTUPINFOW { + cb: u32, + lpReserved: *mut u16, + lpDesktop: *mut u16, + lpTitle: *mut u16, + dwX: u32, + dwY: u32, + dwXSize: u32, + dwYSize: u32, + dwXCountChars: u32, + dwYCountChars: u32, + dwFillAttribute: u32, + dwFlags: u32, + wShowWindow: u16, + cbReserved2: u16, + lpReserved2: *mut u8, + hStdInput: HANDLE, + hStdOutput: HANDLE, + hStdError: HANDLE, +} + +#[repr(C)] +struct PROCESS_INFORMATION { + hProcess: HANDLE, + hThread: HANDLE, + dwProcessId: u32, + dwThreadId: u32, +} + +#[link(name = "kernel32")] +extern "system" { + fn CreateNamedPipeW(name: *const u16, open: u32, mode: u32, max: u32, out: u32, inp: u32, timeout: u32, sa: *mut c_void) -> HANDLE; + fn ConnectNamedPipe(h: HANDLE, ov: *mut c_void) -> i32; + fn ReadFile(h: HANDLE, buf: *mut u8, n: u32, read: *mut u32, ov: *mut c_void) -> i32; + fn WriteFile(h: HANDLE, buf: *const u8, n: u32, written: *mut u32, ov: *mut c_void) -> i32; + fn FlushFileBuffers(h: HANDLE) -> i32; + fn CloseHandle(h: HANDLE) -> i32; + fn GetLastError() -> u32; + fn CreateEventW(sa: *mut c_void, manual: i32, initial: i32, name: *const u16) -> HANDLE; + fn SetEvent(h: HANDLE) -> i32; + fn SetHandleInformation(h: HANDLE, mask: u32, flags: u32) -> i32; + fn CreateProcessW(app: *const u16, cmd: *mut u16, pa: *mut c_void, ta: *mut c_void, inherit: i32, flags: u32, + env: *mut c_void, cwd: *const u16, si: *mut STARTUPINFOW, pi: *mut PROCESS_INFORMATION) -> i32; + fn WaitForSingleObject(h: HANDLE, ms: u32) -> u32; + fn GetExitCodeProcess(h: HANDLE, code: *mut u32) -> i32; + fn OpenProcess(access: u32, inherit: i32, pid: u32) -> HANDLE; + fn ProcessIdToSessionId(pid: u32, session: *mut u32) -> i32; + fn GetCurrentProcessId() -> u32; +} + +pub fn wide(s: &str) -> Vec { + std::ffi::OsStr::new(s).encode_wide().chain(Some(0)).collect() +} + +pub fn last_error() -> u32 { + unsafe { GetLastError() } +} + +pub fn pid() -> u32 { + unsafe { GetCurrentProcessId() } +} + +pub fn session_id() -> u32 { + let mut s = 0; + if unsafe { ProcessIdToSessionId(GetCurrentProcessId(), &mut s) } == 0 { + return 1; + } + s +} + +pub struct Handle(pub HANDLE); +unsafe impl Send for Handle {} +unsafe impl Sync for Handle {} + +impl Drop for Handle { + fn drop(&mut self) { + if !self.0.is_null() && self.0 != INVALID { + unsafe { CloseHandle(self.0) }; + } + } +} + +impl Handle { + pub fn read(&self, buf: &mut [u8]) -> Option { + let mut n = 0u32; + let ok = unsafe { ReadFile(self.0, buf.as_mut_ptr(), buf.len() as u32, &mut n, std::ptr::null_mut()) }; + (ok != 0 && n > 0).then_some(n as usize) + } + + pub fn write_all(&self, mut data: &[u8]) -> bool { + while !data.is_empty() { + let mut n = 0u32; + if unsafe { WriteFile(self.0, data.as_ptr(), data.len() as u32, &mut n, std::ptr::null_mut()) } == 0 || n == 0 { + return false; + } + data = &data[n as usize..]; + } + unsafe { FlushFileBuffers(self.0) }; + true + } + + pub fn wait(&self, ms: u32) -> bool { + unsafe { WaitForSingleObject(self.0, ms) == WAIT_OBJECT_0 } + } + + pub fn exit_code(&self) -> u32 { + let mut c = 0; + unsafe { GetExitCodeProcess(self.0, &mut c) }; + c + } + + pub fn set(&self) { + unsafe { SetEvent(self.0) }; + } +} + +/// A new instance of the named pipe, waiting for its client; `None` when it cannot be created. +pub fn accept(name: &str) -> Option { + let w = wide(name); + let h = unsafe { + CreateNamedPipeW(w.as_ptr(), PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, + PIPE_UNLIMITED_INSTANCES, BUFFER, BUFFER, 0, std::ptr::null_mut()) + }; + if h == INVALID { + return None; + } + let pipe = Handle(h); + if unsafe { ConnectNamedPipe(h, std::ptr::null_mut()) } == 0 && last_error() != ERROR_PIPE_CONNECTED { + return None; + } + Some(pipe) +} + +/// An auto-reset event the started process inherits. +pub fn inheritable_event() -> Handle { + let h = unsafe { CreateEventW(std::ptr::null_mut(), 0, 0, std::ptr::null()) }; + unsafe { SetHandleInformation(h, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT) }; + Handle(h) +} + +pub fn spawn(command_line: &str, cwd: &str) -> Result<(Handle, u32), u32> { + let mut cmd = wide(command_line); + let dir = wide(cwd); + let mut si: STARTUPINFOW = unsafe { std::mem::zeroed() }; + si.cb = std::mem::size_of::() as u32; + let mut pi: PROCESS_INFORMATION = unsafe { std::mem::zeroed() }; + let ok = unsafe { + CreateProcessW(std::ptr::null(), cmd.as_mut_ptr(), std::ptr::null_mut(), std::ptr::null_mut(), 1, 0, + std::ptr::null_mut(), if cwd.is_empty() { std::ptr::null() } else { dir.as_ptr() }, &mut si, &mut pi) + }; + if ok == 0 { + return Err(last_error()); + } + drop(Handle(pi.hThread)); + Ok((Handle(pi.hProcess), pi.dwProcessId)) +} + +pub fn open_process(pid: u32) -> Option { + let h = unsafe { OpenProcess(SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION, 0, pid) }; + (!h.is_null()).then(|| Handle(h)) +} From 055e2ec78fc2cc9f6215e1ed25906ff9ee7a281e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 10 Nov 2026 16:10:42 -0500 Subject: [PATCH 003/101] Fix Electron Node mode sandbox injection (#2418) * Fix Electron Node mode sandbox injection * fix(preload): treat any nonempty ELECTRON_RUN_AS_NODE as Electron Node mode --- tools/linuxfs/preload/binfmt.c | 19 +++++++--- tools/linuxfs/preload/net.c | 12 +++--- tools/linuxfs/preload/webhelper.c | 12 +++++- tools/tests/test_binfmt_preload.py | 33 +++++++++++++++-- tools/tests/test_webhelper_preload.py | 53 +++++++++++++++++++++++++-- 5 files changed, 111 insertions(+), 18 deletions(-) diff --git a/tools/linuxfs/preload/binfmt.c b/tools/linuxfs/preload/binfmt.c index eb912efe11..dbe2977265 100644 --- a/tools/linuxfs/preload/binfmt.c +++ b/tools/linuxfs/preload/binfmt.c @@ -18,6 +18,8 @@ typedef int (*spawn_fn)(pid_t *, const char *, const posix_spawn_file_actions_t *, const posix_spawnattr_t *, char *const[], char *const[]); +__attribute__((visibility("hidden"))) +char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]); #if defined(__aarch64__) || defined(BINFMT_TEST) @@ -141,21 +143,26 @@ __attribute__((visibility("hidden"))) int bl_binfmt_spawn(pid_t *pid, const char } int execvpe(const char *file, char *const argv[], char *const envp[]) { + char resolved[PATH_MAX]; + const char *path = lookup(file, resolved, sizeof resolved) ? resolved : file; + char *const *adjusted = bl_webhelper_argv(path, argv, envp); static int (*real)(const char *, char *const[], char *const[]); if (!real) real = (int (*)(const char *, char *const[], char *const[]))dlsym(RTLD_NEXT, "execvpe"); - bl_binfmt_before_search(file, argv, envp); - real(file, argv, envp); - return bl_binfmt_after_search(file, argv, envp, errno); + bl_binfmt_before_search(file, (char *const *)adjusted, envp); + real(file, (char *const *)adjusted, envp); + return bl_binfmt_after_search(file, (char *const *)adjusted, envp, errno); } int posix_spawnp(pid_t *pid, const char *file, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *attr, char *const argv[], char *const envp[]) { + char path[PATH_MAX]; + int found = lookup(file, path, sizeof path); + char *const *adjusted = bl_webhelper_argv(found ? path : file, argv, envp); static spawn_fn real, spawn; if (!real) real = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawnp"); if (!spawn) spawn = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawn"); - char path[PATH_MAX]; - if (!handing_off() || !lookup(file, path, sizeof path)) return real(pid, file, fa, attr, argv, envp); - return bl_binfmt_spawn(pid, path, fa, attr, argv, envp, spawn); + if (!handing_off() || !found) return real(pid, file, fa, attr, (char *const *)adjusted, envp); + return bl_binfmt_spawn(pid, path, fa, attr, (char *const *)adjusted, envp, spawn); } #else diff --git a/tools/linuxfs/preload/net.c b/tools/linuxfs/preload/net.c index 4946db7f9c..e45ed9c5c0 100644 --- a/tools/linuxfs/preload/net.c +++ b/tools/linuxfs/preload/net.c @@ -271,7 +271,8 @@ __attribute__((visibility("hidden"))) void bl_binfmt_before(const char *path, ch __attribute__((visibility("hidden"))) int bl_binfmt_retry(const char *path, char *const argv[], char *const envp[], int error); __attribute__((visibility("hidden"))) void bl_binfmt_before_search(const char *file, char *const argv[], char *const envp[]); __attribute__((visibility("hidden"))) int bl_binfmt_after_search(const char *file, char *const argv[], char *const envp[], int error); -__attribute__((visibility("hidden"))) char *const *bl_webhelper_argv(const char *path, char *const argv[]); +__attribute__((visibility("hidden"))) +char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]); __attribute__((visibility("hidden"))) int bl_binfmt_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *attr, char *const argv[], char *const envp[], spawn_fn real); @@ -341,7 +342,7 @@ static char **web_helper_redirect(const char *path, char *const argv[], const ch } int execve(const char *path, char *const argv_in[], char *const envp[]) { - char *const *argv = bl_webhelper_argv(path, argv_in); + char *const *argv = bl_webhelper_argv(path, argv_in, envp); static int (*real)(const char *, char *const[], char *const[]); if (!real) real = (int (*)(const char *, char *const[], char *const[]))dlsym(RTLD_NEXT, "execve"); maybe_answer_lsof(path, argv); @@ -372,7 +373,7 @@ static int answer_lsof_via_spawn(const char *path, char *const argv[], pid_t *pi } int execvp(const char *file, char *const argv_in[]) { - char *const *argv = bl_webhelper_argv(file, argv_in); + char *const *argv = bl_webhelper_argv(file, argv_in, environ); static int (*real)(const char *, char *const[]); if (!real) real = (int (*)(const char *, char *const[]))dlsym(RTLD_NEXT, "execvp"); maybe_answer_lsof(file, argv); @@ -382,7 +383,7 @@ int execvp(const char *file, char *const argv_in[]) { } int execv(const char *path, char *const argv_in[]) { - char *const *argv = bl_webhelper_argv(path, argv_in); + char *const *argv = bl_webhelper_argv(path, argv_in, environ); static int (*real)(const char *, char *const[]); if (!real) real = (int (*)(const char *, char *const[]))dlsym(RTLD_NEXT, "execv"); maybe_answer_lsof(path, argv); @@ -406,5 +407,6 @@ int posix_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t * } static spawn_fn real; if (!real) real = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawn"); - return bl_binfmt_spawn(pid, path, fa, attr, argv, envp, real); + char *const *adjusted = bl_webhelper_argv(path, argv, envp); + return bl_binfmt_spawn(pid, path, fa, attr, (char *const *)adjusted, envp, real); } diff --git a/tools/linuxfs/preload/webhelper.c b/tools/linuxfs/preload/webhelper.c index 9494872797..7642a34632 100644 --- a/tools/linuxfs/preload/webhelper.c +++ b/tools/linuxfs/preload/webhelper.c @@ -26,6 +26,14 @@ static char *join_features(const char *have, const char *add) { return strcat(out, add); } +static int electron_node_mode(char *const envp[]) { + static const char variable[] = "ELECTRON_RUN_AS_NODE="; + for (int i = 0; envp && envp[i]; i++) + if (!strncmp(envp[i], variable, sizeof variable - 1)) + return envp[i][sizeof variable - 1] != 0; + return 0; +} + static char *const *chromium_argv(const char *path, char *const argv[]) { const char *slash = path ? strrchr(path, '/') : NULL; if (!slash || !argv || !argv[0]) return argv; @@ -48,7 +56,9 @@ static char *const *chromium_argv(const char *path, char *const argv[]) { return out; } -__attribute__((visibility("hidden"))) char *const *bl_webhelper_argv(const char *path, char *const argv[]) { +__attribute__((visibility("hidden"))) +char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]) { + if (electron_node_mode(envp)) return argv; if (!is_webhelper_browser(path, argv)) return chromium_argv(path, argv); const char *spec = getenv("BL_WEBHELPER_ARGS"); if (!spec || !*spec) spec = WEBHELPER_DEFAULT; diff --git a/tools/tests/test_binfmt_preload.py b/tools/tests/test_binfmt_preload.py index 8314d39e40..9966b28505 100644 --- a/tools/tests/test_binfmt_preload.py +++ b/tools/tests/test_binfmt_preload.py @@ -22,22 +22,29 @@ extern char **environ; int main(int argc, char **argv) { if (argc < 3) return 2; const char *how = argv[1], *file = argv[2]; + char *node_env[] = {"ELECTRON_RUN_AS_NODE=1", NULL}; + char *const *child_env = !strcmp(how, "execve-node") || !strcmp(how, "execvpe-node") || + !strcmp(how, "spawn-node") || !strcmp(how, "spawnp-node") ? node_env : environ; char **args = argv + 2; if (!strcmp(how, "access")) { int result = access(file, X_OK); printf("access %d %d\n", result, result ? errno : 0); return 0; } - if (!strcmp(how, "spawn") || !strcmp(how, "spawnp")) { + if (!strcmp(how, "spawn") || !strcmp(how, "spawnp") || !strcmp(how, "spawn-node") || + !strcmp(how, "spawnp-node")) { pid_t pid; - int error = how[5] ? posix_spawnp(&pid, file, NULL, NULL, args, environ) : posix_spawn(&pid, file, NULL, NULL, args, environ); + int spawnp = !strcmp(how, "spawnp") || !strcmp(how, "spawnp-node"); + int error = spawnp ? posix_spawnp(&pid, file, NULL, NULL, args, child_env) + : posix_spawn(&pid, file, NULL, NULL, args, child_env); if (error) { printf("errno %d\n", error); return 3; } int status; waitpid(pid, &status, 0); printf("exit %d\n", WEXITSTATUS(status)); return 0; } - if (!strcmp(how, "execve")) execve(file, args, environ); + if (!strcmp(how, "execve") || !strcmp(how, "execve-node")) execve(file, args, (char *const *)child_env); + else if (!strcmp(how, "execvpe-node")) execvpe(file, args, (char *const *)child_env); else if (!strcmp(how, "execv")) execv(file, args); else if (!strcmp(how, "execvp")) execvp(file, args); else if (!strcmp(how, "execvpe")) execvpe(file, args, environ); @@ -88,6 +95,15 @@ class BinfmtPreloadTest(unittest.TestCase): path.chmod(mode) return path + def chromium_script(self): + folder = self.dir / "vscode" + folder.mkdir() + executable = folder / "code" + executable.write_text("#!/bin/sh\nprintf '%s\\n' \"$@\"\n") + executable.chmod(0o755) + (folder / "chrome-sandbox").touch() + return executable + def environment(self, desktop=True, **extra): env = {"PATH": "%s:/usr/bin:/bin" % self.dir, "LD_PRELOAD": str(self.library), "HANDLER_LOG": str(self.log)} if desktop: @@ -161,6 +177,17 @@ class BinfmtPreloadTest(unittest.TestCase): self.file("script.sh", b"#!/bin/sh\nexit 5\n") self.assertEqual(self.run_program("spawnp", "script.sh"), (0, "exit 5", None)) + def test_explicit_node_child_environment_skips_injection_for_execve_and_spawn(self): + code = self.chromium_script() + self.assertEqual(self.run_program("execve-node", code, "--version"), (0, "--version", None)) + self.assertEqual(self.run_program("execvpe-node", code, "--version"), (0, "--version", None)) + self.assertEqual(self.run_program("spawn-node", code, "--version"), (0, "--version\nexit 0", None)) + self.assertEqual(self.run_program("spawnp-node", code, "--version"), (0, "--version\nexit 0", None)) + + def test_chromium_gui_launch_without_node_mode_still_receives_no_sandbox(self): + code = self.chromium_script() + self.assertEqual(self.run_program("execve", code, "--version"), (0, "--no-sandbox\n--version", None)) + def test_the_hand_off_switch_works_without_the_desktop(self): tool = self.x86() for how in ("execve", "execvp"): diff --git a/tools/tests/test_webhelper_preload.py b/tools/tests/test_webhelper_preload.py index 7c49e1d765..a7476945ce 100644 --- a/tools/tests/test_webhelper_preload.py +++ b/tools/tests/test_webhelper_preload.py @@ -9,9 +9,16 @@ PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" PROGRAM = r""" #include -char *const *bl_webhelper_argv(const char *path, char *const argv[]); +#include +char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]); int main(int argc, char **argv) { - char *const *out = bl_webhelper_argv(argv[1], argv + 1); + const char *mode = getenv("TEST_NODE_MODE_CHILD"); + static char node[64]; + snprintf(node, sizeof node, "ELECTRON_RUN_AS_NODE=%s", mode ? mode : ""); + char *node_env[] = {node, NULL}; + char *plain_env[] = {"PATH=/usr/bin", NULL}; + char *const *envp = mode ? node_env : plain_env; + char *const *out = bl_webhelper_argv(argv[1], argv + 1, (char *const *)envp); for (int i = 0; out[i]; i++) printf("%s\n", out[i]); return 0; } @@ -35,13 +42,28 @@ class WebhelperPreloadTest(unittest.TestCase): def tearDownClass(cls): shutil.rmtree(cls.tmp, ignore_errors=True) - def argv(self, *args, spec=None): + def argv(self, *args, spec=None, node_child=False, parent_node=False): env = {k: v for k, v in os.environ.items() if k != "BL_WEBHELPER_ARGS"} + env.pop("ELECTRON_RUN_AS_NODE", None) if spec is not None: env["BL_WEBHELPER_ARGS"] = spec + if node_child is not False: + env["TEST_NODE_MODE_CHILD"] = "1" if node_child is True else node_child + else: + env.pop("TEST_NODE_MODE_CHILD", None) + if parent_node: + env["ELECTRON_RUN_AS_NODE"] = "1" result = subprocess.run([str(self.program), *args], env=env, capture_output=True, text=True, check=True) return result.stdout.splitlines() + def chromium(self, directory, name): + root = self.tmp / directory + root.mkdir(exist_ok=True) + executable = root / name + executable.touch() + (root / "chrome-sandbox").touch() + return str(executable) + def test_the_browser_process_keeps_its_helpers_in_process(self): out = self.argv(WEBHELPER, "-lang=en_US", "--enable-features=A", "--no-sandbox", "--disable-features=B,C") self.assertEqual(out, [WEBHELPER, "-lang=en_US", "--no-sandbox", "--no-zygote", "--in-process-gpu", @@ -57,6 +79,31 @@ class WebhelperPreloadTest(unittest.TestCase): other = ["/usr/bin/steam", "--enable-features=A"] self.assertEqual(self.argv(*other), other) + def test_node_mode_from_the_child_environment_skips_sandbox_injection(self): + code = self.chromium("vscode", "code") + self.assertEqual(self.argv(code, node_child=True), [code]) + + def test_any_nonempty_node_mode_value_skips_sandbox_injection(self): + code = self.chromium("vscode-true", "code") + for value in ("true", "0", "yes"): + self.assertEqual(self.argv(code, node_child=value), [code]) + + def test_empty_node_mode_value_still_gets_sandbox_flag(self): + chrome = self.chromium("chromium-empty-mode", "chrome") + self.assertEqual(self.argv(chrome, node_child=""), [chrome, "--no-sandbox"]) + + def test_non_browser_helper_beside_chrome_sandbox_skips_injection_in_node_mode(self): + helper = self.chromium("vscode-helper", "remote-cli") + self.assertEqual(self.argv(helper, node_child=True), [helper]) + + def test_chromium_gui_launch_still_gets_sandbox_flag_from_explicit_environment(self): + chrome = self.chromium("chromium", "chrome") + self.assertEqual(self.argv(chrome), [chrome, "--no-sandbox"]) + + def test_parent_node_mode_does_not_override_the_explicit_child_environment(self): + chrome = self.chromium("chromium-parent-mode", "chrome") + self.assertEqual(self.argv(chrome, parent_node=True), [chrome, "--no-sandbox"]) + def test_stock_turns_it_off(self): args = [WEBHELPER, "--enable-features=A"] self.assertEqual(self.argv(*args, spec="stock"), args) From dd9363e5f2bb90bfb6840f348718ea2a501d9f20 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 10 Nov 2026 16:33:41 -0500 Subject: [PATCH 004/101] fix: ship the Ubisoft launcher service as an add-on pack, scan only the standard APK on main (#2436) * fix: ship the Ubisoft launcher service as an add-on pack, not inside the APK * fix: treat the Ubisoft service as a packed tree, stage it when its pack lands * fix: serialize staging of the Ubisoft service --- .github/workflows/build.yml | 1 + .github/workflows/publish-packs.yml | 2 +- .github/workflows/scan.yml | 6 +++- app/build.gradle | 4 +-- .../main/java/com/droiddeck/launcher/App.kt | 2 ++ .../com/droiddeck/launcher/core/AddonPack.kt | 2 ++ .../launcher/session/SessionFiles.kt | 33 ++++++++++++++++++- .../launcher/stores/ubisoft/UbisoftAuth.kt | 1 + tools/packs/build.sh | 1 + tools/release/runtime_inputs.py | 10 +++--- tools/tests/test_runtime_inputs.py | 10 ++++++ 11 files changed, 63 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 97a659744d..510946aa18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -900,6 +900,7 @@ jobs: uses: ./.github/workflows/scan.yml with: artifact: droiddeck-signed + variant: standard secrets: inherit packs: diff --git a/.github/workflows/publish-packs.yml b/.github/workflows/publish-packs.yml index ca61616d18..53e26f4ed8 100644 --- a/.github/workflows/publish-packs.yml +++ b/.github/workflows/publish-packs.yml @@ -55,7 +55,7 @@ jobs: jq -r --arg n "$2" '.assets // [] | .[] | select(.name == $n) | .digest // empty' } commit=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$BUILD_RUN" --jq .head_sha 2>/dev/null || echo "$GITHUB_SHA") - for name in proot directaudio tracking xbox comet butler powervr; do + for name in proot directaudio tracking xbox comet butler powervr ubisoft; do file="packs/$name.tar.zst" [ -f "$file" ] || { echo "::error::$name.tar.zst is missing from Build APK run $BUILD_RUN"; exit 1; } sha=$(sha256sum "$file" | cut -d' ' -f1) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 408983955b..9790f40c7b 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -7,6 +7,10 @@ on: description: Prefix of the signed artifacts to scan, as passed to sign.yml type: string required: true + variant: + description: Variant to scan, as listed in tools/release/variants.txt; every variant when omitted + type: string + default: '*' fail_on_detection: type: boolean default: false @@ -27,7 +31,7 @@ jobs: - uses: actions/download-artifact@v4 with: - pattern: ${{ inputs.artifact }}-* + pattern: ${{ inputs.artifact }}-${{ inputs.variant }} merge-multiple: true path: scan diff --git a/app/build.gradle b/app/build.gradle index c87e70938f..28bf184e32 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,7 +93,7 @@ def trackingPack = rootProject.file('tools/packs/tracking/release.env').readLine def prootPackPin = rootProject.file('tools/packs/proot/release.env').readLines() .findAll { it.contains('=') && !it.startsWith('#') } .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] } -def addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr'].collectEntries { name -> +def addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr', 'ubisoft'].collectEntries { name -> def pack = file("build/packs/${name}.tar.zst") if (!pack.isFile()) { if (ciBuild) throw new GradleException("Add-on pack ${pack} is missing: run tools/packs/build.sh app/build/packs") @@ -205,7 +205,7 @@ android { } androidResources { - ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~:droiddeck-xbox:droiddeck-comet:directaudio:hybris' + ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~:droiddeck-xbox:droiddeck-comet:droiddeck-ubisoft:directaudio:hybris' } packagingOptions { diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 2137828dd7..be81fc6960 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -77,6 +77,8 @@ class App : Application() { if (com.droiddeck.launcher.stores.gog.GogComet.enabled(app)) com.droiddeck.launcher.core.AddonPack.COMET.ensure(app) if (com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, com.droiddeck.launcher.stores.Store.XBOX) != null) com.droiddeck.launcher.core.AddonPack.XBOX.ensure(app) + if (com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, com.droiddeck.launcher.stores.Store.UBISOFT) != null) + com.droiddeck.launcher.session.SessionFiles.ensureUbisoftService(app) com.droiddeck.launcher.handtracking.HandTracking.load(app) }.onFailure { android.util.Log.w("App", "add-on pack prefetch failed", it) } }, "addon-packs").start() diff --git a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt index 4f88d90e34..d3d5cf2c74 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt @@ -152,5 +152,7 @@ internal class AddonPack( @JvmField val POWERVR = AddonPack("powervr", BuildConfig.PACK_POWERVR_SHA256, BuildConfig.PACK_POWERVR_SIZE, listOf("runtime.tzst", "version.txt")) + val UBISOFT = AddonPack("ubisoft", BuildConfig.PACK_UBISOFT_SHA256, BuildConfig.PACK_UBISOFT_SIZE, + listOf("droiddeck-upc.exe")) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 1984f8c93c..3ade0b497e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -33,6 +33,37 @@ object SessionFiles { "etc/xdg/autostart/droiddeck-clipboard.desktop" to "etc/xdg/autostart/droiddeck-clipboard.desktop", ) + private const val UBISOFT_SERVICE = "usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe" + + /** Fetches the Ubisoft pack and, once it lands, stages the service so a running session gets it without restarting. */ + fun ensureUbisoftService(context: Context) { + AddonPack.UBISOFT.ensure(context) { app -> + com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app).takeIf { it.isDirectory } + ?.let { stageUbisoftService(app, it, null) } + } + } + + @Synchronized + private fun stageUbisoftService(context: Context, root: File, ledger: StageLedger?) { + val pack = AddonPack.UBISOFT.takeIf { it.installed(context) }?.dir(context) ?: return + val target = File(root, UBISOFT_SERVICE) + if (ledger?.current(UBISOFT_SERVICE, target) == true) return + val staged = File(target.parentFile, target.name + ".staged") + var installed = false + try { + target.parentFile?.mkdirs() + File(pack, "droiddeck-upc.exe").inputStream().use { input -> + staged.outputStream().use { output -> FileUtils.copy(input, output) } + } + installed = staged.setExecutable(true, false) && staged.renameTo(target) + } catch (e: Exception) { + Log.w(TAG, "could not stage the Ubisoft launcher service", e) + } finally { + if (!installed) staged.delete() + } + if (installed) ledger?.staged(UBISOFT_SERVICE, target) else Log.e(TAG, "$UBISOFT_SERVICE NOT staged") + } + fun stage(context: Context, root: File, startsSession: Boolean = false) { if (DesktopCatalog.desktopInstalled(root) && !DesktopCatalog.desktopFromPack(root)) try { DesktopCatalog.cleanLegacy(context) } catch (e: Exception) { Log.w(TAG, "LXQt cleanup will retry next session", e) } @@ -196,7 +227,6 @@ object SessionFiles { "usr/local/lib/droiddeck-pipewire.tzst" to "usr/local/lib/droiddeck-pipewire.tzst", "usr/local/share/licenses/uruntime/LICENSE" to "usr/local/share/licenses/uruntime/LICENSE", "usr/local/lib/droiddeck-dirt/ws2_32.dll" to "usr/local/lib/droiddeck-dirt/ws2_32.dll", - "usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe" to "usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe", ) + mangoapp + xclipse.map { it to it } + maliCompat + msitools.map { it to it } + vr + gpuLoad + fexPreloads).filter { (asset, _) -> val dir = asset.substringBeforeLast('/') runCatching { context.assets.list("linuxfs/$dir")?.contains(asset.substringAfterLast('/')) == true }.getOrDefault(false) @@ -252,6 +282,7 @@ object SessionFiles { } if (installed) ledger.staged(key, target) else Log.e(TAG, "DirectAudio $set/$relative NOT staged") } + stageUbisoftService(context, root, ledger) ledger.save() for (old in arrayOf("aarch64-unix", "aarch64-windows", "i386-windows")) File(root, "$DIRECTAUDIO_DIR/lib/wine/$old").deleteRecursively() val preload = StringBuilder("/usr/local/lib/libblsession.so\n") diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt index 5de002dade..f1cf2ea84d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt @@ -132,6 +132,7 @@ object UbisoftAuth { } ?: remember.takeIf { it.isNotEmpty() }?.let { rm -> parseSession(session("rm_v1 t=$rm").body, rm) } ?: return "no ticket" save(context, fresh) + com.droiddeck.launcher.session.SessionFiles.ensureUbisoftService(context) return null } diff --git a/tools/packs/build.sh b/tools/packs/build.sh index 7b7e7e76fd..4ea6a41932 100755 --- a/tools/packs/build.sh +++ b/tools/packs/build.sh @@ -77,6 +77,7 @@ pack tracking "$work/tracking" hand_landmarker.task hand_landmarker_lite.task po pack xbox "$linuxfs/droiddeck-xbox" version xodus-cli xodus-service pack comet "$linuxfs/droiddeck-comet" version comet pack powervr "$repo/app/src/main/assets/hybris" runtime.tzst version.txt +[ ! -f "$linuxfs/droiddeck-ubisoft/droiddeck-upc.exe" ] || pack ubisoft "$linuxfs/droiddeck-ubisoft" droiddeck-upc.exe mkdir "$work/butler" fetch "https://broth.itch.zone/butler/linux-arm64/${BUTLER_VERSION}/archive/default" \ diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 806c49f79e..5afaae5f61 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -14,15 +14,16 @@ ROOT = Path(__file__).resolve().parents[2] MANIFEST = Path('app/build/runtime-inputs.json') PACKS = Path('app/build/packs') PACKED = {'assets/linuxfs/usr/local/lib/droiddeck-xbox/': 'xbox', 'assets/linuxfs/usr/local/lib/droiddeck-comet/': 'comet', + 'assets/linuxfs/usr/local/lib/droiddeck-ubisoft/': 'ubisoft', 'assets/directaudio/': 'directaudio', 'assets/hybris/': 'powervr'} PACKED_FILES = {'lib/arm64-v8a/libproot.so': ('proot', 'libproot.so'), 'lib/arm64-v8a/libproot-loader.so': ('proot', 'libproot-loader.so')} PACKED_LIBRARIES = ['lib/arm64-v8a/libopencv_java4.so', 'lib/arm64-v8a/libmediapipe_tasks_jni.so'] -PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr'] +PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr', 'ubisoft'] SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', - 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/components', 'tools/ci', 'tools/build_local.sh', + 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/ubisoft-launcher', 'tools/components', 'tools/ci', 'tools/build_local.sh', 'tools/powervr', 'tools/hybris', 'tools/dxvk', 'tools/vulkan-wsi', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', 'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh', @@ -211,7 +212,8 @@ def pack_digests(root, name): def check_apk(apk, root=ROOT): data = verify(root) - packs = {name: pack_digests(root, name) for name in PACK_NAMES} + packs = {name: pack_digests(root, name) for name in PACK_NAMES + if name != 'ubisoft' or (root / PACKS / 'ubisoft.tar.zst').is_file()} with ZipFile(apk) as package: names = set(package.namelist()) for library in PACKED_LIBRARIES: @@ -231,7 +233,7 @@ def check_apk(apk, root=ROOT): if prefix: if name in names: raise ValueError('APK still carries ' + name + ', which the ' + PACKED[prefix] + ' pack provides') - if packs[PACKED[prefix]].get(name[len(prefix):]) != output['sha256']: + if packs.get(PACKED[prefix], {}).get(name[len(prefix):]) != output['sha256']: raise ValueError('Add-on pack ' + PACKED[prefix] + ' is missing or has a stale ' + name) continue try: diff --git a/tools/tests/test_runtime_inputs.py b/tools/tests/test_runtime_inputs.py index 60c0fc9920..906bef4c2f 100644 --- a/tools/tests/test_runtime_inputs.py +++ b/tools/tests/test_runtime_inputs.py @@ -33,6 +33,9 @@ class RuntimeInputsTest(unittest.TestCase): self.source = self.root / 'tools/linuxfs/preload/test.c' self.source.parent.mkdir(parents=True) self.source.write_text('current source') + service = self.root / 'app/src/main/assets/linuxfs/usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe' + service.parent.mkdir(parents=True) + service.write_bytes(b'MZ service') self.audio(['pactl', 'modules/arm64/module-aaudio-sink.so', 'modules/arm64/module-directaudio-native-sink.so']) self.packs() @@ -179,6 +182,13 @@ class RuntimeInputsTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, 'xbox pack provides'): runtime.check_apk(apk, self.root) + def test_an_apk_still_carrying_the_ubisoft_service_is_rejected(self): + name = 'assets/linuxfs/usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe' + self.assertIn(name, runtime.outputs(self.root)) + apk = self.current_apk(self.root / 'bundled.apk', {name: b'MZ service'}) + with self.assertRaisesRegex(ValueError, 'ubisoft pack provides'): + runtime.check_apk(apk, self.root) + def test_an_apk_still_carrying_the_powervr_runtime_is_rejected(self): apk = self.current_apk(self.root / 'bundled.apk', {'assets/hybris/runtime.tzst': b'runtime'}) with self.assertRaisesRegex(ValueError, 'powervr pack provides'): From e4b2526d2c3f8cc424f612125df1d3a38183ad52 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Tue, 10 Nov 2026 18:39:13 -0500 Subject: [PATCH 005/101] chore(ci): trust contributor for test builds (#2443) --- .github/trusted-test-builds.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/trusted-test-builds.txt b/.github/trusted-test-builds.txt index 8f7b0148c5..ca03f6d9a3 100644 --- a/.github/trusted-test-builds.txt +++ b/.github/trusted-test-builds.txt @@ -1,5 +1,6 @@ ASEbrahim FX192 K11MCH1 +KeegantheVeganat0r kingokksa ovurrsl From 0c79a742c414242a5b3076f2f335edb19a991f57 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 10 Nov 2026 20:30:11 -0500 Subject: [PATCH 006/101] fix(game-env): keep the x64 Visual C++ runtime in ARM64 prefixes (#2442) --- .../linuxfs/overlay/usr/local/bin/droiddeck-wine-pe | 9 +++++++++ tools/tests/test_game_environment.py | 11 +++++++++++ tools/tests/test_wincomponents.py | 12 ++++++++++++ 3 files changed, 32 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-wine-pe b/tools/linuxfs/overlay/usr/local/bin/droiddeck-wine-pe index 7034bf3013..65c3446a2a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-wine-pe +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-wine-pe @@ -1,4 +1,5 @@ #!/usr/bin/python3 +import re from pathlib import Path @@ -75,8 +76,16 @@ def pe_has_arm64ec_metadata(path): return False +# Only x64 code and members of the same runtime family import these, so an x64 copy loads in an +# ARM64EC prefix, and games check for a newer version than Wine's builtins report. +VC_RUNTIME = re.compile(r"(msvc[pr]\d.*|vcruntime\d.*|vcomp\d*|vcamp\d.*|vccorlib\d.*|concrt\d.*|mfcm?\d.*)\.dll", + re.IGNORECASE) + + def machine_compatible(path, machines, machine=None): machine = pe_machine(path) if machine is None else machine + if machine == 0x8664 and 0xA641 in machines and VC_RUNTIME.fullmatch(Path(path).name): + return True if machine == 0x8664 and pe_has_arm64ec_metadata(path): return 0xA641 in machines return machine in machines diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index b1cdcedad9..d6cb49582e 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -2738,6 +2738,17 @@ class ForeignSystemDllTest(unittest.TestCase): self.assertFalse((system32 / "ucrtbase.dll").is_symlink()) self.assertEqual(0x8664, MODULE["pe_machine"](system32 / "userlib.dll")) + def test_x64_visual_cpp_runtime_in_arm64_system32_is_kept(self): + with tempfile.TemporaryDirectory() as tmp: + proton, compat, windows = self.prefix(tmp) + builtins = proton.parent / "files/lib/wine/aarch64-windows" + for name in ("msvcp140.dll", "VCRUNTIME140.dll", "msvcp_win.dll"): + (builtins / name.lower()).write_bytes(pe_image(0xAA64)) + (windows / "system32" / name).write_bytes(pe_image(0x8664)) + self.assertEqual(["system32/msvcp_win.dll (machine 0x8664)"], self.run_repair(compat, proton)) + self.assertFalse((windows / "system32/msvcp140.dll").is_symlink()) + self.assertFalse((windows / "system32/VCRUNTIME140.dll").is_symlink()) + def test_final_arm64ec_image_is_not_repaired_as_a_foreign_x64_dll(self): with tempfile.TemporaryDirectory() as tmp: proton, compat, windows = self.prefix(tmp) diff --git a/tools/tests/test_wincomponents.py b/tools/tests/test_wincomponents.py index e6ad95e2d6..7423fb2bbf 100644 --- a/tools/tests/test_wincomponents.py +++ b/tools/tests/test_wincomponents.py @@ -92,6 +92,18 @@ class WinComponentsTest(unittest.TestCase): self.assertEqual(names, ["ucrtbase"]) self.assertEqual(MODULE["pe_machine"](self.pfx / "system32/ucrtbase.dll"), 0x8664) + def test_x64_visual_cpp_runtime_is_placed_in_arm64_system32(self): + proton = self.proton() + self.component("vc", ["msvcp140", "vcruntime140_1"], { + "system32/msvcp140.dll": self.pe_image(0x8664), + "system32/vcruntime140_1.dll": self.pe_image(0x8664), + }) + self.pick("vc") + names, _ = self.apply(proton) + self.assertEqual(names, ["msvcp140", "vcruntime140_1"]) + self.assertEqual(MODULE["pe_machine"](self.pfx / "system32/msvcp140.dll"), 0x8664) + self.assertEqual(MODULE["pe_machine"](self.pfx / "system32/vcruntime140_1.dll"), 0x8664) + def test_compatible_copy_keeps_override_when_other_architecture_copy_is_skipped(self): proton = self.proton() self.component("vc", ["ucrtbase"], { From 2aeff3bd9be4ad2b989ccdd49d17fff4403fb0a2 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 10 Nov 2026 20:57:42 -0500 Subject: [PATCH 007/101] chore: CodeRabbit reviews draft PRs (#2447) --- .coderabbit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coderabbit.yaml b/.coderabbit.yaml index ef66d13d74..c83ae0e95d 100644 --- a/.coderabbit.yaml +++ b/.coderabbit.yaml @@ -18,7 +18,7 @@ reviews: enabled: true auto_incremental_review: true auto_pause_after_reviewed_commits: 0 - drafts: false + drafts: true pre_merge_checks: docstrings: mode: "off" From 45ef6b7d1a29192bca1d502d79aafb5f7940248a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 07:44:59 -0500 Subject: [PATCH 008/101] chore(ci): trust KeegantheVeganat0r for automatic test builds (#2434) --- .github/trusted-test-builds.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/trusted-test-builds.txt b/.github/trusted-test-builds.txt index ca03f6d9a3..fa4cff1104 100644 --- a/.github/trusted-test-builds.txt +++ b/.github/trusted-test-builds.txt @@ -4,3 +4,4 @@ K11MCH1 KeegantheVeganat0r kingokksa ovurrsl +KeegantheVeganat0r From b1a410ccd2ca3baf89f2d3edd938ccdad063866a Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Wed, 11 Nov 2026 21:49:18 +0900 Subject: [PATCH 009/101] fix(ubisoft): answer Orbit, login and process-only check-ins (#2460) --- docs/development/ubisoft-launch.md | 15 ++-- tools/ubisoft-launcher/src/launcher.rs | 98 ++++++++++++++++++++++---- tools/ubisoft-launcher/src/main.rs | 35 +++++++-- tools/ubisoft-launcher/src/win.rs | 6 ++ 4 files changed, 131 insertions(+), 23 deletions(-) diff --git a/docs/development/ubisoft-launch.md b/docs/development/ubisoft-launch.md index 0fb49d23bc..f7321f4d72 100644 --- a/docs/development/ubisoft-launch.md +++ b/docs/development/ubisoft-launch.md @@ -33,11 +33,12 @@ followed by a proto2 message, except on `uplay_service_ipc_pipe_`. | Pipe | Client | Exchange | |---|---|---| | `game_start_ipc_pipe_` | `UbisoftGameLauncher.exe` | `game_starter.Upstream{1:{1:{1: build, 2: product, 10: exe, 11: arguments, ...}}}` → `Downstream{2:{1:{1:0 (overlay off), 2:0, 3: / + "/" + , 4: /, 8:3, 9:{1:{1,113,0,1,0} 1:{3,123,0,0,0}}}}}` | -| `uplay_api_process_ipc_pipe_` | game | `Req.initProcessReq{1: product, 2: game pid, 5: env set}` → `Rsp.initProcessRsp(13){1:1, 3:0 (overlay off), 4:3, 6:0}`. Kept open. Answering it is what releases the starter (below) | -| `uplay_ipc_pipe_` | game (`uplay_r1.dll`) | `Req.initReq(1)` → `Rsp.initRsp(1)`, answered every time it is asked. `Req.installerReq(13)` with `initInstallerReq` → `Rsp.installerRsp(10){1:{1:1, 2:"", 3: language}}` | +| `uplay_api_process_ipc_pipe_` | game | `Req.initProcessReq{1: product, 2: game pid, 5: env set}` → `Rsp.initProcessRsp(13){1:1, 3:0 (overlay off), 4:3, 6:0}`. Kept open. Answering it is what releases the starter (below). Far Cry 3 Blood Dragon sends only `{2: pid, 5:1}`; a missing pid is taken from the pipe's client process | +| `uplay_ipc_pipe_` | game (`uplay_r1.dll`) | `Req.initReq(1)` → `Rsp.initRsp(1)`, answered every time it is asked. `Req.installerReq(13)` with `initInstallerReq` → `Rsp.installerRsp(10){1:{1:1, 2:"", 3: language}}`. `Req.userReq(11).getCredentialsReq(1){1: id}` → `Rsp.userRsp(8).getCredentialsRsp(1){1: id, 2: username, 3: "" (password), 4: userId, 5: email}` | | `uplay_aux_ipc_pipe_` | `uplay_aux_r1(64).dll` (Denuvo) | `{1: rid, 2: init}` → `{1: rid, 2:{1:1, 2: pid, 3:3367, 3:3368, 3:3962}}`; `{1: rid, 3:{2:{2: challenge}}}` → `{1: rid, 3:{2:{2:1, 3:0, 4: game token, 5:""}}}` | | `uplay_service_ipc_pipe_` | Ubisoft helpers | Server sends `{3:{1:1, 3:{1: }}}` once, then only reads, unframed | -| `upc_api_process_ipc_pipe_standard`, `uplay_protocol_ipc_pipe_`, `uplay_overlay_ipc_pipe_`, `orbit_ipc_pipe_`, `uplay_crash_reporter_ipc_pipe_` | — | Held open, never answered | +| `orbit_ipc_pipe_` | game (`ubiorbitapi_r2.dll`) | `mg.protocol.orbitdll` from the DLL's own `proto_orbitdll/OrbitDll.proto`. `Req{1: id, 12: init{1: product}}` → `Rsp{1: id, 12:{1: save folder, 2:1}}`; `getLoginDetails(2)` → `{1: username, 2:"", 3:""}`; `getOsi(3){1: sub}` → `{2:1}` (failed, no online-services pipe) | +| `upc_api_process_ipc_pipe_standard`, `uplay_protocol_ipc_pipe_`, `uplay_overlay_ipc_pipe_`, `uplay_crash_reporter_ipc_pipe_` | — | Held open, never answered | ### The session (`InitRsp`) @@ -60,6 +61,12 @@ runtime folder right after the session arrives, whatever the session says; witho with `UplayAPI [ERROR]: Startup failed: cannot load uplay library` (Assassin's Creed Chronicles: China then sits on a black screen and aborts with code 3 after about 160 s), so the runtime includes it. +### Orbit titles + +Older titles such as Far Cry 3 Blood Dragon (205) load `ubiorbitapi_r2.dll` next to `uplay_r1.dll` and ask +`orbit_ipc_pipe_` for `init` before anything else; unanswered, the game waits forever on a black screen. The DLL +keeps savegames itself as `*.save` files in the folder `init` returns, the same save folder as field 17 above. + ## Start sequence 1. `droiddeck-upc.exe` creates the pipes and an auto-reset event marked inheritable, then starts the @@ -86,5 +93,5 @@ titles without Denuvo never open the aux pipe. - R2 (`UPC_*`) titles use `uplay_r2.dll`; their pipe traffic has not been captured, so whether the same server answers them is unverified. -- Orbit (`ubiorbitapi_r2`) titles. +- Orbit's online-services pipe (`getOsi` is declined) and Orbit titles other than Far Cry 3 Blood Dragon. - Achievements, friends, overlay, cloud saves. diff --git a/tools/ubisoft-launcher/src/launcher.rs b/tools/ubisoft-launcher/src/launcher.rs index c58a69c8cf..3d5fcac4c5 100644 --- a/tools/ubisoft-launcher/src/launcher.rs +++ b/tools/ubisoft-launcher/src/launcher.rs @@ -11,14 +11,16 @@ pub const API_PROCESS: &str = "uplay_api_process_ipc_pipe_"; pub const SESSION: &str = "uplay_ipc_pipe_"; pub const AUX: &str = "uplay_aux_ipc_pipe_"; pub const SERVICE: &str = "uplay_service_ipc_pipe_"; +pub const ORBIT: &str = "orbit_ipc_pipe_"; /// Pipes Connect creates that the game may open; they are held open without answers. pub const QUIET: &[&str] = &[ "upc_api_process_ipc_pipe_standard", "uplay_protocol_ipc_pipe_", "uplay_overlay_ipc_pipe_", - "orbit_ipc_pipe_", "uplay_crash_reporter_ipc_pipe_", ]; +/// `GetOsiRsp.Status.Failed`: no online-services pipe is offered. +const OSI_FAILED: u64 = 1; /// The add-on list Connect returns from the aux init; the game echoes it back. const AUX_ADDONS: [u64; 3] = [3367, 3368, 3962]; /// `OverlayInjectionMethod_None`. @@ -175,6 +177,12 @@ impl Config { Msg::new().msg(1, body.bytes(23, b"")).0 } + /// `Rsp.userRsp.getCredentialsRsp`: the account without its password, which DroidDeck never holds. + pub fn credentials(&self, request_id: u64) -> Vec { + let rsp = Msg::new().uint(1, request_id).text(2, &self.username).text(3, "").text(4, &self.user_id).text(5, &self.email); + Msg::new().msg(8, Msg::new().msg(1, rsp)).0 + } + /// `Rsp.installerRsp.initInstallerRsp`. pub fn installer(&self) -> Vec { Msg::new().msg(10, Msg::new().msg(1, Msg::new().uint(1, 1).msg(2, self.chunks()).text(3, &self.language))).0 @@ -193,6 +201,26 @@ impl Config { pub fn service_hello(&self) -> Vec { Msg::new().msg(3, Msg::new().uint(1, 1).msg(3, Msg::new().text(1, HWSCORE))).0 } + + /// `mg.protocol.orbitdll.Rsp`. The DLL keeps its own `*.save` files in the folder `init` returns. + pub fn orbit(&self, body: &[u8]) -> Option<(Vec, String)> { + let f = pb::fields(body)?; + let id = pb::num(&f, 1)?; + let rsp = Msg::new().uint(1, id); + if let Some(init) = pb::sub(&f, 12) { + let product = pb::fields(init).and_then(|i| pb::num(&i, 1)).unwrap_or(0); + return Some((rsp.msg(12, Msg::new().text(1, &self.saves).uint(2, 1)).0, format!("init {id} for {product} answered"))); + } + if pb::has(&f, 2) { + let login = Msg::new().text(1, &self.username).text(2, "").text(3, ""); + return Some((rsp.msg(2, login).0, format!("login details {id} answered"))); + } + if let Some(osi) = pb::sub(&f, 3) { + let sub = pb::fields(osi).and_then(|o| pb::num(&o, 1)).unwrap_or(0); + return Some((rsp.msg(3, Msg::new().uint(2, OSI_FAILED)).0, format!("osi {id} for {sub} declined"))); + } + None + } } /// Requests answered with only their id and a result: (`Req` field, its request) to (`Rsp` field, its @@ -233,26 +261,33 @@ pub enum SessionReq { Init, Installer, ProductList(u64), + Credentials(u64), Other, } pub fn session_request(body: &[u8]) -> SessionReq { - match pb::fields(body) { - Some(f) if pb::sub(&f, 13).and_then(pb::fields).is_some_and(|i| pb::has(&i, 1)) => SessionReq::Installer, - Some(f) if pb::has(&f, 1) => SessionReq::Init, - Some(f) => match pb::sub(&f, 23).and_then(pb::fields).and_then(|p| pb::sub(&p, 1).and_then(pb::fields)) { - Some(list) => SessionReq::ProductList(pb::num(&list, 1).unwrap_or(0)), - None => SessionReq::Other, - }, - _ => SessionReq::Other, + let Some(f) = pb::fields(body) else { return SessionReq::Other }; + let leaf = |req, sub| pb::sub(&f, req).and_then(pb::fields).and_then(|r| pb::sub(&r, sub).and_then(pb::fields)); + if pb::sub(&f, 13).and_then(pb::fields).is_some_and(|i| pb::has(&i, 1)) { + SessionReq::Installer + } else if pb::has(&f, 1) { + SessionReq::Init + } else if let Some(get) = leaf(11, 1) { + SessionReq::Credentials(pb::num(&get, 1).unwrap_or(0)) + } else if let Some(list) = leaf(23, 1) { + SessionReq::ProductList(pb::num(&list, 1).unwrap_or(0)) + } else { + SessionReq::Other } } -/// The product and game process the game announces on the api-process pipe. -pub fn announced(body: &[u8]) -> Option<(u32, u32)> { +/// The product and game process announced on the api-process pipe, each when the game names it +/// (Far Cry 3 Blood Dragon sends only its process). +pub fn announced(body: &[u8]) -> Option<(Option, Option)> { let f = pb::fields(body)?; let r = pb::fields(pb::sub(&f, 2)?)?; - Some((pb::num(&r, 1)? as u32, pb::num(&r, 2)? as u32)) + let named = |n| pb::num(&r, n).map(|v| v as u32).filter(|v| *v != 0); + Some((named(1), named(2))) } pub enum AuxReq<'a> { @@ -350,9 +385,46 @@ mod tests { let rsp = pb::fields(pb::sub(&pb::fields(pb::sub(&pb::fields(&answer).unwrap(), 5).unwrap()).unwrap(), 1).unwrap()).unwrap(); assert_eq!((pb::num(&rsp, 1), pb::num(&rsp, 2)), (Some(0x20000), Some(1))); assert!(acknowledge(&Msg::new().msg(1, Msg::new().uint(1, 1)).0).is_none()); - assert_eq!(announced(&Msg::new().msg(2, Msg::new().uint(1, 109).uint(2, 4242).uint(5, 1)).0), Some((109, 4242))); + assert_eq!(announced(&Msg::new().msg(2, Msg::new().uint(1, 109).uint(2, 4242).uint(5, 1)).0), Some((Some(109), Some(4242)))); + assert_eq!(announced(&[0x12, 0x05, 0x10, 0x88, 0x04, 0x28, 0x01]), Some((None, Some(520)))); + assert!(matches!(session_request(&[0x5a, 0x04, 0x0a, 0x02, 0x08, 0x00]), SessionReq::Credentials(0))); let activate = Msg::new().uint(1, 2).msg(3, Msg::new().msg(2, Msg::new().bytes(2, b"challenge").uint(3, 0))); assert!(matches!(aux_request(&activate.0), AuxReq::Activate(2, b"challenge"))); assert!(matches!(aux_request(&Msg::new().uint(1, 1).msg(2, Msg::new().uint(1, 109)).0), AuxReq::Init(1))); } + + #[test] + fn orbit_init_answers_with_the_save_folder() { + let (rsp, what) = config().orbit(&[0x08, 0x01, 0x62, 0x03, 0x08, 0xcd, 0x01]).unwrap(); + assert_eq!(what, "init 1 for 205 answered"); + let f = pb::fields(&rsp).unwrap(); + assert_eq!(pb::num(&f, 1), Some(1)); + let init = pb::fields(pb::sub(&f, 12).unwrap()).unwrap(); + assert_eq!(pb::sub(&init, 1), Some(&b"Z:/saves/u1/109/"[..])); + assert_eq!(pb::num(&init, 2), Some(1)); + } + + #[test] + fn orbit_login_details_carry_no_password_and_osi_is_declined() { + let c = config(); + let (rsp, _) = c.orbit(&Msg::new().uint(1, 2).bytes(2, b"").0).unwrap(); + let f = pb::fields(&rsp).unwrap(); + let login = pb::fields(pb::sub(&f, 2).unwrap()).unwrap(); + assert_eq!((pb::sub(&login, 1), pb::sub(&login, 2), pb::sub(&login, 3)), (Some(&b"name"[..]), Some(&b""[..]), Some(&b""[..]))); + let (rsp, what) = c.orbit(&Msg::new().uint(1, 3).msg(3, Msg::new().uint(1, 7)).0).unwrap(); + assert_eq!(what, "osi 3 for 7 declined"); + let osi = pb::fields(pb::sub(&pb::fields(&rsp).unwrap(), 3).unwrap()).unwrap(); + assert_eq!((pb::num(&osi, 2), pb::has(&osi, 1)), (Some(OSI_FAILED), false)); + assert!(c.orbit(&Msg::new().uint(1, 4).0).is_none()); + } + + #[test] + fn credentials_name_the_account_without_a_password() { + let rsp = config().credentials(7); + let user = pb::fields(pb::sub(&pb::fields(&rsp).unwrap(), 8).unwrap()).unwrap(); + let get = pb::fields(pb::sub(&user, 1).unwrap()).unwrap(); + assert_eq!(pb::num(&get, 1), Some(7)); + assert_eq!((pb::sub(&get, 2), pb::sub(&get, 3), pb::sub(&get, 4), pb::sub(&get, 5)), + (Some(&b"name"[..]), Some(&b""[..]), Some(&b"u1"[..]), Some(&b"e@x"[..]))); + } } diff --git a/tools/ubisoft-launcher/src/main.rs b/tools/ubisoft-launcher/src/main.rs index 6677a4a071..425522e638 100644 --- a/tools/ubisoft-launcher/src/main.rs +++ b/tools/ubisoft-launcher/src/main.rs @@ -123,13 +123,17 @@ mod service { let mut frames = Frames::new(&pipe); let Some(req) = frames.next() else { return }; match launcher::announced(&req) { - Some((product, pid)) => { - state.say(&format!("api_process: product {product} is process {pid}")); - if pid != 0 { - state.game.store(pid, Ordering::SeqCst); + Some((product, named)) => { + let product = product.unwrap_or(state.cfg.product); + match named.or_else(|| pipe.client_pid()) { + Some(pid) => { + state.say(&format!("api_process: product {product} is process {pid}")); + state.game.store(pid, Ordering::SeqCst); + } + None => state.say(&format!("api_process: product {product} named no process")), } } - None => state.say(&format!("api_process: {} B announcement not understood", req.len())), + None => state.say(&format!("api_process: {} B announcement not understood {}", req.len(), hex(&req, 32))), } send(&pipe, &state.cfg.init_process()); state.event.set(); @@ -150,6 +154,10 @@ mod service { send(&pipe, &state.cfg.installer()); state.say("session: installer init answered"); } + SessionReq::Credentials(id) => { + send(&pipe, &state.cfg.credentials(id)); + state.say(&format!("session: credentials {id} answered")); + } SessionReq::ProductList(id) => { send(&pipe, &state.cfg.product_list(id)); state.say(&format!("session: product list {id} answered")); @@ -217,6 +225,20 @@ mod service { while pipe.read(&mut chunk).is_some() {} } + fn orbit(state: &State, pipe: Handle) { + let mut frames = Frames::new(&pipe); + while let Some(req) = frames.next() { + match state.cfg.orbit(&req) { + Some((answer, what)) => { + send(&pipe, &answer); + state.say(&format!("orbit: {what}")); + } + None => state.say(&format!("orbit: {} B request {} not handled", req.len(), hex(&req, 24))), + } + } + state.say("orbit: closed"); + } + fn quiet(state: &State, name: &str, pipe: Handle) { state.say(&format!("{name}: connected")); let mut chunk = vec![0u8; 65536]; @@ -240,6 +262,7 @@ mod service { launcher::SESSION => session(&s, pipe), launcher::AUX => aux(&s, pipe), launcher::SERVICE => service(&s, pipe), + launcher::ORBIT => orbit(&s, pipe), _ => quiet(&s, name, pipe), }); } @@ -283,7 +306,7 @@ mod service { started: Instant::now(), }); state.say(&format!("product {} on {}*", state.cfg.product, state.prefix)); - for name in [launcher::GAME_START, launcher::API_PROCESS, launcher::SESSION, launcher::AUX, launcher::SERVICE] + for name in [launcher::GAME_START, launcher::API_PROCESS, launcher::SESSION, launcher::AUX, launcher::SERVICE, launcher::ORBIT] .into_iter() .chain(launcher::QUIET.iter().copied()) { diff --git a/tools/ubisoft-launcher/src/win.rs b/tools/ubisoft-launcher/src/win.rs index aa08c76a7f..e6953f46d1 100644 --- a/tools/ubisoft-launcher/src/win.rs +++ b/tools/ubisoft-launcher/src/win.rs @@ -67,6 +67,7 @@ extern "system" { fn GetExitCodeProcess(h: HANDLE, code: *mut u32) -> i32; fn OpenProcess(access: u32, inherit: i32, pid: u32) -> HANDLE; fn ProcessIdToSessionId(pid: u32, session: *mut u32) -> i32; + fn GetNamedPipeClientProcessId(pipe: HANDLE, pid: *mut u32) -> i32; fn GetCurrentProcessId() -> u32; } @@ -134,6 +135,11 @@ impl Handle { pub fn set(&self) { unsafe { SetEvent(self.0) }; } + + pub fn client_pid(&self) -> Option { + let mut pid = 0; + (unsafe { GetNamedPipeClientProcessId(self.0, &mut pid) } != 0 && pid != 0).then_some(pid) + } } /// A new instance of the named pipe, waiting for its client; `None` when it cannot be created. From 2848484a99686bb89fbd0201ffba7f4ef267d0c4 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 09:13:17 -0500 Subject: [PATCH 010/101] feat: fuck proot and proots mama (#2300) * feat: experimental native userland that runs the Linux side without proot * fix(native): keep the visible name of link2symlink binaries * fix(ci): run the native hook build through bash * fix(native): address review findings in the hook and the ctl fallback * fix(ctl): use the broadcast fallback only when content is missing * fix(native): survive Android's seccomp filter in ld.so, libc and posix_spawn children * docs(native): how to test under Android's seccomp filter * fix(session): hide an unlistable /sys/bus/pci/devices so libpci does not abort Chromium's GPU init * fix(native): nested syscall() redirects no longer loop with libblsession's openat2 * fix(native): controllers reach Steam and the install-script evaluator no longer blocks game moves * fix(native): write the hook's NUL character literals as escapes * fix(native): proot fast path turns off and greys out while running without proot * fix(native): D-Bus logins work and Xwayland still admits root once peers read as root * fix(native): scripts on session mounts outside the rootfs run with the rootfs shell * fix(native): games on the SD card library start in their own folder * fix(native): Wine drive links proot made point at their real places * fix(native): at-calls, uid lookups and relative programs follow the session's mounts * fix(native): close-from in spawned programs covers what is open at the spawn * fix(native): service names resolve and the DNS fallback answers what was asked * build(native): the hook is built with its Go support and tracked by the preload recipe * fix(native): drive links into identity mounts stay, and relink and seccomp patch failures are logged * fix(native): seccomp-sim's filter holds every allowed call * fix(ctl): the broadcast fallback only stands in for a missing content command * fix(native): pre-2.33 glibc stat calls present owners as root too * fix(native): res_init and res_ninit call glibc, so Steam's store resolves names * fix(ci): a preload lock older than a new output rebuilds that group, and generated headers are not hashed * fix(native): a second seccomp patch run leaves other system calls alone * fix(native): the terminal and bottom desktop keep proot's environment in a native session * fix(native): any number of session mounts, and openat2 relative to a mounted folder * fix(agent): a native command's stdin is written beside its timeout * fix(ctl): native rejects --env without = and timeouts outside 0-600 s * fix(native): the resolver fallback has the network's IPv6 servers, and lookups keep the fallback's validation errors * fix(native): a spawn whose dup2 source close-from closed fails with EBADF * fix(native): __getcwd_chk checks its buffer, and seccomp-sim -a takes only call numbers * feat(native): guests see the session hostname from uname and gethostname * feat(native): the terminal and bottom desktop run without proot * fix(components): an origin APK without a newer preload output still proves the rest * fix(native): seccomp-sim -a rejects empty fields * fix(native): gethostbyname no longer answers failed lookups with Ubuntu and Debian addresses * feat(native): store installers, root helpers, Comet and Xodus run without proot * fix(native): the hook finds libraries, preloads and itself through a sandbox's mounts, and ldconfig -C makes its cache * feat(native): Flatpak sandboxes run without proot, and apply_extra runs without a runtime * fix(native): remove, glob and nftw take guest paths, and links in a mount are followed as the guest sees them * fix(native): Flatpak sandboxes get the session's mounts, their libraries' RUNPATHs, and no rootfs-only settings * fix(native): gethostbyname asks the network's DNS servers, nftw of / gives single slashes, and the library path fits mapped directories * fix(native): a native process starts in its working directory's real place * fix(native): the library path given to ld.so holds whole directories only * fix(native): Wine drive links keep their guest paths, so proot finds the library after a native session * fix(native): droiddeckctl native prepares the rootfs with the setting off * fix(native): a SysV segment stays while any process has it attached * fix(native): DNS lookups ask the network's own servers before public ones * fix(native): a program's own seccomp traps reach its own SIGSYS handler * feat(native): run native sessions under a device's own app seccomp filter for testing * fix(native): SysV attaches and collection take a lock, a failed mark fails the attach, and collection closes its directory * fix(native): shmat fails when it cannot take the segment lock * fix(native): the SysV segment lock is retried when a signal interrupts it * fix(native): process tools see the session's processes as root's * fix(native): native processes are named after their program, not ld.so * fix(native): a session's helpers keep the mode the session started in * fix(native): a keyed SysV segment stays until IPC_RMID * fix(native): a rootfs link to an absolute guest path is followed in the guest, so Wine finds its z: drive * fix(native): a sandbox whose loader can't be patched runs under proot * fix(native): creating a private SysV segment also collects stale ones * fix(native): a session stopped during startup forgets its mode * fix(xbox): a native backend is authorized by its process ancestry * fix(native): Wine's drive links are followed in the guest from any prefix * fix(native): only the startup that owns the running session publishes its mode * fix(native): a SysV segment stays until IPC_RMID even after its maker ends * fix(native): a sandbox mount nested in another mount gets its own place * fix(native): a sandbox whose mount places can't be made runs under proot --- .github/workflows/build.yml | 1 + app/src/main/cpp/fakeinput_steam.cpp | 10 +- .../droiddeck/launcher/FrontEndActivity.kt | 5 +- .../launcher/agent/AgentBridgeProvider.kt | 4 + .../droiddeck/launcher/agent/AgentNative.kt | 65 + .../droiddeck/launcher/core/DeviceReport.kt | 1 + .../launcher/runtime/BwrapSpawner.kt | 226 +++- .../droiddeck/launcher/runtime/ElfRunpath.kt | 72 ++ .../launcher/runtime/ElfSeccompPatch.kt | 85 ++ .../launcher/runtime/GuestCommand.kt | 39 +- .../launcher/runtime/LinuxRuntime.java | 17 +- .../droiddeck/launcher/runtime/NativeGuest.kt | 269 ++++ .../launcher/runtime/ProotFastPath.kt | 9 +- .../droiddeck/launcher/runtime/RootSpawner.kt | 34 +- .../launcher/session/BottomDesktop.kt | 16 +- .../launcher/session/ProtonExtras.kt | 22 +- .../launcher/session/SessionFiles.kt | 5 + .../launcher/session/SessionPrefs.kt | 6 + .../launcher/session/SessionService.kt | 55 +- .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/stores/gog/GogComet.kt | 24 +- .../launcher/stores/xbox/XboxCredentials.kt | 23 +- .../droiddeck/launcher/stores/xbox/Xodus.kt | 9 +- .../launcher/ui/PerformanceDialog.kt | 17 +- app/src/main/res/values/strings.xml | 3 + .../launcher/runtime/BwrapSpawnerTest.kt | 20 + .../launcher/runtime/ElfSeccompPatchTest.kt | 53 + .../launcher/runtime/NativeGuestTest.kt | 99 ++ .../launcher/runtime/ProotFastPathTest.kt | 4 + tools/build_local.sh | 1 + tools/components/build-arm64-preloads.sh | 1 + tools/components/preloads.py | 23 +- tools/components/recipes.json | 12 +- tools/droiddeckctl | 37 +- .../overlay/usr/local/bin/droiddeck-game-env | 4 + tools/linuxfs/preload/tracer.c | 5 +- tools/nativeguest/LICENSE | 202 +++ tools/nativeguest/README.md | 34 + tools/nativeguest/app-seccomp-dump.c | 50 + tools/nativeguest/build-gosys.sh | 82 ++ tools/nativeguest/build.sh | 15 + tools/nativeguest/ddnatv-hook.c | 87 ++ tools/nativeguest/gosys/gosys.c | 510 ++++++++ tools/nativeguest/gosys/gosys.ld | 14 + tools/nativeguest/gosys/gosys_abi.h | 79 ++ tools/nativeguest/hook/env.c | 309 +++++ tools/nativeguest/hook/exec.c | 1127 +++++++++++++++++ tools/nativeguest/hook/exec_probe.c | 1027 +++++++++++++++ tools/nativeguest/hook/fileops.c | 805 ++++++++++++ tools/nativeguest/hook/files.c | 813 ++++++++++++ tools/nativeguest/hook/go_programs.c | 465 +++++++ tools/nativeguest/hook/hardlinks.c | 628 +++++++++ tools/nativeguest/hook/identity.c | 838 ++++++++++++ tools/nativeguest/hook/net.c | 1054 +++++++++++++++ tools/nativeguest/hook/paths.c | 697 ++++++++++ tools/nativeguest/hook/posix_shm.c | 174 +++ tools/nativeguest/hook/privileged.c | 815 ++++++++++++ tools/nativeguest/hook/setup.c | 384 ++++++ tools/nativeguest/hook/signals.c | 233 ++++ tools/nativeguest/hook/sockets.c | 351 +++++ tools/nativeguest/hook/static_programs.c | 345 +++++ tools/nativeguest/hook/syscalls.c | 128 ++ tools/nativeguest/hook/sysv_shm.c | 561 ++++++++ tools/nativeguest/seccomp-sim.c | 92 ++ tools/release/runtime_inputs.py | 2 +- tools/tests/test_droiddeckctl.py | 47 +- tools/tests/test_preload_snapshots.py | 24 + 67 files changed, 13157 insertions(+), 113 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentNative.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/runtime/ElfRunpath.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/runtime/ElfSeccompPatch.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/ElfSeccompPatchTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/NativeGuestTest.kt create mode 100644 tools/nativeguest/LICENSE create mode 100644 tools/nativeguest/README.md create mode 100644 tools/nativeguest/app-seccomp-dump.c create mode 100755 tools/nativeguest/build-gosys.sh create mode 100755 tools/nativeguest/build.sh create mode 100644 tools/nativeguest/ddnatv-hook.c create mode 100644 tools/nativeguest/gosys/gosys.c create mode 100644 tools/nativeguest/gosys/gosys.ld create mode 100644 tools/nativeguest/gosys/gosys_abi.h create mode 100644 tools/nativeguest/hook/env.c create mode 100644 tools/nativeguest/hook/exec.c create mode 100644 tools/nativeguest/hook/exec_probe.c create mode 100644 tools/nativeguest/hook/fileops.c create mode 100644 tools/nativeguest/hook/files.c create mode 100644 tools/nativeguest/hook/go_programs.c create mode 100644 tools/nativeguest/hook/hardlinks.c create mode 100644 tools/nativeguest/hook/identity.c create mode 100644 tools/nativeguest/hook/net.c create mode 100644 tools/nativeguest/hook/paths.c create mode 100644 tools/nativeguest/hook/posix_shm.c create mode 100644 tools/nativeguest/hook/privileged.c create mode 100644 tools/nativeguest/hook/setup.c create mode 100644 tools/nativeguest/hook/signals.c create mode 100644 tools/nativeguest/hook/sockets.c create mode 100644 tools/nativeguest/hook/static_programs.c create mode 100644 tools/nativeguest/hook/syscalls.c create mode 100644 tools/nativeguest/hook/sysv_shm.c create mode 100644 tools/nativeguest/seccomp-sim.c diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 510946aa18..555d8b673c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -195,6 +195,7 @@ jobs: !app/src/main/assets/linuxfs/i386/libfaultreport.so !app/src/main/assets/linuxfs/libblaudit.so !app/src/main/assets/linuxfs/libblfastpath.so + !app/src/main/assets/linuxfs/libddnatv-hook.so !app/src/main/assets/linuxfs/libblsession.so !app/src/main/assets/linuxfs/libfakeinput.so !app/src/main/assets/linuxfs/libssbs.so diff --git a/app/src/main/cpp/fakeinput_steam.cpp b/app/src/main/cpp/fakeinput_steam.cpp index 498461992f..8941abda20 100644 --- a/app/src/main/cpp/fakeinput_steam.cpp +++ b/app/src/main/cpp/fakeinput_steam.cpp @@ -2322,7 +2322,15 @@ __attribute__((visibility("hidden"))) static bool is_deck_sysfs_path(const char if (!path) return false; if (!strncmp(path, "/sys/devices/droiddeck", 22) || !strncmp(path, "/sys/class/hidraw", 17)) return true; const char *listing = deck_listing_dir(); - return listing && !strncmp(path, listing, strlen(listing)); + if (!listing) return false; + if (!strncmp(path, listing, strlen(listing))) return true; + // Without proot, a descriptor's /proc/self/fd link names the stand-in where it really is (the + // listing's parent holds devices/ and class-hidraw/), not /sys + const char *slash = strrchr(listing, '/'); + if (!slash || slash == listing) return false; + size_t root = static_cast(slash - listing); + return !strncmp(path, listing, root) && path[root] == '/' && + (!strncmp(path + root, "/devices", 8) || !strncmp(path + root, "/class-hidraw", 13)); } __attribute__((visibility("hidden"))) static bool is_deck_sysfs_fd(int fd) { diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 6bdfbbca38..f429efcbf7 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -185,6 +185,7 @@ class FrontEndActivity : ComponentActivity() { private var gpuClockPin by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) private var prootFastPath by mutableStateOf(true) + private var nativeUserland by mutableStateOf(false) private var cursorComposite by mutableStateOf(false) private var guestHostname by mutableStateOf(SessionPrefs.DEFAULT_GUEST_HOSTNAME) private var phantomWarning by mutableStateOf(null) @@ -2557,7 +2558,7 @@ class FrontEndActivity : ComponentActivity() { deviceRamMb = (android.app.ActivityManager.MemoryInfo() .also((getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)::getMemoryInfo).totalMem / (1024 * 1024)).toInt(), ramCapAvailable = com.droiddeck.launcher.core.ZramSupport.supported(), - prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, cursorComposite = cursorComposite, + prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, nativeUserland = nativeUserland, cursorComposite = cursorComposite, guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, onTuSysmem = { on -> SessionPrefs.setTuSysmem(this, on); tuSysmem = on }, @@ -2575,6 +2576,7 @@ class FrontEndActivity : ComponentActivity() { onVramCapMb = { mb -> SessionPrefs.setVramCapMb(this, mb); vramCapMb = mb }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on }, + onNativeUserland = { on -> SessionPrefs.setNativeUserland(this, on); nativeUserland = on }, onCursorComposite = { on -> SessionPrefs.setCursorComposite(this, on); cursorComposite = on }, onGuestHostname = { name -> SessionPrefs.setGuestHostname(this, name) }, onClientCore = { core, on -> @@ -2797,6 +2799,7 @@ class FrontEndActivity : ComponentActivity() { gpuClockPin = SessionPrefs.gpuClockPin(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) prootFastPath = SessionPrefs.prootFastPath(this) + nativeUserland = SessionPrefs.nativeUserland(this) cursorComposite = SessionPrefs.cursorComposite(this) guestHostname = SessionPrefs.guestHostname(this) refreshPhantomStatus() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt index c1955caa05..6b055221e5 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt @@ -85,6 +85,10 @@ class AgentBridgeProvider : ContentProvider() { AgentAccess.requireCommands(context) guest(context, JSONObject(request.toString()).put("kind", "exec"), timeoutMs(request, 30.0, 10_000)) } + "native" -> { + AgentAccess.requireCommands(context) + AgentNative.run(context, request, timeoutMs(request, 30.0, 0)) + } "cdp" -> { AgentAccess.requireCommands(context) guest(context, JSONObject(request.toString()).put("kind", "cdp"), timeoutMs(request, 15.0, 5_000)) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentNative.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentNative.kt new file mode 100644 index 0000000000..613cbe2c39 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentNative.kt @@ -0,0 +1,65 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.NativeGuest +import org.json.JSONArray +import org.json.JSONObject +import java.util.concurrent.TimeUnit + +/** Runs a guest program without proot (`droiddeckctl native`), for testing the native userland. */ +object AgentNative { + private const val OUTPUT_CAP = 256 * 1024 + + fun run(context: Context, request: JSONObject, timeoutMs: Long): JSONObject { + val root = LinuxRuntime.rootDir(context) + com.droiddeck.launcher.session.SessionFiles.stage(context, root) + // with the setting off, staging leaves the rootfs as proot wants it + if (!com.droiddeck.launcher.session.SessionPrefs.nativeUserland(context)) NativeGuest.prepare(context, root) + if (!NativeGuest.available(root)) throw AgentException("NATIVE_UNAVAILABLE", "The rootfs has no native hook or glibc loader yet; start a session once") + val argvJson = request.optJSONArray("argv") ?: throw AgentException("INVALID_REQUEST", "argv is required") + val argv = (0 until argvJson.length()).map { argvJson.getString(it) } + if (argv.isEmpty()) throw AgentException("INVALID_REQUEST", "argv is empty") + val env = linkedMapOf() + request.optJSONObject("env")?.let { obj -> obj.keys().forEach { env[it] = obj.getString(it) } } + val preload = request.optJSONArray("preload")?.let { a -> (0 until a.length()).map { a.getString(it) } } ?: emptyList() + val builder = NativeGuest.builder(root, request.optString("cwd", "/root"), argv, env, preload) + val started = System.nanoTime() + val process = builder.start() + val out = StringBuilder() + val err = StringBuilder() + val readers = listOf( + Thread { drain(process.inputStream, out) }, + Thread { drain(process.errorStream, err) }, + ).onEach { it.isDaemon = true; it.start() } + // written beside the wait: a program that never reads more than a pipe holds would block it + val input = request.optString("stdin").toByteArray() + Thread { + try { + process.outputStream.use { stdin -> if (input.isNotEmpty()) stdin.write(input) } + } catch (_: java.io.IOException) { + } + }.apply { isDaemon = true; start() } + val finished = process.waitFor(timeoutMs, TimeUnit.MILLISECONDS) + if (!finished) process.destroyForcibly().waitFor() + readers.forEach { it.join(2000) } + val code = if (finished) process.exitValue() else -1 + return JSONObject().put("ok", true).put("command", "native") + .put("exitCode", code).put("timedOut", !finished) + .put("ms", (System.nanoTime() - started) / 1_000_000) + .put("stdout", JSONObject().put("text", out.toString())) + .put("stderr", JSONObject().put("text", err.toString())) + .put("argv", JSONArray(argv)) + } + + private fun drain(input: java.io.InputStream, into: StringBuilder) { + val buffer = ByteArray(8192) + val text = java.io.ByteArrayOutputStream() + while (true) { + val n = try { input.read(buffer) } catch (e: java.io.IOException) { -1 } + if (n < 0) break + if (text.size() < OUTPUT_CAP) text.write(buffer, 0, minOf(n, OUTPUT_CAP - text.size())) + } + into.append(text.toString(Charsets.UTF_8.name())) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index cb0b9487b8..63037a24ac 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -278,6 +278,7 @@ object DeviceReport { k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" }) k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) k("proot without seccomp", SessionPrefs.prootNoSeccomp(context)) + k("native userland (no proot)", SessionPrefs.nativeUserland(context)) k("proot fast path", SessionPrefs.prootFastPath(context)) k("proot binary", LinuxRuntime.prootSource(context) + " " + LinuxRuntime.prootBinary(context).path) k("proot fast path (eligible)", com.droiddeck.launcher.runtime.ProotFastPath.enabled(context)) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt index 2d1a9aa401..4a98fdedec 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -182,6 +182,7 @@ object BwrapSpawner { val argv = request.getJSONArray("argv").let { a -> (0 until a.length()).map { a.getString(it) } } val env = LinkedHashMap() request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> env[k] = e.getString(k) } } + withoutRootfsSettings(env, rootfs) val envTool = request.optString("envTool").takeIf { it.startsWith("/") } if (envTool == null && binds.any { it.guest == "/dev" }) gpu(rootfs, root, env)?.forEach { addBind(it) } val libc = listOf("/usr/lib/aarch64-linux-gnu/libc.so.6", "/lib/aarch64-linux-gnu/libc.so.6").map { hostPath(binds, root.path, it) } @@ -191,6 +192,24 @@ object BwrapSpawner { return Plan(root, binds, request.optString("cwd", "/").ifEmpty { "/" }, argv, env, envTool ?: "/usr/bin/env") } + private val ROOTFS_PIPEWIRE = listOf("PIPEWIRE_MODULE_DIR", "SPA_PLUGIN_DIR", "PIPEWIRE_CONFIG_DIR") + + /** + * The session's Flatpak passes settings for the session's own root on: the native hook's, + * DroidDeck's PipeWire build, which a runtime does not have (its apps found no PipeWire plugins), + * and the session's video driver for SDL. + */ + internal fun withoutRootfsSettings(env: MutableMap, rootfs: String) { + env.keys.removeAll { it.startsWith("DDNATV_") } + for (key in ROOTFS_PIPEWIRE) if (env[key]?.startsWith("/usr/local/lib/droiddeck-pipewire") == true) env.remove(key) + // the session's choice of X11 for SDL, in an app that Flatpak gave Wayland and no X display + if (env["SDL_VIDEODRIVER"] == "x11" && env["DISPLAY"].isNullOrEmpty() && !env["WAYLAND_DISPLAY"].isNullOrEmpty()) env.remove("SDL_VIDEODRIVER") + env["LD_PRELOAD"]?.let { preload -> + val kept = preload.split(':').filter { it.isNotEmpty() && it != rootfs && !it.startsWith("$rootfs/") } + if (kept.isEmpty()) env.remove("LD_PRELOAD") else env["LD_PRELOAD"] = kept.joinToString(":") + } + } + private const val GPU_DIR = "/run/droiddeck-gpu" private val LIB_DIRS = listOf("usr/lib/aarch64-linux-gnu", "usr/lib") @@ -347,22 +366,201 @@ object BwrapSpawner { try { Os.chmod(f.path, mode) } catch (e: Exception) { } } + private val SANDBOX_LOADERS = listOf("/usr/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1", "/usr/lib/ld-linux-aarch64.so.1", + "/lib/ld-linux-aarch64.so.1", "/lib64/ld-linux-aarch64.so.1") + private val SANDBOX_LIBCS = listOf("/usr/lib/aarch64-linux-gnu/libc.so.6", "/usr/lib/libc.so.6", "/lib/aarch64-linux-gnu/libc.so.6") + private val SANDBOX_LIB_DIRS = listOf("/app/lib/aarch64-linux-gnu", "/app/lib", "/usr/lib/aarch64-linux-gnu", "/usr/lib") + private val seccompPatched = java.util.concurrent.ConcurrentHashMap.newKeySet() + + /** + * The sandbox started by the runtime's own glibc loader with the native hook, which maps the + * sandbox's mounts; null when the runtime cannot load the hook (older glibc), so proot runs it. + */ + private fun nativeLaunch(context: Context, plan: Plan): Pair, Map>? { + val rootfs = LinuxRuntime.rootDir(context) + val sandbox = plan.root.path + fun host(guest: String) = File(hostPath(plan.binds, sandbox, guest)) + if (!hasEnvTool(plan)) { + val program = plan.argv.firstOrNull()?.takeIf { it.startsWith("/") }?.let(::host)?.canonicalFile + ?.takeIf { it.isFile && isStaticElf(it) } ?: return null + if (!linkMounts(plan)) return null + return (listOf(program.path) + plan.argv.drop(1)) to plan.env + } + val loader = SANDBOX_LOADERS.map(::host).firstOrNull { it.isFile }?.canonicalFile ?: return null + val libc = SANDBOX_LIBCS.map(::host).firstOrNull { it.isFile }?.canonicalFile ?: return null + val hook = NativeGuest.hook(rootfs) + val need = glibcMinor(hook, GLIBC_NEED) { it.maxOrNull() } ?: return null + val have = glibcMinor(libc, GLIBC_RELEASE) { it.firstOrNull() } ?: return null + if (have < need) { + Log.i(TAG, "native userland: this runtime's glibc 2.$have cannot load the hook (2.$need); proot runs the sandbox") + return null + } + for (file in listOf(loader, libc)) { + val key = "${file.path}:${file.length()}:${file.lastModified()}" + if (key in seccompPatched) continue + // an unpatched loader or libc dies under Android's filter before the hook loads: proot runs it + val patched = runCatching { ElfSeccompPatch.patchFile(file) } + .onFailure { Log.e(TAG, "native userland: could not patch $file for Android's seccomp filter; proot runs the sandbox", it) } + if (patched.isFailure) return null + seccompPatched.add("${file.path}:${file.length()}:${file.lastModified()}") + } + val program = host(plan.envTool).canonicalFile.takeIf { it.isFile } ?: return null + if (!linkMounts(plan)) return null + writeRunpathConf(plan, ::host) + val launch = listOf(loader.path, "--argv0", program.name, program.path, "-i") + + plan.env.map { (k, v) -> "$k=$v" } + plan.argv + val env = linkedMapOf( + "DDNATV_ROOT" to sandbox, + "DDNATV_LINK_ROOT" to rootfs.path, + "DDNATV_BINDS" to plan.binds.joinToString("|") { "${it.host}:${it.guest}" }, + "DDNATV_HOSTNAME" to SessionPrefs.guestHostname(context), + "LD_LIBRARY_PATH" to SANDBOX_LIB_DIRS.map(::host).filter { it.isDirectory }.joinToString(":") { it.path }, + "LD_PRELOAD" to hook.path, + ).filterValues { it.isNotEmpty() } + return (NativeGuest.simulator(rootfs)?.let { it + launch } ?: launch) to env + } + + private val runpathDirs = java.util.concurrent.ConcurrentHashMap>() + + /** + * ld.so opens a library's absolute RUNPATH (libpulse's pulseaudio/ directory) without the hook, + * on Android's own filesystem, so those directories are listed for the hook in the sandbox's + * ld.so.conf too, as [NativeGuest.syncLibraryDirs] does for the rootfs. A checkout never changes. + */ + private fun writeRunpathConf(plan: Plan, host: (String) -> File) { + val confDir = inRoot(plan.root, "/run/flatpak/ld.so.conf.d")?.takeIf { it.isDirectory } ?: return + val dirs = sortedSetOf() + for (top in listOf("/usr/lib", "/app/lib")) { + val real = host(top).takeIf { it.isDirectory }?.canonicalFile ?: continue + dirs += runpathDirs.getOrPut(real.path) { + real.walkTopDown().maxDepth(4).onEnter { !Files.isSymbolicLink(it.toPath()) } + .filter { it.isFile && ".so" in it.name && !Files.isSymbolicLink(it.toPath()) } + .flatMap { runCatching { ElfRunpath.read(it) }.getOrDefault(emptyList()) } + .filter { it.startsWith("/usr/") || it.startsWith("/app/") || it.startsWith("/lib") } + .distinct().toList() + } + } + if (dirs.isEmpty()) return + runCatching { File(confDir, "runtime-999-droiddeck-runpath.conf").writeText(dirs.joinToString("\n", postfix = "\n")) } + } + + /** A runtime extension's apply_extra runs in a sandbox with nothing but the extension itself. */ + private fun hasEnvTool(plan: Plan): Boolean = + File(hostPath(plan.binds, plan.root.path, plan.envTool)).let { it.exists() || Files.isSymbolicLink(it.toPath()) } + + internal fun isStaticElf(file: File): Boolean = try { + java.io.RandomAccessFile(file, "r").use { f -> + val head = ByteArray(64).also { f.readFully(it) } + if (head[0] != 0x7f.toByte() || head[1] != 'E'.code.toByte() || head[4] != 2.toByte() || head[5] != 1.toByte()) return false + val le = java.nio.ByteBuffer.wrap(head).order(java.nio.ByteOrder.LITTLE_ENDIAN) + val phoff = le.getLong(32) + val phentsize = le.getShort(54).toInt() and 0xffff + val phnum = le.getShort(56).toInt() and 0xffff + val entry = ByteArray(4) + (0 until phnum).none { i -> + f.seek(phoff + i.toLong() * phentsize) + f.readFully(entry) + java.nio.ByteBuffer.wrap(entry).order(java.nio.ByteOrder.LITTLE_ENDIAN).int == 3 // PT_INTERP + } + } + } catch (_: java.io.IOException) { + false + } + + /** + * The kernel follows paths the hook does not see (ld.so, symbolic links), so each top-level + * mount of the sandbox is also a link to its source in the sandbox's own root, and the + * sandbox's links with absolute guest targets are made relative, which reaches them through those. + * False when a mount's place could not be made; proot then runs the sandbox, whose mounts hide + * whatever was left at their places. + */ + private fun linkMounts(plan: Plan): Boolean { + val root = plan.root.toPath() + plan.root.walkTopDown().onEnter { !Files.isSymbolicLink(it.toPath()) }.map { it.toPath() } + .filter { Files.isSymbolicLink(it) }.toList().forEach { link -> + runCatching { + val target = Files.readSymbolicLink(link).toString() + if (!target.startsWith("/")) return@runCatching + Files.delete(link) + Files.createSymbolicLink(link, link.parent.relativize(root.resolve(target.removePrefix("/")))) + } + } + // a mount inside another mount (a GL extension at /usr/lib/aarch64-linux-gnu/GL) needs its own + // place: the links of the mounts it is in become directories of links to their entries + val entryLinks = HashSet() + for (bind in plan.binds.sortedBy { it.guest.length }) { + if (bind.guest == "/") continue + val at = try { + mountPlace(plan.root, bind.guest, entryLinks)?.also { at -> + val path = at.toPath() + if (path in entryLinks) { + Files.delete(path) + entryLinks.remove(path) + } + } + } catch (e: java.io.IOException) { + Log.e(TAG, "native userland: could not make a place for ${bind.guest}; proot runs the sandbox", e) + return false + } ?: continue + val path = at.toPath() + if (at.exists() || Files.isSymbolicLink(path)) continue + at.parentFile?.mkdirs() + runCatching { Files.createSymbolicLink(path, java.nio.file.Paths.get(bind.host)) } + } + return true + } + + private fun mountPlace(root: File, guest: String, entryLinks: MutableSet): File? { + val parts = guest.split('/').filter { it.isNotEmpty() } + var f = root + for ((i, part) in parts.withIndex()) { + if (part == "..") return null + f = File(f, part) + val path = f.toPath() + if (i == parts.lastIndex || !Files.isSymbolicLink(path)) continue + val target = Files.readSymbolicLink(path) + // a link of the sandbox's own tree, made relative above, is not a mount + if (!target.isAbsolute) return null + Files.delete(path) + entryLinks.remove(path) + Files.createDirectory(path) + target.toFile().listFiles()?.forEach { entry -> + val link = path.resolve(entry.name) + Files.createSymbolicLink(link, entry.toPath()) + entryLinks.add(link) + } + } + return f + } + private fun run(context: Context, plan: Plan, client: LocalSocket, out: DataOutputStream, id: Int) { - val cmd = LinuxRuntime.prootPrefix(context, plan.root, plan.cwd) val verbose = plan.env["DROIDDECK_PROOT_VERBOSE"]?.toIntOrNull() - if (verbose != null) { cmd.add(1, "-v"); cmd.add(2, verbose.toString()) } - plan.binds.forEach { cmd.add("-b"); cmd.add(it.spec) } - cmd.add(plan.envTool) - cmd.add("-i") - plan.env.forEach { (k, v) -> cmd.add("$k=$v") } - cmd.addAll(plan.argv) - val builder = ProcessBuilder(cmd).redirectErrorStream(true).directory(plan.root) - builder.environment().apply { - clear() - put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) - put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) - if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") - LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + val native = if (NativeGuest.forSession(context)) nativeLaunch(context, plan) else null + val builder = if (native != null) { + ProcessBuilder(native.first).redirectErrorStream(true) + .directory(File(hostPath(plan.binds, plan.root.path, plan.cwd)).takeIf { it.isDirectory } ?: plan.root) + .also { b -> b.environment().apply { clear(); putAll(native.second) } } + } else { + val cmd = LinuxRuntime.prootPrefix(context, plan.root, plan.cwd) + if (verbose != null) { cmd.add(1, "-v"); cmd.add(2, verbose.toString()) } + plan.binds.forEach { cmd.add("-b"); cmd.add(it.spec) } + val envTool = hasEnvTool(plan) + if (envTool) { + cmd.add(plan.envTool) + cmd.add("-i") + plan.env.forEach { (k, v) -> cmd.add("$k=$v") } + } + cmd.addAll(plan.argv) + ProcessBuilder(cmd).redirectErrorStream(true).directory(plan.root).also { b -> + b.environment().apply { + clear() + if (!envTool) putAll(plan.env) + put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) + put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) + if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + } + } } val process = builder.start() val pid = HostProcess.pidOf(process) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/ElfRunpath.kt b/app/src/main/java/com/droiddeck/launcher/runtime/ElfRunpath.kt new file mode 100644 index 0000000000..dc772c49a1 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/ElfRunpath.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.runtime + +import java.io.File +import java.io.RandomAccessFile +import java.nio.ByteBuffer +import java.nio.ByteOrder + +/** The absolute DT_RUNPATH and DT_RPATH directories of a 64-bit little-endian ELF object. */ +object ElfRunpath { + private const val PT_LOAD = 1 + private const val PT_DYNAMIC = 2 + private const val DT_STRTAB = 5 + private const val DT_RPATH = 15 + private const val DT_RUNPATH = 29 + + fun read(file: File): List { + if (file.length() < 64) return emptyList() + RandomAccessFile(file, "r").use { raf -> + val channel = raf.channel + val header = ByteBuffer.allocate(64).order(ByteOrder.LITTLE_ENDIAN) + channel.read(header, 0) + if (header.getInt(0) != 0x464c457f || header.get(4).toInt() != 2 || header.get(5).toInt() != 1) return emptyList() + val phoff = header.getLong(32) + val phentsize = header.getShort(54).toInt() and 0xffff + val phnum = header.getShort(56).toInt() and 0xffff + if (phnum == 0 || phnum > 128 || phentsize < 56) return emptyList() + val table = ByteBuffer.allocate(phentsize * phnum).order(ByteOrder.LITTLE_ENDIAN) + channel.read(table, phoff) + class Load(val vaddr: Long, val offset: Long, val size: Long) + val loads = ArrayList() + var dynOffset = -1L + var dynSize = 0L + for (i in 0 until phnum) { + val at = i * phentsize + val type = table.getInt(at) + val offset = table.getLong(at + 8) + val vaddr = table.getLong(at + 16) + val filesz = table.getLong(at + 32) + if (type == PT_LOAD) loads.add(Load(vaddr, offset, filesz)) + if (type == PT_DYNAMIC) { dynOffset = offset; dynSize = filesz } + } + if (dynOffset < 0 || dynSize <= 0 || dynSize > 1 shl 20) return emptyList() + val dynamic = ByteBuffer.allocate(dynSize.toInt()).order(ByteOrder.LITTLE_ENDIAN) + channel.read(dynamic, dynOffset) + var strtab = -1L + val names = ArrayList() + var at = 0 + while (at + 16 <= dynamic.capacity()) { + val tag = dynamic.getLong(at) + val value = dynamic.getLong(at + 8) + if (tag == 0L) break + if (tag == DT_STRTAB.toLong()) strtab = value + if (tag == DT_RPATH.toLong() || tag == DT_RUNPATH.toLong()) names.add(value) + at += 16 + } + if (strtab < 0 || names.isEmpty()) return emptyList() + val strtabOffset = loads.firstOrNull { strtab >= it.vaddr && strtab < it.vaddr + it.size } + ?.let { strtab - it.vaddr + it.offset } ?: return emptyList() + val result = ArrayList() + for (name in names) { + val buffer = ByteBuffer.allocate(4096) + val n = channel.read(buffer, strtabOffset + name) + if (n <= 0) continue + val bytes = buffer.array() + var end = 0 + while (end < n && bytes[end].toInt() != 0) end++ + String(bytes, 0, end, Charsets.UTF_8).split(':').filter { it.startsWith("/") }.forEach { result.add(it.trimEnd('/')) } + } + return result + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/ElfSeccompPatch.kt b/app/src/main/java/com/droiddeck/launcher/runtime/ElfSeccompPatch.kt new file mode 100644 index 0000000000..817cbc9757 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/ElfSeccompPatch.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.runtime + +import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder + +/** + * Android's app seccomp filter kills a process with SIGSYS for rseq, set_robust_list and clone3. glibc's + * dynamic linker makes the first two before any preloaded library (so before the hook's SIGSYS + * handler) exists, so the call sites in the rootfs's ld.so and libc answer by themselves instead: the + * `svc` after `mov x8, #nr` becomes a no-op for set_robust_list (glibc ignores the result) and + * `mov x0, #-ENOSYS` for rseq and clone3 (glibc falls back from both). Under proot the same + * answers are what proot gives. + */ +object ElfSeccompPatch { + private const val SVC = 0xd4000001.toInt() + private const val NOP = 0xd503201f.toInt() + private const val MOV_X0_ENOSYS = 0x928004a0.toInt() + private const val MOV_X8_SET_ROBUST_LIST = 0xd2800c68.toInt() + private const val MOV_X8_CLONE3 = 0xd2803668.toInt() + private const val MOV_X8_RSEQ = 0xd28024a8.toInt() + private const val WINDOW = 16 + + /** Patches [data] in place and returns the number of call sites changed. */ + fun patch(data: ByteArray): Int { + if (data.size < 64 || data[0] != 0x7f.toByte() || data[1] != 'E'.code.toByte() || data[4].toInt() != 2 || data[5].toInt() != 1) return 0 + val buffer = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN) + if (buffer.getShort(18).toInt() != 183) return 0 + val phoff = buffer.getLong(32).toInt() + val phentsize = buffer.getShort(54).toInt() and 0xffff + val phnum = buffer.getShort(56).toInt() and 0xffff + var patched = 0 + for (i in 0 until phnum) { + val at = phoff + i * phentsize + if (at + 56 > data.size) break + if (buffer.getInt(at) != 1 || (buffer.getInt(at + 4) and 1) == 0) continue + val start = ((buffer.getLong(at + 8).toInt()) + 3) and 3.inv() + val end = minOf(data.size, buffer.getLong(at + 8).toInt() + buffer.getLong(at + 32).toInt()) and 3.inv() + var pos = start + while (pos + 4 <= end) { + val replacement = when (buffer.getInt(pos)) { + MOV_X8_SET_ROBUST_LIST -> NOP + MOV_X8_CLONE3, MOV_X8_RSEQ -> MOV_X0_ENOSYS + else -> null + } + if (replacement != null) { + var next = pos + 4 + val limit = minOf(end, pos + 4 + WINDOW * 4) + while (next < limit) { + val insn = buffer.getInt(next) + if (insn == SVC) { + buffer.putInt(next, replacement) + patched++ + break + } + // A site patched before, or x8 set again: an svc after it is another call's + // (a second run found clone3's thread exit there and turned it into -ENOSYS) + if (insn == MOV_X0_ENOSYS || (insn and 0x1f) == 8) break + next += 4 + } + } + pos += 4 + } + } + return patched + } + + /** Patches the file behind [path] (symlinks followed) if it still has unpatched call sites. */ + fun patchFile(path: File): Int { + val target = path.canonicalFile + if (!target.isFile) return 0 + val data = target.readBytes() + val count = patch(data) + if (count == 0) return 0 + val temp = File(target.parentFile, "." + target.name + ".seccomp") + temp.writeBytes(data) + temp.setExecutable(true, false) + temp.setReadable(true, false) + if (!temp.renameTo(target)) { + temp.delete() + throw java.io.IOException("could not replace ${target.path}") + } + return count + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 8e5769c312..0560752a31 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -35,12 +35,10 @@ object GuestCommand { SessionFiles.stage(context, root) LinuxNetworkLinkComponent(context, root).publish() val runtimeDir = File(context.filesDir, ".flatpak-rt").apply { mkdirs() } - val cmd = LinuxRuntime.prootPrefix(context, root, "/root", fakeRoot) - if (linkDir != null) cmd.add(1, "--link2symlink") val binds = LinuxRuntime.binds(context, null, runtimeDir, Environment.getExternalStorageDirectory(), extraBinds) - binds.forEach { cmd.add("-b"); cmd.add(it) } - val fastPathKey = if (fastPath && !fakeRoot && linkDir == null && ProotFastPath.enabled(context)) ProotFastPath.key(root, binds) else null - cmd += listOf( + val native = NativeGuest.forSession(context) + val fastPathKey = if (!native && fastPath && !fakeRoot && linkDir == null && ProotFastPath.enabled(context)) ProotFastPath.key(root, binds) else null + val guest = mutableListOf( "/usr/bin/env", "-i", "HOME=/root", "USER=root", "LANG=C.UTF-8", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games", "XDG_RUNTIME_DIR=${LinuxRuntime.GUEST_RUNTIME_DIR}", "XDG_DATA_HOME=/root/.local/share", "FLATPAK_BWRAP=${FlatpakManager.BWRAP}", @@ -48,22 +46,31 @@ object GuestCommand { "XDG_DATA_DIRS=/root/.local/share/flatpak/exports/share:/usr/local/share:/usr/share", ) DownloadSource.proxyHostPort(context).takeIf { it.isNotEmpty() }?.let { hostPort -> - cmd += listOf( + guest += listOf( "http_proxy=http://$hostPort", "https_proxy=http://$hostPort", "HTTP_PROXY=http://$hostPort", "HTTPS_PROXY=http://$hostPort", "no_proxy=localhost,127.0.0.1,::1", "NO_PROXY=localhost,127.0.0.1,::1", ) } - fastPathKey?.let { cmd += ProotFastPath.guestEnv(root, binds, it) } - cmd += argv - val builder = ProcessBuilder(cmd).directory(root).redirectErrorStream(true) - builder.environment().apply { - put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) - put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) - if (linkDir != null) put("PROOT_L2S_DIR", linkDir.path) - if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") - fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> put(k, v) } } - LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + fastPathKey?.let { guest += ProotFastPath.guestEnv(root, binds, it) } + guest += argv + val builder = if (native) { + NativeGuest.processBuilder(context, root, binds, guest).redirectErrorStream(true) + } else { + val cmd = LinuxRuntime.prootPrefix(context, root, "/root", fakeRoot) + if (linkDir != null) cmd.add(1, "--link2symlink") + binds.forEach { cmd.add("-b"); cmd.add(it) } + cmd += guest + ProcessBuilder(cmd).directory(root).redirectErrorStream(true).also { b -> + b.environment().apply { + put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) + put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) + if (linkDir != null) put("PROOT_L2S_DIR", linkDir.path) + if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") + fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> put(k, v) } } + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + } + } } if (cancelled?.get() == true) return 130 val process = builder.start() diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 3e5b0a29cb..0253604021 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -155,6 +155,11 @@ public final class LinuxRuntime { private static volatile List lastBinds; + /** The mounts of a session started without proot, which sandboxes and root helpers see too. */ + public static void rememberSessionBinds(List binds) { + lastBinds = binds; + } + public static List lastBinds(Context context) { List binds = lastBinds; if (binds != null) return binds; @@ -306,7 +311,17 @@ public final class LinuxRuntime { private static boolean unreadablePciDevice() { File[] devices = new File("/sys/bus/pci/devices").listFiles(); - if (devices == null) return false; + if (devices == null) { + // The directory is there but the app may not list it (Android 13 on the AYN Thor): libpci then + // aborts the whole program with "Cannot open /sys/bus/pci/devices", which Chromium's GPU + // initialisation runs into. Not there at all (no PCI bus) is fine as it is. + try { + android.system.Os.stat("/sys/bus/pci/devices"); + return true; + } catch (android.system.ErrnoException e) { + return e.errno == android.system.OsConstants.EACCES; + } + } for (File device : devices) { if (!new File(device, "vendor").canRead()) return true; } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt b/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt new file mode 100644 index 0000000000..ae4106a081 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt @@ -0,0 +1,269 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import com.droiddeck.launcher.session.SessionPrefs +import java.io.File +import java.nio.file.Files + +/** + * Starts guest programs directly on the Android kernel, with no proot: the glibc loader of the + * rootfs runs the program and [HOOK] translates the guest's absolute paths, execs and the system + * calls Android's seccomp policy blocks, from inside the process. + */ +object NativeGuest { + private const val TAG = "NativeGuest" + const val HOOK = "usr/lib/libddnatv-hook.so" + private val LIB_DIRS = listOf("usr/lib", "usr/lib/aarch64-linux-gnu", "usr/local/lib", "usr/lib/systemd") + + /** Libraries every native program loads before the hook, as /etc/ld.so.preload does for proot. */ + fun preloadList(root: File): List { + val listed = File(root, "etc/droiddeck/native-preload").takeIf { it.isFile }?.readLines().orEmpty() + return listed.map { it.trim() }.filter { it.startsWith("/") && File(root, it.removePrefix("/")).isFile } + } + + fun enabled(context: Context): Boolean = + SessionPrefs.nativeUserland(context) && available(LinuxRuntime.rootDir(context)) + + /** The mode the running session started in; null between sessions. */ + @Volatile var sessionMode: Boolean? = null + + /** + * Whether a session's helpers (root commands, Flatpak sandboxes, installers) run natively: the + * session's own mode while one runs, as the setting can change under it and the rootfs is only + * prepared for native programs at a session's start. + */ + fun forSession(context: Context): Boolean = sessionMode ?: enabled(context) + + /** + * Development switch: etc/droiddeck/seccomp-sim names a helper (a guest path, then its arguments) + * that applies Android's app seccomp filter before the program starts, for devices that run apps + * without one (eng builds, or a permissive SELinux, where zygote skips it). Guest paths among the + * arguments are given as their places in the rootfs, as the helper runs before the hook. + */ + fun simulator(root: File): List? { + val words = File(root, "etc/droiddeck/seccomp-sim").takeIf { it.isFile }?.readText()?.trim() + ?.split(Regex("\\s+"))?.filter { it.isNotEmpty() } ?: return null + val helper = words.firstOrNull()?.takeIf { it.startsWith("/") }?.let { File(root, it.removePrefix("/")) } + ?.takeIf { it.isFile } ?: return null + return listOf(helper.path) + words.drop(1).map { if (it.startsWith("/")) File(root, it.removePrefix("/")).path else it } + } + + fun hook(root: File): File = File(root, HOOK) + + fun loader(root: File): File? = + listOf("usr/lib/ld-linux-aarch64.so.1", "lib/ld-linux-aarch64.so.1").map { File(root, it) }.firstOrNull { it.exists() } + + fun available(root: File): Boolean = hook(root).isFile && loader(root) != null + + fun libraryPath(root: File): String = LIB_DIRS.joinToString(":") { File(root, it).path } + + /** Environment every native process starts with; a guest `env -i` is re-seeded by the hook. */ + fun environment(root: File, preload: List = emptyList()): Map = linkedMapOf( + "DDNATV_ROOT" to root.path, + "LD_LIBRARY_PATH" to libraryPath(root), + "LD_PRELOAD" to (preload.map { File(root, it.removePrefix("/")).path } + hook(root).path).joinToString(":"), + ) + + /** + * The host command line for the guest program at [program] (an absolute guest path to a real + * file, not a symlink). + */ + fun command(root: File, program: String, args: List): List { + val loader = checkNotNull(loader(root)) { "no glibc loader in ${root.path}" } + val host = File(root, program.removePrefix("/")) + val launch = listOf(loader.path, "--argv0", host.name, host.path) + args + return simulator(root)?.let { it + launch } ?: launch + } + + /** The environment of the session process: the hook's root, the mounts proot used to make, the preload list. */ + fun sessionEnvironment(root: File, binds: List, hostname: String? = null): Map { + val preload = preloadList(root) + return linkedMapOf( + "DDNATV_ROOT" to root.path, + "DDNATV_HOSTNAME" to hostname.orEmpty(), + "DDNATV_BINDS" to binds.joinToString("|") { if (it.contains(':')) it else "$it:$it" }, + "DDNATV_PRELOAD" to preload.joinToString(":"), + "LD_LIBRARY_PATH" to libraryPath(root), + "LD_PRELOAD" to (preload.map { File(root, it.removePrefix("/")).path } + hook(root).path).joinToString(":"), + ).filterValues { it.isNotEmpty() } + } + + /** Where guest directory [cwd] is, through the session's mounts ([binds], "src:dst"); the rootfs if it is nowhere. */ + fun workingDirectory(root: File, binds: List, cwd: String): File = + File(BwrapSpawner.hostPath(binds.map { BwrapSpawner.Bind.parse(it) }, root.path, cwd)).takeIf { it.isDirectory } ?: root + + /** A process for [guest] (argv) started as proot would with [binds], in guest directory [cwd]. */ + fun processBuilder(context: Context, root: File, binds: List, guest: List, cwd: String = "/root"): ProcessBuilder = + ProcessBuilder(command(root, guest.first(), guest.drop(1))) + .directory(workingDirectory(root, binds, cwd)) + .also { builder -> + builder.environment().apply { + remove("LD_AUDIT") + putAll(sessionEnvironment(root, binds, SessionPrefs.guestHostname(context))) + } + } + + private const val RUNPATH_CONF = "etc/ld.so.conf.d/zz-droiddeck-native.conf" + private val SCAN_DIRS = listOf("usr/lib", "usr/local/lib", "opt") + + /** + * ld.so opens the absolute RUNPATH directories of a library itself, with system calls the hook + * cannot translate, so every one of them is also listed in ld.so.conf (which the hook maps). + * Rescanned when dpkg's state or a library directory changes. + */ + fun syncLibraryDirs(root: File) { + val conf = File(root, RUNPATH_CONF) + val signature = (listOf("var/lib/dpkg/status", "usr/lib", "usr/local/lib", "usr/lib/aarch64-linux-gnu") + .joinToString(",") { File(root, it).lastModified().toString() }) + "," + conf.parentFile.list()?.size + val stamp = File(root, "etc/droiddeck/native-runpath-signature") + if (conf.isFile && stamp.isFile && stamp.readText() == signature) return + val dirs = sortedSetOf() + for (name in SCAN_DIRS) File(root, name).walkTopDown().maxDepth(6) + .onEnter { !Files.isSymbolicLink(it.toPath()) } + .filter { it.isFile && !Files.isSymbolicLink(it.toPath()) && ".so" in it.name } + .forEach { file -> runCatching { ElfRunpath.read(file) }.getOrNull()?.let { dirs.addAll(it) } } + val kept = dirs.filter { it.startsWith("/usr") || it.startsWith("/lib") || it.startsWith("/opt") } + conf.parentFile?.mkdirs() + conf.writeText(kept.joinToString("\n", postfix = "\n")) + stamp.parentFile?.mkdirs() + stamp.writeText(signature) + } + + /** What a rootfs needs before anything runs in it natively; cheap once done. */ + fun prepare(context: Context, root: File) { + val relinked = relinkAbsoluteSymlinks(context, root) + if (relinked > 0) android.util.Log.i(TAG, "native userland: $relinked absolute symlinks made relative") + val patched = patchForSeccomp(root) + if (patched > 0) android.util.Log.i(TAG, "native userland: $patched system call sites in ld.so and libc answer Android's blocked calls") + syncLibraryDirs(root) + } + + /** See [ElfSeccompPatch]: the linker and libc must survive Android's seccomp filter before the hook loads. */ + fun patchForSeccomp(root: File): Int = + listOf("usr/lib/ld-linux-aarch64.so.1", "usr/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1", + "usr/lib/aarch64-linux-gnu/libc.so.6", "usr/lib/libc.so.6") + .map { File(root, it) }.filter { it.exists() } + .distinctBy { it.canonicalPath }.sumOf { file -> + runCatching { ElfSeccompPatch.patchFile(file) }.getOrElse { + android.util.Log.e(TAG, "native userland: could not patch $file for Android's seccomp filter; programs will die with SIGSYS", it) + 0 + } + } + + private val HOST_LINK_TARGETS = listOf("/proc", "/dev", "/sys", "/sdcard", "/storage", "/data", "/system", "/vendor", "/apex", + "/system_ext", "/product", "/odm", "/linkerconfig", "/mnt") + + /** + * Symbolic links the kernel follows by itself (ld.so, Steam, anything that skips the hook) read + * their absolute target on Android's own filesystem. The image's links were made for proot, + * which reads the target inside the rootfs, so each is rewritten as a relative link, which + * resolves the same way under proot and without it. Rerun when the runtime changes. + */ + fun relinkAbsoluteSymlinks(context: Context, root: File): Int { + val stamp = File(root, "etc/droiddeck/native-symlinks") + val version = com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.installedVersion(context).orEmpty() + "/2" + if (stamp.isFile && stamp.readText() == version) return 0 + val rootPath = root.toPath() + var rewritten = 0 + Files.walkFileTree(rootPath, object : java.nio.file.SimpleFileVisitor() { + override fun visitFile(file: java.nio.file.Path, attrs: java.nio.file.attribute.BasicFileAttributes): java.nio.file.FileVisitResult { + if (attrs.isSymbolicLink) { + try { + val target = Files.readSymbolicLink(file).toString() + if (target.startsWith("/") && HOST_LINK_TARGETS.none { target == it || target.startsWith("$it/") } + && !target.startsWith(root.path)) { + val relative = file.parent.relativize(rootPath.resolve(target.removePrefix("/"))) + val temp = file.resolveSibling(".relink-" + file.fileName) + Files.deleteIfExists(temp) + Files.createSymbolicLink(temp, relative) + Files.move(temp, file, java.nio.file.StandardCopyOption.REPLACE_EXISTING) + rewritten++ + } + } catch (_: java.io.IOException) { + } + } + return java.nio.file.FileVisitResult.CONTINUE + } + + override fun visitFileFailed(file: java.nio.file.Path, exc: java.io.IOException) = java.nio.file.FileVisitResult.CONTINUE + }) + stamp.parentFile?.mkdirs() + stamp.writeText(version) + return rewritten + } + + /** + * The guest path that host path [target] stands for in a session with [binds] ("src:dst"), or null + * when it is a guest path already: the rootfs, or the longest mount source holding it (the first + * such mount when several share a source). + */ + fun guestLinkTarget(target: String, root: String, binds: List): String? { + if (!target.startsWith("/")) return null + fun under(path: String, dir: String) = path == dir || path.startsWith("$dir/") + var best: Pair? = if (under(target, root)) root to "/" else null + for (spec in binds) { + val colon = spec.indexOf(':') + if (colon < 0) continue + val src = spec.substring(0, colon).trimEnd('/') + val dst = spec.substring(colon + 1).trimEnd('/').ifEmpty { "/" } + if (src.isEmpty() || src == dst || !under(target, src)) continue + if (best == null || src.length > best.first.length) best = src to dst + } + val (src, dst) = best ?: return null + val rest = target.removePrefix(src) + return if (rest.isEmpty()) dst else dst.trimEnd('/') + rest + } + + /** + * Wine prefixes' drive links (dosdevices) hold guest paths ("s:" -> /mnt/droiddeck-sd), which + * proot follows and the hook follows inside a mount. Earlier native sessions made them point at + * their real places, which proot cannot see: those are given their guest paths back. + */ + fun relinkPrefixDrives(root: File, binds: List): Int { + val compatdata = listOf(File(root, "root/.local/share/Steam/steamapps/compatdata")) + binds.mapNotNull { spec -> + val colon = spec.indexOf(':') + if (colon > 0 && spec.substring(colon + 1).trimEnd('/').endsWith("/steamapps/compatdata")) File(spec.substring(0, colon)) else null + } + var rewritten = 0 + for (prefix in compatdata.distinct().flatMap { it.listFiles()?.toList().orEmpty() }) { + val devices = File(prefix, "pfx/dosdevices").toPath() + val links = try { + Files.newDirectoryStream(devices).use { it.toList() } + } catch (e: java.nio.file.NoSuchFileException) { + continue + } catch (e: java.io.IOException) { + android.util.Log.w(TAG, "native userland: could not read the drive links of $prefix", e) + continue + } catch (e: java.nio.file.DirectoryIteratorException) { + android.util.Log.w(TAG, "native userland: could not read the drive links of $prefix", e) + continue + } + for (link in links) { + try { + if (!Files.isSymbolicLink(link)) continue + val guest = guestLinkTarget(Files.readSymbolicLink(link).toString(), root.path, binds) ?: continue + val temp = link.resolveSibling(".relink-" + link.fileName) + Files.deleteIfExists(temp) + Files.createSymbolicLink(temp, java.nio.file.Paths.get(guest)) + Files.move(temp, link, java.nio.file.StandardCopyOption.REPLACE_EXISTING) + rewritten++ + } catch (_: java.io.IOException) { + } + } + } + return rewritten + } + + fun builder(root: File, cwd: String, argv: List, env: Map, preload: List = emptyList()): ProcessBuilder { + val program = argv.first() + val cmd = command(root, program, argv.drop(1)) + val builder = ProcessBuilder(cmd).redirectErrorStream(false) + builder.directory(File(root, cwd.removePrefix("/")).takeIf { it.isDirectory } ?: root) + builder.environment().apply { + clear() + putAll(environment(root, preload)) + putAll(env) + } + return builder + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt index e9a9f4a72e..11265bd8ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt @@ -12,15 +12,16 @@ object ProotFastPath { const val LIBRARY = "/usr/local/lib/libblfastpath.so" const val MAX_BINDS = 256 - fun allows(preference: Boolean, noSeccomp: Boolean, source: String): Boolean = - preference && !noSeccomp && source == LinuxRuntime.PROOT_PACK + fun allows(preference: Boolean, noSeccomp: Boolean, source: String, nativeUserland: Boolean = false): Boolean = + preference && !noSeccomp && !nativeUserland && source == LinuxRuntime.PROOT_PACK fun enabled(context: Context): Boolean { val preference = SessionPrefs.prootFastPath(context) val noSeccomp = SessionPrefs.prootNoSeccomp(context) + val nativeUserland = SessionPrefs.nativeUserland(context) val source = LinuxRuntime.prootSource(context) - val on = allows(preference, noSeccomp, source) - if (preference && !noSeccomp && !on) + val on = allows(preference, noSeccomp, source, nativeUserland) + if (preference && !noSeccomp && !nativeUserland && !on) Log.i(TAG, "proot: fast path off - binary is $source, not the patched proot") return on } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt index 1138bab0de..a96ff46f38 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt @@ -113,20 +113,26 @@ object RootSpawner { val argv = request.getJSONArray("argv").let { a -> (0 until a.length()).map { a.getString(it) } } if (argv.isEmpty()) throw IOException("no command") val cwd = request.optString("cwd", "/root").ifEmpty { "/root" } - val cmd = LinuxRuntime.prootPrefix(context, root, cwd, true) - cmd.add(1, "--link2symlink") - LinuxRuntime.lastBinds(context).filterNot { it.startsWith("/proc/self/fd/") }.forEach { cmd.add("-b"); cmd.add(it) } - cmd.add("/usr/bin/env") - cmd.add("-i") - request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> cmd.add("$k=${e.getString(k)}") } } - cmd.addAll(argv) - val builder = ProcessBuilder(cmd).directory(root) - builder.environment().apply { - clear() - put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) - put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) - if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") - LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + val binds = LinuxRuntime.lastBinds(context).filterNot { it.startsWith("/proc/self/fd/") } + val guest = mutableListOf("/usr/bin/env", "-i") + request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> guest.add("$k=${e.getString(k)}") } } + guest.addAll(argv) + val builder = if (NativeGuest.forSession(context)) { + NativeGuest.processBuilder(context, root, binds, guest, cwd) + } else { + val cmd = LinuxRuntime.prootPrefix(context, root, cwd, true) + cmd.add(1, "--link2symlink") + binds.forEach { cmd.add("-b"); cmd.add(it) } + cmd.addAll(guest) + ProcessBuilder(cmd).directory(root).also { b -> + b.environment().apply { + clear() + put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) + put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) + if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + } + } } val streams = listOf(stdio(fds.getOrNull(0), false), stdio(fds.getOrNull(1), true), stdio(fds.getOrNull(2), true)) try { diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt index 36b9c3dfdc..10d031715b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt @@ -39,6 +39,7 @@ object BottomDesktop { val sessionDir: File, val generation: Int, val installed: Boolean, + val nativeUserland: Boolean, ) @Volatile private var launch: Launch? = null @@ -89,10 +90,11 @@ object BottomDesktop { root: File, sessionDir: File, generation: Int, + nativeUserland: Boolean, stillCurrent: () -> Boolean, ) { val prepared = Launch(ArrayList(guest), ArrayList(binds), sessionRoot, hostEnvironment.copyOf(), root, sessionDir, generation, - DesktopCatalog.desktopInstalled(root)) + DesktopCatalog.desktopInstalled(root), nativeUserland) synchronized(launchLock) { if (stillCurrent()) launch = prepared } } @@ -320,9 +322,17 @@ object BottomDesktop { add("BL_IME_DIR=" + imeDir.path) add(SCRIPT) } - val command = LinuxRuntime.commandWithBinds(context, current.root, binds, guest) + val command = if (current.nativeUserland) { + com.droiddeck.launcher.runtime.NativeGuest.command(current.root, guest.first(), guest.drop(1)) + } else { + LinuxRuntime.commandWithBinds(context, current.root, binds, guest) + } + val environment = if (current.nativeUserland) { + com.droiddeck.launcher.runtime.NativeGuest.sessionEnvironment(current.root, binds, SessionPrefs.guestHostname(context)) + .map { (k, v) -> "$k=$v" }.toTypedArray() + } else current.hostEnvironment val line = command.joinToString(" ") { it.replace("\\", "\\\\").replace(" ", "\\ ") } - val pid = HostProcess.start(line, current.hostEnvironment, current.root, { status -> + val pid = HostProcess.start(line, environment, current.root, { status -> main.post { if (generation != guestGeneration) return@post Log.i(TAG, "the desktop ended ($status)") diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index d17d40df48..94334f4dc9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -283,14 +283,20 @@ object ProtonExtras { "LANG=C.UTF-8", "XDG_DATA_HOME=/root/.local/share", "/usr/local/bin/droiddeck-proton-extra", "/root/.local/share/Steam", archive.absolutePath, ) - val command = LinuxRuntime.command(context, null, runtimeDir, null, guest) - val process = ProcessBuilder(command) - .directory(root) - .redirectErrorStream(true) - val hostEnv = process.environment() - hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(context).path - hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(context).path - LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { hostEnv["LD_LIBRARY_PATH"] = it } + val process = if (com.droiddeck.launcher.runtime.NativeGuest.enabled(context)) { + com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, + LinuxRuntime.binds(context, null, runtimeDir, null, null), guest).redirectErrorStream(true) + } else { + ProcessBuilder(LinuxRuntime.command(context, null, runtimeDir, null, guest)) + .directory(root) + .redirectErrorStream(true) + .also { builder -> + val hostEnv = builder.environment() + hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(context).path + hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(context).path + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { hostEnv["LD_LIBRARY_PATH"] = it } + } + } val child = process.start() var placed: String? = null child.inputStream.bufferedReader().useLines { lines -> diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 3ade0b497e..8c5e7431b1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -83,6 +83,7 @@ object SessionFiles { "libblsession.so" to "usr/local/lib/libblsession.so", "libfakeinput.so" to "usr/local/lib/libfakeinput.so", "libblfastpath.so" to "usr/local/lib/libblfastpath.so", + "libddnatv-hook.so" to "usr/lib/libddnatv-hook.so", "libblaudit.so" to "usr/local/lib/libblaudit.so", "libssbs.so" to "usr/local/lib/libssbs.so", "usr/local/bin/droiddeck-session" to "usr/local/bin/droiddeck-session", @@ -289,12 +290,16 @@ object SessionFiles { if (!File(Environment.getExternalStorageDirectory(), NO_PAD_SWITCH).exists()) { preload.append("/usr/local/lib/libfakeinput.so\n") } + val nativeUserland = SessionPrefs.nativeUserland(context) + if (nativeUserland) com.droiddeck.launcher.runtime.NativeGuest.prepare(context, root) if (ProotFastPath.enabled(context)) { val library = com.droiddeck.launcher.agent.AgentEnv.fastPathLibrary(context) preload.append(library + "\n") if (startsSession && library != ProotFastPath.LIBRARY) Log.i(TAG, "fast path preload: $library (debugging override)") } val etc = File(root, "etc").apply { mkdirs() } + File(etc, "droiddeck").mkdirs() + FileUtils.writeString(File(etc, "droiddeck/native-preload"), preload.toString()) val staged = File(etc, "ld.so.preload.staged") if (!FileUtils.writeString(staged, preload.toString()) || !staged.renameTo(File(etc, "ld.so.preload"))) { 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 c8e81550a5..4b0a94f7b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -752,6 +752,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("prootNoSeccomp", on).apply() } + fun nativeUserland(context: Context): Boolean = prefs(context).getBoolean("nativeUserland", false) + + fun setNativeUserland(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("nativeUserland", on).apply() + } + fun prootFastPath(context: Context): Boolean = prefs(context).getBoolean("prootFastPath", true) fun setProotFastPath(context: Context, on: Boolean) { 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 5fb5e37f29..4faa870866 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -665,6 +665,10 @@ class SessionService : Service() { FileUtils.clear(File(LinuxRuntime.liveDir(this), "shm")) val binds = sessionBinds(controllersOn, fakeInputDir, sessionDir, guest, sessionRoot, runtimeDir) + val nativeUserland = com.droiddeck.launcher.runtime.NativeGuest.enabled(this) + synchronized(stopLock) { + if (gen == sessionGen && SessionState.running) com.droiddeck.launcher.runtime.NativeGuest.sessionMode = nativeUserland + } val fastPathKey = if (ProotFastPath.enabled(this)) { val prootBinds = LinuxRuntime.binds( this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds, @@ -681,27 +685,42 @@ class SessionService : Service() { } } else null - val command = LinuxRuntime.command( - this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds, guest, - ) - - val hostEnv = HostEnvironment() - hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(this).path - hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(this).path - if (SessionPrefs.prootNoSeccomp(this)) { - hostEnv["PROOT_NO_SECCOMP"] = "1" - Log.i(TAG, "proot: seccomp acceleration off by request") + val sessionBindSpecs = LinuxRuntime.binds(this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds) + val command = if (nativeUserland) { + LinuxRuntime.rememberSessionBinds(sessionBindSpecs) + com.droiddeck.launcher.runtime.NativeGuest.command(root, guest.first(), guest.drop(1)) + } else { + LinuxRuntime.command(this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds, guest) } - fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> hostEnv[k] = v } } + + val prootEnv = HostEnvironment() + prootEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(this).path + prootEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(this).path + if (SessionPrefs.prootNoSeccomp(this)) { + prootEnv["PROOT_NO_SECCOMP"] = "1" + if (!nativeUserland) Log.i(TAG, "proot: seccomp acceleration off by request") + } + fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> prootEnv[k] = v } } for (key in listOf("PROOT_PROFILE", "PROOT_PROFILE_SLOW_US")) { - guest.lastOrNull { it.startsWith("$key=") }?.substringAfter('=')?.let { hostEnv[key] = it } + guest.lastOrNull { it.startsWith("$key=") }?.substringAfter('=')?.let { prootEnv[key] = it } } val prootLibs = LinuxRuntime.prootLibraryPath(this) - if (prootLibs.isNotEmpty()) hostEnv["LD_LIBRARY_PATH"] = prootLibs + if (prootLibs.isNotEmpty()) prootEnv["LD_LIBRARY_PATH"] = prootLibs - val terminalCommand = LinuxRuntime.command( - this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds, shellGuest, - ) + val drives = com.droiddeck.launcher.runtime.NativeGuest.relinkPrefixDrives(root, sessionBindSpecs) + if (drives > 0) Log.i(TAG, "$drives Wine drive links given their guest paths back") + val hostEnv = if (nativeUserland) HostEnvironment().also { env -> + Log.i(TAG, "native userland: no proot (${sessionBindSpecs.size} mounts)") + com.droiddeck.launcher.runtime.NativeGuest.sessionEnvironment(root, sessionBindSpecs, SessionPrefs.guestHostname(this)) + .forEach { (k, v) -> env[k] = v } + } else prootEnv + + // The terminal and the bottom desktop run the way the session does: without proot when it does + val terminalCommand = if (nativeUserland) { + com.droiddeck.launcher.runtime.NativeGuest.command(root, shellGuest.first(), shellGuest.drop(1)) + } else { + LinuxRuntime.command(this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds, shellGuest) + } val terminalHostEnvironment = LinkedHashMap(System.getenv()) hostEnv.asArray().forEach { entry -> val separator = entry.indexOf('=') @@ -711,7 +730,7 @@ class SessionService : Service() { SessionTerminal.prepare(terminalCommand, terminalHostEnvironment.map { (key, value) -> "$key=$value" }.toTypedArray(), root, gen) val (fastPathName, _) = ProotFastPath.hostEnv("") BottomDesktop.prepare(desktopGuest, binds, sessionRoot, - hostEnv.asArray().filterNot { it.startsWith("$fastPathName=") }.toTypedArray(), root, sessionDir, gen, + prootEnv.asArray().filterNot { it.startsWith("$fastPathName=") }.toTypedArray(), root, sessionDir, gen, nativeUserland, ) { gen == sessionGen && SessionState.running } } @@ -2023,6 +2042,8 @@ class SessionService : Service() { if (gen != null && gen != sessionGen) return cancelQueuedSteamGame() gameExitWatchToken++ + // also when startup stopped before the guest ran + com.droiddeck.launcher.runtime.NativeGuest.sessionMode = null if (!SessionState.running) return if (relaunch) SessionState.confirmRelaunchStop() SessionEvents.record("guest.exited", mapOf("status" to status)) 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 2146ac1942..67f013b78f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -22,7 +22,7 @@ object SettingsReset { "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", - "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "cursorComposite", + "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias", "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt index dec376c456..8ad240e651 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogComet.kt @@ -139,15 +139,21 @@ object GogComet { !File(LinuxRuntime.rootDir(context), BIN.removePrefix("/")).isFile) return reply(false, "not-installed") val data = File(context.filesDir, "gog-achievements").apply { mkdirs() } val ready = CountDownLatch(1) - val command = LinuxRuntime.command(context, null, null, Environment.getExternalStorageDirectory(), - listOf("/usr/bin/env", "HOME=/root", "XDG_DATA_HOME=${data.path}/data", "XDG_CONFIG_HOME=${data.path}/config", "COMET_LOG=off", "COMET_ALLOWED_CLIENTS=${policy.path}", BIN, "--credentials-stdin")) - val pb = ProcessBuilder(command).redirectErrorStream(true) - pb.environment().apply { - remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") - put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) - put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) - if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") - LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + val guest = listOf("/usr/bin/env", "HOME=/root", "XDG_DATA_HOME=${data.path}/data", "XDG_CONFIG_HOME=${data.path}/config", "COMET_LOG=off", "COMET_ALLOWED_CLIENTS=${policy.path}", BIN, "--credentials-stdin") + val pb = if (com.droiddeck.launcher.runtime.NativeGuest.forSession(context)) { + val root = LinuxRuntime.rootDir(context) + com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, + LinuxRuntime.binds(context, null, null, Environment.getExternalStorageDirectory(), null), guest).redirectErrorStream(true) + } else { + ProcessBuilder(LinuxRuntime.command(context, null, null, Environment.getExternalStorageDirectory(), guest)).redirectErrorStream(true).also { + it.environment().apply { + remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") + put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) + put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) + if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + } + } } try { val child = pb.start() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt index c8b126519f..59403dac0f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt @@ -64,15 +64,32 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str if (root <= 0 || pid <= 0) return null val status = java.io.File("/proc/$pid/status").readLines() val tracer = status.first { it.startsWith("TracerPid:") }.substringAfter(':').trim().toInt() - val tracerGroup = java.io.File("/proc/$tracer/status").readLines() - .first { it.startsWith("Tgid:") }.substringAfter(':').trim().toInt() - if (tracerGroup != root) return null + if (tracer != 0) { + // under proot, every guest process is traced by the proot the app started + val tracerGroup = java.io.File("/proc/$tracer/status").readLines() + .first { it.startsWith("Tgid:") }.substringAfter(':').trim().toInt() + if (tracerGroup != root) return null + } else if (!descendsFrom(pid, root)) { + // without proot, the process the app started is the backend itself (or its parent) + return null + } val executable = android.system.Os.stat(binary.path) if (!mapsBackend(java.io.File("/proc/$pid/maps").readText(), binary.path, executable.st_ino)) return null return java.io.File("/proc/$pid/stat").readText().substringAfterLast(") ").split(' ')[19] + ":${executable.st_dev}:${executable.st_ino}" } + private fun descendsFrom(pid: Int, root: Int): Boolean { + var current = pid + repeat(32) { + if (current == root) return true + if (current <= 1) return false + current = java.io.File("/proc/$current/status").readLines() + .firstOrNull { it.startsWith("PPid:") }?.substringAfter(':')?.trim()?.toIntOrNull() ?: return false + } + return false + } + fun signalBackend(signal: Int) { val process = backend ?: return if (!process.isAlive) return diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt index f803d06416..f27794d1b5 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt @@ -88,7 +88,8 @@ internal object Xodus { val fastPathPreloaded = runCatching { File(root, "etc/ld.so.preload").useLines { lines -> lines.any { it.trim() == ProotFastPath.LIBRARY } } }.getOrDefault(false) - val fastPathKey = if (ProotFastPath.enabled(app) && fastPathPreloaded && + val native = com.droiddeck.launcher.runtime.NativeGuest.forSession(app) + val fastPathKey = if (!native && ProotFastPath.enabled(app) && fastPathPreloaded && File(root, ProotFastPath.LIBRARY.removePrefix("/")).isFile) ProotFastPath.key(root, binds) else null val guestCommand = mutableListOf( "/usr/bin/env", "HOME=/root", "XODUS_LOG=off", "RUST_LOG=off", @@ -98,12 +99,12 @@ internal object Xodus { guestCommand.addAll(guestCommand.lastIndex, ProotFastPath.guestEnv(root, binds, key)) } guestCommand.addAll(args) - val command = LinuxRuntime.commandWithBinds(app, root, binds, guestCommand) - val builder = ProcessBuilder(command).directory(LinuxRuntime.rootDir(app)) + val builder = if (native) com.droiddeck.launcher.runtime.NativeGuest.processBuilder(app, root, binds, guestCommand) + else ProcessBuilder(LinuxRuntime.commandWithBinds(app, root, binds, guestCommand)).directory(LinuxRuntime.rootDir(app)) if (launchDirectory != null) builder.environment()["TMPDIR"] = launchDirectory.path builder.environment()["DROIDDECK_XBOX_CREDENTIAL_PORT"] = credentials.port.toString() builder.environment()["DROIDDECK_XBOX_CREDENTIAL_KEY"] = credentials.key - builder.environment().apply { + if (!native) builder.environment().apply { remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") put("PROOT_LOADER", LinuxRuntime.prootLoader(app).path) put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(app).path) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index 2c0927bc88..f8f44907a7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -53,6 +53,7 @@ fun PerformancePage( ramCapAvailable: Boolean, prootNoSeccomp: Boolean, prootFastPath: Boolean, + nativeUserland: Boolean, cursorComposite: Boolean, guestHostname: String, phantomWarning: String?, @@ -72,6 +73,7 @@ fun PerformancePage( onVramCapMb: (Int) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, onProotFastPath: (Boolean) -> Unit, + onNativeUserland: (Boolean) -> Unit, onCursorComposite: (Boolean) -> Unit, onGuestHostname: (String) -> Unit, onClientCore: (Int, Boolean) -> Unit, @@ -187,9 +189,18 @@ fun PerformancePage( ) ToggleRow( host, "fastpath", stringResource(R.string.perf_fastpath), - if (prootNoSeccomp) stringResource(R.string.perf_fastpath_needs_seccomp) - else stringResource(R.string.perf_fastpath_hint), - prootFastPath && !prootNoSeccomp, enabled = !prootNoSeccomp, onChange = onProotFastPath, + when { + nativeUserland -> stringResource(R.string.perf_fastpath_needs_proot) + prootNoSeccomp -> stringResource(R.string.perf_fastpath_needs_seccomp) + else -> stringResource(R.string.perf_fastpath_hint) + }, + prootFastPath && !prootNoSeccomp && !nativeUserland, enabled = !prootNoSeccomp && !nativeUserland, + onChange = onProotFastPath, + ) + ToggleRow( + host, "nativeuserland", stringResource(R.string.perf_native_userland), + stringResource(R.string.perf_native_userland_hint), + nativeUserland, onChange = onNativeUserland, ) ToggleRow( host, "cursorcomposite", stringResource(R.string.perf_cursor_composite), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a7a221a0b..3351982981 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -648,7 +648,10 @@ Disables Proton\'s gamepad navigation helper, which costs CPU in every game. Run proot without seccomp May fix missing-syscall errors on some kernels. Can reduce performance. + Run without proot (experimental) + Starts the Linux side directly on Android. Applies to the next session. Turn off if something fails to start. proot fast path + Not used without proot. Needs proot\'s seccomp filter. Faster file lookups and less stutter. Turn off if a program can\'t find its files. Draw the cursor inside gamescope diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt index a71063bf35..23db657ed5 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -55,6 +55,26 @@ class BwrapSpawnerTest { assertTrue(Bind("/rootfs/etc/droiddeck/proc/stat", "/newproc/stat") in binds) } + @Test fun theSessionsRootfsSettingsStayOutOfTheSandbox() { + val rootfs = "/data/app/linuxfs" + val env = mutableMapOf( + "DDNATV_ROOT" to rootfs, "DDNATV_BINDS" to "/dev:/dev", "HOME" to "/root", + "SPA_PLUGIN_DIR" to "/usr/local/lib/droiddeck-pipewire/lib/spa-0.2", + "LD_PRELOAD" to "/run/droiddeck-preload/libblsession.so:$rootfs/usr/local/lib/libblsession.so:$rootfs/usr/lib/libddnatv-hook.so", + ) + BwrapSpawner.withoutRootfsSettings(env, rootfs) + assertEquals(mapOf("HOME" to "/root", "LD_PRELOAD" to "/run/droiddeck-preload/libblsession.so"), env) + val onlySession = mutableMapOf("LD_PRELOAD" to "$rootfs/usr/lib/libddnatv-hook.so") + BwrapSpawner.withoutRootfsSettings(onlySession, rootfs) + assertTrue(onlySession.isEmpty()) + val wayland = mutableMapOf("SDL_VIDEODRIVER" to "x11", "WAYLAND_DISPLAY" to "wayland-0") + BwrapSpawner.withoutRootfsSettings(wayland, rootfs) + assertEquals(mapOf("WAYLAND_DISPLAY" to "wayland-0"), wayland) + val x11 = mutableMapOf("SDL_VIDEODRIVER" to "x11", "WAYLAND_DISPLAY" to "wayland-0", "DISPLAY" to ":99") + BwrapSpawner.withoutRootfsSettings(x11, rootfs) + assertEquals("x11", x11["SDL_VIDEODRIVER"]) + } + @Test fun normalizeResolvesDotsLexically() { assertEquals("/usr/lib/x", BwrapSpawner.normalize("/usr/lib/GL/../x")) assertEquals("/", BwrapSpawner.normalize("/../..")) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/ElfSeccompPatchTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/ElfSeccompPatchTest.kt new file mode 100644 index 0000000000..386017d154 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/ElfSeccompPatchTest.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.runtime + +import java.nio.ByteBuffer +import java.nio.ByteOrder +import org.junit.Assert.assertEquals +import org.junit.Test + +class ElfSeccompPatchTest { + private fun elfWith(vararg words: Int): ByteArray { + val data = ByteArray(0x200) + val b = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN) + b.put(0, 0x7f); b.put(1, 'E'.code.toByte()); b.put(2, 'L'.code.toByte()); b.put(3, 'F'.code.toByte()) + b.put(4, 2); b.put(5, 1) + b.putShort(18, 183) + b.putLong(32, 64) + b.putShort(54, 56); b.putShort(56, 1) + b.putInt(64, 1); b.putInt(68, 5) + b.putLong(72, 0x100); b.putLong(96, 0x100) + words.forEachIndexed { i, w -> b.putInt(0x100 + i * 4, w) } + return data + } + + @Test + fun theSvcAfterEachBlockedCallIsAnsweredInPlace() { + val svc = 0xd4000001.toInt() + val data = elfWith(0xd2800c68.toInt(), 0xaa0003e1.toInt(), svc, 0xd28024a8.toInt(), svc, 0xd2803668.toInt(), svc) + assertEquals(3, ElfSeccompPatch.patch(data)) + val b = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN) + assertEquals(0xd503201f.toInt(), b.getInt(0x108)) + assertEquals(0x928004a0.toInt(), b.getInt(0x110)) + assertEquals(0x928004a0.toInt(), b.getInt(0x118)) + assertEquals(0, ElfSeccompPatch.patch(data)) + } + + @Test + fun aSecondRunLeavesTheNextCallAlone() { + val svc = 0xd4000001.toInt() + val exit = 0xd2800ba8.toInt() + for (blocked in listOf(0xd2803668.toInt(), 0xd2800c68.toInt())) { + val data = elfWith(blocked, svc, 0xaa1303e0.toInt(), exit, svc) + assertEquals(1, ElfSeccompPatch.patch(data)) + assertEquals(0, ElfSeccompPatch.patch(data)) + assertEquals(svc, ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN).getInt(0x110)) + } + } + + @Test + fun otherSystemCallsAreLeftAlone() { + val svc = 0xd4000001.toInt() + val data = elfWith(0xd2800ba8.toInt(), svc) + assertEquals(0, ElfSeccompPatch.patch(data)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/NativeGuestTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/NativeGuestTest.kt new file mode 100644 index 0000000000..3188eb4e62 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/NativeGuestTest.kt @@ -0,0 +1,99 @@ +package com.droiddeck.launcher.runtime + +import java.io.File +import java.nio.file.Files +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class NativeGuestTest { + private fun rootWithLoader(): File = Files.createTempDirectory("native-root").toFile().also { + File(it, "usr/lib").mkdirs() + File(it, "usr/lib/ld-linux-aarch64.so.1").writeText("") + } + + @Test + fun theSeccompSwitchNamesAHelperAndItsArgumentsInTheRootfs() { + val root = Files.createTempDirectory("rootfs").toFile() + assertEquals(null, NativeGuest.simulator(root)) + File(root, "usr/local/bin").mkdirs() + File(root, "usr/local/bin/seccomp-sim").writeText("") + File(root, "etc/droiddeck").mkdirs() + File(root, "etc/droiddeck/seccomp-sim").writeText("/usr/local/bin/seccomp-sim -f /etc/droiddeck/app.bpf\n") + assertEquals(listOf(File(root, "usr/local/bin/seccomp-sim").path, "-f", File(root, "etc/droiddeck/app.bpf").path), + NativeGuest.simulator(root)) + File(root, "etc/droiddeck/seccomp-sim").writeText("/usr/local/bin/missing") + assertEquals(null, NativeGuest.simulator(root)) + } + + @Test + fun aWorkingDirectoryInAMountIsItsSource() { + val root = Files.createTempDirectory("rootfs").toFile() + val storage = Files.createTempDirectory("storage").toFile() + File(root, "root").mkdirs() + // a mount spec is "src:dst"; Windows' drive letters cannot be written in one + org.junit.Assume.assumeFalse(storage.path.contains(':')) + val binds = listOf("${storage.path}:/root/Storage", "/proc") + assertEquals(storage, NativeGuest.workingDirectory(root, binds, "/root/Storage")) + assertEquals(File(root, "root"), NativeGuest.workingDirectory(root, binds, "/root")) + assertEquals(root, NativeGuest.workingDirectory(root, binds, "/nowhere")) + } + + @Test + fun commandRunsTheProgramThroughTheRootfsLoader() { + val root = rootWithLoader() + val command = NativeGuest.command(root, "/usr/bin/env", listOf("-i", "A=1")) + assertEquals(File(root, "usr/lib/ld-linux-aarch64.so.1").path, command[0]) + assertEquals(listOf("--argv0", "env", File(root, "usr/bin/env").path, "-i", "A=1"), command.drop(1)) + } + + @Test + fun mountsWithoutADestinationMapToThemselves() { + val root = rootWithLoader() + val env = NativeGuest.sessionEnvironment(root, listOf("/dev", "/a:/b")) + assertEquals("/dev:/dev|/a:/b", env["DDNATV_BINDS"]) + assertEquals(root.path, env["DDNATV_ROOT"]) + assertTrue(env.getValue("LD_PRELOAD").replace(File.separatorChar, '/').endsWith("usr/lib/libddnatv-hook.so")) + } + + private val linkRoot = "/data/user/0/app/files/linuxfs" + private val sdBinds = listOf( + "/mnt/media_rw/CARD/files/steam:/mnt/droiddeck-sd", + "/data/user/0/app/files/steam-libraries/x/steamapps/compatdata:/mnt/droiddeck-sd/steamapps/compatdata", + "/storage/emulated/0", + ) + + @Test + fun aDriveLinkToTheCardGetsItsGuestPathBack() { + assertEquals("/mnt/droiddeck-sd", NativeGuest.guestLinkTarget("/mnt/media_rw/CARD/files/steam", linkRoot, sdBinds)) + assertEquals("/mnt/droiddeck-sd/steamapps/compatdata/1", + NativeGuest.guestLinkTarget("/data/user/0/app/files/steam-libraries/x/steamapps/compatdata/1", linkRoot, sdBinds)) + } + + @Test + fun aDriveLinkIntoTheRootfsGetsItsGuestPathBack() { + assertEquals("/", NativeGuest.guestLinkTarget(linkRoot, linkRoot, sdBinds)) + assertEquals("/root/Games", NativeGuest.guestLinkTarget("$linkRoot/root/Games", linkRoot, sdBinds)) + } + + @Test + fun guestPathsStayAsTheyAre() { + assertEquals(null, NativeGuest.guestLinkTarget("/mnt/droiddeck-sd", linkRoot, sdBinds)) + assertEquals(null, NativeGuest.guestLinkTarget("/", linkRoot, sdBinds)) + assertEquals(null, NativeGuest.guestLinkTarget("../drive_c", linkRoot, sdBinds)) + assertEquals(null, NativeGuest.guestLinkTarget("/storage/emulated/0/Games", linkRoot, sdBinds)) + } + + @Test + fun aSiblingOfAMountSourceIsNotPartOfIt() { + assertEquals(null, NativeGuest.guestLinkTarget("/mnt/media_rw/CARD/files/steamx", linkRoot, sdBinds)) + assertEquals(null, NativeGuest.guestLinkTarget("${linkRoot}x/root", linkRoot, sdBinds)) + } + + @Test + fun theFirstOfMountsSharingASourceIsTheGuestPath() { + val binds = sdBinds + "/data/user/0/app/files/steam-libraries/x/steamapps/compatdata:/mnt/bannerlator-sd/steamapps/compatdata" + assertEquals("/mnt/droiddeck-sd/steamapps/compatdata/2", + NativeGuest.guestLinkTarget("/data/user/0/app/files/steam-libraries/x/steamapps/compatdata/2", linkRoot, binds)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt index 12fb45bf91..f413618942 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt @@ -33,4 +33,8 @@ class ProotFastPathTest { assertFalse(ProotFastPath.allows(preference = false, noSeccomp = false, source = LinuxRuntime.PROOT_PACK)) assertFalse(ProotFastPath.allows(preference = true, noSeccomp = true, source = LinuxRuntime.PROOT_PACK)) } + + @Test fun fastPathStaysOffWithoutProot() { + assertFalse(ProotFastPath.allows(preference = true, noSeccomp = false, source = LinuxRuntime.PROOT_PACK, nativeUserland = true)) + } } diff --git a/tools/build_local.sh b/tools/build_local.sh index d7f2ca2a21..d564f1e3c0 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -133,6 +133,7 @@ docker run --rm --platform "${docker_platform}" \ aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ -o "$d/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/libblfastpath.so" + bash tools/nativeguest/build.sh "$d/libddnatv-hook.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -nostdlib -ffreestanding -fno-stack-protector \ -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$d/libblaudit.so" tools/proot/fastpath/audit.c aarch64-linux-gnu-strip --strip-unneeded "$d/libblaudit.so" diff --git a/tools/components/build-arm64-preloads.sh b/tools/components/build-arm64-preloads.sh index a38a1edaaa..e06aa2afc1 100644 --- a/tools/components/build-arm64-preloads.sh +++ b/tools/components/build-arm64-preloads.sh @@ -12,6 +12,7 @@ aarch64-linux-gnu-strip --strip-unneeded "$D/libblsession.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ -o "$D/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$D/libblfastpath.so" +bash tools/nativeguest/build.sh "$D/libddnatv-hook.so" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -nostdlib -ffreestanding -fno-stack-protector \ -fno-tree-loop-distribute-patterns -Wl,-z,defs -o "$D/libblaudit.so" tools/proot/fastpath/audit.c aarch64-linux-gnu-strip --strip-unneeded "$D/libblaudit.so" diff --git a/tools/components/preloads.py b/tools/components/preloads.py index 808d510463..36d0b3dcc8 100644 --- a/tools/components/preloads.py +++ b/tools/components/preloads.py @@ -51,6 +51,7 @@ def source_files(group, root=ROOT, commit=None, patterns=None): if not paths: raise ValueError('No preload inputs found') result = {} + listed = set(paths) pending = list(paths) while pending: path = pending.pop() @@ -58,7 +59,13 @@ def source_files(group, root=ROOT, commit=None, patterns=None): continue if path.startswith('../') or path.startswith('/'): raise ValueError('Preload include escapes repository') - content = read(path).replace(b'\r\n', b'\n') + try: + content = read(path).replace(b'\r\n', b'\n') + except (OSError, subprocess.CalledProcessError): + # a header the build generates (gosys/gosys_blob.h, included behind __has_include) + if path in listed: + raise + continue result[path] = sha(content) for include in re.findall(rb'^\s*#\s*include\s*"([^"\n]+)"', content, re.M): pending.append(posixpath.normpath(posixpath.join(posixpath.dirname(path), include.decode()))) @@ -126,13 +133,15 @@ def artifact_bytes(origin, cache): if len(names) != 1: raise ValueError('Expected one original APK') with ZipFile(io.BytesIO(archive.read(names[0]))) as apk: - return {name: apk.read('assets/linuxfs/' + name) for name in FILES} + present = set(apk.namelist()) + return {name: apk.read('assets/linuxfs/' + name) for name in FILES if 'assets/linuxfs/' + name in present} def validate_lock(data): if data.get('version') != 1 or set(data['groups']) != set(INPUTS): raise ValueError('Unsupported preload snapshot') - if set(data['outputs']) != FILES: + # A lock made before a recipe gained an output lacks it; that group is rebuilt (restore) + if not set(data['outputs']) <= FILES: raise ValueError('Unexpected preload output set') for digest in [data['archive_sha256'], *data['outputs'].values()]: if len(digest) != 64 or any(c not in '0123456789abcdef' for c in digest): @@ -160,7 +169,7 @@ def producer_sources(group, commit, root=ROOT): def prove_origin(data, cache, root=ROOT): content = artifact_bytes(data['origin'], cache) - if {name: sha(value) for name, value in content.items()} != data['outputs']: + if {name: sha(value) for name, value in content.items() if name in data['outputs']} != data['outputs']: raise ValueError('Snapshot binaries differ from the original main APK') commit = data['origin']['commit'] run('git', 'fetch', '--no-tags', 'origin', commit, root=root) @@ -183,7 +192,7 @@ def unpack(content, data): total = 0 with tarfile.open(fileobj=io.BytesIO(content), mode='r:gz') as archive: for entry in archive: - if entry.name not in FILES or entry.name in result or not entry.isfile() or entry.size > 32 * 1024 * 1024: + if entry.name not in data['outputs'] or entry.name in result or not entry.isfile() or entry.size > 32 * 1024 * 1024: raise ValueError('Unsafe or unexpected preload archive entry') total += entry.size if total > 64 * 1024 * 1024: @@ -192,7 +201,7 @@ def unpack(content, data): if sha(value) != data['outputs'][entry.name]: raise ValueError('Preload binary checksum mismatch') result[entry.name] = value - if set(result) != FILES: + if set(result) != set(data['outputs']): raise ValueError('Incomplete preload archive') return result @@ -203,6 +212,8 @@ def restore(root=ROOT): matching = {group: source_files(group, root) == data['groups'][group] for group in INPUTS} matching['arm64'] &= recipe(root) == data['arm64_recipe'] matching['x86'] &= x86_recipe(root) == data.get('x86_recipe') + for group in matching: + matching[group] &= all(name in data['outputs'] for name in OUTPUTS[group]) if os.environ.get('FORCE_PRELOAD_REBUILD') == 'true': matching = dict.fromkeys(INPUTS, False) if any(matching.values()): diff --git a/tools/components/recipes.json b/tools/components/recipes.json index b5789aa7ea..92fcc548a4 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -164,7 +164,8 @@ "tools/components/build-arm64-preloads.sh", "tools/linuxfs/preload", "app/src/main/cpp/fakeinput_steam.cpp", - "tools/components/recipes/arm64-preloads.sh" + "tools/components/recipes/arm64-preloads.sh", + "tools/nativeguest" ], "outputs": [ "app/src/main/assets/linuxfs/libfakeinput.so", @@ -172,7 +173,8 @@ "app/src/main/assets/linuxfs/libblfastpath.so", "app/src/main/assets/linuxfs/libblaudit.so", "app/src/main/assets/linuxfs/libssbs.so", - "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard" + "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard", + "app/src/main/assets/linuxfs/libddnatv-hook.so" ], "packages": [ "gcc-aarch64-linux-gnu", @@ -187,7 +189,8 @@ "tools/quest/kgsl_compat.h", "tools/proot/fastpath", "tools/linuxfs/ssbs", - "tools/linuxfs/clipboard" + "tools/linuxfs/clipboard", + "tools/nativeguest" ], "snapshot_outputs": [ "libfakeinput.so", @@ -195,7 +198,8 @@ "libblfastpath.so", "libblaudit.so", "libssbs.so", - "usr/local/bin/droiddeck-clipboard" + "usr/local/bin/droiddeck-clipboard", + "libddnatv-hook.so" ] }, "preload-snapshot": { diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 8d08288d01..7c4116384b 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -101,6 +101,10 @@ def encode_request(request: dict) -> str: def receiver_call(adb: str, serial: str, method: str, arg: str | None, request: dict | None, timeout: float) -> dict: """The agent bridge through a broadcast, for shells without the `content` command.""" + # Its receiver is registered by the running app; a broadcast does not start the app the way `content call` does + running = run_adb(adb, serial, "shell", f"pidof {PACKAGE}", timeout=30) + if not running.stdout.decode(errors="replace").strip(): + raise ControlError(f"{PACKAGE} is not running and this shell has no `content` command to start it; open DroidDeck once", "APP_NOT_RUNNING") call_id = uuid.uuid4().hex[:16] remote = f"/sdcard/Android/data/{PACKAGE}/files/agent-calls/{call_id}.json" command = ["shell", "am", "broadcast", "-a", f"{PACKAGE}.AGENT_CALL", "-p", PACKAGE, @@ -132,7 +136,8 @@ def provider_call(adb: str, serial: str, method: str, arg: str | None = None, re command.extend(["--extra", f"request:s:{encoded}"]) result = run_adb(adb, serial, *command, timeout=timeout) output = (result.stdout + result.stderr).decode(errors="replace") - if "content: inaccessible or not found" in output: + # Only the shell's own answer for a missing `content` binary, never a command's output that quotes it + if result.returncode == 127 and "Result:" not in output and "content: inaccessible or not found" in result.stderr.decode(errors="replace") + output: return receiver_call(adb, serial, method, arg, request, timeout) response = _content_result(output) if result.returncode != 0 and response.get("ok") is not False: @@ -781,6 +786,28 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: f"{(response.get('stderr') or {}).get('text', '')[-400:]}", "GUEST_EXIT") return add_serial(response, serial) + if command == "native": + argv = args.argv[1:] if args.argv[:1] == ["--"] else args.argv + if not argv: + raise ControlError("native needs a command after --", "INVALID_ARGUMENTS") + if not 0 < args.timeout <= 600: + raise ControlError("--timeout must be more than 0 and at most 600 seconds", "INVALID_ARGUMENTS") + env = {} + for item in args.env or []: + key, sep, value = item.partition("=") + if not sep: + raise ControlError(f"--env takes KEY=VALUE, not {item}", "INVALID_ARGUMENTS") + env[key] = value + request = {"argv": argv, "timeout": args.timeout, "env": env} + if args.cwd: + request["cwd"] = args.cwd + if args.stdin is not None: + request["stdin"] = args.stdin + if args.preload: + request["preload"] = args.preload + response = checked(provider_call(adb, serial, "native", request=request, timeout=args.timeout + 40), "NATIVE_FAILED") + return add_serial(response, serial) + if command == "cdp": if args.cdp_op == "targets": request = {"op": "targets"} @@ -1015,6 +1042,14 @@ def build_parser() -> argparse.ArgumentParser: guest.add_argument("--check", action="store_true", help="fail unless the command exits 0") guest.add_argument("argv", nargs=argparse.REMAINDER) + native = commands.add_parser("native", help="run a command in the rootfs without proot (debugging tools)") + native.add_argument("--timeout", type=float, default=30) + native.add_argument("--env", action="append", metavar="KEY=VALUE") + native.add_argument("--cwd") + native.add_argument("--stdin") + native.add_argument("--preload", action="append", help="guest path of another library to preload before the hook") + native.add_argument("argv", nargs=argparse.REMAINDER) + cdp = commands.add_parser("cdp", help="the Steam client's DevTools (debugging tools)") cdp_ops = cdp.add_subparsers(dest="cdp_op", required=True) cdp_ops.add_parser("targets", help="list DevTools targets") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 16b12bfe3d..175b8d8d1c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -1270,6 +1270,10 @@ def main(): if scripts and install_scripts_done(scripts, env): print("droiddeck-game-env: install scripts already run in this prefix; evaluator skipped", file=sys.stderr) return 0 + if scripts and not env.get("DBUS_SESSION_BUS_ADDRESS"): + # libdbus would autolaunch a session bus under the evaluator's reaper, which then waits for it + # forever: Steam keeps seeing the app as running and cannot move or update it + env["DBUS_SESSION_BUS_ADDRESS"] = "disabled:" try: digest = scripts_digest(scripts) if scripts else None except OSError: diff --git a/tools/linuxfs/preload/tracer.c b/tools/linuxfs/preload/tracer.c index 572cf13e09..7f5ac8e8cd 100644 --- a/tools/linuxfs/preload/tracer.c +++ b/tools/linuxfs/preload/tracer.c @@ -81,7 +81,10 @@ __attribute__((visibility("hidden"))) int bl_status_without_tracer(const char *p long pid; if ((flags & O_ACCMODE) != O_RDONLY || (pid = status_pid(path)) < 0 || is_web_helper(caller) || bl_from_ntdll(caller)) return -1; - int in = (int)syscall(SYS_openat, AT_FDCWD, path, O_RDONLY | O_CLOEXEC); + // through the next open(): the native userland's hook gives the app's ids as root's there + static int (*next_open)(const char *, int, ...) = NULL; + if (!next_open) next_open = (int (*)(const char *, int, ...))dlsym(RTLD_NEXT, "open"); + int in = next_open ? next_open(path, O_RDONLY | O_CLOEXEC) : (int)syscall(SYS_openat, AT_FDCWD, path, O_RDONLY | O_CLOEXEC); if (in < 0) goto done; for (;;) { ssize_t n = read(in, text + len, sizeof(text) - 1 - len); diff --git a/tools/nativeguest/LICENSE b/tools/nativeguest/LICENSE new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/tools/nativeguest/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/tools/nativeguest/README.md b/tools/nativeguest/README.md new file mode 100644 index 0000000000..19571de96c --- /dev/null +++ b/tools/nativeguest/README.md @@ -0,0 +1,34 @@ +# Native userland (no proot) + +`libddnatv-hook.so` is an `LD_PRELOAD` library that lets the glibc rootfs run directly on Android: +it maps the guest's absolute paths into the rootfs (plus the mounts proot used to provide, from +`DDNATV_BINDS`), starts every program through the rootfs's `ld.so`, and answers the system calls +Android's seccomp policy kills a process for (`SIGSYS` handler). There is no tracer. The app side +is `runtime/NativeGuest.kt`; the setting is Performance > "Run without proot (experimental)". + +The hook is derived from the Apache-2.0 `libcortex-hook` of +[ssfuisu/cortex](https://github.com/ssfuisu/cortex) (see `LICENSE`), renamed (`cortex` -> `ddnatv`, +same length: the code compares environment names by length) and extended with: + +- `DDNATV_BINDS` mounts, `DDNATV_PRELOAD` (what `/etc/ld.so.preload` does for proot), and mapping of + guest paths inside `LD_PRELOAD`; +- POSIX `shm_open`/`shm_unlink` through `/dev/shm`; +- starting Wine without its static preloader, which opens files with raw system calls. + +Build: `tools/nativeguest/build.sh out.so` with an aarch64 glibc cross compiler. + +## Testing under Android's seccomp filter + +Some devices (eng builds, `setenforce 0` ROMs) run apps with no seccomp filter, so a hook that +passes there can still die with SIGSYS on a stock phone (`GUEST_EXIT 159`). `seccomp-sim.c` applies +a filter that answers the calls Android blocks with SIGSYS, then runs the program: + +``` +aarch64-linux-gnu-gcc -static -O2 -o seccomp-sim tools/nativeguest/seccomp-sim.c +# copy it into the rootfs, then name it for every native launch: +echo /usr/local/bin/seccomp-sim > /etc/droiddeck/seccomp-sim +``` + +`grep Seccomp: /proc//status` should then show `2` for the session's processes. Empty the file +to turn it off. `seccomp-sim -a NR,NR PROGRAM` leaves the listed calls allowed, to find which one +kills a program. diff --git a/tools/nativeguest/app-seccomp-dump.c b/tools/nativeguest/app-seccomp-dump.c new file mode 100644 index 0000000000..1ec09ea256 --- /dev/null +++ b/tools/nativeguest/app-seccomp-dump.c @@ -0,0 +1,50 @@ +// Writes the seccomp filter Android's zygote gives an app (from the device's libandroid_runtime.so) +// to a file, as the raw sock_filter array, for seccomp-sim -f on devices whose zygote skips it +// (a permissive SELinux). A bionic program, built with the NDK and run from adb shell: +// aarch64-linux-android33-clang -O2 -rdynamic -o app-seccomp-dump app-seccomp-dump.c -ldl +// app-seccomp-dump OUT +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static const char *g_out; +static int g_dumped; + +// the runtime's own prctl() call lands here first +__attribute__((visibility("default"))) int prctl(int option, ...) { + va_list ap; + va_start(ap, option); + unsigned long a2 = va_arg(ap, unsigned long), a3 = va_arg(ap, unsigned long); + unsigned long a4 = va_arg(ap, unsigned long), a5 = va_arg(ap, unsigned long); + va_end(ap); + if (option == PR_SET_SECCOMP && a2 == SECCOMP_MODE_FILTER && g_out) { + const struct sock_fprog *prog = (const struct sock_fprog *)a3; + FILE *f = fopen(g_out, "wb"); + if (f) { + fwrite(prog->filter, sizeof(prog->filter[0]), prog->len, f); + fclose(f); + fprintf(stderr, "app-seccomp-dump: %u instructions to %s\n", prog->len, g_out); + g_dumped = 1; + } + return 0; // not installed in this process + } + return (int)syscall(SYS_prctl, option, a2, a3, a4, a5); +} + +int main(int argc, char **argv) { + if (argc != 2) { fprintf(stderr, "usage: %s OUT\n", argv[0]); return 2; } + g_out = argv[1]; + void *rt = dlopen("libandroid_runtime.so", RTLD_NOW); + if (!rt) { fprintf(stderr, "%s\n", dlerror()); return 2; } + int (*set_app_filter)(void) = (int (*)(void))dlsym(rt, "_Z22set_app_seccomp_filterv"); + if (!set_app_filter) { fprintf(stderr, "no set_app_seccomp_filter\n"); return 2; } + set_app_filter(); + return g_dumped ? 0 : 1; +} diff --git a/tools/nativeguest/build-gosys.sh b/tools/nativeguest/build-gosys.sh new file mode 100755 index 0000000000..ce05326c1e --- /dev/null +++ b/tools/nativeguest/build-gosys.sh @@ -0,0 +1,82 @@ +#!/usr/bin/env bash +# Builds the code the native userland adds to static Go programs (gosys/gosys.c) into the C header +# the hook includes (gosys/gosys_blob.h, not kept in the repository; build.sh makes it each time). +# +# The code is AArch64 whatever the machine this runs on: it is compiled freestanding with an +# aarch64 cross compiler (gcc-aarch64-linux-gnu: the one that builds the hook; or clang with lld). +# +# usage: tools/nativeguest/build-gosys.sh [output header] +set -euo pipefail + +here=$(cd "$(dirname "$0")" && pwd) +src=$here/gosys +out=${1:-$src/gosys_blob.h} + +if command -v aarch64-linux-gnu-gcc >/dev/null 2>&1; then + CC=(aarch64-linux-gnu-gcc) + LD=(aarch64-linux-gnu-ld) + OBJCOPY=(aarch64-linux-gnu-objcopy) + NM=(aarch64-linux-gnu-nm) + OBJDUMP=(aarch64-linux-gnu-objdump) +elif command -v clang >/dev/null 2>&1 && command -v ld.lld >/dev/null 2>&1; then + CC=(clang --target=aarch64-linux-gnu) + LD=(ld.lld) + OBJCOPY=(llvm-objcopy) + NM=(llvm-nm) + OBJDUMP=(llvm-objdump) +else + echo "build-gosys.sh: needs aarch64-linux-gnu-gcc (apt install gcc-aarch64-linux-gnu) or clang with lld" >&2 + exit 1 +fi + +tmp=$(mktemp -d) +trap 'rm -rf "$tmp"' EXIT + +"${CC[@]}" -std=gnu11 -O2 -Wall -Wextra -Werror \ + -ffreestanding -fno-builtin -nostdlib -fPIE -fvisibility=hidden -fno-stack-protector \ + -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-tree-loop-distribute-patterns \ + -mcmodel=tiny -mgeneral-regs-only -mno-outline-atomics -ffixed-x18 -ffixed-x28 \ + -c "$src/gosys.c" -o "$tmp/gosys.o" +"${LD[@]}" -T "$src/gosys.ld" -nostdlib -o "$tmp/gosys.elf" "$tmp/gosys.o" +"${OBJCOPY[@]}" -O binary "$tmp/gosys.elf" "$tmp/gosys.bin" + +# It must stand on its own: nothing undefined, no writable data, and nothing that depends on the +# address it is loaded at (adrp assumes the page offset of the link address; adr does not) +if [ -n "$("${NM[@]}" -u "$tmp/gosys.elf")" ]; then + echo "build-gosys.sh: gosys.c needs symbols it does not define:" >&2 + "${NM[@]}" -u "$tmp/gosys.elf" >&2 + exit 1 +fi +if "${OBJDUMP[@]}" -d "$tmp/gosys.elf" | grep -q -w adrp; then + echo "build-gosys.sh: gosys.c uses adrp, which is not position-independent at any address" >&2 + exit 1 +fi +sections=$("${OBJDUMP[@]}" -h "$tmp/gosys.elf" | awk '$1 ~ /^[0-9]+$/ {print $2}' | tr '\n' ' ') +for s in $sections; do + case $s in + .hdr|.thunks|.text|.rodata|.trailer|.symtab|.strtab|.shstrtab) ;; + *) echo "build-gosys.sh: unexpected section $s in gosys.elf (sections: $sections)" >&2; exit 1 ;; + esac +done + +size=$(stat -c %s "$tmp/gosys.bin") +entry=$("${NM[@]}" "$tmp/gosys.elf" | awk '$3 == "cxgo_entry" {print $1}') +thunks=$("${NM[@]}" "$tmp/gosys.elf" | awk '$3 == "g_thunks" {print $1}') +if [ -z "$entry" ] || [ -z "$thunks" ]; then + echo "build-gosys.sh: cxgo_entry or g_thunks not found" >&2 + exit 1 +fi +[ "$(head -c 8 "$tmp/gosys.bin")" = "CXGOSYS1" ] || { echo "build-gosys.sh: the header is not first" >&2; exit 1; } +[ "$(tail -c 64 "$tmp/gosys.bin" | head -c 8)" = "CXGOEND1" ] || { echo "build-gosys.sh: the trailer is not last" >&2; exit 1; } + +{ + echo "// Generated by tools/nativeguest/build-gosys.sh from gosys/gosys.c. Do not edit." + echo "#define GOSYS_BLOB_SIZE $size" + echo "#define GOSYS_ENTRY_OFF 0x$entry" + echo "#define GOSYS_THUNKS_OFF 0x$thunks" + echo "static const unsigned char gosys_blob[GOSYS_BLOB_SIZE] = {" + od -An -v -tx1 "$tmp/gosys.bin" | sed -e 's/^ *//' -e 's/ /, 0x/g' -e 's/^/0x/' -e 's/$/,/' + echo "};" +} > "$out.tmp" +mv "$out.tmp" "$out" +echo "build-gosys.sh: $out ($size bytes, entry 0x$entry)" diff --git a/tools/nativeguest/build.sh b/tools/nativeguest/build.sh new file mode 100755 index 0000000000..46002f248c --- /dev/null +++ b/tools/nativeguest/build.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# Builds libddnatv-hook.so, the library that lets the glibc rootfs run on Android without proot. +# usage: tools/nativeguest/build.sh [compiler, default aarch64-linux-gnu-gcc] +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +out=${1:?output path} +cc=${2:-aarch64-linux-gnu-gcc} +gen=$(mktemp -d) +trap 'rm -rf "$gen"' EXIT +mkdir -p "$gen/gosys" +bash "$here/build-gosys.sh" "$gen/gosys/gosys_blob.h" +"$cc" -std=gnu11 -shared -fPIC -O2 -fno-delete-null-pointer-checks -Wall -Wno-nonnull-compare \ + -Wno-format-truncation -Wno-stringop-truncation -Wl,-z,max-page-size=16384 -I "$gen" \ + -o "$out" "$here/ddnatv-hook.c" -ldl +"${cc%gcc}strip" --strip-unneeded "$out" diff --git a/tools/nativeguest/ddnatv-hook.c b/tools/nativeguest/ddnatv-hook.c new file mode 100644 index 0000000000..954991c261 --- /dev/null +++ b/tools/nativeguest/ddnatv-hook.c @@ -0,0 +1,87 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef RENAME_EXCHANGE +#define RENAME_EXCHANGE (1 << 1) +#endif + +// The code that is added to static Go programs (gosys/gosys.c), built by scripts/build-gosys.sh. A +// build without it works as before, only without Go support. It is AArch64 code: the 32-bit hook +// has none (a 32-bit phone cannot run 64-bit programs). +#if defined(__has_include) && defined(__LP64__) +#if __has_include("gosys/gosys_blob.h") +#include "gosys/gosys_abi.h" +#include "gosys/gosys_blob.h" +#define DDNATV_HAVE_GOSYS 1 +#endif +#endif + +// The hook is one translation unit split into parts by topic, in this order (later parts use +// the static functions of earlier ones). +#include "hook/syscalls.c" +#include "hook/paths.c" +#include "hook/hardlinks.c" +#include "hook/signals.c" +#include "hook/setup.c" +#include "hook/files.c" +#include "hook/fileops.c" +#include "hook/identity.c" +#include "hook/privileged.c" +#include "hook/env.c" +#include "hook/exec_probe.c" +#include "hook/static_programs.c" +#include "hook/go_programs.c" +#include "hook/exec.c" +#include "hook/net.c" +#include "hook/sockets.c" +#include "hook/sysv_shm.c" +#include "hook/posix_shm.c" diff --git a/tools/nativeguest/gosys/gosys.c b/tools/nativeguest/gosys/gosys.c new file mode 100644 index 0000000000..fb8230ce4a --- /dev/null +++ b/tools/nativeguest/gosys/gosys.c @@ -0,0 +1,510 @@ +// The code The native userland adds to a static Go program so that it sees the rootfs (see gosys_abi.h). +// +// Built freestanding (scripts/build-gosys.sh) as a flat, position-independent binary with no +// writable data, no libc and no relocations: the hook copies it into the program's file. It is +// entered from the one place where Go's system calls are made, in place of the "svc #0" of +// internal/runtime/syscall.Syscall6, with the registers of that call: arguments in x0 to x5, +// the number in x8 (passed again as the eighth argument). It returns what the kernel would, and it +// may use every register but x28 (the current goroutine), x29, x30 and sp, which it keeps. +// +// It does for Go what libddnatv-hook.so does for C programs: maps absolute Ubuntu paths into the +// rootfs (the same rules as hook/paths.c), shortens the Unix socket paths that do not fit, shows +// the program the paths it expects from getcwd and /proc/self/exe, and starts Ubuntu programs +// through the rootfs's dynamic linker and env, which then go through the hook. + +#include "gosys_abi.h" + +typedef int64_t i64; +typedef uint64_t u64; +typedef uint32_t u32; +typedef uint16_t u16; + +#define AT_FDCWD (-100) +#define SLOT_PATH_A 0u +#define SLOT_PATH_B 4096u +#define SLOT_ARGV 8192u +#define SLOT_ENV 16384u +#define SLOT_PATH_CAP 4096u +#define ARGV_CAP 1000u // entries of the argv array that starts a program +#define ENV_CAP 2000u + +// The numbers of AArch64 Linux (the same for every kernel) +enum { + NR_SETXATTR = 5, NR_LSETXATTR = 6, NR_GETXATTR = 8, NR_LGETXATTR = 9, NR_LISTXATTR = 11, + NR_LLISTXATTR = 12, NR_REMOVEXATTR = 14, NR_LREMOVEXATTR = 15, NR_GETCWD = 17, + NR_INOTIFY_ADD_WATCH = 27, NR_MKNODAT = 33, NR_MKDIRAT = 34, NR_UNLINKAT = 35, NR_SYMLINKAT = 36, + NR_LINKAT = 37, NR_RENAMEAT = 38, NR_STATFS = 43, NR_TRUNCATE = 45, NR_FACCESSAT = 48, + NR_CHDIR = 49, NR_CHROOT = 51, NR_FCHMODAT = 53, NR_FCHOWNAT = 54, NR_OPENAT = 56, + NR_READLINKAT = 78, NR_NEWFSTATAT = 79, NR_UTIMENSAT = 88, NR_BIND = 200, NR_CONNECT = 203, + NR_EXECVE = 221, NR_NAME_TO_HANDLE_AT = 264, NR_RENAMEAT2 = 276, NR_STATX = 291, + NR_OPENAT2 = 437, NR_FACCESSAT2 = 439, NR_FCHMODAT2 = 452, +}; + +__attribute__((section(".hdr"), used)) +static const volatile struct gosys_hdr g_hdr = { .magic = "CXGOSYS1", .version = GOSYS_VERSION }; + +// Filled by the patcher; the instructions that connect the call site to cxgo_entry +__attribute__((section(".thunks"), used)) +static const volatile u32 g_thunks[GOSYS_THUNK_BYTES / 4]; + +__attribute__((section(".trailer"), used)) +static const volatile struct gosys_trailer g_trailer = { .magic = "CXGOEND1", .version = GOSYS_VERSION }; + +static inline const struct gosys_hdr *hdr(void) { + const struct gosys_hdr *h = (const struct gosys_hdr *)&g_hdr; + __asm__("" : "+r"(h)); // the compiler must not assume it knows the contents + return h; +} + +static inline i64 sc(i64 nr, i64 a0, i64 a1, i64 a2, i64 a3, i64 a4, i64 a5) { + register i64 x8 __asm__("x8") = nr; + register i64 x0 __asm__("x0") = a0; + register i64 x1 __asm__("x1") = a1; + register i64 x2 __asm__("x2") = a2; + register i64 x3 __asm__("x3") = a3; + register i64 x4 __asm__("x4") = a4; + register i64 x5 __asm__("x5") = a5; + __asm__ volatile("svc #0" : "+r"(x0) : "r"(x8), "r"(x1), "r"(x2), "r"(x3), "r"(x4), "r"(x5) : "memory", "cc"); + return x0; +} + +static u64 slen(const char *s) { + u64 n = 0; + while (s[n]) n++; + return n; +} + +static void mcopy(char *d, const char *s, u64 n) { + for (u64 i = 0; i < n; i++) d[i] = s[i]; +} + +// Moves n bytes down (d < s) +static void mmove_down(char *d, const char *s, u64 n) { + for (u64 i = 0; i < n; i++) d[i] = s[i]; +} + +static int pre(const char *path, const char *lit, u64 n) { + for (u64 i = 0; i < n; i++) + if (path[i] != lit[i]) return 0; + return path[n] == '/' || path[n] == '\0'; +} + +// Whether path is the rootfs or in it +static int in_root(const struct gosys_hdr *h, const char *p) { + u64 n = h->root_len; + if (n == 0) return 0; + for (u64 i = 0; i < n; i++) + if (p[i] != h->root[i]) return 0; + return p[n] == '/' || p[n] == '\0'; +} + +// Android's own mounts and files, which must never be redirected into the rootfs (hook/paths.c) +static int is_host_path(const char *path) { + switch (path[1]) { + case 'a': return pre(path, "/apex", 5); + case 'c': return pre(path, "/config", 7); + case 'd': return pre(path, "/dev", 4) || pre(path, "/d", 2) || pre(path, "/data", 5); + case 'l': return pre(path, "/linkerconfig", 13); + case 'o': return pre(path, "/odm", 4) || pre(path, "/oem", 4); + case 'p': return pre(path, "/proc", 5) || pre(path, "/product", 8); + case 's': return pre(path, "/sbin/su", 8) || pre(path, "/su", 3) || pre(path, "/sys", 4) || + pre(path, "/system", 7) || pre(path, "/system_ext", 11) || + pre(path, "/sdcard", 7) || pre(path, "/storage", 8); + case 'v': return pre(path, "/vendor", 7); + default: return 0; + } +} + +// An absolute Ubuntu path mapped into the rootfs: `path` itself when it needs no change, else buf +// (hook/paths.c rewrite_path_in_root). A result that would not fit is the path unchanged: the +// kernel then answers as it would for a path that long. +static const char *rw_path(const struct gosys_hdr *h, const char *path, char *buf, u64 cap) { + if (path[0] != '/' || h->root_len == 0) return path; + while (path[0] == '/' && path[1] == '/') path++; + while (path[0] == '/' && path[1] == '.' && (path[2] == '/' || path[2] == '\0')) { + if (path[2] == '/') { + path += 2; + } else { + path = "/"; + break; + } + } + u64 rl = h->root_len; + if (path[1] == '\0') { + mcopy(buf, h->root, rl); + buf[rl] = '\0'; + return buf; + } + if (in_root(h, path)) return path; + if (pre(path, "/dev/shm", 8)) { + u64 rest = slen(path + 8); + if (rl + 8 + rest + 1 > cap) return path; + mcopy(buf, h->root, rl); + mcopy(buf + rl, "/tmp/shm", 8); + mcopy(buf + rl + 8, path + 8, rest + 1); + return buf; + } + if (is_host_path(path)) return path; + u64 pl = slen(path); + if (rl + pl + 1 > cap) return path; + mcopy(buf, h->root, rl); + mcopy(buf + rl, path, pl + 1); + return buf; +} + +// Whether the rootfs is where the code was told it is. In root mode the program runs in a chroot of +// that very rootfs, where the real paths are the Ubuntu ones and the rootfs's own path does not +// exist: then nothing is mapped and the program works as any other. Looked at once for each process +// (the scratch memory starts as zero, and a forked child keeps what its parent found). +static int rewriting(const struct gosys_hdr *h) { + volatile u32 *mode = (volatile u32 *)((char *)h + h->scratch_rel + 4); + u32 m = *mode; + if (m == 0) { + m = sc(NR_FACCESSAT, AT_FDCWD, (i64)h->root, 0, 0, 0, 0) == 0 ? 1u : 2u; + *mode = m; + } + return m == 1; +} + +#define NO_SLOT 0xffffffffu +#define NR_SCHED_YIELD 124 + +// Who is making the call: the goroutine (x28 holds it, and the code is built not to touch x28). A +// goroutine makes one call at a time, and the vfork child that a goroutine makes runs with the same +// x28 as the goroutine does. (TPIDR_EL0 does not tell the threads of a Go program apart: its runtime +// leaves it unset without cgo.) +static inline u64 thread_tag(void) { + u64 t; + __asm__ volatile("mov %0, x28" : "=r"(t)); + return t; +} + +// How many execve calls have not returned (state area, offset 8). One that works never does: it is +// made by a vfork child, and the slot its path was in stays marked as the goroutine's, which goes on +// when the child is gone (the same x28, a call of its own). Without this, goroutines that each +// started a program held a slot each for good, and after the sixty-fourth all the others waited. +static inline u32 *execs_on_their_way(const struct gosys_hdr *h) { + return (u32 *)((char *)h + h->scratch_rel + 8); +} + +static void count_down(u32 *count) { + u32 n = __atomic_load_n(count, __ATOMIC_RELAXED); + while (n != 0 && !__atomic_compare_exchange_n(count, &n, n - 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED)) { + } +} + +// Gives back what this goroutine's vfork child left (see above). Every call looks at one counter +// for it; the list of slots is only looked through while an execve is on its way. +static void reclaim_left_slots(const struct gosys_hdr *h) { + u32 *count = execs_on_their_way(h); + if (__atomic_load_n(count, __ATOMIC_RELAXED) == 0) return; + u64 *owner = (u64 *)((char *)h + h->scratch_rel + 64); + u64 me = thread_tag() | 1; + for (u32 i = 0; i < GOSYS_SLOTS; i++) { + if (__atomic_load_n(&owner[i], __ATOMIC_RELAXED) != me) continue; + __atomic_store_n(&owner[i], 0, __ATOMIC_RELEASE); + count_down(count); + } +} + +// A slot for the call this goroutine is making; *held is its number, to give back when the call is +// done. Each slot has a word of its own that holds who has it (0: nobody), so that taking one is one +// compare-and-swap, and no other goroutine can ever mistake it for its own. +static char *take_slot(const struct gosys_hdr *h, u32 *held) { + char *base = (char *)h + h->scratch_rel; + u64 *owner = (u64 *)(base + 64); + u64 me = thread_tag() | 1; // never 0 + u32 mine = NO_SLOT; + // A slot of this goroutine that is still taken now (cxgo_entry gives back those of its vfork + // children) is its own again + for (u32 i = 0; i < GOSYS_SLOTS; i++) { + if (__atomic_load_n(&owner[i], __ATOMIC_RELAXED) != me) continue; + if (mine == NO_SLOT) + mine = i; + else + __atomic_store_n(&owner[i], 0, __ATOMIC_RELEASE); + } + while (mine == NO_SLOT) { + for (u32 i = 0; i < GOSYS_SLOTS && mine == NO_SLOT; i++) { + u64 none = 0; + if (__atomic_load_n(&owner[i], __ATOMIC_RELAXED) == 0 && + __atomic_compare_exchange_n(&owner[i], &none, me, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) + mine = i; + } + if (mine == NO_SLOT) sc(NR_SCHED_YIELD, 0, 0, 0, 0, 0, 0); // all taken: the others finish soon + } + *held = mine; + return base + GOSYS_STATE_SIZE + (u64)mine * GOSYS_SLOT_SIZE; +} + +static void put_slot(const struct gosys_hdr *h, u32 held) { + if (held == NO_SLOT) return; + char *base = (char *)h + h->scratch_rel; + __atomic_store_n((u64 *)(base + 64) + held, 0, __ATOMIC_RELEASE); +} + +// A path as the program expects to see it, from one of the kernel's: the rootfs prefix removed. +// Returns the new length of the n bytes at buf (a path, not NUL-terminated unless `nul`). +static i64 unmap_prefix(const struct gosys_hdr *h, char *buf, i64 n, int nul) { + u64 rl = h->root_len; + if (rl == 0 || n <= 0 || (u64)n < rl + (nul ? 1 : 0)) return n; + for (u64 i = 0; i < rl; i++) + if (buf[i] != h->root[i]) return n; + u64 end = (u64)n - (nul ? 1 : 0); // the path's own length + if (end == rl) { // exactly the rootfs + buf[0] = '/'; + if (nul) { + buf[1] = '\0'; + return 2; + } + return 1; + } + if (buf[rl] != '/') return n; + mmove_down(buf, buf + rl, (u64)n - rl); + return n - (i64)rl; +} + +// ---- Unix sockets ------------------------------------------------------------------------ + +static void put_hex16(char *out, u64 v) { + static const char digits[] = "0123456789abcdef"; + for (int i = 15; i >= 0; i--) { + out[i] = digits[v & 15]; + v >>= 4; + } +} + +// bind() and connect() of a Unix socket with a path: mapped like hook/setup.c does, and hashed +// into /tmp when it does not fit the 108 bytes of sun_path (the same name, so a Go server and a +// program using the C library find each other) +static i64 with_sockaddr(const struct gosys_hdr *h, u32 *held, i64 nr, i64 a0, i64 a1, i64 a2) { + const unsigned char *sa = (const unsigned char *)a1; + if (!sa || a2 < 4 || a2 > 128 || sa[0] != 1 /* AF_UNIX */ || sa[1] != 0 || sa[2] != '/') + return sc(nr, a0, a1, a2, 0, 0, 0); + char *slot = take_slot(h, held); + char *orig = slot + SLOT_PATH_A; + u64 max = (u64)a2 - 2; + if (max > 108) max = 108; + mcopy(orig, (const char *)sa + 2, max); + orig[max] = '\0'; + const char *rw = rw_path(h, orig, slot + SLOT_PATH_B, SLOT_PATH_CAP); + u64 rl = slen(rw); + char *out = slot + SLOT_ARGV; + out[0] = 1; + out[1] = 0; + if (rl < 108) { + mcopy(out + 2, rw, rl + 1); + return sc(nr, a0, (i64)out, (i64)(2 + rl + 1), 0, 0, 0); + } + u64 hash = 14695981039346656037ULL; + for (const char *p = rw; *p; p++) { + hash ^= (unsigned char)*p; + hash *= 1099511628211ULL; + } + u64 n = h->root_len; + if (n + 5 + 11 + 16 + 1 > 108) return sc(nr, a0, a1, a2, 0, 0, 0); + mcopy(out + 2, h->root, n); + mcopy(out + 2 + n, "/tmp/.ctx_sock_", 15); + put_hex16(out + 2 + n + 15, hash); + out[2 + n + 15 + 16] = '\0'; + return sc(nr, a0, (i64)out, (i64)(2 + n + 15 + 16 + 1), 0, 0, 0); +} + +// ---- Starting programs ------------------------------------------------------------------- + +static int starts_with(const char *s, const char *lit) { + for (u64 i = 0; lit[i]; i++) + if (s[i] != lit[i]) return 0; + return 1; +} + +// A program of Android's gets the environment it expects, as from hook/env.c clean_env_for_system(): +// without the hook and the rootfs's libraries, and with Android's directories in its PATH +static i64 exec_host(const struct gosys_hdr *h, char *slot, const char *p, i64 a1, char *const *envp) { + (void)h; + static const char android_path[] = "PATH=/system/bin:/system/xbin:/sbin:/vendor/bin"; + u32 envc = 0; + while (envp && envp[envc]) envc++; + if (envc + 2 > ENV_CAP) return sc(NR_EXECVE, (i64)p, a1, (i64)envp, 0, 0, 0); + char **ne = (char **)(slot + SLOT_ENV); + char *path_str = slot + SLOT_PATH_B; + u32 n = 0; + int has_path = 0; + for (u32 i = 0; i < envc; i++) { + char *e = envp[i]; + if (starts_with(e, "LD_PRELOAD=") || starts_with(e, "LD_LIBRARY_PATH=") || starts_with(e, "GLIBC_TUNABLES=")) + continue; + if (starts_with(e, "PATH=")) { + u64 len = slen(e); + has_path = 1; + if (len + sizeof(android_path) + 1 < SLOT_PATH_CAP) { + mcopy(path_str, android_path, sizeof(android_path) - 1); + path_str[sizeof(android_path) - 1] = ':'; + mcopy(path_str + sizeof(android_path), e + 5, len - 5 + 1); + ne[n++] = path_str; + continue; + } + } + ne[n++] = e; + } + if (!has_path) ne[n++] = (char *)android_path; + ne[n] = 0; + return sc(NR_EXECVE, (i64)p, a1, (i64)ne, 0, 0, 0); +} + +// execve(): a program of the rootfs is started as +// --preload --library-path -c 'exec -a "$0" "$@"' ... +// so that bash, a program of the rootfs with the hook loaded, starts it the way every program of +// The native userland is started (Ubuntu's dynamic programs through ld.so, scripts through their interpreter, +// static programs patched first), with the argv[0] the caller chose. Without bash it is env, +// which cannot set argv[0]. The path is passed as the caller wrote it. +static i64 with_execve(const struct gosys_hdr *h, u32 *held, i64 a0, i64 a1, i64 a2) { + const char *path = (const char *)a0; + char *const *argv = (char *const *)a1; + char *const *envp = (char *const *)a2; + if (!path || path[0] == '\0') return sc(NR_EXECVE, a0, a1, a2, 0, 0, 0); + + char *slot = take_slot(h, held); + const char *p = path[0] == '/' ? rw_path(h, path, slot + SLOT_PATH_A, SLOT_PATH_CAP) : path; + int wrap = h->ldso_len != 0 && h->runner_len != 0 && (path[0] != '/' || in_root(h, p)); + if (!wrap) { + if (path[0] == '/' && !in_root(h, p)) return exec_host(h, slot, p, a1, envp); + return sc(NR_EXECVE, (i64)p, a1, a2, 0, 0, 0); + } + + // A program that is not there is reported to the caller, as execve() does + i64 r = sc(NR_FACCESSAT, AT_FDCWD, (i64)p, 0, 0, 0, 0); + if (r < 0) return r; + + u32 argc = 0; + while (argv && argv[argc]) argc++; + if (argc + 12 > ARGV_CAP) return sc(NR_EXECVE, (i64)p, a1, a2, 0, 0, 0); + + // DDNATV_ROOT must reach env even when the caller built an environment of its own + char *const *env = envp; + u32 envc = 0; + int has_root = 0; + while (envp && envp[envc]) { + const char *e = envp[envc]; + if (e[0] == 'D' && e[1] == 'D' && e[2] == 'N' && e[3] == 'A' && e[4] == 'T' && e[5] == 'V' && + e[6] == '_' && e[7] == 'R' && e[8] == 'O' && e[9] == 'O' && e[10] == 'T' && e[11] == '=') + has_root = 1; + envc++; + } + if (!has_root) { + if (envc + 2 > ENV_CAP) return sc(NR_EXECVE, (i64)p, a1, a2, 0, 0, 0); + char **ne = (char **)(slot + SLOT_ENV); + char *kv = slot + SLOT_PATH_B; + mcopy(kv, "DDNATV_ROOT=", 12); + mcopy(kv + 12, h->root, h->root_len + 1); + for (u32 i = 0; i < envc; i++) ne[i] = envp[i]; + ne[envc] = kv; + ne[envc + 1] = 0; + env = ne; + } + + char **v = (char **)(slot + SLOT_ARGV); + u32 n = 0; + v[n++] = (char *)h->ldso; + if (h->hook_len) { + v[n++] = (char *)"--preload"; + v[n++] = (char *)h->hook; + } + v[n++] = (char *)"--library-path"; + v[n++] = (char *)h->libs; + v[n++] = (char *)h->runner; + if (h->flags & GOSYS_FLAG_RUNNER_IS_BASH) { + v[n++] = (char *)"-c"; + v[n++] = (char *)"exec -a \"$0\" \"$@\""; + v[n++] = (argc > 0 && argv[0]) ? argv[0] : (char *)path; + } else { + v[n++] = (char *)"--"; + } + v[n++] = (char *)path; + for (u32 i = 1; i < argc; i++) v[n++] = argv[i]; + v[n] = 0; + return sc(NR_EXECVE, (i64)h->ldso, (i64)v, (i64)env, 0, 0, 0); +} + +// ---- The entry --------------------------------------------------------------------------- + +// Rewrites the path arguments `i1` and `i2` (an index into a[], -1: none) that are absolute, makes +// the call, and shows the program the paths it expects in what the call returns. +static i64 with_paths(const struct gosys_hdr *h, u32 *held, i64 nr, i64 *a, int i1, int i2) { + char *slot = 0; + int proc_link = 0; + int idx[2] = { i1, i2 }; + for (int k = 0; k < 2; k++) { + int i = idx[k]; + if (i < 0) continue; + const char *p = (const char *)a[i]; + if (!p || p[0] != '/') continue; + if (!slot) slot = take_slot(h, held); + if (nr == NR_READLINKAT && k == 0 && pre(p, "/proc", 5)) proc_link = 1; + a[i] = (i64)rw_path(h, p, slot + (k ? SLOT_PATH_B : SLOT_PATH_A), SLOT_PATH_CAP); + } + i64 r = sc(nr, a[0], a[1], a[2], a[3], a[4], a[5]); + if (proc_link && r > 0) r = unmap_prefix(h, (char *)a[2], r, 0); + return r; +} + +// The call itself; a slot that it takes is given back by cxgo_entry +static i64 handle(const struct gosys_hdr *h, u32 *held, i64 nr, i64 a0, i64 a1, i64 a2, i64 a3, i64 a4, i64 a5) { + i64 a[6] = { a0, a1, a2, a3, a4, a5 }; + switch (nr) { + case NR_OPENAT: case NR_FACCESSAT: case NR_FACCESSAT2: case NR_FCHMODAT: case NR_FCHMODAT2: + case NR_FCHOWNAT: case NR_NEWFSTATAT: case NR_STATX: case NR_READLINKAT: case NR_MKDIRAT: + case NR_MKNODAT: case NR_UNLINKAT: case NR_UTIMENSAT: case NR_OPENAT2: case NR_NAME_TO_HANDLE_AT: + case NR_INOTIFY_ADD_WATCH: case NR_CHDIR: case NR_CHROOT: case NR_STATFS: case NR_TRUNCATE: + case NR_SETXATTR: case NR_LSETXATTR: case NR_GETXATTR: case NR_LGETXATTR: case NR_LISTXATTR: + case NR_LLISTXATTR: case NR_REMOVEXATTR: case NR_LREMOVEXATTR: case NR_RENAMEAT: case NR_RENAMEAT2: + case NR_LINKAT: case NR_SYMLINKAT: case NR_GETCWD: case NR_BIND: case NR_CONNECT: case NR_EXECVE: + // The calls that carry paths: not mapped where the rootfs is not in its own place (above) + if (!rewriting(h)) return sc(nr, a0, a1, a2, a3, a4, a5); + break; + default: + return sc(nr, a0, a1, a2, a3, a4, a5); + } + switch (nr) { + case NR_OPENAT: case NR_FACCESSAT: case NR_FACCESSAT2: case NR_FCHMODAT: case NR_FCHMODAT2: + case NR_FCHOWNAT: case NR_NEWFSTATAT: case NR_STATX: case NR_READLINKAT: case NR_MKDIRAT: + case NR_MKNODAT: case NR_UNLINKAT: case NR_UTIMENSAT: case NR_OPENAT2: case NR_NAME_TO_HANDLE_AT: + case NR_INOTIFY_ADD_WATCH: + return with_paths(h, held, nr, a, 1, -1); + case NR_CHDIR: case NR_CHROOT: case NR_STATFS: case NR_TRUNCATE: case NR_SETXATTR: + case NR_LSETXATTR: case NR_GETXATTR: case NR_LGETXATTR: case NR_LISTXATTR: case NR_LLISTXATTR: + case NR_REMOVEXATTR: case NR_LREMOVEXATTR: + return with_paths(h, held, nr, a, 0, -1); + case NR_RENAMEAT: case NR_RENAMEAT2: case NR_LINKAT: + return with_paths(h, held, nr, a, 1, 3); + case NR_SYMLINKAT: // the target is data, only the link is a path + return with_paths(h, held, nr, a, 2, -1); + case NR_GETCWD: { + i64 r = sc(nr, a0, a1, 0, 0, 0, 0); + return r > 0 ? unmap_prefix(h, (char *)a0, r, 1) : r; + } + case NR_BIND: case NR_CONNECT: + return with_sockaddr(h, held, nr, a0, a1, a2); + case NR_EXECVE: { + // Counted while it is on its way: when it works it does not return (see execs_on_their_way) + u32 *count = execs_on_their_way(h); + __atomic_fetch_add(count, 1, __ATOMIC_RELAXED); + i64 r = with_execve(h, held, a0, a1, a2); + count_down(count); // it did return: it failed, and cxgo_entry gives its slot back + return r; + } + default: + return sc(nr, a0, a1, a2, a3, a4, a5); + } +} + +__attribute__((section(".text.cxgo_entry"), used, noinline)) +i64 cxgo_entry(i64 a0, i64 a1, i64 a2, i64 a3, i64 a4, i64 a5, i64 unused, i64 nr) { + (void)unused; + const struct gosys_hdr *h = hdr(); + u32 held = NO_SLOT; + reclaim_left_slots(h); + i64 r = handle(h, &held, nr, a0, a1, a2, a3, a4, a5); + put_slot(h, held); + return r; +} diff --git a/tools/nativeguest/gosys/gosys.ld b/tools/nativeguest/gosys/gosys.ld new file mode 100644 index 0000000000..ba5a6ba34f --- /dev/null +++ b/tools/nativeguest/gosys/gosys.ld @@ -0,0 +1,14 @@ +/* The layout of gosys.c's flat binary: the header at 0 (the patcher fills it in), the room for the + call site's connecting code, the code with its entry first, read-only data, the trailer last. */ +OUTPUT_FORMAT(elf64-littleaarch64) +ENTRY(cxgo_entry) +SECTIONS +{ + . = 0; + .hdr : { KEEP(*(.hdr)) } + .thunks : { . = ALIGN(16); KEEP(*(.thunks)) } + .text : { . = ALIGN(16); KEEP(*(.text.cxgo_entry)) *(.text .text.*) } + .rodata : { . = ALIGN(16); *(.rodata .rodata.*) } + .trailer : { . = ALIGN(64); KEEP(*(.trailer)) } + /DISCARD/ : { *(.comment) *(.note*) *(.eh_frame*) *(.gnu*) *(.interp) } +} diff --git a/tools/nativeguest/gosys/gosys_abi.h b/tools/nativeguest/gosys/gosys_abi.h new file mode 100644 index 0000000000..e0c4807d34 --- /dev/null +++ b/tools/nativeguest/gosys/gosys_abi.h @@ -0,0 +1,79 @@ +// What the hook and the code it adds to a static Go program (gosys.c) agree on. +// +// A Go program built without cgo makes its system calls itself, so the preloaded hook never sees +// them and Ubuntu's paths (/etc/resolv.conf, /usr/bin/git, ...) mean nothing to it. Before such a +// program starts, the hook adds a small piece of position-independent code to its file (see +// go_programs.c): the program's one system call function, internal/runtime/syscall.Syscall6, jumps +// to it, and it maps paths into the rootfs like the hook does, then makes the call. +// +// This header has no dependencies beyond , so that the freestanding code and the hook, +// which are built with different flags, can both include it. + +#ifndef DDNATV_GOSYS_ABI_H +#define DDNATV_GOSYS_ABI_H + +#include + +#ifndef GOSYS_VERSION +#define GOSYS_VERSION 3u // raised when the code or its header changes: patched programs are patched again +#endif + +// The scratch memory for rewritten paths: a small state area and 64 slots, in zero-filled memory the +// patcher appends to the program's data segment (so nothing is allocated per call). A slot belongs to +// the thread that took it until its call is over: a word in the state area for each slot says +// which goroutine (x28) has it. A slot that a vfork child kept by a successful execve is given back +// at the next call of the goroutine that made the child (the state area counts the execve calls +// that have not returned, [8]). +// (A ring of slots shared by every call was tried first: a thread that was descheduled for a +// moment between taking a slot and the call let sixteen others go round the ring and overwrite its +// path, so a Go program opened another file than it asked for.) +#define GOSYS_SLOTS 64u +#define GOSYS_SLOT_SIZE 32768u // two paths (4K each), an argv array (8K), an environment array (16K) +#define GOSYS_STATE_SIZE 1024u // [4] rewriting mode, [8] execve calls on their way, [64 + 8 * slot] who has the slot (0: nobody) +#define GOSYS_SCRATCH_SIZE (GOSYS_STATE_SIZE + GOSYS_SLOTS * GOSYS_SLOT_SIZE) + +#define GOSYS_THUNK_BYTES 256u // room for the small code that connects a call site to the code + +#define GOSYS_ROOT_MAX 448 +#define GOSYS_PATH_MAX 448 +#define GOSYS_LIBS_MAX 1024 + +struct gosys_hdr { + char magic[8]; // "CXGOSYS1" + uint32_t version; // GOSYS_VERSION + uint32_t flags; + int64_t scratch_rel; // scratch memory, relative to this header (the same in any load address) + uint32_t root_len; // the rootfs, as Android sees it + uint32_t ldso_len; // the rootfs's dynamic linker + uint32_t hook_len; // libddnatv-hook.so; 0: none + uint32_t libs_len; // the rootfs's library directories, ':' separated + uint32_t runner_len; // the rootfs's bash, or env without it; 0: Ubuntu programs cannot be started + uint32_t reserved; + char root[GOSYS_ROOT_MAX]; + char ldso[GOSYS_PATH_MAX]; + char hook[GOSYS_PATH_MAX]; + char libs[GOSYS_LIBS_MAX]; + char runner[GOSYS_PATH_MAX]; +}; + +#define GOSYS_FLAG_RUNNER_IS_BASH 1u // gosys_hdr.flags + +// The last 64 bytes of the added code: where it is, and what the patcher changed to add it. +struct gosys_trailer { + char magic[8]; // "CXGOEND1" + uint32_t version; + uint32_t total_size; // the added code, header to trailer + uint64_t text_orig_filesz; // the segment that holds it: its size before + uint64_t rw_orig_memsz; // the data segment: its size before + uint32_t text_index; // their numbers in the program header table + uint32_t rw_index; + uint32_t text_orig_flags; + uint32_t reserved; + uint64_t site_file_off; // the instruction that was replaced (a "svc #0") + uint64_t reserved2; +}; + +_Static_assert(sizeof(struct gosys_trailer) == 64, "the trailer is 64 bytes"); +_Static_assert(sizeof(struct gosys_hdr) % 16 == 0, "the header keeps the code after it aligned"); + +#endif diff --git a/tools/nativeguest/hook/env.c b/tools/nativeguest/hook/env.c new file mode 100644 index 0000000000..e95083c25e --- /dev/null +++ b/tools/nativeguest/hook/env.c @@ -0,0 +1,309 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// The environment of started programs: Android programs get it without the hook, rootfs +// programs with it. + +#ifndef DDNATV_HOST_TEST + +static const char *ddnatv_hook_library(char *buf, size_t bufsz); + +static char **clean_env_for_system(char *const envp[]) { + int count = 0; + while (envp && envp[count]) count++; + char **new_env = calloc(count + 3, sizeof(char *)); + int dst = 0; + int has_path = 0; + for (int i = 0; i < count; i++) { + char first = envp[i][0]; + if (!((first == 'L' && (strncmp(envp[i], "LD_PRELOAD=", 11) == 0 || + strncmp(envp[i], "LD_LIBRARY_PATH=", 16) == 0)) || + (first == 'G' && strncmp(envp[i], "GLIBC_TUNABLES=", 15) == 0))) { + if (first == 'P' && strncmp(envp[i], "PATH=", 5) == 0) { + has_path = 1; + size_t plen = strlen(envp[i]); + char *new_path = malloc(plen + 64); + if (new_path) { + snprintf(new_path, plen + 64, "PATH=/system/bin:/system/xbin:/sbin:/vendor/bin:%s", envp[i] + 5); + new_env[dst++] = new_path; + } else { + new_env[dst++] = envp[i]; + } + } else { + new_env[dst++] = envp[i]; + } + } + } + if (!has_path) { + new_env[dst++] = strdup("PATH=/system/bin:/system/xbin:/sbin:/vendor/bin"); + } + new_env[dst] = NULL; + return new_env; +} + +// LD_PRELOAD with every absolute path that is not in the rootfs yet mapped into it. Entries are +// separated by ':' or ' '. free() the result. +static char *map_preload_paths(const char *value) { + if (!value) return NULL; + size_t cap = strlen(value) + (g_ddnatv_root_len + 1) * 16 + 16; + char *out = malloc(cap); + if (!out) return NULL; + size_t used = 0; + out[0] = '\0'; + const char *p = value; + while (*p) { + size_t len = strcspn(p, ": "); + if (len > 0 && len < PATH_MAX) { + char entry[PATH_MAX]; + memcpy(entry, p, len); + entry[len] = '\0'; + char buf[PATH_MAX]; + const char *mapped = entry[0] == '/' ? rewrite_path_in_root(entry, buf, sizeof(buf)) : entry; + size_t mlen = strlen(mapped); + if (used + mlen + 2 >= cap) break; + if (used) out[used++] = ':'; + memcpy(out + used, mapped, mlen); + used += mlen; + out[used] = '\0'; + } + p += len; + if (*p) p++; + } + return out; +} + +static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { + init_ddnatv_hook(); + int count = 0; + int has_preload = 0; + int has_ld_library_path = 0; + int has_root = 0; + int has_tunables = 0; + int has_path = 0; + int has_tmp = 0; + int has_threads_max = 0; + int has_xz_opt = 0; + int has_xz_defaults = 0; + int has_frontend = 0; + int has_debconf_frontend = 0; + int has_debconf_seen = 0; + + const char *chosen_real_exe = (real_exe && real_exe[0] != '\0') ? real_exe : (g_real_exe[0] != '\0' ? g_real_exe : NULL); + + // Every variable is looked at on every exec, so only the names that start with its first letter + // are compared (this was 13 strncmp() calls for each of the 30 or so variables) + int has_nt = 0; + int has_binds = 0; + int has_hostname = 0; + int has_link_root = 0; + int has_preload_list = 0; + const char *preload_value = NULL; + while (envp && envp[count]) { + const char *e = envp[count]; + switch (e[0]) { + case 'L': + if (strncmp(e, "LD_PRELOAD=", 11) == 0) { has_preload = 1; preload_value = e + 11; } + else if (strncmp(e, "LD_LIBRARY_PATH=", 16) == 0) has_ld_library_path = 1; + break; + case 'G': + if (strncmp(e, "GLIBC_TUNABLES=", 15) == 0) has_tunables = 1; + break; + case 'P': + if (strncmp(e, "PATH=", 5) == 0) has_path = 1; + break; + case 'T': + if (strncmp(e, "TMPDIR=", 7) == 0) has_tmp = 1; + break; + case 'X': + if (strncmp(e, "XZ_OPT=", 7) == 0) has_xz_opt = 1; + else if (strncmp(e, "XZ_DEFAULTS=", 12) == 0) has_xz_defaults = 1; + break; + case 'D': + if (strncmp(e, "DDNATV_ROOT=", 12) == 0) has_root = 1; + else if (strncmp(e, "DDNATV_NT=", 10) == 0) has_nt = 1; + else if (strncmp(e, "DDNATV_BINDS=", 13) == 0) has_binds = 1; + else if (strncmp(e, "DDNATV_PRELOAD=", 15) == 0) has_preload_list = 1; + else if (strncmp(e, "DDNATV_HOSTNAME=", 16) == 0) has_hostname = 1; + else if (strncmp(e, "DDNATV_LINK_ROOT=", 17) == 0) has_link_root = 1; + else if (strncmp(e, "DPKG_DEB_THREADS_MAX=", 21) == 0) has_threads_max = 1; + else if (strncmp(e, "DEBIAN_FRONTEND=", 16) == 0) has_frontend = 1; + else if (strncmp(e, "DEBCONF_FRONTEND=", 17) == 0) has_debconf_frontend = 1; + else if (strncmp(e, "DEBCONF_NONINTERACTIVE_SEEN=", 28) == 0) has_debconf_seen = 1; + break; + default: + break; + } + count++; + } + + char **new_env = calloc(count + 24, sizeof(char *)); + int dst = 0; + for (int i = 0; i < count; i++) { + if (has_preload && envp[i][0] == 'L' && strncmp(envp[i], "LD_PRELOAD=", 11) == 0) { + // ld.so opens these itself: the guest's paths are mapped to the rootfs, and the libraries every + // program loads (DDNATV_PRELOAD) come first + char *mapped = map_preload_paths(preload_value); + if (mapped) { + size_t chain = g_preload_host ? strlen(g_preload_host) : 0; + int has_chain = chain > 0 && strstr(mapped, g_preload_host) != NULL; + size_t len = 11 + chain + 1 + strlen(mapped) + 1; + char *str = malloc(len); + if (str) { + if (chain > 0 && !has_chain) snprintf(str, len, "LD_PRELOAD=%s:%s", g_preload_host, mapped); + else snprintf(str, len, "LD_PRELOAD=%s", mapped); + new_env[dst++] = str; + free(mapped); + continue; + } + free(mapped); + } + } + // If we have an explicit real executable, drop the inherited entry to replace with the fresh target + if (chosen_real_exe && envp[i][0] == 'D' && strncmp(envp[i], "DDNATV_REAL_EXE=", 16) == 0) { + continue; + } + new_env[dst++] = envp[i]; + } + + // Exact-size strings: this runs before every exec, often in a freshly forked child where each + // newly touched page is a copy-on-write fault. + if (chosen_real_exe) { + size_t len = strlen(chosen_real_exe); + char *str = malloc(16 + len + 1); + if (str) { + memcpy(str, "DDNATV_REAL_EXE=", 16); + memcpy(str + 16, chosen_real_exe, len + 1); + new_env[dst++] = str; + } + } + + char hook_buf[PATH_MAX]; + const char *hook = (!has_preload && g_ddnatv_root[0] != '\0') ? ddnatv_hook_library(hook_buf, sizeof(hook_buf)) : NULL; + if (hook) { + size_t hook_len = strlen(hook); + size_t host_len = g_preload_host ? strlen(g_preload_host) + 1 : 0; + size_t size = 11 + host_len + hook_len + 1; + char *str = malloc(size); + if (str) { + size_t n = ddnatv_append(str, size, 0, "LD_PRELOAD=", 11); + if (host_len) { + n = ddnatv_append(str, size, n, g_preload_host, host_len - 1); + n = ddnatv_append(str, size, n, ":", 1); + } + ddnatv_append(str, size, n, hook, hook_len); + new_env[dst++] = str; + } + } + if (!has_preload_list && g_preload_guest) { + size_t len = strlen(g_preload_guest); + char *str = malloc(15 + len + 1); + if (str) { + memcpy(str, "DDNATV_PRELOAD=", 15); + memcpy(str + 15, g_preload_guest, len + 1); + new_env[dst++] = str; + } + } + if (!has_ld_library_path && g_ddnatv_root[0] != '\0') { + size_t size = 16 + 1; + for (size_t i = 0; i < sizeof(k_rootfs_lib_dirs) / sizeof(k_rootfs_lib_dirs[0]); i++) { + char dir[PATH_MAX]; + size += 1 + strlen(rewrite_path_in_root(k_rootfs_lib_dirs[i], dir, sizeof(dir))); + } + char *str = malloc(size); + if (str) { + size_t n = ddnatv_append(str, size, 0, "LD_LIBRARY_PATH=", 16); + append_rootfs_lib_dirs(str, size, n, 0); + new_env[dst++] = str; + } + } + if (!has_root && g_ddnatv_root[0] != '\0') { + char *str = malloc(PATH_MAX + 16); + if (str) { + snprintf(str, PATH_MAX + 16, "DDNATV_ROOT=%s", g_ddnatv_root); + new_env[dst++] = str; + } + } + if (!has_link_root && g_link_root_len) { + char *str = malloc(17 + g_link_root_len + 1); + if (str) { + memcpy(str, "DDNATV_LINK_ROOT=", 17); + memcpy(str + 17, g_link_root, g_link_root_len + 1); + new_env[dst++] = str; + } + } + if (!has_hostname && g_hostname[0]) { + char *str = malloc(16 + sizeof(g_hostname)); + if (str) { + snprintf(str, 16 + sizeof(g_hostname), "DDNATV_HOSTNAME=%s", g_hostname); + new_env[dst++] = str; + } + } + if (!has_binds && g_binds_raw) { + size_t len = strlen(g_binds_raw); + char *str = malloc(13 + len + 1); + if (str) { + memcpy(str, "DDNATV_BINDS=", 13); + memcpy(str + 13, g_binds_raw, len + 1); + new_env[dst++] = str; + } + } + // This process looked for the ARM translator's files and found none: the programs it starts + // need not look again (it takes a look at /proc/self/fd in each of them, see privileged.c) + if (!has_nt && g_no_translator) { + new_env[dst++] = strdup("DDNATV_NT=0"); + } + if (!has_tunables) { + new_env[dst++] = strdup("GLIBC_TUNABLES=glibc.pthread.rseq=0"); + } + if (!has_path) { + new_env[dst++] = strdup("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"); + } + if (!has_tmp && g_ddnatv_root[0] != '\0') { + char *str = malloc(PATH_MAX + 16); + if (str) { + snprintf(str, PATH_MAX + 16, "TMPDIR=%s/tmp", g_ddnatv_root); + new_env[dst++] = str; + } + } + if (!has_threads_max) { + new_env[dst++] = strdup("DPKG_DEB_THREADS_MAX=1"); + } + if (!has_xz_opt) { + new_env[dst++] = strdup("XZ_OPT=-T1"); + } + if (!has_xz_defaults) { + new_env[dst++] = strdup("XZ_DEFAULTS=-T1"); + } + if (!has_frontend) { + new_env[dst++] = strdup("DEBIAN_FRONTEND=noninteractive"); + } + if (!has_debconf_frontend) { + new_env[dst++] = strdup("DEBCONF_FRONTEND=noninteractive"); + } + if (!has_debconf_seen) { + new_env[dst++] = strdup("DEBCONF_NONINTERACTIVE_SEEN=true"); + } + new_env[dst] = NULL; + return new_env; +} + +static void free_modified_env(char **modified_env, char *const orig_env[]) { + if (!modified_env) return; + for (int i = 0; modified_env[i] != NULL; i++) { + int is_orig = 0; + if (orig_env) { + for (int j = 0; orig_env[j] != NULL; j++) { + if (modified_env[i] == orig_env[j]) { + is_orig = 1; + break; + } + } + } + if (!is_orig) { + free(modified_env[i]); + } + } + free(modified_env); +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/exec.c b/tools/nativeguest/hook/exec.c new file mode 100644 index 0000000000..90df96f8fe --- /dev/null +++ b/tools/nativeguest/hook/exec.c @@ -0,0 +1,1127 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// execve() and posix_spawn(): rootfs programs through ld.so with the hook, scripts through their +// interpreter, Android programs with Android's environment. + +#ifndef DDNATV_HOST_TEST + +// Runs before every exec, mostly in a child a shell has just forked: the copies write only the +// string (ddnatv_copy_cstr), not the whole PATH_MAX buffer, since each page written there is a +// copy-on-write fault. +static void resolve_symlinks(const char *path, char *out, size_t out_size, int depth) { + if (!path || !out || out_size == 0) return; + ddnatv_copy_cstr(out, out_size, path); + if (depth > 8) return; + + char link_target[PATH_MAX]; + ssize_t len = readlink(path, link_target, sizeof(link_target) - 1); + if (len < 0) return; + link_target[len] = '\0'; + + char next_path[PATH_MAX]; + if (link_target[0] == '/') { + char rw_buf[PATH_MAX]; + const char *rewritten = rewrite_path(link_target, rw_buf, sizeof(rw_buf)); + ddnatv_copy_cstr(next_path, sizeof(next_path), rewritten); + } else { + const char *slash = strrchr(path, '/'); + if (slash) { + size_t dir_len = (size_t)(slash - path); + if (dir_len > sizeof(next_path) - 1) dir_len = sizeof(next_path) - 1; + memcpy(next_path, path, dir_len); + next_path[dir_len] = '\0'; + size_t n = ddnatv_append(next_path, sizeof(next_path), dir_len, "/", 1); + ddnatv_append(next_path, sizeof(next_path), n, link_target, (size_t)len); + } else { + ddnatv_copy_cstr(next_path, sizeof(next_path), link_target); + } + } + // proot's link2symlink leaves hard links as ".l2s.*" files that programs must not see by name + const char *next_base = strrchr(next_path, '/'); + next_base = next_base ? next_base + 1 : next_path; + if (strncmp(next_base, ".l2s.", 5) == 0) return; + resolve_symlinks(next_path, out, out_size, depth + 1); +} + +static char **ensure_hook_in_envp(char *const envp[], const char *real_exe) { + return prepare_ddnatv_env(envp, real_exe); +} + +// The file whose header decides how to start `target`: the symlink-resolved ELF (so ld.so and +// /proc/self/exe see the real program, as with the kernel), else `target` itself (scripts, +// links to ld.so). `probe` describes the returned file. +static const char *select_exec_target(const char *target, char *resolved, size_t resolved_size, struct exec_probe *probe) { + resolve_symlinks(target, resolved, resolved_size, 0); + probe_exec_file(resolved, probe); + if (probe->is_elf && !is_ld_linux(resolved)) return resolved; + if (strcmp(resolved, target) != 0) probe_exec_file(target, probe); + return target; +} + +// The library children get with --preload: the one this process runs from, so that a program +// always starts with the same build as its parent, else the first of usr/lib and lib that exists; +// NULL if neither does. +// The path dladdr() finds is kept (it does not change): set once, read by every later exec, and +// set before a fork by prepare_exec_in_parent() so that the children only read it. +static char g_hook_library[PATH_MAX]; +static int g_hook_library_known = 0; + +static const char *ddnatv_hook_library(char *buf, size_t bufsz) { + static const char usr_lib[] = "/usr/lib/libddnatv-hook.so"; + static const char lib[] = "/lib/libddnatv-hook.so"; + if (__atomic_load_n(&g_hook_library_known, __ATOMIC_ACQUIRE)) return g_hook_library; + Dl_info info; + if (dladdr((void *)ddnatv_hook_library, &info) && info.dli_fname && info.dli_fname[0] == '/' && + strlen(info.dli_fname) < sizeof(g_hook_library)) { + // loaded from there, so it exists + ddnatv_copy_cstr(g_hook_library, sizeof(g_hook_library), info.dli_fname); + __atomic_store_n(&g_hook_library_known, 1, __ATOMIC_RELEASE); + return g_hook_library; + } + size_t n = ddnatv_append(buf, bufsz, 0, g_ddnatv_root, g_ddnatv_root_len); + ddnatv_append(buf, bufsz, n, usr_lib, sizeof(usr_lib) - 1); + if (access(buf, F_OK) == 0) return buf; + n = ddnatv_append(buf, bufsz, 0, g_ddnatv_root, g_ddnatv_root_len); + ddnatv_append(buf, bufsz, n, lib, sizeof(lib) - 1); + return access(buf, F_OK) == 0 ? buf : NULL; +} + +// ld.so does not need the exec bit on the program it loads, but other tools look at it: set +// it as the old access(X_OK)/chmod() pair did, using the mode the probe already has. +static void ensure_exec_bit(const char *path, mode_t mode) { + if (S_ISDIR(mode) || (mode & 0111) != 0) return; + if (strstr(path, "/bin/") || strstr(path, "/sbin/")) return; + chmod(path, 0755); +} + +// Rootfs path of a "#!" interpreter; a missing /bin/sh falls back to Android's shell. +static const char *shebang_interpreter(const char *interp, char *buf, size_t bufsz) { + const char *rewritten = rewrite_path(interp, buf, bufsz); + if (strcmp(interp, "/bin/sh") == 0 && access(rewritten, F_OK) != 0 && access("/system/bin/sh", X_OK) == 0) { + return "/system/bin/sh"; + } + return rewritten; +} + +static const char *exec_prog_name(const char *target) { + const char *slash = strrchr(target, '/'); + return slash ? slash + 1 : target; +} + +// Hook execve +typedef int (*orig_execve_f_type)(const char *filename, char *const argv[], char *const envp[]); + +// glibc's execve(), looked up once (also by prepare_exec_in_parent() before a fork) +static orig_execve_f_type g_orig_execve = NULL; + +static orig_execve_f_type real_execve(void) { + orig_execve_f_type f = __atomic_load_n(&g_orig_execve, __ATOMIC_RELAXED); + if (!f) { + f = (orig_execve_f_type)dlsym(RTLD_NEXT, "execve"); + __atomic_store_n(&g_orig_execve, f, __ATOMIC_RELAXED); + } + return f; +} + +// prepare_exec_in_parent() rehearses an exec in the parent: everything up to the execve() itself, +// which this then skips. Only in the thread that rehearses: another thread's exec at that moment +// is a real one. +static int g_exec_rehearsal = 0; +static pthread_t g_exec_rehearsal_thread; + +static int in_exec_rehearsal(void) { + return __atomic_load_n(&g_exec_rehearsal, __ATOMIC_ACQUIRE) && + pthread_equal(pthread_self(), g_exec_rehearsal_thread); +} + +static int run_execve(orig_execve_f_type f, const char *path, char *const argv[], char *const envp[]) { + if (in_exec_rehearsal()) { + errno = 0; + return 0; + } + return f(path, argv, envp); +} + +// ldconfig does nothing in The native userland (its cache is for paths that ld.so opens without the hook), but the +// exec code reads /etc/ld.so.conf(.d) again when /etc/ld.so.cache changes: "sudo ldconfig" after an +// edit of a .conf file marks it changed, as the real ldconfig would by writing it. A cache asked +// for with -C is made (empty): Flatpak mounts the one it generates over /etc/ld.so.cache. +static void ldconfig_mark_cache(char *const argv[]) { + if (g_ddnatv_root[0] == '\0') return; + char path[PATH_MAX]; + const char *cache = NULL; + for (int i = 1; argv && argv[i]; i++) { + if (strcmp(argv[i], "-C") == 0 && argv[i + 1]) cache = argv[++i]; + else if (strncmp(argv[i], "-C", 2) == 0 && argv[i][2] != '\0') cache = argv[i] + 2; + } + const char *target = path; + if (cache) { + target = rewrite_path_in_root(cache, path, sizeof(path)); + } else { + size_t n = ddnatv_append(path, sizeof(path), 0, g_ddnatv_root, g_ddnatv_root_len); + ddnatv_append(path, sizeof(path), n, "/etc/ld.so.cache", 16); + } + int fd = (int)syscall(SYS_openat, AT_FDCWD, target, O_WRONLY | O_CREAT | O_CLOEXEC, 0644); + if (fd < 0) return; + syscall(SYS_utimensat, fd, NULL, NULL, 0); + syscall(SYS_close, fd); +} + +static int is_ldconfig_name(const char *name) { + return strcmp(name, "ldconfig") == 0 || strcmp(name, "ldconfig.real") == 0; +} + +static int ddnatv_execve(const char *filename, char *const argv[], char *const envp[], int depth) { + orig_execve_f_type orig_execve = real_execve(); + if (!orig_execve) { + errno = ENOSYS; + return -1; + } + + // Scripts get the path exactly as the caller wrote it ("./x.sh" stays "./x.sh" in $0), + // like the kernel would pass it; routing below uses the absolute form. + const char *caller_path = filename; + char abs_buf[PATH_MAX]; + filename = absolutize_exec_path(filename, abs_buf, sizeof(abs_buf)); + + char buf[PATH_MAX]; + const char *target = rewrite_path(filename, buf, sizeof(buf)); + + init_ddnatv_hook(); + + const char *f_base = (filename != NULL) ? strrchr(filename, '/') : NULL; + f_base = (f_base != NULL) ? f_base + 1 : (filename != NULL ? filename : ""); + + const char *prog_name = strrchr(target, '/'); + prog_name = (prog_name != NULL) ? prog_name + 1 : target; + + // Wine's preloader is a static program that opens the program and the dynamic linker it loads with + // system calls of its own, which no hook can map, to reserve address ranges before the linker runs. + // The program is started without it: its libc and ntdll reserve what Wine needs themselves. + if ((strcmp(prog_name, "wine-preloader") == 0 || strcmp(prog_name, "wine64-preloader") == 0) && + argv && argv[0] && argv[1] && depth < DDNATV_MAX_SHEBANG_DEPTH) { + return ddnatv_execve(argv[1], argv + 1, envp, depth + 1); + } + + // Intercept utilities that fail or cause issues in unprivileged Android environment + if (strcmp(f_base, "ldconfig") == 0 || + strcmp(f_base, "ldconfig.real") == 0 || + strcmp(f_base, "systemd-machine-id-setup") == 0 || + strcmp(f_base, "systemd-sysusers") == 0 || + strcmp(f_base, "systemd-tmpfiles") == 0 || + strcmp(f_base, "start-stop-daemon") == 0 || + strcmp(f_base, "mandb") == 0 || + strcmp(f_base, "mandb.real") == 0 || + strcmp(f_base, "update-mime-database") == 0 || + strcmp(f_base, "update-desktop-database") == 0 || + strcmp(f_base, "install-info") == 0 || + strcmp(f_base, "install-sgmlcatalog") == 0 || + strcmp(prog_name, "ldconfig") == 0 || + strcmp(prog_name, "ldconfig.real") == 0 || + strcmp(prog_name, "systemd-machine-id-setup") == 0 || + strcmp(prog_name, "systemd-sysusers") == 0 || + strcmp(prog_name, "systemd-tmpfiles") == 0 || + strcmp(prog_name, "start-stop-daemon") == 0 || + strcmp(prog_name, "mandb") == 0 || + strcmp(prog_name, "mandb.real") == 0 || + strcmp(prog_name, "update-mime-database") == 0 || + strcmp(prog_name, "update-desktop-database") == 0 || + strcmp(prog_name, "install-info") == 0 || + strcmp(prog_name, "install-sgmlcatalog") == 0) { + if (is_ldconfig_name(f_base) || is_ldconfig_name(prog_name)) ldconfig_mark_cache(argv); + _exit(0); + } + if (strcmp(f_base, "mountpoint") == 0 || strcmp(prog_name, "mountpoint") == 0) { + int is_virtual_fs = 0; + for (int i = 1; argv && argv[i]; i++) { + if (strcmp(argv[i], "/proc") == 0 || strcmp(argv[i], "/proc/") == 0 || + strcmp(argv[i], "/sys") == 0 || strcmp(argv[i], "/sys/") == 0 || + strcmp(argv[i], "/dev") == 0 || strcmp(argv[i], "/dev/") == 0 || + strcmp(argv[i], "/dev/pts") == 0) { + is_virtual_fs = 1; + break; + } + } + if (is_virtual_fs) { + _exit(0); + } + } + if (strcmp(f_base, "policy-rc.d") == 0 || strcmp(prog_name, "policy-rc.d") == 0) { + _exit(101); + } + + // A static program inside the rootfs, to be made safe to start (prepare_static_program) + const char *static_elf = NULL; + char resolved_target[PATH_MAX]; + + // Only intercept binaries/scripts within DDNATV_ROOT + if ((g_ddnatv_root[0] != '\0' && strncmp(target, g_ddnatv_root, g_ddnatv_root_len) == 0) || is_mapped_guest_path(filename)) { + struct exec_probe probe; + const char *elf_target = select_exec_target(target, resolved_target, sizeof(resolved_target), &probe); + if (probe.is_elf && !probe.is_dynamic) static_elf = elf_target; + // A Go program built for Android asks for Android's linker, so it is started like the dynamic + // ones, but it makes its own system calls: it gets the code of the static Go programs (#42) + if (probe.is_dynamic && probe.android_interp) prepare_static_program_ex(elf_target, 1); + + // 1. Transparently route dynamically linked glibc ELF binaries through ld.so + // Note: Statically linked binaries (PT_INTERP absent, e.g. Meta Muse Code) must execute directly! + if (probe.is_dynamic) { + char ld_so[PATH_MAX]; + ld_so[0] = '\0'; + if (find_dynamic_linker_for_machine(g_ddnatv_root, probe.e_machine, ld_so, sizeof(ld_so)) && strcmp(elf_target, ld_so) != 0) { + ensure_exec_bit(elf_target, probe.mode); + + if (!in_exec_rehearsal()) ddnatv_copy_cstr(g_real_exe, sizeof(g_real_exe), elf_target); + + char hook_buf[PATH_MAX]; + const char *hook_so = ddnatv_hook_library(hook_buf, sizeof(hook_buf)); + char ld_lib_path[PATH_MAX * 6]; + build_ld_library_path(envp, probe.runpath, probe.runpath_is_rpath, elf_target, ld_lib_path, sizeof(ld_lib_path)); + char **new_argv = build_ldso_argv(ld_so, hook_so, ld_lib_path, elf_target, exec_prog_name(target), argv); + if (!new_argv) { + errno = ENOMEM; + return -1; + } + char **new_env = ensure_hook_in_envp(envp, elf_target); + int ret = run_execve(orig_execve, ld_so, new_argv, new_env); + if (errno == EACCES && chmod(ld_so, 0755) == 0) { + // ld.so without its exec bit (an unusual restore): fix it once and retry + ret = run_execve(orig_execve, ld_so, new_argv, new_env); + } + int saved_errno = errno; + free(new_argv); + free_modified_env(new_env, envp); + errno = saved_errno; + return ret; + } + } + + // ld.so started directly (ldd, "ld.so --list PROGRAM", "ld.so PROGRAM"): the program it loads + // gets the --library-path a start of its own gets, or ldd reports its libraries as not found, + // and its path mapped into the rootfs, since ld.so opens it without the hook + if (probe.is_elf && !probe.is_dynamic && is_ld_linux(elf_target)) { + int caller_lib_path = 0; + int pi = ldso_program_index(argv, &caller_lib_path); + if (pi > 0 && caller_lib_path) { + // the caller's own --library-path stays as it is; only the program is mapped (when it is + // in the rootfs: a caller can also name a file by its real path) + char prog_buf[PATH_MAX]; + const char *prog = argv[pi]; + if (prog[0] == '/') { + const char *mapped = rewrite_path(prog, prog_buf, sizeof(prog_buf)); + int fd = mapped != prog ? (int)syscall(SYS_openat, AT_FDCWD, mapped, O_PATH | O_CLOEXEC) : -1; + if (fd >= 0) { + syscall(SYS_close, fd); + prog = mapped; + } + } + int argc = 0; + while (argv[argc]) argc++; + char **new_argv = (char **)malloc(sizeof(char *) * (size_t)(argc + 1)); + if (!new_argv) { + errno = ENOMEM; + return -1; + } + for (int i = 0; i <= argc; i++) new_argv[i] = argv[i]; + new_argv[pi] = (char *)prog; + prepare_static_program(static_elf); // ld.so is a static program itself + char **ddnatv_env = prepare_ddnatv_env(envp, target); + int ret = run_execve(orig_execve, target, new_argv, ddnatv_env); + int saved_errno = errno; + free_modified_env(ddnatv_env, envp); + free(new_argv); + errno = saved_errno; + return ret; + } + if (pi > 0) { + char prog_buf[PATH_MAX]; + const char *prog = argv[pi][0] == '/' ? rewrite_path(argv[pi], prog_buf, sizeof(prog_buf)) : argv[pi]; + struct exec_probe prog_probe; + probe_exec_file(prog, &prog_probe); + char ld_lib_path[PATH_MAX * 6]; + build_ld_library_path(envp, prog_probe.runpath, prog_probe.runpath_is_rpath, + prog[0] == '/' ? prog : NULL, ld_lib_path, sizeof(ld_lib_path)); + int argc = 0; + while (argv[argc]) argc++; + char **new_argv = (char **)malloc(sizeof(char *) * (size_t)(argc + 3)); + if (!new_argv) { + errno = ENOMEM; + return -1; + } + new_argv[0] = argv[0]; + new_argv[1] = (char *)"--library-path"; + new_argv[2] = ld_lib_path; + for (int i = 1; i <= argc; i++) new_argv[i + 2] = argv[i]; + new_argv[pi + 2] = (char *)prog; // ld.so opens it itself: "ldd /usr/bin/adb" as well + prepare_static_program(static_elf); // ld.so is a static program itself + char **ddnatv_env = prepare_ddnatv_env(envp, target); + int ret = run_execve(orig_execve, target, new_argv, ddnatv_env); + int saved_errno = errno; + free_modified_env(ddnatv_env, envp); + free(new_argv); + errno = saved_errno; + return ret; + } + } + + // 2. Handle scripts with shebang lines (e.g., #!/bin/sh, #!/usr/bin/perl) + if (!probe.is_elf && probe.n >= 2 && probe.hdr[0] == '#' && probe.hdr[1] == '!') { + char *interp; + char *interp_arg; + parse_shebang(probe.hdr, &interp, &interp_arg); + char interp_buf[PATH_MAX]; + const char *rewritten_interp = shebang_interpreter(interp, interp_buf, sizeof(interp_buf)); + const char *script = (caller_path && caller_path[0] != '/') ? caller_path : target; + char **new_argv = build_script_argv(rewritten_interp, interp_arg, script, argv); + if (!new_argv) { + errno = ENOMEM; + return -1; + } + int ret; + if (is_host_interpreter(rewritten_interp)) { + char **sys_env = clean_env_for_system(envp); + ret = run_execve(orig_execve, rewritten_interp, new_argv, sys_env); + int saved_errno = errno; + free_modified_env(sys_env, envp); + errno = saved_errno; + } else if (depth >= DDNATV_MAX_SHEBANG_DEPTH) { + errno = ELOOP; + ret = -1; + } else { + char **ddnatv_env = prepare_ddnatv_env(envp, NULL); + ret = ddnatv_execve(rewritten_interp, new_argv, ddnatv_env, depth + 1); + int saved_errno = errno; + free_modified_env(ddnatv_env, envp); + errno = saved_errno; + } + free(new_argv); + return ret; + } + } else { + // Any binary outside DDNATV_ROOT is an Android host binary (e.g. /system/bin/su, /sbin/su, /data/adb/...) + char **sys_env = clean_env_for_system(envp); + int ret = run_execve(orig_execve, target, argv, sys_env); + int saved_errno = errno; + free_modified_env(sys_env, envp); + errno = saved_errno; + return ret; + } + + if (static_elf) prepare_static_program(static_elf); + char **ddnatv_env = prepare_ddnatv_env(envp, target); + int ret = run_execve(orig_execve, target, argv, ddnatv_env); + int saved_errno = errno; + free_modified_env(ddnatv_env, envp); + errno = saved_errno; + return ret; +} + +int execve(const char *filename, char *const argv[], char *const envp[]) { + return ddnatv_execve(filename, argv, envp, 0); +} + +// ---- fork() --------------------------------------------------------------------------------- +// A shell (and make, dpkg, perl, ...) starts a program with fork() and then execve() in the child. +// What the exec code above needs for the first time in a process (glibc's execve, fstat and readlink +// behind the hooks, the rootfs' ld.so, the path of this library) it found in the child, where every +// page it writes is a copy of the parent's: some 40 copy-on-write faults before each program even +// started, where a shell's child without the hook has fewer than ten. Now the parent finds them at +// its first fork(), and the children inherit them and only read them. At its eighth fork() the +// parent also rehearses an exec (everything but the execve() itself), which binds the calls the +// exec code makes and touches the code it runs. That costs about as much as it saves in four +// children, so only a process that keeps forking (a shell running a loop or a long script, make, +// dpkg) does it; one that forks a few times (sh -c with a pipe) does not pay for it. +#define DDNATV_FORKS_BEFORE_REHEARSAL 8 +static int g_exec_prepared = 0; // 1 after the first fork(), 2 after the rehearsal +static pthread_mutex_t g_exec_prepare_lock = PTHREAD_MUTEX_INITIALIZER; + +static void rehearse_exec(void) { + static const char rehearsal_target[] = "/usr/bin/true"; + char target_buf[PATH_MAX]; + const char *target = rewrite_path(rehearsal_target, target_buf, sizeof(target_buf)); + struct exec_probe probe; + // A dynamic program only: it takes the one way through ddnatv_execve() that ends in run_execve() + probe_exec_file(target, &probe); + if (!probe.is_elf || !probe.is_dynamic) return; + extern char **environ; + char *rehearsal_argv[] = { (char *)"true", NULL }; + g_exec_rehearsal_thread = pthread_self(); + __atomic_store_n(&g_exec_rehearsal, 1, __ATOMIC_RELEASE); + ddnatv_execve(rehearsal_target, rehearsal_argv, environ, 0); + __atomic_store_n(&g_exec_rehearsal, 0, __ATOMIC_RELEASE); +} + +static void prepare_exec_in_parent(int level) { + // One thread prepares (two rehearsing at once would take each other for the other's thread). + // Not waiting for the lock: a signal handler that forks while its thread is preparing would wait + // for itself; a busy lock leaves the preparation to a later fork(). + if (pthread_mutex_trylock(&g_exec_prepare_lock) != 0) return; + int done = __atomic_load_n(&g_exec_prepared, __ATOMIC_ACQUIRE); + if (done >= level) { + pthread_mutex_unlock(&g_exec_prepare_lock); + return; + } + int saved_errno = errno; + init_ddnatv_hook(); + real_execve(); + if (g_ddnatv_root[0] != '\0') { + if (done < 1) { + char ld_so[PATH_MAX]; +#if defined(__aarch64__) + uint16_t machine = 183; +#elif defined(__arm__) + uint16_t machine = 40; +#elif defined(__x86_64__) + uint16_t machine = 62; +#else + uint16_t machine = 0; +#endif + if (machine && find_dynamic_linker_for_machine(g_ddnatv_root, machine, ld_so, sizeof(ld_so))) { + // readlink(), open(), read() and close() behind the hooks, as the probe calls them + char resolved[PATH_MAX]; + struct exec_probe probe; + resolve_symlinks(ld_so, resolved, sizeof(resolved), 0); + probe_exec_file(ld_so, &probe); + } + char hook_buf[PATH_MAX]; + ddnatv_hook_library(hook_buf, sizeof(hook_buf)); + struct stat st; + probe_fstat(-1, &st); // looks fstat() up; -1 only fails with EBADF + char conf[PATH_MAX * 2]; + ldconf_dirs(conf, sizeof(conf)); // ld.so.conf read here, so the children only compare times + } + if (level >= 2) rehearse_exec(); + } + __atomic_store_n(&g_exec_prepared, level, __ATOMIC_RELEASE); + pthread_mutex_unlock(&g_exec_prepare_lock); + errno = saved_errno; +} + +pid_t fork(void) { + static pid_t (*orig_fork)(void) = NULL; + if (!orig_fork) orig_fork = (pid_t (*)(void))dlsym(RTLD_NEXT, "fork"); + if (!orig_fork) { + errno = ENOSYS; + return -1; + } + int done = __atomic_load_n(&g_exec_prepared, __ATOMIC_ACQUIRE); + if (done < 2) { + static int forks = 0; + int n = __atomic_add_fetch(&forks, 1, __ATOMIC_RELAXED); + if (n == 1 || n >= DDNATV_FORKS_BEFORE_REHEARSAL) prepare_exec_in_parent(n >= DDNATV_FORKS_BEFORE_REHEARSAL ? 2 : 1); + } + pid_t pid = orig_fork(); + // A child forked from a signal handler that interrupted a rehearsal is not rehearsing: its + // execve() is a real one (only read in the usual case, so no page is copied for it) + if (pid == 0 && __atomic_load_n(&g_exec_rehearsal, __ATOMIC_RELAXED)) __atomic_store_n(&g_exec_rehearsal, 0, __ATOMIC_RELAXED); + return pid; +} + +extern char **environ; + +int execv(const char *path, char *const argv[]) { + return execve(path, argv, environ); +} + +int execl(const char *path, const char *arg0, ...) { + va_list args; + va_start(args, arg0); + int count = (arg0 != NULL) ? 1 : 0; + if (arg0 != NULL) { + while (va_arg(args, const char *) != NULL) { + count++; + } + } + va_end(args); + + char **argv = (char **)calloc(count + 1, sizeof(char *)); + if (!argv) { + errno = ENOMEM; + return -1; + } + if (count > 0) { + argv[0] = (char *)arg0; + va_start(args, arg0); + for (int i = 1; i < count; i++) { + argv[i] = va_arg(args, char *); + } + va_end(args); + } + argv[count] = NULL; + int ret = execv(path, argv); + free(argv); + return ret; +} + +int execlp(const char *file, const char *arg0, ...) { + va_list args; + va_start(args, arg0); + int count = (arg0 != NULL) ? 1 : 0; + if (arg0 != NULL) { + while (va_arg(args, const char *) != NULL) { + count++; + } + } + va_end(args); + + char **argv = (char **)calloc(count + 1, sizeof(char *)); + if (!argv) { + errno = ENOMEM; + return -1; + } + if (count > 0) { + argv[0] = (char *)arg0; + va_start(args, arg0); + for (int i = 1; i < count; i++) { + argv[i] = va_arg(args, char *); + } + va_end(args); + } + argv[count] = NULL; + int ret = execvp(file, argv); + free(argv); + return ret; +} + +int execle(const char *path, const char *arg0, ...) { + va_list args; + va_start(args, arg0); + int count = (arg0 != NULL) ? 1 : 0; + if (arg0 != NULL) { + while (va_arg(args, const char *) != NULL) { + count++; + } + } + char *const *envp = va_arg(args, char *const *); + va_end(args); + + char **argv = (char **)calloc(count + 1, sizeof(char *)); + if (!argv) { + errno = ENOMEM; + return -1; + } + if (count > 0) { + argv[0] = (char *)arg0; + va_start(args, arg0); + for (int i = 1; i < count; i++) { + argv[i] = va_arg(args, char *); + } + va_end(args); + } + argv[count] = NULL; + int ret = execve(path, argv, (char *const *)envp); + free(argv); + return ret; +} + +int execvp(const char *file, char *const argv[]) { + if (!file || !*file) { + errno = ENOENT; + return -1; + } + if (strchr(file, '/')) { + return execve(file, argv, environ); + } + const char *path_env = getenv("PATH"); + if (!path_env) path_env = "/usr/bin:/bin"; + char path_copy[4096]; + strncpy(path_copy, path_env, sizeof(path_copy) - 1); + path_copy[sizeof(path_copy) - 1] = '\0'; + char *saveptr = NULL; + char *token = strtok_r(path_copy, ":", &saveptr); + while (token) { + char candidate[PATH_MAX]; + snprintf(candidate, sizeof(candidate), "%s/%s", token, file); + if (access(candidate, F_OK) == 0) { + return execve(candidate, argv, environ); + } + token = strtok_r(NULL, ":", &saveptr); + } + const char *standard_paths[] = {"/usr/bin", "/bin", "/usr/sbin", "/sbin", "/usr/local/bin", NULL}; + for (int i = 0; standard_paths[i] != NULL; i++) { + char candidate[PATH_MAX]; + snprintf(candidate, sizeof(candidate), "%s/%s", standard_paths[i], file); + if (access(candidate, F_OK) == 0) { + return execve(candidate, argv, environ); + } + } + return execve(file, argv, environ); +} + +int execvpe(const char *file, char *const argv[], char *const envp[]) { + if (!file || !*file) { + errno = ENOENT; + return -1; + } + if (strchr(file, '/')) { + return execve(file, argv, envp); + } + const char *path_env = NULL; + if (envp) { + for (char *const *ep = envp; *ep; ep++) { + if (strncmp(*ep, "PATH=", 5) == 0) { + path_env = *ep + 5; + break; + } + } + } + if (!path_env) path_env = getenv("PATH"); + if (!path_env) path_env = "/usr/bin:/bin"; + char path_copy[4096]; + strncpy(path_copy, path_env, sizeof(path_copy) - 1); + path_copy[sizeof(path_copy) - 1] = '\0'; + char *saveptr = NULL; + char *token = strtok_r(path_copy, ":", &saveptr); + while (token) { + char candidate[PATH_MAX]; + snprintf(candidate, sizeof(candidate), "%s/%s", token, file); + if (access(candidate, F_OK) == 0) { + return execve(candidate, argv, envp); + } + token = strtok_r(NULL, ":", &saveptr); + } + const char *standard_paths[] = {"/usr/bin", "/bin", "/usr/sbin", "/sbin", "/usr/local/bin", NULL}; + for (int i = 0; standard_paths[i] != NULL; i++) { + char candidate[PATH_MAX]; + snprintf(candidate, sizeof(candidate), "%s/%s", standard_paths[i], file); + if (access(candidate, F_OK) == 0) { + return execve(candidate, argv, envp); + } + } + return execve(file, argv, envp); +} + +typedef int (*orig_posix_spawn_f_type)(pid_t *, const char *, const posix_spawn_file_actions_t *, + const posix_spawnattr_t *, char *const [], char *const []); + +static orig_posix_spawn_f_type real_posix_spawn(void) { + static orig_posix_spawn_f_type orig_posix_spawn = NULL; + if (!orig_posix_spawn) orig_posix_spawn = (orig_posix_spawn_f_type)dlsym(RTLD_NEXT, "posix_spawn"); + return orig_posix_spawn; +} + +static int ddnatv_posix_spawn(pid_t *pid, const char *path, + const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, + char *const argv[], char *const envp[], int depth); + +// A rootfs script: start its interpreter with the same file actions and attributes. Handing the +// script to the kernel resolves "#!/bin/sh" to Android's own shell, which crashed on the glibc +// hook in LD_PRELOAD (and "#!/usr/bin/env" etc. used to fall back to fork() + execve(), which +// dropped the file actions). +static int spawn_script(pid_t *pid, const char *script, struct exec_probe *probe, + const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t *attrp, + char *const argv[], char *const envp[], int depth) { + char *interp; + char *interp_arg; + parse_shebang(probe->hdr, &interp, &interp_arg); + char interp_buf[PATH_MAX]; + const char *rewritten_interp = shebang_interpreter(interp, interp_buf, sizeof(interp_buf)); + char **new_argv = build_script_argv(rewritten_interp, interp_arg, script, argv); + if (!new_argv) return ENOMEM; + int ret; + if (is_host_interpreter(rewritten_interp)) { + orig_posix_spawn_f_type orig_posix_spawn = real_posix_spawn(); + char **sys_env = clean_env_for_system(envp); + ret = orig_posix_spawn ? orig_posix_spawn(pid, rewritten_interp, file_actions, attrp, new_argv, sys_env) : ENOSYS; + free_modified_env(sys_env, envp); + } else { + ret = ddnatv_posix_spawn(pid, rewritten_interp, file_actions, attrp, new_argv, envp, depth + 1); + } + free(new_argv); + return ret; +} + +static int ddnatv_posix_spawn(pid_t *pid, const char *path, + const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, + char *const argv[], char *const envp[], int depth) { + orig_posix_spawn_f_type orig_posix_spawn = real_posix_spawn(); + + const char *caller_path = path; + char abs_buf[PATH_MAX]; + path = absolutize_exec_path(path, abs_buf, sizeof(abs_buf)); + + char buf[PATH_MAX]; + const char *target = rewrite_path(path, buf, sizeof(buf)); + + init_ddnatv_hook(); + + const char *f_base = (path != NULL) ? strrchr(path, '/') : NULL; + f_base = (f_base != NULL) ? f_base + 1 : (path != NULL ? path : ""); + + const char *prog_name = exec_prog_name(target); + + if (strcmp(f_base, "ldconfig") == 0 || + strcmp(f_base, "ldconfig.real") == 0 || + strcmp(f_base, "systemd-machine-id-setup") == 0 || + strcmp(f_base, "systemd-sysusers") == 0 || + strcmp(f_base, "systemd-tmpfiles") == 0 || + strcmp(f_base, "start-stop-daemon") == 0 || + strcmp(prog_name, "ldconfig") == 0 || + strcmp(prog_name, "ldconfig.real") == 0 || + strcmp(prog_name, "systemd-machine-id-setup") == 0 || + strcmp(prog_name, "systemd-sysusers") == 0 || + strcmp(prog_name, "systemd-tmpfiles") == 0 || + strcmp(prog_name, "start-stop-daemon") == 0) { + pid_t child = fork(); + if (child == 0) { + if (is_ldconfig_name(f_base) || is_ldconfig_name(prog_name)) ldconfig_mark_cache(argv); + _exit(0); + } else if (child > 0) { + if (pid) *pid = child; + return 0; + } + return errno; + } + if (strcmp(f_base, "mountpoint") == 0 || strcmp(prog_name, "mountpoint") == 0) { + int is_virtual_fs = 0; + for (int i = 1; argv && argv[i]; i++) { + if (strcmp(argv[i], "/proc") == 0 || strcmp(argv[i], "/proc/") == 0 || + strcmp(argv[i], "/sys") == 0 || strcmp(argv[i], "/sys/") == 0 || + strcmp(argv[i], "/dev") == 0 || strcmp(argv[i], "/dev/") == 0 || + strcmp(argv[i], "/dev/pts") == 0) { + is_virtual_fs = 1; + break; + } + } + if (is_virtual_fs) { + pid_t child = fork(); + if (child == 0) { + _exit(0); + } else if (child > 0) { + if (pid) *pid = child; + return 0; + } + return errno; + } + } + if (strcmp(f_base, "policy-rc.d") == 0 || strcmp(prog_name, "policy-rc.d") == 0) { + pid_t child = fork(); + if (child == 0) { + _exit(101); + } else if (child > 0) { + if (pid) *pid = child; + return 0; + } + return errno; + } + + char *const *orig_ep = envp ? envp : environ; + int in_root = (g_ddnatv_root[0] != '\0' && strncmp(target, g_ddnatv_root, g_ddnatv_root_len) == 0) || is_mapped_guest_path(path); + + struct exec_probe probe; + char resolved_target[PATH_MAX]; + const char *elf_target = target; + if (in_root) { + elf_target = select_exec_target(target, resolved_target, sizeof(resolved_target), &probe); + if (!probe.is_elf && probe.n >= 2 && probe.hdr[0] == '#' && probe.hdr[1] == '!') { + // Like the kernel, give up after a few nested "#!" interpreters. + if (depth >= DDNATV_MAX_SHEBANG_DEPTH) return ELOOP; + const char *script = (caller_path && caller_path[0] != '/') ? caller_path : target; + return spawn_script(pid, script, &probe, file_actions, attrp, argv, orig_ep, depth); + } + } else { + probe.hdr[0] = '\0'; + probe.n = -1; + probe.is_elf = 0; + probe.is_dynamic = 0; + probe.android_interp = 0; + probe.e_machine = 0; + probe.mode = 0; + probe.runpath[0] = '\0'; + probe.runpath_is_rpath = 0; + } + + char ld_so[PATH_MAX]; + ld_so[0] = '\0'; + int has_ld_so = probe.is_dynamic ? find_dynamic_linker_for_machine(g_ddnatv_root, probe.e_machine, ld_so, sizeof(ld_so)) : 0; + + // Android programs get Android's environment, as execve() gives them: the glibc hook in + // LD_PRELOAD crashes them. + char **new_envp = in_root ? ensure_hook_in_envp(orig_ep, elf_target) : clean_env_for_system(orig_ep); + + int ret = -1; + if (has_ld_so && strcmp(elf_target, ld_so) != 0) { + ensure_exec_bit(elf_target, probe.mode); + if (probe.android_interp) prepare_static_program_ex(elf_target, 1); // a Go program built for Android (#42) + + char hook_buf[PATH_MAX]; + const char *hook_so = ddnatv_hook_library(hook_buf, sizeof(hook_buf)); + char ld_lib_path[PATH_MAX * 6]; + build_ld_library_path(orig_ep, probe.runpath, probe.runpath_is_rpath, elf_target, ld_lib_path, sizeof(ld_lib_path)); + char **new_argv = build_ldso_argv(ld_so, hook_so, ld_lib_path, elf_target, prog_name, argv); + if (!new_argv) { + ret = ENOMEM; + } else { + if (orig_posix_spawn) { + ret = orig_posix_spawn(pid, ld_so, file_actions, attrp, new_argv, new_envp); + if (ret == EACCES && chmod(ld_so, 0755) == 0) { + // ld.so without its exec bit (an unusual restore): fix it once and retry + ret = orig_posix_spawn(pid, ld_so, file_actions, attrp, new_argv, new_envp); + } + } + free(new_argv); + } + } else { + if (in_root && probe.is_elf && !probe.is_dynamic) prepare_static_program(elf_target); + if (orig_posix_spawn) { + ret = orig_posix_spawn(pid, target, file_actions, attrp, argv, new_envp); + } + } + + if (!orig_posix_spawn) { + pid_t child = fork(); + if (child < 0) { + free_modified_env(new_envp, orig_ep); + return errno; + } else if (child == 0) { + execve(target, argv, new_envp); + _exit(127); + } else { + if (pid) *pid = child; + free_modified_env(new_envp, orig_ep); + return 0; + } + } + free_modified_env(new_envp, orig_ep); + return ret; +} + +static int apply_closefrom(posix_spawn_file_actions_t *actions); + +int posix_spawn(pid_t *pid, const char *path, + const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, + char *const argv[], char *const envp[]) { + if (file_actions) { + int bad = apply_closefrom((posix_spawn_file_actions_t *)file_actions); + if (bad) return bad; + } + posix_spawnattr_t sanitized; + return ddnatv_posix_spawn(pid, path, file_actions, spawn_attr_for_android(attrp, &sanitized), argv, envp, 0); +} + +int posix_spawnp(pid_t *pid, const char *file, + const posix_spawn_file_actions_t *file_actions, + const posix_spawnattr_t *attrp, + char *const argv[], char *const envp[]) { + if (!file || !*file) { + return ENOENT; + } + if (strchr(file, '/')) { + return posix_spawn(pid, file, file_actions, attrp, argv, envp); + } + const char *path_env = NULL; + if (envp) { + for (char *const *ep = envp; *ep; ep++) { + if (strncmp(*ep, "PATH=", 5) == 0) { + path_env = *ep + 5; + break; + } + } + } + if (!path_env) path_env = getenv("PATH"); + if (!path_env) path_env = "/usr/bin:/bin"; + char path_copy[4096]; + strncpy(path_copy, path_env, sizeof(path_copy) - 1); + path_copy[sizeof(path_copy) - 1] = '\0'; + char *saveptr = NULL; + char *token = strtok_r(path_copy, ":", &saveptr); + while (token) { + char candidate[PATH_MAX]; + snprintf(candidate, sizeof(candidate), "%s/%s", token, file); + if (access(candidate, F_OK) == 0) { + return posix_spawn(pid, candidate, file_actions, attrp, argv, envp); + } + token = strtok_r(NULL, ":", &saveptr); + } + const char *standard_paths[] = {"/usr/bin", "/bin", "/usr/sbin", "/sbin", "/usr/local/bin", NULL}; + for (int i = 0; standard_paths[i] != NULL; i++) { + char candidate[PATH_MAX]; + snprintf(candidate, sizeof(candidate), "%s/%s", standard_paths[i], file); + if (access(candidate, F_OK) == 0) { + return posix_spawn(pid, candidate, file_actions, attrp, argv, envp); + } + } + // If not found in PATH or standard paths, return ENOENT without spawning zombie + return ENOENT; +} + +// ---- system(), popen() and pclose() --------------------------------------------------------- +// glibc starts the shell of system() and popen() from inside the C library (its own posix_spawn and +// execve), where the hook's execve() is not called: the kernel ran the machine's /bin/sh, which on +// Android is the system's own shell, and that one failed to link against Ubuntu's libraries +// ("CANNOT LINK EXECUTABLE sh: ...libc.so has bad ELF magic", #49). They start Ubuntu's /bin/sh here. + +extern char **environ; + +static pid_t start_shell(const char *command, int child_fd, int target_fd, const sigset_t *mask, + const struct sigaction *intr, const struct sigaction *quit, int close_popen_streams); + +// While system() waits, SIGINT and SIGQUIT are ignored; with several threads in system() at once, the +// first one in saves the dispositions and the last one out puts them back (as glibc does) +static pthread_mutex_t g_system_lock = PTHREAD_MUTEX_INITIALIZER; +static int g_system_waiting; +static struct sigaction g_system_intr, g_system_quit; + +// system(3) as POSIX describes it: SIGINT and SIGQUIT ignored and SIGCHLD blocked while it waits +int system(const char *command) { + if (!command) return access("/bin/sh", X_OK) == 0; // whether there is a shell (Ubuntu's) + pthread_mutex_lock(&g_system_lock); + if (g_system_waiting++ == 0) { + struct sigaction ignore; + memset(&ignore, 0, sizeof(ignore)); + ignore.sa_handler = SIG_IGN; + sigemptyset(&ignore.sa_mask); + sigaction(SIGINT, &ignore, &g_system_intr); + sigaction(SIGQUIT, &ignore, &g_system_quit); + } + struct sigaction intr = g_system_intr, quit = g_system_quit; + pthread_mutex_unlock(&g_system_lock); + sigset_t block, old; + sigemptyset(&block); + sigaddset(&block, SIGCHLD); + sigprocmask(SIG_BLOCK, &block, &old); + + int status = -1; + pid_t pid = start_shell(command, -1, -1, &old, &intr, &quit, 0); + if (pid > 0) { + while (waitpid(pid, &status, 0) < 0) { + if (errno != EINTR) { + status = -1; + break; + } + } + } + int saved = errno; + pthread_mutex_lock(&g_system_lock); + if (--g_system_waiting == 0) { + sigaction(SIGINT, &g_system_intr, NULL); + sigaction(SIGQUIT, &g_system_quit, NULL); + } + pthread_mutex_unlock(&g_system_lock); + sigprocmask(SIG_SETMASK, &old, NULL); + errno = saved; + return status; +} + +// The streams popen() made, with their shells: pclose() waits for the one of its stream +struct ddnatv_popen { + FILE *fp; + pid_t pid; + struct ddnatv_popen *next; +}; +static struct ddnatv_popen *g_popen_streams; +static pthread_mutex_t g_popen_lock = PTHREAD_MUTEX_INITIALIZER; + +static pid_t start_shell(const char *command, int child_fd, int target_fd, const sigset_t *mask, + const struct sigaction *intr, const struct sigaction *quit, int close_popen_streams) { + pid_t pid = fork(); + if (pid != 0) return pid; + if (intr) sigaction(SIGINT, intr, NULL); + if (quit) sigaction(SIGQUIT, quit, NULL); + if (mask) sigprocmask(SIG_SETMASK, mask, NULL); + if (child_fd >= 0) { + if (child_fd == target_fd) { + fcntl(target_fd, F_SETFD, 0); + } else if (dup2(child_fd, target_fd) < 0) { + _exit(127); + } + } + // POSIX: the streams of earlier popen() calls are not open in the new shell + if (close_popen_streams) { + for (struct ddnatv_popen *p = g_popen_streams; p; p = p->next) { + int fd = fileno(p->fp); + if (fd >= 0 && fd != target_fd) close(fd); + } + } + char *const argv[] = { (char *)"sh", (char *)"-c", (char *)command, NULL }; + ddnatv_execve("/bin/sh", argv, environ, 0); + _exit(127); +} + +FILE *popen(const char *command, const char *type) { + if (!command || !type || (type[0] != 'r' && type[0] != 'w')) { + errno = EINVAL; + return NULL; + } + int reading = type[0] == 'r'; + int keep_on_exec = strchr(type, 'e') == NULL; + int fds[2]; + if (pipe2(fds, O_CLOEXEC) != 0) return NULL; + int parent_end = reading ? fds[0] : fds[1]; + int child_end = reading ? fds[1] : fds[0]; + struct ddnatv_popen *entry = (struct ddnatv_popen *)malloc(sizeof(*entry)); + if (!entry) { + close(fds[0]); + close(fds[1]); + errno = ENOMEM; + return NULL; + } + pthread_mutex_lock(&g_popen_lock); + pid_t pid = start_shell(command, child_end, reading ? STDOUT_FILENO : STDIN_FILENO, NULL, NULL, NULL, 1); + int saved = errno; + close(child_end); + FILE *fp = NULL; + if (pid > 0) { + if (keep_on_exec) fcntl(parent_end, F_SETFD, 0); + fp = fdopen(parent_end, reading ? "r" : "w"); + saved = errno; + } + if (!fp) { + close(parent_end); + pthread_mutex_unlock(&g_popen_lock); + free(entry); + if (pid > 0) { + // A shell nobody will read or write: it is not left to run (or waited for while it does) + kill(pid, SIGKILL); + while (waitpid(pid, NULL, 0) < 0 && errno == EINTR) {} + } + errno = saved; + return NULL; + } + entry->fp = fp; + entry->pid = pid; + entry->next = g_popen_streams; + g_popen_streams = entry; + pthread_mutex_unlock(&g_popen_lock); + return fp; +} + +int pclose(FILE *stream) { + struct ddnatv_popen *found = NULL; + pthread_mutex_lock(&g_popen_lock); + for (struct ddnatv_popen **p = &g_popen_streams; *p; p = &(*p)->next) { + if ((*p)->fp == stream) { + found = *p; + *p = found->next; + break; + } + } + // Closed before the lock is let go: a popen() in between would fork a shell that keeps this pipe open, + // and the shell of this stream would wait for its end of it + if (found) fclose(stream); + pthread_mutex_unlock(&g_popen_lock); + if (!found) { + // Not one of ours: glibc's own + static int (*orig_pclose)(FILE *) = NULL; + if (!orig_pclose) orig_pclose = (int (*)(FILE *))dlsym(RTLD_NEXT, "pclose"); + if (!orig_pclose) { + errno = ECHILD; + return -1; + } + return orig_pclose(stream); + } + pid_t pid = found->pid; + free(found); + int status = -1; + pid_t r; + do { + r = waitpid(pid, &status, 0); + } while (r < 0 && errno == EINTR); + return r < 0 ? -1 : status; +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/exec_probe.c b/tools/nativeguest/hook/exec_probe.c new file mode 100644 index 0000000000..f877175e58 --- /dev/null +++ b/tools/nativeguest/hook/exec_probe.c @@ -0,0 +1,1027 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// What execve() and posix_spawn() need to know about a program: its ld.so, whether it is a +// dynamic ELF, a script and its interpreter, and the argument lists built from that. + +// Relative exec paths ("./configure", "bin/tool", "../x.sh") must go through the same +// DDNATV_ROOT routing as absolute ones. Without this they were mistaken for Android host +// binaries and handed to the kernel unchanged, which then resolved "#!/bin/bash" (or a glibc +// PT_INTERP) literally and failed with "bad interpreter: No such file or directory". +// getcwd() is not virtualised, so cwd + path is a real path that starts with DDNATV_ROOT. +static const char *absolutize_exec_path(const char *path, char *buffer, size_t bufsize) { + if (!path || path[0] == '\0' || path[0] == '/') return path; + char cwd[PATH_MAX]; + static char *(*real_getcwd)(char *, size_t) = NULL; + if (!real_getcwd) real_getcwd = (char *(*)(char *, size_t))dlsym(RTLD_NEXT, "getcwd"); + if (!real_getcwd || !real_getcwd(cwd, sizeof(cwd))) return path; + + while (path[0] == '.' && path[1] == '/') { + path += 2; + while (path[0] == '/') path++; + } + if (path[0] == '\0' || strcmp(path, ".") == 0) return path; + + size_t cwd_len = strlen(cwd); + while (cwd_len > 1 && cwd[cwd_len - 1] == '/') cwd[--cwd_len] = '\0'; + int n = snprintf(buffer, bufsize, "%s%s%s", cwd, (cwd_len == 1 && cwd[0] == '/') ? "" : "/", path); + if (n < 0 || (size_t)n >= bufsize) return path; + return buffer; +} + +static char s_cached_ld_so[PATH_MAX] = {0}; +static char s_cached_ld_root[PATH_MAX] = {0}; +static uint16_t s_cached_e_machine = 0; + +// ld.so inside `ddnatv_root` for an ELF with machine type `e_machine` (0 when unknown). +static int find_dynamic_linker_for_machine(const char *ddnatv_root, uint16_t e_machine, char *out_ld_so, size_t max_len) { + if (!ddnatv_root || ddnatv_root[0] == '\0' || !out_ld_so || max_len == 0) return 0; + + if (s_cached_ld_so[0] != '\0' && strcmp(s_cached_ld_root, ddnatv_root) == 0 && + e_machine != 0 && e_machine == s_cached_e_machine) { + ddnatv_copy_cstr(out_ld_so, max_len, s_cached_ld_so); + return 1; + } + + const char *aarch64_cands[] = { + "/usr/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1", + "/usr/lib/aarch64-linux-gnu/ld-2.39.so", + "/lib/ld-linux-aarch64.so.1", + "/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1", + "/usr/lib/ld-linux-aarch64.so.1", + "/usr/lib64/ld-linux-aarch64.so.1", + "/lib64/ld-linux-aarch64.so.1", + "/lib/aarch64-linux-gnu/ld-2.39.so", + NULL + }; + + const char *armhf_cands[] = { + "/usr/lib/arm-linux-gnueabihf/ld-linux-armhf.so.3", + "/usr/lib/arm-linux-gnueabihf/ld-2.39.so", + "/lib/ld-linux-armhf.so.3", + "/lib/arm-linux-gnueabihf/ld-linux-armhf.so.3", + "/usr/lib/ld-linux-armhf.so.3", + "/lib/arm-linux-gnueabihf/ld-2.39.so", + "/usr/lib/arm-linux-gnueabi/ld-linux.so.3", + "/lib/arm-linux-gnueabi/ld-linux.so.3", + NULL + }; + + const char *x86_64_cands[] = { + "/lib64/ld-linux-x86-64.so.2", + "/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2", + "/usr/lib/x86_64-linux-gnu/ld-2.39.so", + "/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2", + NULL + }; + + const char **primary = NULL; + const char **secondary = NULL; + + if (e_machine == 183) { // EM_AARCH64 + primary = aarch64_cands; + secondary = NULL; + } else if (e_machine == 40) { // EM_ARM + primary = armhf_cands; + secondary = NULL; + } else if (e_machine == 62) { // EM_X86_64 + primary = x86_64_cands; + secondary = NULL; + } else if (e_machine == 3) { // EM_386 + primary = NULL; + secondary = NULL; + } else { + #if defined(__aarch64__) + primary = aarch64_cands; + secondary = armhf_cands; + #elif defined(__arm__) + primary = armhf_cands; + secondary = aarch64_cands; + #else + primary = x86_64_cands; + #endif + } + + if (primary) { + for (int i = 0; primary[i] != NULL; i++) { + snprintf(out_ld_so, max_len, "%s%s", ddnatv_root, primary[i]); + if (access(out_ld_so, F_OK) == 0) { + if (e_machine != 0) { + ddnatv_copy_cstr(s_cached_ld_so, sizeof(s_cached_ld_so), out_ld_so); + ddnatv_copy_cstr(s_cached_ld_root, sizeof(s_cached_ld_root), ddnatv_root); + s_cached_e_machine = e_machine; + } + return 1; + } + } + } + if (secondary) { + for (int i = 0; secondary[i] != NULL; i++) { + snprintf(out_ld_so, max_len, "%s%s", ddnatv_root, secondary[i]); + if (access(out_ld_so, F_OK) == 0) { + if (e_machine != 0) { + ddnatv_copy_cstr(s_cached_ld_so, sizeof(s_cached_ld_so), out_ld_so); + ddnatv_copy_cstr(s_cached_ld_root, sizeof(s_cached_ld_root), ddnatv_root); + s_cached_e_machine = e_machine; + } + return 1; + } + } + } + + return 0; +} + +#ifdef DDNATV_HOST_TEST +// Test entry point taking a program instead of its machine type (ddnatv-pty.c, which the tests +// include too, has a find_dynamic_linker of its own). +static int hook_find_dynamic_linker(const char *ddnatv_root, const char *cmd, char *out_ld_so, size_t max_len) { + if (!ddnatv_root || ddnatv_root[0] == '\0' || !out_ld_so || max_len == 0) return 0; + + uint16_t e_machine = 0; + if (cmd && cmd[0] != '\0') { + int fd = open(cmd, O_RDONLY); + if (fd >= 0) { + unsigned char ehdr[20]; + ssize_t n = read(fd, ehdr, sizeof(ehdr)); + close(fd); + if (n >= 20 && ehdr[0] == 0x7f && ehdr[1] == 'E' && ehdr[2] == 'L' && ehdr[3] == 'F') { + e_machine = (uint16_t)(ehdr[18] | (ehdr[19] << 8)); + } + } + } + return find_dynamic_linker_for_machine(ddnatv_root, e_machine, out_ld_so, max_len); +} +#endif + +static int check_elf_dynamic(int fd, const unsigned char *ehdr, ssize_t n) { + if (n < 52 || ehdr[0] != 0x7f || ehdr[1] != 'E' || ehdr[2] != 'L' || ehdr[3] != 'F') { + return 0; + } + if ((ehdr[4] != 1 && ehdr[4] != 2) || ehdr[5] != 1 /* ELFDATA2LSB */) { + return 0; + } + int is_64 = (ehdr[4] == 2); + uint64_t phoff = 0; + uint16_t phentsize = 0; + uint16_t phnum = 0; + if (is_64) { + if (n < 64) return 0; + memcpy(&phoff, ehdr + 32, sizeof(uint64_t)); + memcpy(&phentsize, ehdr + 54, sizeof(uint16_t)); + memcpy(&phnum, ehdr + 56, sizeof(uint16_t)); + } else { + uint32_t phoff32 = 0; + memcpy(&phoff32, ehdr + 28, sizeof(uint32_t)); + phoff = phoff32; + memcpy(&phentsize, ehdr + 42, sizeof(uint16_t)); + memcpy(&phnum, ehdr + 44, sizeof(uint16_t)); + } + uint16_t min_phentsize = is_64 ? 56 : 32; + if (phoff == 0 || phentsize < min_phentsize || phentsize > 4096 || phnum == 0) { + return 0; + } + if ((off_t)phoff < 0 || (uint64_t)(off_t)phoff != phoff) { + return 0; + } + if (lseek(fd, (off_t)phoff, SEEK_SET) < 0) { + return 0; + } + for (int i = 0; i < phnum && i < 128; i++) { + uint32_t p_type = 0; + if (read(fd, &p_type, sizeof(p_type)) != sizeof(p_type)) break; + if (p_type == 3 /* PT_INTERP */) { + return 1; + } + if (lseek(fd, (off_t)(phentsize - sizeof(p_type)), SEEK_CUR) < 0) break; + } + return 0; +} + +// check_elf_dynamic() on the bytes already read: 1 or 0, or -1 when a program header lies past +// the buffer and the file has to be read after all. Program headers normally follow the ELF +// header directly, so this saves the lseek()/read() pairs. +static int elf_interp_in_buffer(const unsigned char *ehdr, ssize_t n) { + if (n < 52 || ehdr[0] != 0x7f || ehdr[1] != 'E' || ehdr[2] != 'L' || ehdr[3] != 'F') { + return 0; + } + if ((ehdr[4] != 1 && ehdr[4] != 2) || ehdr[5] != 1 /* ELFDATA2LSB */) { + return 0; + } + int is_64 = (ehdr[4] == 2); + uint64_t phoff = 0; + uint16_t phentsize = 0; + uint16_t phnum = 0; + if (is_64) { + if (n < 64) return 0; + memcpy(&phoff, ehdr + 32, sizeof(uint64_t)); + memcpy(&phentsize, ehdr + 54, sizeof(uint16_t)); + memcpy(&phnum, ehdr + 56, sizeof(uint16_t)); + } else { + uint32_t phoff32 = 0; + memcpy(&phoff32, ehdr + 28, sizeof(uint32_t)); + phoff = phoff32; + memcpy(&phentsize, ehdr + 42, sizeof(uint16_t)); + memcpy(&phnum, ehdr + 44, sizeof(uint16_t)); + } + uint16_t min_phentsize = is_64 ? 56 : 32; + if (phoff == 0 || phentsize < min_phentsize || phentsize > 4096 || phnum == 0) { + return 0; + } + if ((off_t)phoff < 0 || (uint64_t)(off_t)phoff != phoff) { + return 0; + } + for (int i = 0; i < phnum && i < 128; i++) { + uint64_t off = phoff + (uint64_t)i * phentsize; + if (off > (uint64_t)n || (uint64_t)n - off < sizeof(uint32_t)) return -1; + uint32_t p_type = 0; + memcpy(&p_type, ehdr + off, sizeof(p_type)); + if (p_type == 3 /* PT_INTERP */) { + return 1; + } + } + return 0; +} + +// Whether the interpreter of a 64-bit ELF is Android's own linker (/system/bin/linker64). A Go +// program built with GOOS=android is a PIE that asks for it, so it has a PT_INTERP and looks like a +// dynamic program, but it has no C library and makes its own system calls like every Go program +// (#42). `h` holds the `n` first bytes of the file; the program headers usually are among them. +static int elf_interp_is_android(int fd, const unsigned char *h, ssize_t n) { + if (n < 64 || h[4] != 2) return 0; + uint64_t phoff = 0; + uint16_t phentsize = 0, phnum = 0; + memcpy(&phoff, h + 32, sizeof(phoff)); + memcpy(&phentsize, h + 54, sizeof(phentsize)); + memcpy(&phnum, h + 56, sizeof(phnum)); + if (phoff == 0 || phoff > (1ULL << 40) || phentsize < 56 || phentsize > 4096 || phnum == 0) return 0; + for (int i = 0; i < phnum && i < 128; i++) { + unsigned char e[56]; + uint64_t off = phoff + (uint64_t)i * phentsize; + if (off + sizeof(e) <= (uint64_t)n) { + memcpy(e, h + off, sizeof(e)); + } else if (pread(fd, e, sizeof(e), (off_t)off) != (ssize_t)sizeof(e)) { + return 0; + } + uint32_t p_type = 0; + memcpy(&p_type, e, sizeof(p_type)); + if (p_type != 3 /* PT_INTERP */) continue; + uint64_t p_offset = 0, p_filesz = 0; + memcpy(&p_offset, e + 8, sizeof(p_offset)); + memcpy(&p_filesz, e + 32, sizeof(p_filesz)); + char interp[48]; + size_t want = p_filesz < sizeof(interp) - 1 ? (size_t)p_filesz : sizeof(interp) - 1; + if (want == 0 || p_offset > (1ULL << 40)) return 0; + ssize_t got = pread(fd, interp, want, (off_t)p_offset); + if (got <= 0) return 0; + interp[got] = '\0'; + return strncmp(interp, "/system/bin/linker", 18) == 0; + } + return 0; +} + +// The kernel follows at most four nested "#!" interpreters, then fails with ELOOP. +#define DDNATV_MAX_SHEBANG_DEPTH 4 + +// What execve()/posix_spawn() need to know about the file they are about to start, from a +// single open()/read() (they used to open it up to three times). +struct exec_probe { + char hdr[256]; // first bytes of the file, NUL-terminated for "#!" parsing + ssize_t n; // bytes read; -1 when the file could not be opened + int is_elf; + int is_dynamic; // ELF with PT_INTERP: has to be started through ld.so + int android_interp; // AArch64 ELF whose PT_INTERP is Android's linker (a Go program for GOOS=android) + uint16_t e_machine; + mode_t mode; // st_mode, filled in for dynamic ELF files only + int runpath_is_rpath; // runpath holds a DT_RPATH (searched before LD_LIBRARY_PATH), not a DT_RUNPATH + char runpath[1024]; // DT_RUNPATH (else DT_RPATH) of a dynamic ELF as written in it, or "" +}; + +// The DT_RUNPATH of a dynamic ELF (its DT_RPATH when it has none, as ld.so does) into `out`, as +// written in the file. ld.so looks for the program's libraries there, but it opens those +// directories itself, without the hook: an absolute one such as /usr/lib/aarch64-linux-gnu/android +// (Ubuntu's adb and fastboot keep their own libbase, liblog, libssl... there) is looked for in +// Android's tree and the program does not start. The exec adds the rootfs copies to the +// --library-path it gives ld.so (build_ld_library_path). Returns 1 for a DT_RUNPATH, 2 for a +// DT_RPATH, 0 when there is neither. The headers are read in pieces, so that their number does +// not matter; a list longer than `out` keeps its first whole entries (ld.so still has the rest). +static int elf_read_dynamic(int fd, const unsigned char *h, ssize_t n, char *out, size_t outsz, + char *needed, size_t needed_size, int *needed_count); + +static int elf_read_runpath(int fd, const unsigned char *h, ssize_t n, char *out, size_t outsz) { + return elf_read_dynamic(fd, h, n, out, outsz, NULL, 0, NULL); +} + +// elf_read_runpath(), and with `needed` the DT_NEEDED names too: one after the other, each ended by a +// NUL, their number in *needed_count (as many as fit). +#define ELF_MAX_NEEDED 128 +static int elf_read_dynamic(int fd, const unsigned char *h, ssize_t n, char *out, size_t outsz, + char *needed, size_t needed_size, int *needed_count) { + if (needed_count) *needed_count = 0; + if (!out || outsz < 2) return 0; + out[0] = '\0'; + if (n < 52 || h[0] != 0x7f || h[1] != 'E' || h[2] != 'L' || h[3] != 'F' || h[5] != 1 /* LSB */) return 0; + int is_64 = (h[4] == 2); + if (!is_64 && h[4] != 1) return 0; + if (is_64 && n < 64) return 0; + uint64_t phoff = 0; + uint16_t phentsize = 0, phnum = 0; + if (is_64) { + memcpy(&phoff, h + 32, 8); + memcpy(&phentsize, h + 54, 2); + memcpy(&phnum, h + 56, 2); + } else { + uint32_t off32 = 0; + memcpy(&off32, h + 28, 4); + phoff = off32; + memcpy(&phentsize, h + 42, 2); + memcpy(&phnum, h + 44, 2); + } + size_t ph_size = is_64 ? 56 : 32; + if (phoff == 0 || phoff > (1ULL << 40) || phentsize < ph_size || phentsize > 1024 || phnum == 0) return 0; + + // PT_DYNAMIC, and the PT_LOAD segments that map an address of the file to its offset + unsigned char buf[2048]; + uint64_t dyn_off = 0, dyn_size = 0; + uint64_t load_vaddr[16], load_off[16], load_size[16]; + int loads = 0; + size_t per_read = sizeof(buf) / phentsize; + for (size_t first = 0; first < phnum; first += per_read) { + size_t count = phnum - first < per_read ? phnum - first : per_read; + size_t bytes = count * phentsize; + if (pread(fd, buf, bytes, (off_t)(phoff + first * phentsize)) != (ssize_t)bytes) return 0; + for (size_t i = 0; i < count; i++) { + const unsigned char *e = buf + i * phentsize; + uint32_t type = 0; + memcpy(&type, e, 4); + uint64_t off = 0, vaddr = 0, filesz = 0; + if (is_64) { + memcpy(&off, e + 8, 8); + memcpy(&vaddr, e + 16, 8); + memcpy(&filesz, e + 32, 8); + } else { + uint32_t v = 0; + memcpy(&v, e + 4, 4); off = v; + memcpy(&v, e + 8, 4); vaddr = v; + memcpy(&v, e + 16, 4); filesz = v; + } + if (type == 2 /* PT_DYNAMIC */) { + dyn_off = off; + dyn_size = filesz; + } else if (type == 1 /* PT_LOAD */ && loads < 16) { + load_vaddr[loads] = vaddr; + load_off[loads] = off; + load_size[loads] = filesz; + loads++; + } + } + } + if (dyn_size == 0 || dyn_off > (1ULL << 40)) return 0; + if (dyn_size > (1u << 20)) dyn_size = 1u << 20; + + size_t ent = is_64 ? 16 : 8; + uint64_t strtab = 0, runpath = 0, rpath = 0; + int has_strtab = 0, has_runpath = 0, has_rpath = 0, done = 0; + uint64_t needed_at[ELF_MAX_NEEDED]; + int nneeded = 0; + for (uint64_t at = 0; at + ent <= dyn_size && !done;) { + size_t want = dyn_size - at < sizeof(buf) ? (size_t)(dyn_size - at) : sizeof(buf); + want -= want % ent; + ssize_t got = pread(fd, buf, want, (off_t)(dyn_off + at)); + if (got < (ssize_t)ent) break; + for (size_t i = 0; i + ent <= (size_t)got; i += ent) { + int64_t tag = 0; + uint64_t val = 0; + if (is_64) { + memcpy(&tag, buf + i, 8); + memcpy(&val, buf + i + 8, 8); + } else { + int32_t tv = 0; + uint32_t vv = 0; + memcpy(&tv, buf + i, 4); + memcpy(&vv, buf + i + 4, 4); + tag = tv; + val = vv; + } + if (tag == 0 /* DT_NULL */) { done = 1; break; } + if (tag == 5 /* DT_STRTAB */) { strtab = val; has_strtab = 1; } + else if (tag == 29 /* DT_RUNPATH */) { runpath = val; has_runpath = 1; } + else if (tag == 15 /* DT_RPATH */) { rpath = val; has_rpath = 1; } + else if (tag == 1 /* DT_NEEDED */ && needed && nneeded < ELF_MAX_NEEDED) needed_at[nneeded++] = val; + } + at += (uint64_t)got - (uint64_t)got % ent; + } + if (!has_strtab || (!has_runpath && !has_rpath)) return 0; + uint64_t str_index = has_runpath ? runpath : rpath; + + // DT_STRTAB is an address: the file offset is that of the PT_LOAD segment holding it + uint64_t strtab_off = 0; + int mapped = 0; + for (int i = 0; i < loads; i++) { + if (strtab >= load_vaddr[i] && strtab - load_vaddr[i] < load_size[i]) { + strtab_off = load_off[i] + (strtab - load_vaddr[i]); + mapped = 1; + break; + } + } + if (!mapped || str_index > (1ULL << 32)) return 0; + if (needed && needed_count && needed_size > 0) { + size_t used = 0; + for (int i = 0; i < nneeded; i++) { + char name[256]; + ssize_t got = pread(fd, name, sizeof(name) - 1, (off_t)(strtab_off + needed_at[i])); + if (got <= 0) continue; + name[got] = '\0'; + size_t len = strnlen(name, (size_t)got); + if (len == 0 || len == (size_t)got || used + len + 1 > needed_size) continue; + memcpy(needed + used, name, len + 1); + used += len + 1; + (*needed_count)++; + } + } + ssize_t len = pread(fd, out, outsz - 1, (off_t)(strtab_off + str_index)); + if (len <= 0) { + out[0] = '\0'; + return 0; + } + out[len] = '\0'; + if (strnlen(out, (size_t)len) == (size_t)len) { + // Longer than `out`: its whole entries up to there + char *last = strrchr(out, ':'); + if (!last) { + out[0] = '\0'; + return 0; + } + *last = '\0'; + } + if (out[0] == '\0') return 0; + return has_runpath ? 1 : 2; +} + +// Appends dir[0..len) to the ':'-separated out_buf[0..used) unless it is there already. +static size_t append_lib_dir(char *out_buf, size_t out_size, size_t used, const char *dir, size_t len) { + if (len == 0 || lib_dir_list_has(out_buf, dir, len)) return used; + size_t need = (used > 0 ? 1 : 0) + len; + if (used + need >= out_size) return used; + if (used > 0) out_buf[used++] = ':'; + memcpy(out_buf + used, dir, len); + used += len; + out_buf[used] = '\0'; + return used; +} + +// The directories of `runpath` (a DT_RUNPATH or DT_RPATH), in their order, appended to +// out_buf[0..used): the absolute ones that lie in the rootfs mapped into it, and those that start +// with $ORIGIN with it replaced by the directory of `exe` (the program's real path, in the rootfs +// already), so that both keep their places. ld.so opens them itself, without the hook, so +// /usr/lib/aarch64-linux-gnu/android would be looked for in Android's tree. Others ($LIB, +// $PLATFORM, directories outside the rootfs) are left to ld.so. Returns the new length. +static size_t append_runpath_dirs(char *out_buf, size_t out_size, size_t used, const char *runpath, const char *exe) { + size_t origin_len = 0; + if (exe) { + const char *slash = strrchr(exe, '/'); + if (slash) origin_len = slash > exe ? (size_t)(slash - exe) : 1; + } + for (const char *p = runpath; p && *p;) { + const char *end = strchr(p, ':'); + size_t len = end ? (size_t)(end - p) : strlen(p); + if (len > 0 && len < PATH_MAX) { + char tok[PATH_MAX]; + memcpy(tok, p, len); + tok[len] = '\0'; + size_t skip = 0; + if (strncmp(tok, "$ORIGIN", 7) == 0) skip = 7; + else if (strncmp(tok, "${ORIGIN}", 9) == 0) skip = 9; + if (skip && (tok[skip] == '\0' || tok[skip] == '/') && origin_len > 0 && !strchr(tok + skip, '$')) { + char full[PATH_MAX]; + size_t rest = len - skip; + if (origin_len + rest < sizeof(full)) { + memcpy(full, exe, origin_len); + memcpy(full + origin_len, tok + skip, rest); + full[origin_len + rest] = '\0'; + used = append_lib_dir(out_buf, out_size, used, full, origin_len + rest); + } + } else if (tok[0] == '/' && len > 1 && !strchr(tok, '$')) { + char rw_buf[PATH_MAX]; + const char *rw = rewrite_path_in_root(tok, rw_buf, sizeof(rw_buf)); + if (strcmp(rw, tok) != 0) used = append_lib_dir(out_buf, out_size, used, rw, strlen(rw)); + } + } + if (!end) break; + p = end + 1; + } + return used; +} + +// Whether dir[0..len) is one of the rootfs library directories The native userland adds itself (also what its +// shells export in LD_LIBRARY_PATH). +static int is_rootfs_default_lib_dir(const char *dir, size_t len) { + if (len <= g_ddnatv_root_len || memcmp(dir, g_ddnatv_root, g_ddnatv_root_len) != 0) return 0; + const char *rel = dir + g_ddnatv_root_len; + size_t rel_len = len - g_ddnatv_root_len; + for (size_t i = 0; i < sizeof(k_rootfs_lib_dirs) / sizeof(k_rootfs_lib_dirs[0]); i++) { + if (strlen(k_rootfs_lib_dirs[i]) == rel_len && memcmp(k_rootfs_lib_dirs[i], rel, rel_len) == 0) return 1; + } + return 0; +} + +// Where the program is among the arguments of ld.so started directly (ldd runs "ld.so PROGRAM" with +// LD_TRACE_LOADED_OBJECTS set; "ld.so --list PROGRAM" and "ld.so --verify PROGRAM" are the same): its +// index, or -1 when there is none; *has_library_path says whether the caller gives --library-path itself. +static int ldso_program_index(char *const argv[], int *has_library_path) { + if (has_library_path) *has_library_path = 0; + if (!argv || !argv[0]) return -1; + static const char *const with_value[] = { "--library-path", "--preload", "--argv0", "--inhibit-rpath", "--audit", + "--glibc-hwcaps-prepend", "--glibc-hwcaps-mask" }; + for (int i = 1; argv[i]; i++) { + const char *a = argv[i]; + if (strcmp(a, "--library-path") == 0 && has_library_path) *has_library_path = 1; + if (a[0] != '-' || a[1] != '-') return i; + if (a[2] == '\0') return argv[i + 1] ? i + 1 : -1; + int takes_value = 0; + for (size_t k = 0; k < sizeof(with_value) / sizeof(with_value[0]); k++) { + if (strcmp(a, with_value[k]) == 0) takes_value = 1; + } + if (takes_value) { + if (!argv[i + 1]) return -1; + i++; + } + } + return -1; +} + +// ---- dlopen() of a library with a RUNPATH --------------------------------------------------- +// A library that a program loads with dlopen() looks for its own dependencies in its RUNPATH, which ld.so +// opens without the hook: PulseAudio's modules (RUNPATH /usr/lib/aarch64-linux-gnu/pulseaudio) and many +// plugins did not load. Before the real dlopen(), the dependencies found in the rootfs copies of those +// directories are loaded by their full path, depth first; ld.so then finds them loaded, by their name. +#define DLOPEN_PRELOAD_DEPTH 6 + +static int dlopen_preload_deps(const char *path, void *(*orig_dlopen)(const char *, int), int depth) { + if (depth > DLOPEN_PRELOAD_DEPTH || !path || path[0] != '/') return 0; + int fd = (int)syscall(SYS_openat, AT_FDCWD, path, O_RDONLY | O_CLOEXEC); + if (fd < 0) return 0; + unsigned char hdr[64]; + ssize_t n = pread(fd, hdr, sizeof(hdr), 0); + char runpath[1024]; + char needed[4096]; + int count = 0; + int kind = n > 0 ? elf_read_dynamic(fd, hdr, n, runpath, sizeof(runpath), needed, sizeof(needed), &count) : 0; + syscall(SYS_close, fd); + if (!kind || count == 0) return 0; + // the RUNPATH's directories, mapped into the rootfs ($ORIGIN from this library's own place) + char dirs[PATH_MAX * 2]; + dirs[0] = '\0'; + size_t used = append_runpath_dirs(dirs, sizeof(dirs), 0, runpath, path); + if (used == 0) return 0; + int loaded = 0; + const char *name = needed; + for (int i = 0; i < count; i++, name += strlen(name) + 1) { + if (strchr(name, '/')) continue; + void *already = orig_dlopen(name, RTLD_LAZY | RTLD_NOLOAD); + if (already) { + dlclose(already); + continue; + } + for (const char *p = dirs; *p;) { + const char *end = strchr(p, ':'); + size_t len = end ? (size_t)(end - p) : strlen(p); + char candidate[PATH_MAX]; + if (len + 1 + strlen(name) < sizeof(candidate)) { + memcpy(candidate, p, len); + candidate[len] = '/'; + strcpy(candidate + len + 1, name); + int probe_fd = (int)syscall(SYS_openat, AT_FDCWD, candidate, O_PATH | O_CLOEXEC); + if (probe_fd >= 0) { + syscall(SYS_close, probe_fd); + dlopen_preload_deps(candidate, orig_dlopen, depth + 1); + if (orig_dlopen(candidate, RTLD_LAZY | RTLD_LOCAL)) loaded++; + break; + } + } + if (!end) break; + p = end + 1; + } + } + return loaded; +} + +// ---- /etc/ld.so.conf ------------------------------------------------------------------------- +// The library directories of /etc/ld.so.conf and the files it includes (/etc/ld.so.conf.d/*.conf), +// mapped into the rootfs. On Linux, ldconfig turns them into /etc/ld.so.cache, which ld.so reads. +// Here ld.so would read Android's /etc/ld.so.cache, and the paths in the cache are not mapped into +// the rootfs either, so the exec hands the directories to ld.so in --library-path instead. They are +// read again only when /etc/ld.so.conf, /etc/ld.so.conf.d or /etc/ld.so.cache changes: a .conf file +// added or removed counts at once, an edit of one after ldconfig, as on Linux. +#define LDCONF_MAX_DEPTH 4 +#define LDCONF_MAX_INCLUDES 64 + +struct ldconf_sig { + int64_t t[6]; // mtimes (seconds, nanoseconds) of ld.so.conf, ld.so.conf.d and ld.so.cache; 0 if missing +}; + +static struct { + int valid; + struct ldconf_sig sig; + char root[PATH_MAX]; + char dirs[PATH_MAX * 2]; +} g_ldconf; +static pthread_mutex_t g_ldconf_lock = PTHREAD_MUTEX_INITIALIZER; + +// fstatat() behind the hook's stat emulation (which would map the hard link table in a child that is +// about to exec): only the times are wanted. +static int ldconf_stat_time(const char *real, int64_t *sec, int64_t *nsec) { + static int (*f)(int, const char *, struct stat64 *, int) = NULL; + int (*fn)(int, const char *, struct stat64 *, int) = __atomic_load_n(&f, __ATOMIC_RELAXED); + if (!fn) { + fn = (int (*)(int, const char *, struct stat64 *, int))dlsym(RTLD_NEXT, "fstatat64"); + if (!fn) return -1; + __atomic_store_n(&f, fn, __ATOMIC_RELAXED); + } + struct stat64 st; + if (fn(AT_FDCWD, real, &st, 0) != 0) return -1; + *sec = (int64_t)st.st_mtim.tv_sec; + *nsec = (int64_t)st.st_mtim.tv_nsec; + return 0; +} + +static void ldconf_signature(struct ldconf_sig *sig) { + static const char *const files[3] = { "/etc/ld.so.conf", "/etc/ld.so.conf.d", "/etc/ld.so.cache" }; + for (int i = 0; i < 3; i++) { + char path[PATH_MAX]; + size_t n = ddnatv_append(path, sizeof(path), 0, g_ddnatv_root, g_ddnatv_root_len); + ddnatv_append(path, sizeof(path), n, files[i], strlen(files[i])); + if (ldconf_stat_time(path, &sig->t[i * 2], &sig->t[i * 2 + 1]) != 0) { + sig->t[i * 2] = 0; + sig->t[i * 2 + 1] = 0; + } + } +} + +// The whole of the rootfs file `logical` (an absolute path inside Ubuntu) into buf, NUL-terminated. +static ssize_t ldconf_read(const char *logical, char *buf, size_t bufsz) { + char rw_buf[PATH_MAX]; + const char *real = rewrite_path_in_root(logical, rw_buf, sizeof(rw_buf)); + int fd = (int)syscall(SYS_openat, AT_FDCWD, real, O_RDONLY | O_CLOEXEC); + if (fd < 0) return -1; + size_t got = 0; + while (got + 1 < bufsz) { + ssize_t n = (ssize_t)syscall(SYS_read, fd, buf + got, bufsz - 1 - got); + if (n <= 0) break; + got += (size_t)n; + } + syscall(SYS_close, fd); + buf[got] = '\0'; + return (ssize_t)got; +} + +static int ldconf_name_cmp(const void *a, const void *b) { + return strcmp(*(const char *const *)a, *(const char *const *)b); +} + +static void ldconf_parse_file(const char *logical, char *out, size_t outsz, size_t *used, int depth, int *includes); + +// include PATTERN: the files of one directory that match a shell pattern, in name order (as glob()). +// Patterns in the directory part are not supported (Ubuntu uses /etc/ld.so.conf.d/*.conf). +static void ldconf_include(const char *pattern, char *out, size_t outsz, size_t *used, int depth, int *includes) { + const char *slash = strrchr(pattern, '/'); + if (!slash || slash == pattern) return; + size_t dir_len = (size_t)(slash - pattern); + if (dir_len >= PATH_MAX || memchr(pattern, '*', dir_len) || memchr(pattern, '?', dir_len) || memchr(pattern, '[', dir_len)) return; + char dir[PATH_MAX]; + memcpy(dir, pattern, dir_len); + dir[dir_len] = '\0'; + const char *name_pattern = slash + 1; + if (!strpbrk(name_pattern, "*?[")) { + ldconf_parse_file(pattern, out, outsz, used, depth + 1, includes); + return; + } + char rw_buf[PATH_MAX]; + const char *real = rewrite_path_in_root(dir, rw_buf, sizeof(rw_buf)); + int fd = (int)syscall(SYS_openat, AT_FDCWD, real, O_RDONLY | O_DIRECTORY | O_CLOEXEC); + if (fd < 0) return; + char names_buf[4096]; + char *names[LDCONF_MAX_INCLUDES]; + int count = 0; + size_t names_used = 0; + char dents[4096]; + for (;;) { + long n = syscall(SYS_getdents64, fd, dents, sizeof(dents)); + if (n <= 0) break; + for (long at = 0; at < n;) { + unsigned short reclen; + memcpy(&reclen, dents + at + 16, sizeof(reclen)); + const char *name = dents + at + 19; + if (reclen == 0) break; + size_t len = strnlen(name, (size_t)reclen - 19); + if (count < LDCONF_MAX_INCLUDES && names_used + len + 1 <= sizeof(names_buf) && + fnmatch(name_pattern, name, FNM_PERIOD) == 0) { + memcpy(names_buf + names_used, name, len + 1); + names[count++] = names_buf + names_used; + names_used += len + 1; + } + at += reclen; + } + } + syscall(SYS_close, fd); + qsort(names, (size_t)count, sizeof(names[0]), ldconf_name_cmp); + for (int i = 0; i < count; i++) { + char file[PATH_MAX]; + if (dir_len + 1 + strlen(names[i]) >= sizeof(file)) continue; + snprintf(file, sizeof(file), "%s/%s", dir, names[i]); + ldconf_parse_file(file, out, outsz, used, depth + 1, includes); + } +} + +// One ld.so.conf-style file: a directory per line, "include PATTERN..." (relative to the file's own +// directory), "#" comments, and the old "hwcap" lines, which are skipped as glibc does. +static void ldconf_parse_file(const char *logical, char *out, size_t outsz, size_t *used, int depth, int *includes) { + if (depth > LDCONF_MAX_DEPTH || ++*includes > LDCONF_MAX_INCLUDES) return; + char text[8192]; + if (ldconf_read(logical, text, sizeof(text)) < 0) return; + for (char *line = text; line && *line;) { + char *next = strchr(line, '\n'); + if (next) *next++ = '\0'; + char *hash = strchr(line, '#'); + if (hash) *hash = '\0'; + while (*line == ' ' || *line == '\t' || *line == '\r') line++; + size_t len = strlen(line); + while (len > 0 && (line[len - 1] == ' ' || line[len - 1] == '\t' || line[len - 1] == '\r')) line[--len] = '\0'; + if (len == 0) { + line = next; + continue; + } + if (strncmp(line, "include", 7) == 0 && (line[7] == ' ' || line[7] == '\t')) { + for (char *p = line + 8; *p;) { + while (*p == ' ' || *p == '\t') p++; + if (!*p) break; + char *end = p; + while (*end && *end != ' ' && *end != '\t') end++; + char saved = *end; + *end = '\0'; + char pattern[PATH_MAX]; + if (p[0] == '/') { + snprintf(pattern, sizeof(pattern), "%s", p); + } else { + const char *slash = strrchr(logical, '/'); + int base = slash ? (int)(slash - logical) : 0; + snprintf(pattern, sizeof(pattern), "%.*s/%s", base, logical, p); + } + ldconf_include(pattern, out, outsz, used, depth, includes); + *end = saved; + p = end; + } + } else if (strncmp(line, "hwcap", 5) == 0 && (line[5] == ' ' || line[5] == '\t')) { + // ignored by ldconfig since glibc 2.37 + } else if (line[0] == '/') { + // "DIR" or the old "DIR=TYPE" / "DIR TYPE" + size_t dlen = strcspn(line, "= \t"); + while (dlen > 1 && line[dlen - 1] == '/') dlen--; + if (dlen > 0 && dlen < PATH_MAX) { + char dir[PATH_MAX]; + memcpy(dir, line, dlen); + dir[dlen] = '\0'; + char rw_buf[PATH_MAX]; + const char *rw = rewrite_path_in_root(dir, rw_buf, sizeof(rw_buf)); + if (strcmp(rw, dir) != 0) *used = append_lib_dir(out, outsz, *used, rw, strlen(rw)); + } + } + line = next; + } +} + +static void ldconf_parse(char *out, size_t outsz) { + out[0] = '\0'; + size_t used = 0; + int includes = 0; + ldconf_parse_file("/etc/ld.so.conf", out, outsz, &used, 0, &includes); +} + +// The ld.so.conf directories into out (':'-separated, "" when there are none). Uses the copy of an +// earlier call while the files have not changed: the parent finds it when it first forks, and its +// children only compare the three times. Never waits for the lock: a child forked while another +// thread held it reads the files itself. +static void ldconf_dirs(char *out, size_t outsz) { + if (!out || outsz == 0) return; + out[0] = '\0'; + if (g_ddnatv_root[0] == '\0') return; + struct ldconf_sig sig; + ldconf_signature(&sig); + if (sig.t[0] == 0 && sig.t[1] == 0) return; // neither ld.so.conf nor ld.so.conf.d + if (pthread_mutex_trylock(&g_ldconf_lock) != 0) { + ldconf_parse(out, outsz); + return; + } + if (!g_ldconf.valid || memcmp(&g_ldconf.sig, &sig, sizeof(sig)) != 0 || strcmp(g_ldconf.root, g_ddnatv_root) != 0) { + ldconf_parse(g_ldconf.dirs, sizeof(g_ldconf.dirs)); + g_ldconf.sig = sig; + snprintf(g_ldconf.root, sizeof(g_ldconf.root), "%s", g_ddnatv_root); + g_ldconf.valid = 1; + } + snprintf(out, outsz, "%s", g_ldconf.dirs); + pthread_mutex_unlock(&g_ldconf_lock); +} + +// The --library-path ld.so is given for the rootfs program `exe`, in the order ld.so searches on +// Linux: the program's RPATH, the caller's LD_LIBRARY_PATH (the rootfs paths in it mapped), its +// RUNPATH, the directories of /etc/ld.so.conf (ld.so's cache), and the rootfs defaults last. The native userland's +// shells export the defaults in LD_LIBRARY_PATH too, where Linux has none; when there is anything to +// put before them they move to the end, so that a library the program keeps for itself wins over +// one of the same name in /usr/lib. Runs after the hook's setup, so the +// rewrites are those of rewrite_path(). +static void build_ld_library_path(char *const envp[], const char *runpath, int is_rpath, const char *exe, + char *out_buf, size_t out_size) { + if (!out_buf || out_size == 0) return; + out_buf[0] = '\0'; + + const char *caller_ld = NULL; + if (envp) { + for (int i = 0; envp[i] != NULL; i++) { + if (envp[i][0] == 'L' && strncmp(envp[i], "LD_LIBRARY_PATH=", 16) == 0) { + caller_ld = envp[i] + 16; + break; + } + } + } + if (!caller_ld) { + caller_ld = getenv("LD_LIBRARY_PATH"); + } + int has_runpath = runpath && runpath[0]; + char conf[PATH_MAX * 2]; + ldconf_dirs(conf, sizeof(conf)); + // The rootfs defaults that The native userland's shells export in LD_LIBRARY_PATH go to the end, after the + // program's and ld.so.conf's own directories, as on Linux (where LD_LIBRARY_PATH has none of them) + int move_defaults = has_runpath || conf[0] != '\0'; + + size_t used = 0; + if (has_runpath && is_rpath) used = append_runpath_dirs(out_buf, out_size, used, runpath, exe); + + // The caller's directories (those inside the rootfs rewritten), written straight into out_buf: + // this runs in nearly every child a shell forks, where two 8 KB copies of the list on the stack + // were pages more to copy before the exec. + size_t cap = used + PATH_MAX * 2 < out_size ? used + PATH_MAX * 2 : out_size; // the caller's part, as before + for (const char *p = caller_ld; p && *p;) { + const char *end = strchr(p, ':'); + size_t len = end ? (size_t)(end - p) : strlen(p); + if (len > 0 && len < PATH_MAX) { + char tok[PATH_MAX]; + memcpy(tok, p, len); + tok[len] = '\0'; + char rw_buf[PATH_MAX]; + const char *rw = (tok[0] == '/') ? rewrite_path_in_root(tok, rw_buf, sizeof(rw_buf)) : tok; + size_t rw_len = strlen(rw); + size_t need = (used > 0 ? 1 : 0) + rw_len; + if (move_defaults && is_rootfs_default_lib_dir(rw, rw_len)) { + // after the program's own directories, with the other defaults + } else if (used + need < cap) { + if (used > 0) out_buf[used++] = ':'; + memcpy(out_buf + used, rw, rw_len); + used += rw_len; + out_buf[used] = '\0'; + } + } + if (!end) break; + p = end + 1; + } + if (has_runpath && !is_rpath) used = append_runpath_dirs(out_buf, out_size, used, runpath, exe); + // ld.so.conf, as ld.so's cache: after LD_LIBRARY_PATH and RUNPATH, before the default directories + for (const char *p = conf; *p;) { + const char *end = strchr(p, ':'); + size_t len = end ? (size_t)(end - p) : strlen(p); + used = append_lib_dir(out_buf, out_size, used, p, len); + if (!end) break; + p = end + 1; + } + append_rootfs_lib_dirs_missing_from(out_buf, out_size, used, used > 0, out_buf); +} + +// fstat() without the hook's stat emulation: the probe wants the mode bits only, and the +// emulation would map the hard link table and look up the app's ids in a child that is about to +// exec (new pages there, each a copy-on-write fault). Resolved by prepare_exec_in_parent() when the +// process forks, so that its children find it set. +static int (*g_probe_fstat)(int, struct stat *) = NULL; + +static int probe_fstat(int fd, struct stat *st) { + int (*f)(int, struct stat *) = __atomic_load_n(&g_probe_fstat, __ATOMIC_RELAXED); + if (!f) { + f = (int (*)(int, struct stat *))dlsym(RTLD_NEXT, "fstat"); + if (!f) return fstat(fd, st); + __atomic_store_n(&g_probe_fstat, f, __ATOMIC_RELAXED); + } + return f(fd, st); +} + +static void probe_exec_file(const char *path, struct exec_probe *p) { + p->hdr[0] = '\0'; + p->n = -1; + p->is_elf = 0; + p->is_dynamic = 0; + p->android_interp = 0; + p->e_machine = 0; + p->mode = 0; + p->runpath[0] = '\0'; + p->runpath_is_rpath = 0; + if (!path || path[0] == '\0') return; + int fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0) return; + ssize_t n = read(fd, p->hdr, sizeof(p->hdr) - 1); + p->n = n; + p->hdr[n > 0 ? n : 0] = '\0'; + const unsigned char *h = (const unsigned char *)p->hdr; + if (n >= 4 && h[0] == 0x7f && h[1] == 'E' && h[2] == 'L' && h[3] == 'F') { + p->is_elf = 1; + if (n >= 20) p->e_machine = (uint16_t)(h[18] | (h[19] << 8)); + int dynamic = elf_interp_in_buffer(h, n); + if (dynamic < 0) dynamic = check_elf_dynamic(fd, h, n); + p->is_dynamic = dynamic; + if (dynamic && p->e_machine == 183 /* EM_AARCH64 */) p->android_interp = elf_interp_is_android(fd, h, n); + if (dynamic && !p->android_interp) p->runpath_is_rpath = elf_read_runpath(fd, h, n, p->runpath, sizeof(p->runpath)) == 2; + struct stat st; + if (dynamic && probe_fstat(fd, &st) == 0) p->mode = st.st_mode; + } + close(fd); +} + +static int is_ld_linux(const char *path) { + if (!path) return 0; + const char *base = strrchr(path, '/'); + base = base ? base + 1 : path; + return (strncmp(base, "ld-linux", 8) == 0 || strncmp(base, "ld-2.", 5) == 0); +} + +// Splits a "#!" line (NUL-terminated `hdr`, modified in place) into the interpreter and its +// optional argument, the way execve() always has. +static void parse_shebang(char *hdr, char **interp, char **interp_arg) { + char *newline = strchr(hdr, '\n'); + if (newline) *newline = '\0'; + char *p = hdr + 2; + while (*p == ' ' || *p == '\t') p++; + char *arg = strchr(p, ' '); + if (arg) { + *arg = '\0'; + arg++; + while (*arg == ' ' || *arg == '\t') arg++; + } + *interp = p; + *interp_arg = arg; +} + +// Interpreters outside the rootfs (Android's /system/bin/sh) run with Android's environment. +static int is_host_interpreter(const char *interp) { + return strncmp(interp, "/system", 7) == 0 || + (g_ddnatv_root[0] != '\0' && strncmp(interp, g_ddnatv_root, g_ddnatv_root_len) != 0); +} + +// argv for running `script` with its interpreter: interp [arg] script args... (the script's own +// argv[0] is dropped, as the kernel does). free() the result. +static char **build_script_argv(const char *interp, const char *interp_arg, const char *script, char *const argv[]) { + int argc = 0; + while (argv && argv[argc]) argc++; + int has_arg = (interp_arg && *interp_arg) ? 1 : 0; + char **v = (char **)calloc(argc + has_arg + 3, sizeof(char *)); + if (!v) return NULL; + int n = 0; + v[n++] = (char *)interp; + if (has_arg) v[n++] = (char *)interp_arg; + v[n++] = (char *)script; + for (int i = 1; i < argc; i++) v[n++] = argv[i]; + v[n] = NULL; + return v; +} + +// argv for "ld.so [--preload hook] --library-path dirs --argv0 name program args...". +// free() the result; the strings stay owned by the caller. +static char **build_ldso_argv(const char *ld_so, const char *hook, const char *lib_path, + const char *program, const char *prog_name, char *const argv[]) { + int argc = 0; + while (argv && argv[argc]) argc++; + char **v = (char **)calloc(argc + 16, sizeof(char *)); + if (!v) return NULL; + int n = 0; + v[n++] = (char *)ld_so; + if (hook) { + v[n++] = (char *)"--preload"; + v[n++] = (char *)hook; + } + v[n++] = (char *)"--library-path"; + v[n++] = (char *)lib_path; + v[n++] = (char *)"--argv0"; + v[n++] = (char *)((argc > 0 && argv[0]) ? argv[0] : prog_name); + v[n++] = (char *)program; + for (int i = 1; i < argc; i++) v[n++] = argv[i]; + v[n] = NULL; + return v; +} + +// POSIX_SPAWN_RESETIDS makes glibc's spawn child call setresuid() and setresgid() after it has reset +// every signal handler to its default, which includes the SIGSYS handler that emulates the calls +// Android's seccomp filter blocks, so the child died of SIGSYS (GNU make asks for the flag on every +// command it starts). The native userland shows one fixed user id and never runs set-user-id programs: there is +// no id to reset, so the flag is left out and everything else is passed on. +static const posix_spawnattr_t *spawn_attr_for_android(const posix_spawnattr_t *attrp, posix_spawnattr_t *copy) { + short flags = 0; + if (!attrp || posix_spawnattr_getflags(attrp, &flags) != 0 || !(flags & POSIX_SPAWN_RESETIDS)) return attrp; + memcpy(copy, attrp, sizeof(*copy)); + posix_spawnattr_setflags(copy, (short)(flags & ~POSIX_SPAWN_RESETIDS)); + return copy; +} diff --git a/tools/nativeguest/hook/fileops.c b/tools/nativeguest/hook/fileops.c new file mode 100644 index 0000000000..9d0ff7cf9d --- /dev/null +++ b/tools/nativeguest/hook/fileops.c @@ -0,0 +1,805 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Other file operations: access, chmod, unlink, mkdir, rename, readlink, extended attributes, +// links, times, truncate, statfs, the working directory, realpath and scandir. + +#ifndef DDNATV_HOST_TEST + +// Hook faccessat +int faccessat(int dirfd, const char *pathname, int mode, int flags) { + init_ddnatv_hook(); + if (!pathname) { + errno = EFAULT; + return -1; + } + DDNATV_AT_REMAP(dirfd, pathname); + + struct stat st; + int stat_flags = (flags & AT_SYMLINK_NOFOLLOW) ? AT_SYMLINK_NOFOLLOW : 0; + if (fstatat(dirfd, pathname, &st, stat_flags) != 0) { + return -1; + } + + if (mode == F_OK) { + return 0; + } + + if (mode & X_OK) { + if (S_ISDIR(st.st_mode)) return 0; + if ((st.st_mode & 0111) != 0) return 0; + if (strstr(pathname, "/bin/") || strstr(pathname, "/sbin/")) return 0; + errno = EACCES; + return -1; + } + + return 0; +} + +int faccessat2(int dirfd, const char *pathname, int mode, int flags) { + return faccessat(dirfd, pathname, mode, flags); +} + +// Hook access +int access(const char *pathname, int mode) { + return faccessat(AT_FDCWD, pathname, mode, 0); +} + +// Hook euidaccess and eaccess +int euidaccess(const char *pathname, int mode) { + return faccessat(AT_FDCWD, pathname, mode, AT_EACCESS); +} + +int eaccess(const char *pathname, int mode) { + return faccessat(AT_FDCWD, pathname, mode, AT_EACCESS); +} + +// Hook chmod +int chmod(const char *pathname, mode_t mode) { + static int (*orig_chmod)(const char *, mode_t) = NULL; + if (!orig_chmod) orig_chmod = (int (*)(const char *, mode_t))dlsym(RTLD_NEXT, "chmod"); + if (!orig_chmod) return -1; + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(pathname, buf, sizeof(buf)); + int ret = orig_chmod(target, mode); + if (ret != 0 && ((mode & 06000) != 0 || errno == EPERM || errno == EACCES || errno == ENOSYS)) { + ret = orig_chmod(target, mode & 01777); + } + if (ret != 0 && (errno == EPERM || errno == EACCES)) { + errno = 0; + return 0; + } + return ret; +} + +// Hook fchmod +int fchmod(int fd, mode_t mode) { + static int (*orig_fchmod)(int, mode_t) = NULL; + if (!orig_fchmod) orig_fchmod = (int (*)(int, mode_t))dlsym(RTLD_NEXT, "fchmod"); + if (!orig_fchmod) return -1; + int ret = orig_fchmod(fd, mode); + if (ret != 0 && ((mode & 06000) != 0 || errno == EPERM || errno == EACCES || errno == ENOSYS)) { + ret = orig_fchmod(fd, mode & 01777); + } + if (ret != 0 && (errno == EPERM || errno == EACCES)) { + errno = 0; + return 0; + } + return ret; +} + +// Hook fchmodat +int fchmodat(int dirfd, const char *pathname, mode_t mode, int flags) { + static int (*orig_fchmodat)(int, const char *, mode_t, int) = NULL; + if (!orig_fchmodat) orig_fchmodat = (int (*)(int, const char *, mode_t, int))dlsym(RTLD_NEXT, "fchmodat"); + if (!orig_fchmodat) return -1; + DDNATV_AT_REMAP(dirfd, pathname); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + int ret = orig_fchmodat(dirfd, target, mode, flags); + if (ret != 0 && ((mode & 06000) != 0 || errno == EPERM || errno == EACCES || errno == ENOSYS)) { + ret = orig_fchmodat(dirfd, target, mode & 01777, flags); + } + if (ret != 0 && (errno == EPERM || errno == EACCES)) { + errno = 0; + return 0; + } + return ret; +} + +// Hook unlink +int unlink(const char *pathname) { + static int (*orig_unlink)(const char *) = NULL; + if (!orig_unlink) orig_unlink = (int (*)(const char *))dlsym(RTLD_NEXT, "unlink"); + char buf[PATH_MAX]; + const char *target = rewrite_path(pathname, buf, sizeof(buf)); + unlink_mapped_unix_socket(target); + dev_t hl_dev = 0; + ino_t hl_ino = 0; + int hardlinked = lookup_emulated_hardlink_at(AT_FDCWD, target, &hl_dev, &hl_ino); + int ret = orig_unlink(target); + if (ret != 0 && refused_in_repaired_dir(AT_FDCWD, target)) { + // The name could not be looked up while its directory was closed + hardlinked = lookup_emulated_hardlink_at(AT_FDCWD, target, &hl_dev, &hl_ino); + ret = orig_unlink(target); + } + if (ret == 0 && hardlinked) unregister_emulated_hardlink(hl_dev, hl_ino); + return ret; +} + +// Hook unlinkat +int unlinkat(int dirfd, const char *pathname, int flags) { + static int (*orig_unlinkat)(int, const char *, int) = NULL; + if (!orig_unlinkat) orig_unlinkat = (int (*)(int, const char *, int))dlsym(RTLD_NEXT, "unlinkat"); + DDNATV_AT_REMAP(dirfd, pathname); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + dev_t hl_dev = 0; + ino_t hl_ino = 0; + int hardlinked = 0; + if (target) { + unlink_mapped_unix_socket(target); + hardlinked = lookup_emulated_hardlink_at(dirfd, target, &hl_dev, &hl_ino); + } + int ret = orig_unlinkat ? orig_unlinkat(dirfd, target, flags) : -1; + if (ret != 0 && orig_unlinkat && refused_in_repaired_dir(dirfd, target)) { + hardlinked = target ? lookup_emulated_hardlink_at(dirfd, target, &hl_dev, &hl_ino) : 0; + ret = orig_unlinkat(dirfd, target, flags); + } + if (ret == 0 && hardlinked) unregister_emulated_hardlink(hl_dev, hl_ino); + return ret; +} + +// Hook rmdir +int rmdir(const char *pathname) { + static int (*orig_rmdir)(const char *) = NULL; + if (!orig_rmdir) orig_rmdir = (int (*)(const char *))dlsym(RTLD_NEXT, "rmdir"); + char buf[PATH_MAX]; + const char *target = rewrite_path(pathname, buf, sizeof(buf)); + int ret = orig_rmdir(target); + if (ret != 0 && refused_in_repaired_dir(AT_FDCWD, target)) ret = orig_rmdir(target); + return ret; +} + +// glibc's remove() calls its internal unlinkat, which no preload can see: GLib's g_file_delete() +// got ENOENT for every guest path, and Flatpak could not replace an app's "current" link +int remove(const char *pathname) { + if (unlink(pathname) == 0) return 0; + if (errno != EISDIR) return -1; + return rmdir(pathname); +} + +// glob() and nftw() walk directories with glibc's internal calls too. glob() is given the hook's +// own through GLOB_ALTDIRFUNC; nftw() walks the mapped directory and its callback is given guest paths. +static int glob_alt_stat(const char *path, void *st) { return stat(path, (struct stat *)st); } +static int glob_alt_lstat(const char *path, void *st) { return lstat(path, (struct stat *)st); } +static void *glob_alt_opendir(const char *path) { return opendir(path); } +static void *glob_alt_readdir(void *dir) { return readdir((DIR *)dir); } +static void glob_alt_closedir(void *dir) { closedir((DIR *)dir); } + +int glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob) { + static int (*orig_glob)(const char *, int, int (*)(const char *, int), glob_t *) = NULL; + if (!orig_glob) orig_glob = (int (*)(const char *, int, int (*)(const char *, int), glob_t *))dlsym(RTLD_NEXT, "glob"); + if (pglob && !(flags & GLOB_ALTDIRFUNC)) { + init_ddnatv_hook(); + pglob->gl_closedir = glob_alt_closedir; + pglob->gl_readdir = (struct dirent *(*)(void *))glob_alt_readdir; + pglob->gl_opendir = glob_alt_opendir; + pglob->gl_lstat = (int (*)(const char *, struct stat *))glob_alt_lstat; + pglob->gl_stat = (int (*)(const char *, struct stat *))glob_alt_stat; + flags |= GLOB_ALTDIRFUNC; + } + return orig_glob ? orig_glob(pattern, flags, errfunc, pglob) : GLOB_NOSPACE; +} + +int glob64(const char *pattern, int flags, int (*errfunc)(const char *, int), glob64_t *pglob) { + return glob(pattern, flags, errfunc, (glob_t *)pglob); +} + +static __thread struct { + const char *host, *guest; + size_t host_len, guest_len; + int (*nftw_fn)(const char *, const struct stat *, int, struct FTW *); + int (*ftw_fn)(const char *, const struct stat *, int); +} t_walk; + +static const char *walk_guest_path(const char *path, char *buf, size_t size, int *base) { + if (!t_walk.host || strncmp(path, t_walk.host, t_walk.host_len) != 0) return path; + const char *rest = path + t_walk.host_len; + if (*rest != '\0' && *rest != '/') return path; + // a walk of "/" gives "/etc", not "//etc" + size_t guest_len = (t_walk.guest_len == 1 && *rest == '/') ? 0 : t_walk.guest_len; + size_t n = ddnatv_append(buf, size, 0, t_walk.guest, guest_len); + ddnatv_append(buf, size, n, rest, strlen(rest)); + if (base) *base = *base - (int)t_walk.host_len + (int)guest_len; + return buf; +} + +static int walk_nftw_cb(const char *path, const struct stat *st, int type, struct FTW *ftwbuf) { + char buf[PATH_MAX]; + struct FTW guest_ftw = *ftwbuf; + return t_walk.nftw_fn(walk_guest_path(path, buf, sizeof(buf), &guest_ftw.base), st, type, &guest_ftw); +} + +static int walk_ftw_cb(const char *path, const struct stat *st, int type) { + char buf[PATH_MAX]; + return t_walk.ftw_fn(walk_guest_path(path, buf, sizeof(buf), NULL), st, type); +} + +int nftw(const char *dir, int (*fn)(const char *, const struct stat *, int, struct FTW *), int fds, int flags) { + static int (*orig_nftw)(const char *, int (*)(const char *, const struct stat *, int, struct FTW *), int, int) = NULL; + if (!orig_nftw) orig_nftw = (int (*)(const char *, int (*)(const char *, const struct stat *, int, struct FTW *), int, int))dlsym(RTLD_NEXT, "nftw"); + if (!orig_nftw) { errno = ENOSYS; return -1; } + char buf[PATH_MAX]; + const char *target = rewrite_path(dir, buf, sizeof(buf)); + if (target == dir || !fn) return orig_nftw(dir, fn, fds, flags); + __typeof__(t_walk) saved = t_walk; + t_walk.host = target; t_walk.host_len = strlen(target); + while (t_walk.host_len > 1 && target[t_walk.host_len - 1] == '/') t_walk.host_len--; + t_walk.guest = dir; t_walk.guest_len = strlen(dir); + while (t_walk.guest_len > 1 && dir[t_walk.guest_len - 1] == '/') t_walk.guest_len--; + t_walk.nftw_fn = fn; + int ret = orig_nftw(target, walk_nftw_cb, fds, flags); + t_walk = saved; + return ret; +} + +int nftw64(const char *dir, int (*fn)(const char *, const struct stat64 *, int, struct FTW *), int fds, int flags) { + return nftw(dir, (int (*)(const char *, const struct stat *, int, struct FTW *))fn, fds, flags); +} + +int ftw(const char *dir, int (*fn)(const char *, const struct stat *, int), int fds) { + static int (*orig_ftw)(const char *, int (*)(const char *, const struct stat *, int), int) = NULL; + if (!orig_ftw) orig_ftw = (int (*)(const char *, int (*)(const char *, const struct stat *, int), int))dlsym(RTLD_NEXT, "ftw"); + if (!orig_ftw) { errno = ENOSYS; return -1; } + char buf[PATH_MAX]; + const char *target = rewrite_path(dir, buf, sizeof(buf)); + if (target == dir || !fn) return orig_ftw(dir, fn, fds); + __typeof__(t_walk) saved = t_walk; + t_walk.host = target; t_walk.host_len = strlen(target); + while (t_walk.host_len > 1 && target[t_walk.host_len - 1] == '/') t_walk.host_len--; + t_walk.guest = dir; t_walk.guest_len = strlen(dir); + while (t_walk.guest_len > 1 && dir[t_walk.guest_len - 1] == '/') t_walk.guest_len--; + t_walk.ftw_fn = fn; + int ret = orig_ftw(target, walk_ftw_cb, fds); + t_walk = saved; + return ret; +} + +int ftw64(const char *dir, int (*fn)(const char *, const struct stat64 *, int), int fds) { + return ftw(dir, (int (*)(const char *, const struct stat *, int))fn, fds); +} + +// The app is root for the programs it runs, and root enters and writes every directory whatever its +// mode; the app does not. dpkg makes each new directory with mode 0 and sets the mode a moment later, +// and a chmod that fails is reported as done (see chmod), which left directories nobody could put a +// file in: "Permission denied" in /usr/share/applications and others (#44). So a directory always +// keeps its owner's read, write and search rights. +#define NEW_DIR_OWNER_RIGHTS S_IRWXU + +// Hook mkdir +int mkdir(const char *pathname, mode_t mode) { + static int (*orig_mkdir)(const char *, mode_t) = NULL; + if (!orig_mkdir) orig_mkdir = (int (*)(const char *, mode_t))dlsym(RTLD_NEXT, "mkdir"); + char buf[PATH_MAX]; + const char *target = rewrite_path(pathname, buf, sizeof(buf)); + int ret = orig_mkdir(target, mode | NEW_DIR_OWNER_RIGHTS); + if (ret != 0 && refused_in_repaired_dir(AT_FDCWD, target)) ret = orig_mkdir(target, mode | NEW_DIR_OWNER_RIGHTS); + return ret; +} + +// Hook mkdirat +int mkdirat(int dirfd, const char *pathname, mode_t mode) { + static int (*orig_mkdirat)(int, const char *, mode_t) = NULL; + if (!orig_mkdirat) orig_mkdirat = (int (*)(int, const char *, mode_t))dlsym(RTLD_NEXT, "mkdirat"); + DDNATV_AT_REMAP(dirfd, pathname); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + int ret = orig_mkdirat(dirfd, target, mode | NEW_DIR_OWNER_RIGHTS); + if (ret != 0 && refused_in_repaired_dir(dirfd, target)) ret = orig_mkdirat(dirfd, target, mode | NEW_DIR_OWNER_RIGHTS); + return ret; +} + +static void ensure_dir_exists(const char *path) { + if (!path || path[0] == '\0') return; + char tmp[PATH_MAX]; + strncpy(tmp, path, sizeof(tmp) - 1); + tmp[sizeof(tmp) - 1] = '\0'; + for (char *p = tmp + 1; *p; p++) { + if (*p == '/') { + *p = '\0'; + mkdir(tmp, 0755); + *p = '/'; + } + } + mkdir(tmp, 0755); +} + +// Hook inotify_add_watch +int inotify_add_watch(int fd, const char *pathname, uint32_t mask) { + static int (*orig_inotify_add_watch)(int, const char *, uint32_t) = NULL; + if (!orig_inotify_add_watch) orig_inotify_add_watch = (int (*)(int, const char *, uint32_t))dlsym(RTLD_NEXT, "inotify_add_watch"); + if (!pathname) return -1; + char buf[PATH_MAX]; + const char *target = rewrite_path(pathname, buf, sizeof(buf)); + if (!orig_inotify_add_watch) return -1; + int wd = orig_inotify_add_watch(fd, target, mask); + if (wd < 0 && errno == ENOENT && (mask & IN_ONLYDIR)) { + ensure_dir_exists(target); + wd = orig_inotify_add_watch(fd, target, mask); + } + return wd; +} + +// Hook rename +int rename(const char *oldpath, const char *newpath) { + static int (*orig_rename)(const char *, const char *) = NULL; + if (!orig_rename) orig_rename = (int (*)(const char *, const char *))dlsym(RTLD_NEXT, "rename"); + char buf1[PATH_MAX]; + char buf2[PATH_MAX]; + const char *target_old = rewrite_path(oldpath, buf1, sizeof(buf1)); + const char *target_new = rewrite_path(newpath, buf2, sizeof(buf2)); + dev_t hl_dev = 0; + ino_t hl_ino = 0; + int hardlinked = lookup_emulated_hardlink_at(AT_FDCWD, target_new, &hl_dev, &hl_ino); + int ret = orig_rename(target_old, target_new); + if (ret != 0 && errno == EACCES) { + // Both directories: the old name is taken out of one, the new put in the other + int refused = errno; + int fixed_old = refused_in_repaired_dir(AT_FDCWD, target_old); + errno = refused; + int fixed_new = refused_in_repaired_dir(AT_FDCWD, target_new); + if (fixed_old || fixed_new) { + hardlinked = lookup_emulated_hardlink_at(AT_FDCWD, target_new, &hl_dev, &hl_ino); + ret = orig_rename(target_old, target_new); + } + } + if (ret == 0 && hardlinked) unregister_emulated_hardlink(hl_dev, hl_ino); + return ret; +} + +// Hook renameat +int renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath) { + static int (*orig_renameat)(int, const char *, int, const char *) = NULL; + if (!orig_renameat) orig_renameat = (int (*)(int, const char *, int, const char *))dlsym(RTLD_NEXT, "renameat"); + DDNATV_AT_REMAP_NAMED(olddirfd, oldpath, ddnatv_at_old); + DDNATV_AT_REMAP_NAMED(newdirfd, newpath, ddnatv_at_new); + char buf1[PATH_MAX]; + char buf2[PATH_MAX]; + const char *target_old = (oldpath && oldpath[0] == '/') ? rewrite_path(oldpath, buf1, sizeof(buf1)) : oldpath; + const char *target_new = (newpath && newpath[0] == '/') ? rewrite_path(newpath, buf2, sizeof(buf2)) : newpath; + dev_t hl_dev = 0; + ino_t hl_ino = 0; + int hardlinked = lookup_emulated_hardlink_at(newdirfd, target_new, &hl_dev, &hl_ino); + int ret = orig_renameat(olddirfd, target_old, newdirfd, target_new); + if (ret != 0 && errno == EACCES) { + int refused = errno; + int fixed_old = refused_in_repaired_dir(olddirfd, target_old); + errno = refused; + int fixed_new = refused_in_repaired_dir(newdirfd, target_new); + if (fixed_old || fixed_new) { + hardlinked = lookup_emulated_hardlink_at(newdirfd, target_new, &hl_dev, &hl_ino); + ret = orig_renameat(olddirfd, target_old, newdirfd, target_new); + } + } + if (ret == 0 && hardlinked) unregister_emulated_hardlink(hl_dev, hl_ino); + return ret; +} + +// Hook renameat2 +int renameat2(int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags) { + static int (*orig_renameat2)(int, const char *, int, const char *, unsigned int) = NULL; + if (!orig_renameat2) { + orig_renameat2 = (int (*)(int, const char *, int, const char *, unsigned int))dlsym(RTLD_NEXT, "renameat2"); + if (!orig_renameat2) return renameat(olddirfd, oldpath, newdirfd, newpath); + } + DDNATV_AT_REMAP_NAMED(olddirfd, oldpath, ddnatv_at_old); + DDNATV_AT_REMAP_NAMED(newdirfd, newpath, ddnatv_at_new); + char buf1[PATH_MAX]; + char buf2[PATH_MAX]; + const char *target_old = (oldpath && oldpath[0] == '/') ? rewrite_path(oldpath, buf1, sizeof(buf1)) : oldpath; + const char *target_new = (newpath && newpath[0] == '/') ? rewrite_path(newpath, buf2, sizeof(buf2)) : newpath; + dev_t hl_dev = 0; + ino_t hl_ino = 0; + // RENAME_EXCHANGE keeps both files, so nothing is replaced. + int hardlinked = !(flags & RENAME_EXCHANGE) && lookup_emulated_hardlink_at(newdirfd, target_new, &hl_dev, &hl_ino); + int ret = orig_renameat2(olddirfd, target_old, newdirfd, target_new, flags); + if (ret != 0 && errno == EACCES) { + int refused = errno; + int fixed_old = refused_in_repaired_dir(olddirfd, target_old); + errno = refused; + int fixed_new = refused_in_repaired_dir(newdirfd, target_new); + if (fixed_old || fixed_new) { + hardlinked = !(flags & RENAME_EXCHANGE) && lookup_emulated_hardlink_at(newdirfd, target_new, &hl_dev, &hl_ino); + ret = orig_renameat2(olddirfd, target_old, newdirfd, target_new, flags); + } + } + if (ret == 0 && hardlinked) unregister_emulated_hardlink(hl_dev, hl_ino); + return ret; +} + +// Hook readlink +ssize_t readlink(const char *pathname, char *buf, size_t bufsiz) { + if (is_proc_self_exe(pathname)) { + ssize_t exe_len = handle_proc_self_exe(buf, bufsiz); + if (exe_len >= 0) return exe_len; + } + static ssize_t (*orig_readlink)(const char *, char *, size_t) = NULL; + if (!orig_readlink) orig_readlink = (ssize_t (*)(const char *, char *, size_t))dlsym(RTLD_NEXT, "readlink"); + char pbuf[PATH_MAX]; + const char *target = rewrite_path(pathname, pbuf, sizeof(pbuf)); + ssize_t ret = orig_readlink ? orig_readlink(target, buf, bufsiz) : -1; + if (ret < 0 && errno == ENOENT) { + char alt[PATH_MAX]; + const char *retry = usrmerge_retry_path(target, alt, sizeof(alt)); + if (retry) ret = orig_readlink(retry, buf, bufsiz); + } + return postprocess_readlink(pathname, buf, ret, bufsiz); +} + +// Hook readlinkat +ssize_t readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz) { + static ssize_t (*orig_readlinkat)(int, const char *, char *, size_t) = NULL; + if (!orig_readlinkat) orig_readlinkat = (ssize_t (*)(int, const char *, char *, size_t))dlsym(RTLD_NEXT, "readlinkat"); + DDNATV_AT_REMAP(dirfd, pathname); + // after the remap: "proc/self/exe" relative to a descriptor for "/" is /proc/self/exe as well + if (is_proc_self_exe(pathname)) { + ssize_t exe_len = handle_proc_self_exe(buf, bufsiz); + if (exe_len >= 0) return exe_len; + } + char pbuf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? rewrite_path(pathname, pbuf, sizeof(pbuf)) : pathname; + ssize_t ret = orig_readlinkat ? orig_readlinkat(dirfd, target, buf, bufsiz) : -1; + if (ret < 0 && errno == ENOENT && pathname && pathname[0] == '/') { + char alt[PATH_MAX]; + const char *retry = usrmerge_retry_path(target, alt, sizeof(alt)); + if (retry) ret = orig_readlinkat(dirfd, retry, buf, bufsiz); + } + return postprocess_readlink(pathname, buf, ret, bufsiz); +} + +// Fortified readlink variants used by dpkg / update-alternatives +ssize_t __readlink_chk(const char *pathname, char *buf, size_t bufsiz, size_t buflen) { + return readlink(pathname, buf, bufsiz); +} + +ssize_t __readlinkat_chk(int dirfd, const char *pathname, char *buf, size_t bufsiz, size_t buflen) { + return readlinkat(dirfd, pathname, buf, bufsiz); +} + +// Ubuntu's programs find Android's SELinux (enforcing) through libselinux and then ask its policy +// questions it has no answers for. The one that mattered: PAM's pam_rootok, which lets root +// change its own entries, asks "may this user be root" and was refused, so chfn, chsh and +// `adduser --gecos` (the installation of PostgreSQL) failed with "PAM: Authentication failure". +// Ubuntu does not use SELinux, so for its programs it is off, as its labels are hidden below. +int is_selinux_enabled(void) { return 0; } + +// Extended attributes take the same paths as stat(). Without these hooks coreutils read +// security.selinux with the Ubuntu path itself: `ls -l` printed an error line for every file +// Android lacks (/etc/os-release) and showed Android's own label for the ones it has +// (/etc/passwd). Ubuntu does not use SELinux, so its label is hidden altogether: `ls -l` looks as +// on Ubuntu and cp/tar/rsync do not try to copy Android's labels. +ssize_t getxattr(const char *path, const char *name, void *value, size_t size) { + static ssize_t (*orig_getxattr)(const char *, const char *, void *, size_t) = NULL; + if (!orig_getxattr) orig_getxattr = (ssize_t (*)(const char *, const char *, void *, size_t))dlsym(RTLD_NEXT, "getxattr"); + if (is_selinux_xattr(name)) { + errno = ENODATA; + return -1; + } + char pbuf[PATH_MAX]; + return orig_getxattr ? orig_getxattr(rewrite_path_follow(path, pbuf, sizeof(pbuf)), name, value, size) : -1; +} + +ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size) { + static ssize_t (*orig_lgetxattr)(const char *, const char *, void *, size_t) = NULL; + if (!orig_lgetxattr) orig_lgetxattr = (ssize_t (*)(const char *, const char *, void *, size_t))dlsym(RTLD_NEXT, "lgetxattr"); + if (is_selinux_xattr(name)) { + errno = ENODATA; + return -1; + } + char pbuf[PATH_MAX]; + return orig_lgetxattr ? orig_lgetxattr(rewrite_path(path, pbuf, sizeof(pbuf)), name, value, size) : -1; +} + +ssize_t listxattr(const char *path, char *list, size_t size) { + static ssize_t (*orig_listxattr)(const char *, char *, size_t) = NULL; + if (!orig_listxattr) orig_listxattr = (ssize_t (*)(const char *, char *, size_t))dlsym(RTLD_NEXT, "listxattr"); + char pbuf[PATH_MAX]; + ssize_t ret = orig_listxattr ? orig_listxattr(rewrite_path_follow(path, pbuf, sizeof(pbuf)), list, size) : -1; + return size > 0 ? drop_selinux_xattr(list, ret) : ret; +} + +ssize_t llistxattr(const char *path, char *list, size_t size) { + static ssize_t (*orig_llistxattr)(const char *, char *, size_t) = NULL; + if (!orig_llistxattr) orig_llistxattr = (ssize_t (*)(const char *, char *, size_t))dlsym(RTLD_NEXT, "llistxattr"); + char pbuf[PATH_MAX]; + ssize_t ret = orig_llistxattr ? orig_llistxattr(rewrite_path(path, pbuf, sizeof(pbuf)), list, size) : -1; + return size > 0 ? drop_selinux_xattr(list, ret) : ret; +} + +ssize_t fgetxattr(int fd, const char *name, void *value, size_t size) { + static ssize_t (*orig_fgetxattr)(int, const char *, void *, size_t) = NULL; + if (!orig_fgetxattr) orig_fgetxattr = (ssize_t (*)(int, const char *, void *, size_t))dlsym(RTLD_NEXT, "fgetxattr"); + if (is_selinux_xattr(name)) { + errno = ENODATA; + return -1; + } + return orig_fgetxattr ? orig_fgetxattr(fd, name, value, size) : -1; +} + +ssize_t flistxattr(int fd, char *list, size_t size) { + static ssize_t (*orig_flistxattr)(int, char *, size_t) = NULL; + if (!orig_flistxattr) orig_flistxattr = (ssize_t (*)(int, char *, size_t))dlsym(RTLD_NEXT, "flistxattr"); + ssize_t ret = orig_flistxattr ? orig_flistxattr(fd, list, size) : -1; + return size > 0 ? drop_selinux_xattr(list, ret) : ret; +} + +int setxattr(const char *path, const char *name, const void *value, size_t size, int flags) { + static int (*orig_setxattr)(const char *, const char *, const void *, size_t, int) = NULL; + if (!orig_setxattr) orig_setxattr = (int (*)(const char *, const char *, const void *, size_t, int))dlsym(RTLD_NEXT, "setxattr"); + char pbuf[PATH_MAX]; + return orig_setxattr ? orig_setxattr(rewrite_path_follow(path, pbuf, sizeof(pbuf)), name, value, size, flags) : -1; +} + +int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags) { + static int (*orig_lsetxattr)(const char *, const char *, const void *, size_t, int) = NULL; + if (!orig_lsetxattr) orig_lsetxattr = (int (*)(const char *, const char *, const void *, size_t, int))dlsym(RTLD_NEXT, "lsetxattr"); + char pbuf[PATH_MAX]; + return orig_lsetxattr ? orig_lsetxattr(rewrite_path(path, pbuf, sizeof(pbuf)), name, value, size, flags) : -1; +} + +int removexattr(const char *path, const char *name) { + static int (*orig_removexattr)(const char *, const char *) = NULL; + if (!orig_removexattr) orig_removexattr = (int (*)(const char *, const char *))dlsym(RTLD_NEXT, "removexattr"); + char pbuf[PATH_MAX]; + return orig_removexattr ? orig_removexattr(rewrite_path(path, pbuf, sizeof(pbuf)), name) : -1; +} + +int lremovexattr(const char *path, const char *name) { + static int (*orig_lremovexattr)(const char *, const char *) = NULL; + if (!orig_lremovexattr) orig_lremovexattr = (int (*)(const char *, const char *))dlsym(RTLD_NEXT, "lremovexattr"); + char pbuf[PATH_MAX]; + return orig_lremovexattr ? orig_lremovexattr(rewrite_path(path, pbuf, sizeof(pbuf)), name) : -1; +} + +// Hook symlink +int symlink(const char *target, const char *linkpath) { + static int (*orig_symlink)(const char *, const char *) = NULL; + if (!orig_symlink) orig_symlink = (int (*)(const char *, const char *))dlsym(RTLD_NEXT, "symlink"); + char pbuf[PATH_MAX], tbuf[PATH_MAX]; + const char *newlink = rewrite_path(linkpath, pbuf, sizeof(pbuf)); + const char *newtarget = (target && target[0] == '/') ? rewrite_path(target, tbuf, sizeof(tbuf)) : target; + int ret = orig_symlink ? orig_symlink(newtarget, newlink) : -1; + if (ret != 0 && orig_symlink && refused_in_repaired_dir(AT_FDCWD, newlink)) ret = orig_symlink(newtarget, newlink); + return ret; +} + +// Hook symlinkat +int symlinkat(const char *target, int newdirfd, const char *linkpath) { + static int (*orig_symlinkat)(const char *, int, const char *) = NULL; + if (!orig_symlinkat) orig_symlinkat = (int (*)(const char *, int, const char *))dlsym(RTLD_NEXT, "symlinkat"); + DDNATV_AT_REMAP(newdirfd, linkpath); + char pbuf[PATH_MAX], tbuf[PATH_MAX]; + const char *newlink = (linkpath && linkpath[0] == '/') ? rewrite_path(linkpath, pbuf, sizeof(pbuf)) : linkpath; + const char *newtarget = (target && target[0] == '/') ? rewrite_path(target, tbuf, sizeof(tbuf)) : target; + int ret = orig_symlinkat ? orig_symlinkat(newtarget, newdirfd, newlink) : -1; + if (ret != 0 && orig_symlinkat && refused_in_repaired_dir(newdirfd, newlink)) ret = orig_symlinkat(newtarget, newdirfd, newlink); + return ret; +} + +// Hook linkat +int linkat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath, int flags) { + static int (*orig_linkat)(int, const char *, int, const char *, int) = NULL; + if (!orig_linkat) orig_linkat = (int (*)(int, const char *, int, const char *, int))dlsym(RTLD_NEXT, "linkat"); + DDNATV_AT_REMAP_NAMED(olddirfd, oldpath, ddnatv_at_old); + DDNATV_AT_REMAP_NAMED(newdirfd, newpath, ddnatv_at_new); + char obuf[PATH_MAX], nbuf[PATH_MAX]; + const char *rold = (oldpath && oldpath[0] == '/') ? rewrite_path(oldpath, obuf, sizeof(obuf)) : oldpath; + const char *rnew = (newpath && newpath[0] == '/') ? rewrite_path(newpath, nbuf, sizeof(nbuf)) : newpath; + int ret = orig_linkat ? orig_linkat(olddirfd, rold, newdirfd, rnew, flags) : -1; + if (ret != 0 && orig_linkat && refused_in_repaired_dir(newdirfd, rnew)) ret = orig_linkat(olddirfd, rold, newdirfd, rnew, flags); + if (ret != 0 && (errno == EXDEV || errno == EPERM || errno == EACCES || errno == ENOTSUP || errno == ENOSYS)) { + ret = ddnatv_emulate_hardlinkat(olddirfd, rold, newdirfd, rnew); + } + return ret; +} + +// Hook link +int link(const char *oldpath, const char *newpath) { + return linkat(AT_FDCWD, oldpath, AT_FDCWD, newpath, 0); +} + +// Hook utime / utimes / lutimes / futimesat / utimensat +int utime(const char *filename, const struct utimbuf *times) { + static int (*orig_utime)(const char *, const struct utimbuf *) = NULL; + if (!orig_utime) orig_utime = (int (*)(const char *, const struct utimbuf *))dlsym(RTLD_NEXT, "utime"); + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(filename, buf, sizeof(buf)); + return orig_utime ? orig_utime(target, times) : -1; +} + +int utimes(const char *filename, const struct timeval times[2]) { + static int (*orig_utimes)(const char *, const struct timeval[2]) = NULL; + if (!orig_utimes) orig_utimes = (int (*)(const char *, const struct timeval[2]))dlsym(RTLD_NEXT, "utimes"); + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(filename, buf, sizeof(buf)); + return orig_utimes ? orig_utimes(target, times) : -1; +} + +int lutimes(const char *filename, const struct timeval times[2]) { + static int (*orig_lutimes)(const char *, const struct timeval[2]) = NULL; + if (!orig_lutimes) orig_lutimes = (int (*)(const char *, const struct timeval[2]))dlsym(RTLD_NEXT, "lutimes"); + char buf[PATH_MAX]; + const char *target = rewrite_path(filename, buf, sizeof(buf)); + return orig_lutimes ? orig_lutimes(target, times) : -1; +} + +int futimesat(int dirfd, const char *pathname, const struct timeval times[2]) { + static int (*orig_futimesat)(int, const char *, const struct timeval[2]) = NULL; + if (!orig_futimesat) orig_futimesat = (int (*)(int, const char *, const struct timeval[2]))dlsym(RTLD_NEXT, "futimesat"); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + return orig_futimesat ? orig_futimesat(dirfd, target, times) : -1; +} + +int utimensat(int dirfd, const char *pathname, const struct timespec times[2], int flags) { + static int (*orig_utimensat)(int, const char *, const struct timespec[2], int) = NULL; + if (!orig_utimensat) orig_utimensat = (int (*)(int, const char *, const struct timespec[2], int))dlsym(RTLD_NEXT, "utimensat"); + DDNATV_AT_REMAP(dirfd, pathname); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + return orig_utimensat ? orig_utimensat(dirfd, target, times, flags) : -1; +} + +// Hook truncate +int truncate(const char *path, off_t length) { + static int (*orig_truncate)(const char *, off_t) = NULL; + if (!orig_truncate) orig_truncate = (int (*)(const char *, off_t))dlsym(RTLD_NEXT, "truncate"); + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(path, buf, sizeof(buf)); + return orig_truncate(target, length); +} + +// Hook statfs / statfs64 / statvfs / statvfs64 +int statfs(const char *path, struct statfs *buf) { + static int (*orig_statfs)(const char *, struct statfs *) = NULL; + if (!orig_statfs) orig_statfs = (int (*)(const char *, struct statfs *))dlsym(RTLD_NEXT, "statfs"); + char pbuf[PATH_MAX]; + const char *target = rewrite_path_follow(path, pbuf, sizeof(pbuf)); + return orig_statfs ? orig_statfs(target, buf) : -1; +} + +int statvfs(const char *path, struct statvfs *buf) { + static int (*orig_statvfs)(const char *, struct statvfs *) = NULL; + if (!orig_statvfs) orig_statvfs = (int (*)(const char *, struct statvfs *))dlsym(RTLD_NEXT, "statvfs"); + char pbuf[PATH_MAX]; + const char *target = rewrite_path_follow(path, pbuf, sizeof(pbuf)); + return orig_statvfs ? orig_statvfs(target, buf) : -1; +} + +// Hook chdir +int chdir(const char *path) { + static int (*orig_chdir)(const char *) = NULL; + if (!orig_chdir) orig_chdir = (int (*)(const char *))dlsym(RTLD_NEXT, "chdir"); + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(path, buf, sizeof(buf)); + return orig_chdir ? orig_chdir(target) : -1; +} + +// Hook fchdir +int fchdir(int fd) { + static int (*orig_fchdir)(int) = NULL; + if (!orig_fchdir) orig_fchdir = (int (*)(int))dlsym(RTLD_NEXT, "fchdir"); + return orig_fchdir ? orig_fchdir(fd) : -1; +} + +// Hook getcwd +char *getcwd(char *buf, size_t size) { + static char *(*orig_getcwd)(char *, size_t) = NULL; + if (!orig_getcwd) orig_getcwd = (char *(*)(char *, size_t))dlsym(RTLD_NEXT, "getcwd"); + char *res = orig_getcwd ? orig_getcwd(buf, size) : NULL; + if (res) { + size_t len = strlen(res); + guest_path_of_mount_source(res, len, buf ? size : len + 1); + } + return res; +} + +extern void __chk_fail(void) __attribute__((__noreturn__)); +char *__getcwd_chk(char *buf, size_t size, size_t buflen) { + if (size > buflen) __chk_fail(); + return getcwd(buf, size); +} + +// Hook realpath and canonicalize_file_name +char *realpath(const char *path, char *resolved_path) { + static char *(*orig_realpath)(const char *, char *) = NULL; + if (!orig_realpath) orig_realpath = (char *(*)(const char *, char *))dlsym(RTLD_NEXT, "realpath"); + if (!path) { + errno = EINVAL; + return NULL; + } + init_ddnatv_hook(); + if (is_proc_self_exe(path)) { + char tmp[PATH_MAX]; + ssize_t n = handle_proc_self_exe(tmp, sizeof(tmp) - 1); + if (n > 0) { + tmp[n] = '\0'; + if (resolved_path) { + strncpy(resolved_path, tmp, PATH_MAX - 1); + resolved_path[PATH_MAX - 1] = '\0'; + return resolved_path; + } else { + return strdup(tmp); + } + } + } + char pbuf[PATH_MAX]; + const char *target = rewrite_path(path, pbuf, sizeof(pbuf)); + char *res = orig_realpath ? orig_realpath(target, resolved_path) : NULL; + if (res && g_ddnatv_root[0] != '\0') { + size_t rlen = g_ddnatv_root_len; + if (strncmp(res, g_ddnatv_root, rlen) == 0 && (res[rlen] == '/' || res[rlen] == '\0')) { + size_t rem_len = strlen(res + rlen); + if (rem_len == 0) { + res[0] = '/'; + res[1] = '\0'; + } else { + memmove(res, res + rlen, rem_len + 1); + } + } + } + if (res) guest_path_of_mount_source(res, strlen(res), resolved_path ? PATH_MAX : strlen(res) + 1); + return res; +} + +char *__realpath_chk(const char *path, char *resolved_path, size_t resolved_len) { + return realpath(path, resolved_path); +} + +char *canonicalize_file_name(const char *path) { + return realpath(path, NULL); +} + +// Hook scandir and scandir64 +int scandir(const char *dirp, struct dirent ***namelist, + int (*filter)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)) { + static int (*orig_scandir)(const char *, struct dirent ***, + int (*)(const struct dirent *), + int (*)(const struct dirent **, const struct dirent **)) = NULL; + if (!orig_scandir) orig_scandir = (int (*)(const char *, struct dirent ***, + int (*)(const struct dirent *), + int (*)(const struct dirent **, const struct dirent **)))dlsym(RTLD_NEXT, "scandir"); + char buf[PATH_MAX]; + const char *target = rewrite_path(dirp, buf, sizeof(buf)); + return orig_scandir ? orig_scandir(target, namelist, filter, compar) : -1; +} + +#if defined(__LP64__) +// Export 64-bit Large File Support (LFS) symbol aliases on 64-bit platforms so that +// calls from libraries compiled with LFS (such as libstdc++ calling fopen64) are intercepted. +__asm__( + ".globl open64\n" ".set open64, open\n" + ".globl openat64\n" ".set openat64, openat\n" + ".globl __open64_2\n" ".set __open64_2, __open_2\n" + ".globl __openat64_2\n" ".set __openat64_2, __openat_2\n" + ".globl creat64\n" ".set creat64, creat\n" + ".globl fopen64\n" ".set fopen64, fopen\n" + ".globl freopen64\n" ".set freopen64, freopen\n" + ".globl stat64\n" ".set stat64, stat\n" + ".globl lstat64\n" ".set lstat64, lstat\n" + ".globl fstatat64\n" ".set fstatat64, fstatat\n" + ".globl truncate64\n" ".set truncate64, truncate\n" + ".globl statfs64\n" ".set statfs64, statfs\n" + ".globl statvfs64\n" ".set statvfs64, statvfs\n" + ".globl scandir64\n" ".set scandir64, scandir\n" + ".globl mkstemp64\n" ".set mkstemp64, mkstemp\n" + ".globl mkostemp64\n" ".set mkostemp64, mkostemp\n" + ".globl mkstemps64\n" ".set mkstemps64, mkstemps\n" + ".globl mkostemps64\n" ".set mkostemps64, mkostemps\n" + ".globl tmpfile64\n" ".set tmpfile64, tmpfile\n" +); +#endif + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/files.c b/tools/nativeguest/hook/files.c new file mode 100644 index 0000000000..6c52f70adf --- /dev/null +++ b/tools/nativeguest/hook/files.c @@ -0,0 +1,813 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Opening, creating and inspecting files: open, fopen, temporary files, directories, the stat family. + +#ifndef DDNATV_HOST_TEST + +#ifndef O_TMPFILE +#define O_TMPFILE (020000000 | 00200000) +#endif + +static inline int open_needs_mode(int flags) { +#ifdef O_TMPFILE + return ((flags & O_CREAT) != 0) || ((flags & O_TMPFILE) == O_TMPFILE); +#else + return (flags & O_CREAT) != 0; +#endif +} + +// The app is root for the programs it runs, and root puts names in every directory and takes them out +// whatever the mode of the directory; the app does not. A directory that is the app's own can have lost +// its owner's rights: an earlier version left the directories dpkg makes (with mode 0) at mode 0 when the +// chmod that follows did not take effect, and a package can ship a read-only one (#44). When a call that +// makes or removes a name is refused in such a directory, the directory is given its owner's rights and the +// call is made once more. Returns 1 when the directory was repaired (the call can be made again). +static int give_dir_owner_rights(int dirfd, const char *name) { + static int (*orig_fchmodat)(int, const char *, mode_t, int) = NULL; + if (!name || !*name) return 0; + char parent[PATH_MAX]; + size_t len = strlen(name); + if (len >= sizeof(parent)) return 0; + memcpy(parent, name, len + 1); + while (len > 1 && parent[len - 1] == '/') parent[--len] = '\0'; + char *slash = strrchr(parent, '/'); + if (!slash) { + strcpy(parent, "."); + } else if (slash == parent) { + parent[1] = '\0'; + } else { + *slash = '\0'; + } + struct stat st; + if (real_fstatat(dirfd, parent, &st, 0) != 0 || !S_ISDIR(st.st_mode)) return 0; + if (__atomic_load_n(&g_app_uid, __ATOMIC_RELAXED) == (uid_t)-1) load_app_ids(); + if (st.st_uid != __atomic_load_n(&g_app_uid, __ATOMIC_RELAXED)) return 0; + if ((st.st_mode & 0700) == 0700) return 0; + if (!orig_fchmodat) orig_fchmodat = (int (*)(int, const char *, mode_t, int))dlsym(RTLD_NEXT, "fchmodat"); + return orig_fchmodat && orig_fchmodat(dirfd, parent, (st.st_mode | 0700) & 07777, 0) == 0; +} + +// For the calls that were refused (EACCES): whether the directory of `name` was repaired, so that the call +// can be made again. errno stays what the call left when it was not. +static int refused_in_repaired_dir(int dirfd, const char *name) { + if (errno != EACCES) return 0; + int saved = errno; + int fixed = give_dir_owner_rights(dirfd, name); + if (!fixed) errno = saved; + return fixed; +} + +static int dlopen_preload_deps(const char *path, void *(*orig_dlopen)(const char *, int), int depth); + +// Hook dlopen and dlmopen +void *dlopen(const char *filename, int flags) { + static void *(*orig_dlopen)(const char *, int) = NULL; + if (!orig_dlopen) orig_dlopen = (void *(*)(const char *, int))dlsym(RTLD_NEXT, "dlopen"); + if (!filename) return orig_dlopen ? orig_dlopen(NULL, flags) : NULL; + if (!orig_dlopen) return NULL; + + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(filename, buf, sizeof(buf)); + void *handle = orig_dlopen(target, flags); + if (!handle && target[0] == '/' && !(flags & RTLD_NOLOAD)) { + // Its dependencies may be in its RUNPATH, which ld.so looked for outside the rootfs + int saved = errno; + if (dlopen_preload_deps(target, orig_dlopen, 0) > 0) handle = orig_dlopen(target, flags); + if (!handle) errno = saved; + } + return handle; +} + +void *dlmopen(Lmid_t lmid, const char *filename, int flags) { + static void *(*orig_dlmopen)(Lmid_t, const char *, int) = NULL; + if (!orig_dlmopen) orig_dlmopen = (void *(*)(Lmid_t, const char *, int))dlsym(RTLD_NEXT, "dlmopen"); + if (!filename) return orig_dlmopen ? orig_dlmopen(lmid, NULL, flags) : NULL; + + char buf[PATH_MAX]; + const char *target = rewrite_path(filename, buf, sizeof(buf)); + return orig_dlmopen ? orig_dlmopen(lmid, target, flags) : NULL; +} + +// /proc//status (and a thread's) give the app's own ids, which every other call presents as +// root: process monitors comparing them with getuid() showed none of the session's processes. Only +// such tools are given root's there: Chromium (Steam's web helper) checks the ids of the processes it +// sandboxes in those files, and with them all 0 every helper exited and Steam never drew a frame. +static int reader_compares_process_ids(void) { + static const char *const k_readers[] = { + "ps", "top", "htop", "btop", "atop", "pgrep", "pkill", "pidof", "pstree", "w", "glances", + "ksystemstats", "plasma-systemmonitor", "ksysguard", "ksysguardd", "kinfocenter", "gnome-system-monitor", + }; + const char *me = program_invocation_short_name; + if (!me) return 0; + for (size_t i = 0; i < sizeof(k_readers) / sizeof(k_readers[0]); i++) { + if (strcmp(me, k_readers[i]) == 0) return 1; + } + return 0; +} + +static int is_proc_status_path(const char *p) { + if (!p || strncmp(p, "/proc/", 6) != 0) return 0; + p += 6; + if (strncmp(p, "self/", 5) == 0) p += 5; + else if (strncmp(p, "thread-self/", 12) == 0) p += 12; + else { + if (*p < '0' || *p > '9') return 0; + while (*p >= '0' && *p <= '9') p++; + if (*p++ != '/') return 0; + if (strncmp(p, "task/", 5) == 0) { + p += 5; + if (*p < '0' || *p > '9') return 0; + while (*p >= '0' && *p <= '9') p++; + if (*p++ != '/') return 0; + } + } + return strcmp(p, "status") == 0; +} + +static void proc_status_root_ids(char *text, size_t len, const char *field, unsigned long id) { + size_t flen = strlen(field); + for (size_t at = 0; at + flen <= len; at++) { + if ((at != 0 && text[at - 1] != '\n') || memcmp(text + at, field, flen) != 0) continue; + char *p = text + at + flen; + char *end = memchr(p, '\n', len - (size_t)(p - text)); + if (!end) end = text + len; + char out[128]; + size_t used = 0; + while (p < end && used + 24 < sizeof(out)) { + while (p < end && (*p == '\t' || *p == ' ')) out[used++] = *p++; + char *num = p; + while (p < end && *p >= '0' && *p <= '9') p++; + if (p == num) break; + unsigned long v = strtoul(num, NULL, 10); + used += (size_t)snprintf(out + used, sizeof(out) - used, "%lu", v == id ? 0UL : v); + } + if (p != end) return; + // the line shrinks or stays (an id becomes 0), so it is rewritten in place + size_t old_len = (size_t)(end - (text + at + flen)); + if (used > old_len) return; + memcpy(text + at + flen, out, used); + memmove(text + at + flen + used, end, len - (size_t)(end - text) + 1); + return; + } +} + +// The status file with the app's ids as root's, in a memory file; -2 when `path` is no such file +// or is opened for writing. +static int open_proc_status(const char *path, int flags) { + if ((flags & O_ACCMODE) != O_RDONLY || !is_proc_status_path(path) || !reader_compares_process_ids()) return -2; + int fd = (int)syscall(SYS_openat, AT_FDCWD, path, O_RDONLY | O_CLOEXEC); + if (fd < 0) return -1; + char text[16384]; + size_t len = 0; + for (;;) { + ssize_t n = (ssize_t)syscall(SYS_read, fd, text + len, sizeof(text) - 1 - len); + if (n <= 0) break; + len += (size_t)n; + if (len >= sizeof(text) - 1) break; + } + syscall(SYS_close, fd); + text[len] = '\0'; + if (__atomic_load_n(&g_app_uid, __ATOMIC_RELAXED) == (uid_t)-1) load_app_ids(); + proc_status_root_ids(text, len, "Uid:", (unsigned long)__atomic_load_n(&g_app_uid, __ATOMIC_RELAXED)); + len = strlen(text); + proc_status_root_ids(text, len, "Gid:", (unsigned long)__atomic_load_n(&g_app_gid, __ATOMIC_RELAXED)); + len = strlen(text); + int mfd = (int)syscall(SYS_memfd_create, "status", (flags & O_CLOEXEC) ? MFD_CLOEXEC : 0); + if (mfd < 0) return (int)syscall(SYS_openat, AT_FDCWD, path, flags, 0); + size_t written = 0; + while (written < len) { + ssize_t n = (ssize_t)syscall(SYS_write, mfd, text + written, len - written); + if (n <= 0) break; + written += (size_t)n; + } + syscall(SYS_lseek, mfd, 0, SEEK_SET); + return mfd; +} + +// openat(dirfd, "status") with dirfd on /proc/ or a thread of it +static int open_proc_status_at(int dirfd, const char *name, int flags) { + if (dirfd < 0 || !name || strcmp(name, "status") != 0 || (flags & O_ACCMODE) != O_RDONLY) return -2; + char link[48], dir[PATH_MAX]; + snprintf(link, sizeof(link), "/proc/self/fd/%d", dirfd); + long n = syscall(SYS_readlinkat, AT_FDCWD, link, dir, sizeof(dir) - 8); + if (n <= 0) return -2; + dir[n] = '\0'; + memcpy(dir + n, "/status", 8); + return open_proc_status(dir, flags); +} + +// Hook open +int open(const char *pathname, int flags, ...) { + static int (*orig_open)(const char *, int, ...) = NULL; + if (!orig_open) orig_open = (int (*)(const char *, int, ...))dlsym(RTLD_NEXT, "open"); + init_ddnatv_hook(); + char exe_buf[PATH_MAX]; + if (is_proc_self_exe(pathname)) { + if (g_real_exe[0] != '\0') { + pathname = g_real_exe; + } else if (handle_proc_self_exe(exe_buf, sizeof(exe_buf)) > 0) { + pathname = exe_buf; + } + } + int status_fd = open_proc_status(pathname, flags); + if (status_fd != -2) return status_fd; + char buf[PATH_MAX]; + const char *target = ((flags & O_NOFOLLOW) ? rewrite_path : rewrite_path_follow)(pathname, buf, sizeof(buf)); + if (open_needs_mode(flags)) { + va_list args; + va_start(args, flags); + mode_t mode = va_arg(args, mode_t); + va_end(args); + int fd = orig_open(target, flags, mode); + if (fd < 0 && (flags & O_CREAT) && refused_in_repaired_dir(AT_FDCWD, target)) fd = orig_open(target, flags, mode); + return fd; + } + return orig_open(target, flags); +} + +// Hook openat +int openat(int dirfd, const char *pathname, int flags, ...) { + static int (*orig_openat)(int, const char *, int, ...) = NULL; + if (!orig_openat) orig_openat = (int (*)(int, const char *, int, ...))dlsym(RTLD_NEXT, "openat"); + init_ddnatv_hook(); + DDNATV_AT_REMAP(dirfd, pathname); + char exe_buf[PATH_MAX]; + if (is_proc_self_exe(pathname)) { + if (g_real_exe[0] != '\0') { + pathname = g_real_exe; + } else if (handle_proc_self_exe(exe_buf, sizeof(exe_buf)) > 0) { + pathname = exe_buf; + } + } + int status_fd = (pathname && pathname[0] == '/') ? open_proc_status(pathname, flags) : open_proc_status_at(dirfd, pathname, flags); + if (status_fd != -2) return status_fd; + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? ((flags & O_NOFOLLOW) ? rewrite_path : rewrite_path_follow)(pathname, buf, sizeof(buf)) : pathname; + if (open_needs_mode(flags)) { + va_list args; + va_start(args, flags); + mode_t mode = va_arg(args, mode_t); + va_end(args); + int fd = orig_openat(dirfd, target, flags, mode); + if (fd < 0 && (flags & O_CREAT) && refused_in_repaired_dir(dirfd, target)) fd = orig_openat(dirfd, target, flags, mode); + return fd; + } + return orig_openat(dirfd, target, flags); +} + +// Hook creat +int creat(const char *pathname, mode_t mode) { + return open(pathname, O_CREAT | O_WRONLY | O_TRUNC, mode); +} + +// Fortified open variants used by GNU tar and other coreutils compiled with _FORTIFY_SOURCE=2/3 +int __open_2(const char *pathname, int flags) { + return open(pathname, flags); +} + +int __openat_2(int dirfd, const char *pathname, int flags) { + return openat(dirfd, pathname, flags); +} + +// openat2/open_how local definition: avoids depending on , +// which old NDK/cross headers may lack. Layout matches UAPI ver0 +// (flags, mode, resolve = 3 x __u64); extra fields are never read here. +struct ddnatv_open_how { + uint64_t flags; + uint64_t mode; + uint64_t resolve; +}; +#ifndef RESOLVE_BENEATH +#define RESOLVE_BENEATH 0x08 +#endif +#ifndef __NR_openat2 +#define __NR_openat2 437 +#endif +#ifndef __NR_fchmodat2 +#define __NR_fchmodat2 452 +#endif + +static long call_orig_syscall(long number, unsigned long a1, unsigned long a2, unsigned long a3, unsigned long a4, unsigned long a5, unsigned long a6) { + static long (*orig_syscall)(long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) = NULL; + if (!orig_syscall) { + orig_syscall = (long (*)(long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long))dlsym(RTLD_NEXT, "syscall"); + } + return orig_syscall ? orig_syscall(number, a1, a2, a3, a4, a5, a6) : syscall(number, a1, a2, a3, a4, a5, a6); +} + +// Hook openat2 (used by GNU tar 1.35+/gnulib for RESOLVE_BENEATH traversal). +// Rewrites absolute paths like openat, then delegates; on ENOSYS (kernels +// without openat2, e.g. Android < 5.6) emulates with plain openat instead of +// trusting every caller to implement the fallback itself. +int openat2(int dirfd, const char *pathname, struct ddnatv_open_how *how, size_t usize) { + static int (*orig_openat2)(int, const char *, struct ddnatv_open_how *, size_t) = NULL; + if (!orig_openat2) orig_openat2 = (int (*)(int, const char *, struct ddnatv_open_how *, size_t))dlsym(RTLD_NEXT, "openat2"); + if (!pathname) { + errno = EFAULT; + return -1; + } + const char *given = pathname; + DDNATV_AT_REMAP(dirfd, pathname); + // a remapped path is absolute, which RESOLVE_BENEATH and the like refuse: the caller walks it itself + if (pathname != given && how && how->resolve != 0) { + errno = ENOSYS; + return -1; + } + char exe_buf[PATH_MAX]; + if (is_proc_self_exe(pathname)) { + if (g_real_exe[0] != '\0') { + pathname = g_real_exe; + } else if (handle_proc_self_exe(exe_buf, sizeof(exe_buf)) > 0) { + pathname = exe_buf; + } + } + char buf[PATH_MAX]; + const char *target = (pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + if (orig_openat2) { + int ret = orig_openat2(dirfd, target, how, usize); + if (ret >= 0 || errno != ENOSYS) return ret; + } +#ifdef __NR_openat2 + long sret = call_orig_syscall(__NR_openat2, (unsigned long)dirfd, (unsigned long)target, (unsigned long)how, (unsigned long)usize, 0, 0); + if (sret >= 0 || errno != ENOSYS) { + return (int)sret; + } +#endif + if (!how || usize < 16) { + errno = EINVAL; + return -1; + } + int flags = (int)(how->flags & 0xffffffffu); + mode_t mode = (mode_t)(how->mode & 07777u); + + // RESOLVE_BENEATH, RESOLVE_NO_SYMLINKS and the other resolve flags restrict every component of + // the path, which a plain openat() cannot do (a symlink in the middle would still be followed). + // Say so: callers such as gnulib's openat2 (GNU tar) then walk the path safely themselves. + if (how->resolve != 0) { + errno = ENOSYS; + return -1; + } + + if (open_needs_mode(flags)) { + return openat(dirfd, target, flags, mode); + } + return openat(dirfd, target, flags); +} + +// Hook fchmodat2 (used by GNU tar for lchmod-style symlink chmod). +// Delegates when the libc symbol exists, otherwise emulates: symlinks cannot +// be chmod'ed without kernel support, so skip them (return 0) like gnulib, +// and route everything else through fchmodat. +int fchmodat2(int dirfd, const char *pathname, mode_t mode, int flags) { + static int (*orig_fchmodat2)(int, const char *, mode_t, int) = NULL; + if (!orig_fchmodat2) orig_fchmodat2 = (int (*)(int, const char *, mode_t, int))dlsym(RTLD_NEXT, "fchmodat2"); + if (!pathname) { + errno = EFAULT; + return -1; + } + char buf[PATH_MAX]; + const char *target = (pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + if (orig_fchmodat2) { + int ret = orig_fchmodat2(dirfd, target, mode, flags); + if (ret == 0 || errno != ENOSYS) return ret; + } + if ((flags & AT_SYMLINK_NOFOLLOW) != 0) { + struct stat st; + if (fstatat(dirfd, target, &st, AT_SYMLINK_NOFOLLOW) == 0 && S_ISLNK(st.st_mode)) { + return 0; + } + } + return fchmodat(dirfd, target, mode, 0); +} + + +// Hook fopen +FILE *fopen(const char *pathname, const char *mode) { + static FILE *(*orig_fopen)(const char *, const char *) = NULL; + if (!orig_fopen) orig_fopen = (FILE *(*)(const char *, const char *))dlsym(RTLD_NEXT, "fopen"); + if (mode && mode[0] == 'r' && !strchr(mode, '+')) { + int status_fd = open_proc_status(pathname, O_RDONLY | (strchr(mode, 'e') ? O_CLOEXEC : 0)); + if (status_fd >= 0) return fdopen(status_fd, mode); + if (status_fd == -1) return NULL; + } + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(pathname, buf, sizeof(buf)); + return orig_fopen(target, mode); +} + +// Hook freopen +FILE *freopen(const char *pathname, const char *mode, FILE *stream) { + static FILE *(*orig_freopen)(const char *, const char *, FILE *) = NULL; + if (!orig_freopen) orig_freopen = (FILE *(*)(const char *, const char *, FILE *))dlsym(RTLD_NEXT, "freopen"); + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(pathname, buf, sizeof(buf)); + return orig_freopen(target, mode, stream); +} + +// Hook write +ssize_t write(int fd, const void *buf, size_t count) { + static ssize_t (*orig_write)(int, const void *, size_t) = NULL; + if (!orig_write) orig_write = (ssize_t (*)(int, const void *, size_t))dlsym(RTLD_NEXT, "write"); + return orig_write ? orig_write(fd, buf, count) : -1; +} + +// Hook mkstemp +int mkstemp(char *template) { + static int (*orig_mkstemp)(char *) = NULL; + if (!orig_mkstemp) orig_mkstemp = (int (*)(char *))dlsym(RTLD_NEXT, "mkstemp"); + if (!template) { errno = EINVAL; return -1; } + + char buf[PATH_MAX]; + const char *target = rewrite_path(template, buf, sizeof(buf)); + if (target == template) { + return orig_mkstemp ? orig_mkstemp(template) : -1; + } + + char tmp_buf[PATH_MAX]; + strncpy(tmp_buf, target, sizeof(tmp_buf) - 1); + tmp_buf[sizeof(tmp_buf) - 1] = '\0'; + + int fd = orig_mkstemp ? orig_mkstemp(tmp_buf) : -1; + if (fd >= 0) { + size_t orig_len = strlen(template); + size_t tmp_len = strlen(tmp_buf); + if (orig_len >= 6 && tmp_len >= 6) { + memcpy(template + orig_len - 6, tmp_buf + tmp_len - 6, 6); + } + } + return fd; +} + +// Hook mkostemp +int mkostemp(char *template, int flags) { + static int (*orig_mkostemp)(char *, int) = NULL; + if (!orig_mkostemp) orig_mkostemp = (int (*)(char *, int))dlsym(RTLD_NEXT, "mkostemp"); + if (!template) { errno = EINVAL; return -1; } + + char buf[PATH_MAX]; + const char *target = rewrite_path(template, buf, sizeof(buf)); + if (target == template) { + return orig_mkostemp ? orig_mkostemp(template, flags) : -1; + } + + char tmp_buf[PATH_MAX]; + strncpy(tmp_buf, target, sizeof(tmp_buf) - 1); + tmp_buf[sizeof(tmp_buf) - 1] = '\0'; + + int fd = orig_mkostemp ? orig_mkostemp(tmp_buf, flags) : -1; + if (fd >= 0) { + size_t orig_len = strlen(template); + size_t tmp_len = strlen(tmp_buf); + if (orig_len >= 6 && tmp_len >= 6) { + memcpy(template + orig_len - 6, tmp_buf + tmp_len - 6, 6); + } + } + return fd; +} + +// Hook mkstemps +int mkstemps(char *template, int suffixlen) { + static int (*orig_mkstemps)(char *, int) = NULL; + if (!orig_mkstemps) orig_mkstemps = (int (*)(char *, int))dlsym(RTLD_NEXT, "mkstemps"); + if (!template) { errno = EINVAL; return -1; } + + char buf[PATH_MAX]; + const char *target = rewrite_path(template, buf, sizeof(buf)); + if (target == template) { + return orig_mkstemps ? orig_mkstemps(template, suffixlen) : -1; + } + + char tmp_buf[PATH_MAX]; + strncpy(tmp_buf, target, sizeof(tmp_buf) - 1); + tmp_buf[sizeof(tmp_buf) - 1] = '\0'; + + int fd = orig_mkstemps ? orig_mkstemps(tmp_buf, suffixlen) : -1; + if (fd >= 0) { + size_t orig_len = strlen(template); + size_t tmp_len = strlen(tmp_buf); + if (orig_len >= (size_t)(suffixlen + 6) && tmp_len >= (size_t)(suffixlen + 6)) { + memcpy(template + orig_len - suffixlen - 6, tmp_buf + tmp_len - suffixlen - 6, 6); + } + } + return fd; +} + +// Hook mkostemps +int mkostemps(char *template, int suffixlen, int flags) { + static int (*orig_mkostemps)(char *, int, int) = NULL; + if (!orig_mkostemps) orig_mkostemps = (int (*)(char *, int, int))dlsym(RTLD_NEXT, "mkostemps"); + if (!template) { errno = EINVAL; return -1; } + + char buf[PATH_MAX]; + const char *target = rewrite_path(template, buf, sizeof(buf)); + if (target == template) { + return orig_mkostemps ? orig_mkostemps(template, suffixlen, flags) : -1; + } + + char tmp_buf[PATH_MAX]; + strncpy(tmp_buf, target, sizeof(tmp_buf) - 1); + tmp_buf[sizeof(tmp_buf) - 1] = '\0'; + + int fd = orig_mkostemps ? orig_mkostemps(tmp_buf, suffixlen, flags) : -1; + if (fd >= 0) { + size_t orig_len = strlen(template); + size_t tmp_len = strlen(tmp_buf); + if (orig_len >= (size_t)(suffixlen + 6) && tmp_len >= (size_t)(suffixlen + 6)) { + memcpy(template + orig_len - suffixlen - 6, tmp_buf + tmp_len - suffixlen - 6, 6); + } + } + return fd; +} + +// Hook mkdtemp +char *mkdtemp(char *template) { + static char *(*orig_mkdtemp)(char *) = NULL; + if (!orig_mkdtemp) orig_mkdtemp = (char *(*)(char *))dlsym(RTLD_NEXT, "mkdtemp"); + if (!template) { errno = EINVAL; return NULL; } + + char buf[PATH_MAX]; + const char *target = rewrite_path(template, buf, sizeof(buf)); + if (target == template) { + return orig_mkdtemp ? orig_mkdtemp(template) : NULL; + } + + char tmp_buf[PATH_MAX]; + strncpy(tmp_buf, target, sizeof(tmp_buf) - 1); + tmp_buf[sizeof(tmp_buf) - 1] = '\0'; + + char *res = orig_mkdtemp ? orig_mkdtemp(tmp_buf) : NULL; + if (res) { + size_t orig_len = strlen(template); + size_t tmp_len = strlen(tmp_buf); + if (orig_len >= 6 && tmp_len >= 6) { + memcpy(template + orig_len - 6, tmp_buf + tmp_len - 6, 6); + } + return template; + } + return NULL; +} + +// Hook tmpfile +FILE *tmpfile(void) { + init_ddnatv_hook(); + char template_buf[PATH_MAX]; + if (g_ddnatv_root[0] != '\0') { + snprintf(template_buf, sizeof(template_buf), "%s/tmp/tmpfile.XXXXXX", g_ddnatv_root); + } else { + snprintf(template_buf, sizeof(template_buf), "/tmp/tmpfile.XXXXXX"); + } + int fd = mkstemp(template_buf); + if (fd < 0) return NULL; + unlink(template_buf); + FILE *f = fdopen(fd, "w+b"); + if (!f) { + int saved_errno = errno; + close(fd); + errno = saved_errno; + } + return f; +} + +#ifndef __USE_FILE_OFFSET64 +// Programs built with _LARGEFILE64_SOURCE call this name. With _FILE_OFFSET_BITS=64 (the 32-bit ARM +// build) the headers already export the definition above as tmpfile64. +FILE *tmpfile64(void) { + return tmpfile(); +} +#endif + +// Hook opendir +DIR *opendir(const char *name) { + static DIR *(*orig_opendir)(const char *) = NULL; + if (!orig_opendir) orig_opendir = (DIR *(*)(const char *))dlsym(RTLD_NEXT, "opendir"); + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(name, buf, sizeof(buf)); + return orig_opendir(target); +} + +// Hook stat +int stat(const char *pathname, struct stat *statbuf) { + static int (*orig_stat)(const char *, struct stat *) = NULL; + if (!orig_stat) orig_stat = (int (*)(const char *, struct stat *))dlsym(RTLD_NEXT, "stat"); + char buf[PATH_MAX]; + const char *target = rewrite_path_follow(pathname, buf, sizeof(buf)); + int ret = orig_stat ? orig_stat(target, statbuf) : -1; + if (ret != 0 && errno == ENOENT) { + char alt[PATH_MAX]; + const char *retry = usrmerge_retry_path(target, alt, sizeof(alt)); + if (retry) ret = orig_stat(retry, statbuf); + } + if (ret == 0) apply_stat_emulation(statbuf); + return ret; +} + +// Hook lstat +int lstat(const char *pathname, struct stat *statbuf) { + static int (*orig_lstat)(const char *, struct stat *) = NULL; + if (!orig_lstat) orig_lstat = (int (*)(const char *, struct stat *))dlsym(RTLD_NEXT, "lstat"); + char buf[PATH_MAX]; + const char *target = rewrite_path(pathname, buf, sizeof(buf)); + int ret = orig_lstat ? orig_lstat(target, statbuf) : -1; + char alt[PATH_MAX]; + if (ret != 0 && errno == ENOENT) { + const char *retry = usrmerge_retry_path(target, alt, sizeof(alt)); + if (retry) { + ret = orig_lstat(retry, statbuf); + if (ret == 0) target = retry; + } + } + if (ret == 0 && statbuf && S_ISLNK(statbuf->st_mode) && g_ddnatv_root[0] != '\0' && target && + readlink_result_may_change(pathname, (long long)statbuf->st_size)) { + char link_buf[PATH_MAX]; + static ssize_t (*orig_readlink)(const char *, char *, size_t) = NULL; + if (!orig_readlink) orig_readlink = (ssize_t (*)(const char *, char *, size_t))dlsym(RTLD_NEXT, "readlink"); + ssize_t llen = orig_readlink ? orig_readlink(target, link_buf, sizeof(link_buf) - 1) : -1; + if (llen > 0) { + ssize_t post_len = postprocess_readlink(pathname, link_buf, llen, sizeof(link_buf)); + if (post_len > 0) { + statbuf->st_size = post_len; + } + } + } + if (ret == 0) apply_stat_emulation(statbuf); + return ret; +} + +// Hook fstatat +int fstatat(int dirfd, const char *pathname, struct stat *statbuf, int flags) { + static int (*orig_fstatat)(int, const char *, struct stat *, int) = NULL; + if (!orig_fstatat) orig_fstatat = (int (*)(int, const char *, struct stat *, int))dlsym(RTLD_NEXT, "fstatat"); + DDNATV_AT_REMAP(dirfd, pathname); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? ((flags & AT_SYMLINK_NOFOLLOW) ? rewrite_path : rewrite_path_follow)(pathname, buf, sizeof(buf)) : pathname; + int ret = orig_fstatat ? orig_fstatat(dirfd, target, statbuf, flags) : -1; + char alt[PATH_MAX]; + if (ret != 0 && errno == ENOENT && pathname && pathname[0] == '/') { + const char *retry = usrmerge_retry_path(target, alt, sizeof(alt)); + if (retry) { + ret = orig_fstatat(dirfd, retry, statbuf, flags); + if (ret == 0) target = retry; + } + } + if (ret == 0 && statbuf && (flags & AT_SYMLINK_NOFOLLOW) && S_ISLNK(statbuf->st_mode) && g_ddnatv_root[0] != '\0' && target && + readlink_result_may_change(pathname, (long long)statbuf->st_size)) { + char link_buf[PATH_MAX]; + static ssize_t (*orig_readlinkat)(int, const char *, char *, size_t) = NULL; + if (!orig_readlinkat) orig_readlinkat = (ssize_t (*)(int, const char *, char *, size_t))dlsym(RTLD_NEXT, "readlinkat"); + ssize_t llen = orig_readlinkat ? orig_readlinkat(dirfd, target, link_buf, sizeof(link_buf) - 1) : -1; + if (llen > 0) { + ssize_t post_len = postprocess_readlink(pathname, link_buf, llen, sizeof(link_buf)); + if (post_len > 0) { + statbuf->st_size = post_len; + } + } + } + if (ret == 0) apply_stat_emulation(statbuf); + return ret; +} + +// Hook fstat +int fstat(int fd, struct stat *statbuf) { + static int (*orig_fstat)(int, struct stat *) = NULL; + if (!orig_fstat) orig_fstat = (int (*)(int, struct stat *))dlsym(RTLD_NEXT, "fstat"); + int ret = orig_fstat ? orig_fstat(fd, statbuf) : -1; + if (ret == 0) apply_stat_emulation(statbuf); + return ret; +} + +// Glibc __xstat compatibility hooks, what programs built against glibc before 2.33 call (Firefox): +// they present owners like stat() does, or Firefox saw $HOME owned by the app's uid while geteuid() +// said 0 and refused to start ("as root in a regular user's session"). +int __xstat(int ver, const char *pathname, struct stat *statbuf) { + static int (*orig___xstat)(int, const char *, struct stat *) = NULL; + if (!orig___xstat) orig___xstat = (int (*)(int, const char *, struct stat *))dlsym(RTLD_NEXT, "__xstat"); + if (!orig___xstat) return stat(pathname, statbuf); + char buf[PATH_MAX]; + int ret = orig___xstat(ver, rewrite_path_follow(pathname, buf, sizeof(buf)), statbuf); + if (ret == 0) apply_stat_emulation(statbuf); + return ret; +} + +int __xstat64(int ver, const char *pathname, struct stat64 *statbuf) { + static int (*orig___xstat64)(int, const char *, struct stat64 *) = NULL; + if (!orig___xstat64) orig___xstat64 = (int (*)(int, const char *, struct stat64 *))dlsym(RTLD_NEXT, "__xstat64"); + if (!orig___xstat64) return stat(pathname, (struct stat *)statbuf); + char buf[PATH_MAX]; + int ret = orig___xstat64(ver, rewrite_path_follow(pathname, buf, sizeof(buf)), statbuf); + if (ret == 0) apply_stat_emulation((struct stat *)statbuf); + return ret; +} + +int __lxstat(int ver, const char *pathname, struct stat *statbuf) { + static int (*orig___lxstat)(int, const char *, struct stat *) = NULL; + if (!orig___lxstat) orig___lxstat = (int (*)(int, const char *, struct stat *))dlsym(RTLD_NEXT, "__lxstat"); + if (!orig___lxstat) return lstat(pathname, statbuf); + char buf[PATH_MAX]; + int ret = orig___lxstat(ver, rewrite_path(pathname, buf, sizeof(buf)), statbuf); + if (ret == 0) apply_stat_emulation(statbuf); + return ret; +} + +int __lxstat64(int ver, const char *pathname, struct stat64 *statbuf) { + static int (*orig___lxstat64)(int, const char *, struct stat64 *) = NULL; + if (!orig___lxstat64) orig___lxstat64 = (int (*)(int, const char *, struct stat64 *))dlsym(RTLD_NEXT, "__lxstat64"); + if (!orig___lxstat64) return lstat(pathname, (struct stat *)statbuf); + char buf[PATH_MAX]; + int ret = orig___lxstat64(ver, rewrite_path(pathname, buf, sizeof(buf)), statbuf); + if (ret == 0) apply_stat_emulation((struct stat *)statbuf); + return ret; +} + +int __fxstat(int ver, int fd, struct stat *statbuf) { + static int (*orig___fxstat)(int, int, struct stat *) = NULL; + if (!orig___fxstat) orig___fxstat = (int (*)(int, int, struct stat *))dlsym(RTLD_NEXT, "__fxstat"); + if (!orig___fxstat) return fstat(fd, statbuf); + int ret = orig___fxstat(ver, fd, statbuf); + if (ret == 0) apply_stat_emulation(statbuf); + return ret; +} + +int __fxstat64(int ver, int fd, struct stat64 *statbuf) { + static int (*orig___fxstat64)(int, int, struct stat64 *) = NULL; + if (!orig___fxstat64) orig___fxstat64 = (int (*)(int, int, struct stat64 *))dlsym(RTLD_NEXT, "__fxstat64"); + if (!orig___fxstat64) return fstat(fd, (struct stat *)statbuf); + int ret = orig___fxstat64(ver, fd, statbuf); + if (ret == 0) apply_stat_emulation((struct stat *)statbuf); + return ret; +} + +int __fxstatat(int ver, int dirfd, const char *pathname, struct stat *statbuf, int flags) { + static int (*orig___fxstatat)(int, int, const char *, struct stat *, int) = NULL; + if (!orig___fxstatat) orig___fxstatat = (int (*)(int, int, const char *, struct stat *, int))dlsym(RTLD_NEXT, "__fxstatat"); + if (!orig___fxstatat) return fstatat(dirfd, pathname, statbuf, flags); + DDNATV_AT_REMAP(dirfd, pathname); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? ((flags & AT_SYMLINK_NOFOLLOW) ? rewrite_path : rewrite_path_follow)(pathname, buf, sizeof(buf)) : pathname; + int ret = orig___fxstatat(ver, dirfd, target, statbuf, flags); + if (ret == 0) apply_stat_emulation(statbuf); + return ret; +} + +int __fxstatat64(int ver, int dirfd, const char *pathname, struct stat64 *statbuf, int flags) { + static int (*orig___fxstatat64)(int, int, const char *, struct stat64 *, int) = NULL; + if (!orig___fxstatat64) orig___fxstatat64 = (int (*)(int, int, const char *, struct stat64 *, int))dlsym(RTLD_NEXT, "__fxstatat64"); + if (!orig___fxstatat64) return fstatat(dirfd, pathname, (struct stat *)statbuf, flags); + DDNATV_AT_REMAP(dirfd, pathname); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? ((flags & AT_SYMLINK_NOFOLLOW) ? rewrite_path : rewrite_path_follow)(pathname, buf, sizeof(buf)) : pathname; + int ret = orig___fxstatat64(ver, dirfd, target, statbuf, flags); + if (ret == 0) apply_stat_emulation((struct stat *)statbuf); + return ret; +} + +// Hook statx +int statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf) { + // Rust's standard library asks whether statx exists by calling it with a NULL path and buffer + // (EFAULT means it does). glibc's header declares both as nonnull, so the compiler would drop + // the NULL check below and read the path: every Rust program (rg, rustc, cargo...) crashed. + __asm__ volatile("" : "+r"(pathname), "+r"(statxbuf)); + static int (*orig_statx)(int, const char *, int, unsigned int, struct statx *) = NULL; + if (!orig_statx) orig_statx = (int (*)(int, const char *, int, unsigned int, struct statx *))dlsym(RTLD_NEXT, "statx"); + DDNATV_AT_REMAP(dirfd, pathname); + char buf[PATH_MAX]; + const char *target = (pathname && pathname[0] == '/') ? ((flags & AT_SYMLINK_NOFOLLOW) ? rewrite_path : rewrite_path_follow)(pathname, buf, sizeof(buf)) : pathname; + int ret = orig_statx ? orig_statx(dirfd, target, flags, mask, statxbuf) : -1; + if (ret == 0 && statxbuf && hardlinks_maybe_any()) { + const unsigned int needed = STATX_INO | STATX_NLINK | STATX_MTIME; + struct statx full; + const struct statx *sx = statxbuf; + if ((statxbuf->stx_mask & needed) != needed) { + // The caller asked for less ("stat -c %h" for the link count only): what an emulated + // link is recognized by + int saved_errno = errno; + sx = orig_statx(dirfd, target, flags, needed, &full) == 0 && (full.stx_mask & needed) == needed ? &full : NULL; + errno = saved_errno; + } + if (sx) { + struct stat st; + memset(&st, 0, sizeof(st)); + st.st_dev = makedev(sx->stx_dev_major, sx->stx_dev_minor); + st.st_ino = sx->stx_ino; + st.st_nlink = sx->stx_nlink; + st.st_mtim.tv_sec = sx->stx_mtime.tv_sec; + st.st_mtim.tv_nsec = sx->stx_mtime.tv_nsec; + apply_emulated_hardlink(&st); + if (st.st_ino != sx->stx_ino || st.st_nlink != sx->stx_nlink) { + statxbuf->stx_ino = st.st_ino; + statxbuf->stx_nlink = st.st_nlink; + statxbuf->stx_mask |= STATX_INO | STATX_NLINK; + } + } + } + if (ret == 0 && statxbuf) { + uid_t uid = (uid_t)statxbuf->stx_uid; + gid_t gid = (gid_t)statxbuf->stx_gid; + present_owner_as_root((statxbuf->stx_mask & STATX_UID) ? &uid : NULL, (statxbuf->stx_mask & STATX_GID) ? &gid : NULL); + statxbuf->stx_uid = (uint32_t)uid; + statxbuf->stx_gid = (uint32_t)gid; + } + return ret; +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/go_programs.c b/tools/nativeguest/hook/go_programs.c new file mode 100644 index 0000000000..987d0132ee --- /dev/null +++ b/tools/nativeguest/hook/go_programs.c @@ -0,0 +1,465 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Static Go programs: they make their system calls themselves, so Ubuntu's paths mean nothing to +// them. The code of gosys/gosys.c is added to their file. + +// ---- Static Go programs ------------------------------------------------------------------- +// A Go program built without cgo (all of Ubuntu's, and the single files downloaded from a project's +// releases) has no C library: the preloaded hook is never loaded into it, so "/etc/resolv.conf" is +// a file of Android's that does not exist, and so is every program it starts. Go makes all of its +// system calls but a few of its runtime's in one assembly function, internal/runtime/syscall. +// Syscall6, which loads the number and the arguments from the stack and executes "svc #0". +// +// Before such a program (AArch64, Go 1.19 or newer) starts, The native userland changes its file in place, once: +// - the code of gosys/gosys.c is put after the program's code, in the zero padding that the Go +// linker leaves between its segments (the segment is made longer, and executable if it only +// was readable), +// - zero-filled memory for it is added to the end of the program's data segment, +// - the "svc #0" of Syscall6 becomes a branch to a few instructions in that code, which call it +// and go back to the instruction after the "svc". +// The code maps the paths of the calls into the rootfs, as the hook does for C programs, and starts +// the programs of the rootfs through the hook. The file keeps its size, its times and its mode; +// only the program headers, the padding and one instruction differ. The file is changed back and +// patched again when the code of a newer The native userland differs (the trailer says what to undo). + +#ifdef DDNATV_HAVE_GOSYS + +#define GO_MAX_PH 32 +#define GO_PF_X 1u +#define GO_PF_W 2u +#define GO_ET_EXEC 2 +#define GO_ET_DYN 3 + +struct go_ph { + uint32_t type, flags; + uint64_t offset, vaddr, filesz, memsz; + uint64_t pos; // where the entry is in the file +}; + +static uint64_t go_rd64(const unsigned char *p) { return (uint64_t)rd32(p) | ((uint64_t)rd32(p + 4) << 32); } +static void go_wr64(unsigned char *p, uint64_t v) { wr32(p, (uint32_t)v); wr32(p + 4, (uint32_t)(v >> 32)); } + +// The program headers of a 64-bit little-endian ELF; their number, or -1 +static int go_read_phdrs(int fd, struct go_ph *ph, uint16_t *etype, uint16_t *machine) { + unsigned char eh[64]; + if (pread(fd, eh, sizeof(eh), 0) != (ssize_t)sizeof(eh) || memcmp(eh, "\x7f" "ELF", 4) != 0 || eh[4] != 2 || eh[5] != 1) + return -1; + *etype = rd16(eh + 16); + *machine = rd16(eh + 18); + uint64_t phoff = go_rd64(eh + 32); + uint16_t phentsize = rd16(eh + 54), phnum = rd16(eh + 56); + if (phentsize != 56 || phnum == 0 || phnum > GO_MAX_PH) return -1; + for (int i = 0; i < phnum; i++) { + unsigned char e[56]; + uint64_t pos = phoff + (uint64_t)i * 56; + if (pread(fd, e, sizeof(e), (off_t)pos) != (ssize_t)sizeof(e)) return -1; + ph[i].type = rd32(e); + ph[i].flags = rd32(e + 4); + ph[i].offset = go_rd64(e + 8); + ph[i].vaddr = go_rd64(e + 16); + ph[i].filesz = go_rd64(e + 32); + ph[i].memsz = go_rd64(e + 40); + ph[i].pos = pos; + } + return phnum; +} + +// The instructions of Syscall6 up to its system call: x8 and x0 to x5 loaded from the stack +// (ldr x8, [sp, #8]; ldr x0, [sp, #16] ... ldr x5, [sp, #56]), then "svc #0" and "cmn x0, #4095" +static const uint32_t k_go_syscall6[7] = { + 0xf94007e8u, 0xf9400be0u, 0xf9400fe1u, 0xf94013e2u, 0xf94017e3u, 0xf9401be4u, 0xf9401fe5u, +}; +#define GO_SVC 0xd4000001u +#define GO_CMN_X0_4095 0xb13ffc1fu + +// Where Syscall6 makes its call: the file offset of the instruction after the seven loads (the +// "svc #0", or the branch that replaced it). *found counts the places; the first is returned. +static int64_t go_find_syscall6(int fd, const struct go_ph *ph, int n, int *found) { + int64_t first = -1; + *found = 0; + enum { CHUNK = 1 << 20, KEEP = 36 }; + unsigned char *buf = (unsigned char *)malloc(CHUNK + KEEP); + if (!buf) return -1; + for (int i = 0; i < n; i++) { + if (ph[i].type != 1 /* PT_LOAD */ || !(ph[i].flags & GO_PF_X) || ph[i].filesz == 0) continue; + uint64_t pos = 0; + while (pos < ph[i].filesz) { + uint64_t want = ph[i].filesz - pos; + if (want > CHUNK + KEEP) want = CHUNK + KEEP; + ssize_t got = pread(fd, buf, (size_t)want, (off_t)(ph[i].offset + pos)); + if (got <= KEEP) break; + for (ssize_t o = 0; o + 36 <= got; o += 4) { + if (rd32(buf + o) != k_go_syscall6[0]) continue; + int same = 1; + for (int k = 1; k < 7 && same; k++) same = rd32(buf + o + 4 * k) == k_go_syscall6[k]; + if (!same || rd32(buf + o + 32) != GO_CMN_X0_4095) continue; + if (*found == 0) first = (int64_t)(ph[i].offset + pos + (uint64_t)o + 28); + (*found)++; + } + if (pos + (uint64_t)got >= ph[i].filesz) break; + pos += (uint64_t)got - (KEEP - 4); // the next chunk starts where the last place of this could begin, no place is split or counted twice + } + } + free(buf); + return first; +} + +// "b " / "bl " for a distance in bytes, or 0 when it does not fit +static uint32_t go_branch(uint32_t base, int64_t delta) { + if ((delta & 3) != 0 || delta >= (1LL << 27) || delta < -(1LL << 27)) return 0; + return base | (uint32_t)((delta >> 2) & 0x3ffffff); +} + +static uint64_t go_align_up(uint64_t v, uint64_t a) { return (v + a - 1) & ~(a - 1); } + +// The strings the added code needs, as they are now +static int go_make_header(struct gosys_hdr *h) { + if (g_ddnatv_root_len == 0 || g_ddnatv_root_len >= GOSYS_ROOT_MAX) return -1; + memcpy(h->root, g_ddnatv_root, g_ddnatv_root_len); + h->root_len = (uint32_t)g_ddnatv_root_len; + + char buf[PATH_MAX]; + if (find_dynamic_linker_for_machine(g_ddnatv_root, EM_AARCH64, buf, sizeof(buf)) && strlen(buf) < GOSYS_PATH_MAX) { + h->ldso_len = (uint32_t)strlen(buf); + memcpy(h->ldso, buf, h->ldso_len); + } + static const char *const hooks[] = { "/usr/lib/libddnatv-hook.so", "/lib/libddnatv-hook.so" }; + for (size_t i = 0; i < sizeof(hooks) / sizeof(hooks[0]); i++) { + size_t n = ddnatv_append(buf, sizeof(buf), 0, g_ddnatv_root, g_ddnatv_root_len); + n = ddnatv_append(buf, sizeof(buf), n, hooks[i], strlen(hooks[i])); + if (n < GOSYS_PATH_MAX && access(buf, F_OK) == 0) { + h->hook_len = (uint32_t)n; + memcpy(h->hook, buf, n); + break; + } + } + // The program that starts the others: bash, which can give them the argv[0] they are asked for + static const char *const runners[] = { "/usr/bin/bash", "/bin/bash", "/usr/bin/env", "/bin/env" }; + for (size_t i = 0; i < sizeof(runners) / sizeof(runners[0]); i++) { + size_t n = ddnatv_append(buf, sizeof(buf), 0, g_ddnatv_root, g_ddnatv_root_len); + n = ddnatv_append(buf, sizeof(buf), n, runners[i], strlen(runners[i])); + if (n < GOSYS_PATH_MAX && access(buf, F_OK) == 0) { + h->runner_len = (uint32_t)n; + memcpy(h->runner, buf, n); + if (i < 2) h->flags |= GOSYS_FLAG_RUNNER_IS_BASH; + break; + } + } + // The directories the programs of an AArch64 rootfs load their libraries from + static const int dirs[] = { 0, 1, 4, 5, 6 }; + size_t used = 0; + for (size_t i = 0; i < sizeof(dirs) / sizeof(dirs[0]); i++) { + const char *d = k_rootfs_lib_dirs[dirs[i]]; + if (i > 0) used = ddnatv_append(buf, sizeof(buf), used, ":", 1); + used = ddnatv_append(buf, sizeof(buf), used, g_ddnatv_root, g_ddnatv_root_len); + used = ddnatv_append(buf, sizeof(buf), used, d, strlen(d)); + } + if (used < GOSYS_LIBS_MAX) { + h->libs_len = (uint32_t)used; + memcpy(h->libs, buf, used); + } + if (h->ldso_len == 0 || h->runner_len == 0) h->runner_len = 0; // Ubuntu programs cannot be started + return 0; +} + +static int go_pwrite_all(int fd, const void *buf, size_t len, uint64_t off) { + return pwrite(fd, buf, len, (off_t)off) == (ssize_t)len ? 0 : -1; +} + +static int go_open_for_write(int fd, const struct stat *st, const char *path, int *made_writable) { + int wfd = open(path, O_WRONLY | O_CLOEXEC); + if (wfd < 0 && errno == EACCES && fchmod(fd, (st->st_mode | S_IWUSR) & 07777) == 0) { + *made_writable = 1; + wfd = open(path, O_WRONLY | O_CLOEXEC); + } + return wfd; // ETXTBSY: the program is running right now, patched at its next start +} + +// The bytes of the added code for a given place: the code with its header (the strings, and where +// the scratch memory is), the instructions that connect the call site to it, and the trailer that +// says what was changed to put it there. +static void go_build_image(unsigned char *img, const struct gosys_hdr *strings, uint64_t cave_v, uint64_t scratch_v, + uint32_t to_entry, uint32_t back, const struct gosys_trailer *info) { + memcpy(img, gosys_blob, GOSYS_BLOB_SIZE); + struct gosys_hdr h = *strings; + h.scratch_rel = (int64_t)scratch_v - (int64_t)cave_v; + memcpy(img, &h, sizeof(h)); + unsigned char *th = img + GOSYS_THUNKS_OFF; + wr32(th + 0, 0xd10043ffu); // sub sp, sp, #16 + wr32(th + 4, 0xf90003feu); // str x30, [sp] + wr32(th + 8, 0xaa0803e7u); // mov x7, x8 (the number is the eighth argument) + wr32(th + 12, to_entry); // bl entry + wr32(th + 16, 0xf94003feu); // ldr x30, [sp] + wr32(th + 20, 0x910043ffu); // add sp, sp, #16 + wr32(th + 24, back); // b + struct gosys_trailer t; + memcpy(&t, img + GOSYS_BLOB_SIZE - sizeof(t), sizeof(t)); + t.version = GOSYS_VERSION; + t.total_size = GOSYS_BLOB_SIZE; + t.text_orig_filesz = info->text_orig_filesz; + t.text_orig_flags = info->text_orig_flags; + t.rw_orig_memsz = info->rw_orig_memsz; + t.text_index = info->text_index; + t.rw_index = info->rw_index; + t.site_file_off = info->site_file_off; + memcpy(img + GOSYS_BLOB_SIZE - sizeof(t), &t, sizeof(t)); +} + +// A short fingerprint of the added code, so that a program patched by an older The native userland is looked at +// again (the marker of a prepared program has it) +static uint32_t go_blob_fingerprint(void) { + static uint32_t fp; + if (fp == 0) { + uint32_t h = 2166136261u; + for (size_t i = 0; i < GOSYS_BLOB_SIZE; i++) h = (h ^ gosys_blob[i]) * 16777619u; + fp = h ? h : 1; + } + return fp; +} + +// Gives the program its old segments and call back: the added code is zeroed, the data segment +// is shortened, the instruction is a "svc #0" again. +static int go_undo(int wfd, struct go_ph *ph, int cave_seg, const struct gosys_trailer *tr, int64_t site_off) { + uint64_t cave_off = ph[cave_seg].offset + ph[cave_seg].filesz - tr->total_size; + unsigned char word[4]; + wr32(word, GO_SVC); + if (go_pwrite_all(wfd, word, 4, (uint64_t)site_off) != 0) return -1; + unsigned char sz[16]; + go_wr64(sz, tr->text_orig_filesz); + go_wr64(sz + 8, tr->text_orig_filesz); + if (go_pwrite_all(wfd, sz, 16, ph[cave_seg].pos + 32) != 0) return -1; + wr32(word, tr->text_orig_flags); + if (go_pwrite_all(wfd, word, 4, ph[cave_seg].pos + 4) != 0) return -1; + if (tr->rw_index < GO_MAX_PH) { + unsigned char mem[8]; + go_wr64(mem, tr->rw_orig_memsz); + if (go_pwrite_all(wfd, mem, 8, ph[tr->rw_index].pos + 40) != 0) return -1; + } + unsigned char *zero = (unsigned char *)calloc(1, tr->total_size); + if (!zero) return -1; + int rc = go_pwrite_all(wfd, zero, tr->total_size, cave_off); + free(zero); + return rc; +} + +// DDNATV_NO_GOSYS=1 (any value but empty or 0): no code is added to Go programs, and the code that is +// in one is taken out again, so that a program can be run as it was built, to see whether a fault +// is the program's or the code's. The marker of a prepared program says it (static_marker). +static int go_disabled(void) { + const char *v = getenv("DDNATV_NO_GOSYS"); + return v && v[0] != '\0' && strcmp(v, "0") != 0; +} + +// The three branches that connect the call site and the code: site -> thunk, thunk -> entry (bl), +// thunk -> the instruction after the site. 0 when one of them is too far. +static int go_branches(uint64_t cave_v, uint64_t site_v, uint32_t *to_thunk, uint32_t *to_entry, uint32_t *back) { + uint64_t thunk_v = cave_v + GOSYS_THUNKS_OFF; + *to_thunk = go_branch(0x14000000u, (int64_t)thunk_v - (int64_t)site_v); + *to_entry = go_branch(0x94000000u, (int64_t)(cave_v + GOSYS_ENTRY_OFF) - (int64_t)(thunk_v + 12)); + *back = go_branch(0x14000000u, (int64_t)(site_v + 4) - (int64_t)(thunk_v + 24)); + return *to_thunk && *to_entry && *back; +} + +// Adds the code to the program, or brings it up to date. Returns 1 when it changed the file, 0 when +// there was nothing to do (not a Go program of a kind the code can serve, or already done), -1 when +// the file could not be changed (it is started as it is). +static int prepare_go_program(int fd, const char *path, const struct stat *st) { + struct go_ph ph[GO_MAX_PH]; + uint16_t etype = 0, machine = 0; + int n = go_read_phdrs(fd, ph, &etype, &machine); + if (n < 0) return -1; + if (machine != EM_AARCH64 || (etype != GO_ET_EXEC && etype != GO_ET_DYN)) return 0; + + int found = 0; + int64_t site_off = go_find_syscall6(fd, ph, n, &found); + if (found != 1) return 0; // not a Go of 1.19 or newer (or its function is not there once) + + // The loadable segments, by address + int order[GO_MAX_PH], nl = 0; + for (int i = 0; i < n; i++) { + if (ph[i].type != 1 /* PT_LOAD */) continue; + int k = nl++; + while (k > 0 && ph[order[k - 1]].vaddr > ph[i].vaddr) { + order[k] = order[k - 1]; + k--; + } + order[k] = i; + } + if (nl < 2) return 0; + + // The call site must be in a segment that is mapped as code + uint64_t site_v = 0; + for (int i = 0; i < nl; i++) { + const struct go_ph *s = &ph[order[i]]; + if ((s->flags & GO_PF_X) && (uint64_t)site_off >= s->offset && (uint64_t)site_off < s->offset + s->filesz) + site_v = s->vaddr + ((uint64_t)site_off - s->offset); + } + if (site_v == 0) return 0; + + struct gosys_hdr strings; + memset(&strings, 0, sizeof(strings)); + memcpy(strings.magic, "CXGOSYS1", 8); + strings.version = GOSYS_VERSION; + if (go_make_header(&strings) != 0) return 0; + + unsigned char *img = (unsigned char *)malloc(GOSYS_BLOB_SIZE); + unsigned char *have = (unsigned char *)malloc(GOSYS_BLOB_SIZE); + if (!img || !have) { + free(img); + free(have); + return -1; + } + int wfd = -1, made_writable = 0, changed = 0, rc = 0; + unsigned char word[4]; + + // An earlier run's code: it ends the segment it is in, and says what it changed + int cave_seg = -1; + struct gosys_trailer tr; + memset(&tr, 0, sizeof(tr)); + for (int i = 0; i < nl && cave_seg < 0; i++) { + const struct go_ph *s = &ph[order[i]]; + if (s->filesz < sizeof(tr) + sizeof(struct gosys_hdr)) continue; + struct gosys_trailer t; + if (pread(fd, &t, sizeof(t), (off_t)(s->offset + s->filesz - sizeof(t))) != (ssize_t)sizeof(t)) continue; + if (memcmp(t.magic, "CXGOEND1", 8) != 0 || t.total_size > s->filesz || t.total_size < sizeof(t) + sizeof(struct gosys_hdr)) continue; + tr = t; + cave_seg = order[i]; + } + + if (go_disabled()) { + if (cave_seg >= 0) { + wfd = go_open_for_write(fd, st, path, &made_writable); + if (wfd < 0) { + rc = -1; + } else { + rc = go_undo(wfd, ph, cave_seg, &tr, site_off); + changed = rc == 0; + } + } + goto done; + } + + if (cave_seg >= 0) { + uint64_t cave_off = ph[cave_seg].offset + ph[cave_seg].filesz - tr.total_size; + uint64_t cave_v = ph[cave_seg].vaddr + (cave_off - ph[cave_seg].offset); + int same = 0, site_ok = 0; + uint32_t to_thunk = 0, to_entry = 0, back = 0; + // Is it what would be put there now? (the code of an older The native userland differs) + if (tr.total_size == GOSYS_BLOB_SIZE && tr.rw_index < (uint32_t)n && ph[tr.rw_index].type == 1 && + go_branches(cave_v, site_v, &to_thunk, &to_entry, &back)) { + uint64_t scratch_v = go_align_up(ph[tr.rw_index].vaddr + tr.rw_orig_memsz, 64); + go_build_image(img, &strings, cave_v, scratch_v, to_entry, back, &tr); + same = pread(fd, have, GOSYS_BLOB_SIZE, (off_t)cave_off) == (ssize_t)GOSYS_BLOB_SIZE && + memcmp(have, img, GOSYS_BLOB_SIZE) == 0 && + ph[tr.rw_index].memsz == scratch_v - ph[tr.rw_index].vaddr + GOSYS_SCRATCH_SIZE; + } + unsigned char cur[4]; + site_ok = same && pread(fd, cur, 4, (off_t)site_off) == 4 && rd32(cur) == to_thunk; + if (same && site_ok) goto done; + + wfd = go_open_for_write(fd, st, path, &made_writable); + if (wfd < 0) { + rc = -1; + goto done; + } + if (same) { + // The code is there, only the branch is not (a patch that was cut short) + wr32(word, to_thunk); + rc = go_pwrite_all(wfd, word, 4, (uint64_t)site_off); + changed = rc == 0; + goto done; + } + // An older code, or other strings: back to the plain program, then patch again + if (go_undo(wfd, ph, cave_seg, &tr, site_off) != 0) { + rc = -1; + goto done; + } + close(wfd); + wfd = -1; + if (made_writable) fchmod(fd, st->st_mode & 07777); + free(img); + free(have); + return prepare_go_program(fd, path, st); + } + + // A place for the code: the end of a segment that is followed by padding up to the next one + uint64_t total = GOSYS_BLOB_SIZE; + int text = -1; + uint64_t cave_v = 0, cave_off = 0; + for (int pass = 0; pass < 2 && text < 0; pass++) { + for (int k = 0; k + 1 < nl && text < 0; k++) { + const struct go_ph *s = &ph[order[k]], *nx = &ph[order[k + 1]]; + if (pass == 0 ? !(s->flags & GO_PF_X) : (s->flags & GO_PF_W)) continue; + if (s->memsz != s->filesz || s->filesz == 0) continue; + uint64_t v = go_align_up(s->vaddr + s->filesz, 64); + uint64_t off = s->offset + (v - s->vaddr); + if (v + total > nx->vaddr || (nx->vaddr & 0x3fff) != 0) continue; + if (off + total > nx->offset || off + total > (uint64_t)st->st_size) continue; + // Only padding may be written over + uint64_t pad_from = s->offset + s->filesz, pad_len = off + total - pad_from; + unsigned char *pad = (unsigned char *)malloc(pad_len); + if (!pad) continue; + int zero = pread(fd, pad, pad_len, (off_t)pad_from) == (ssize_t)pad_len; + for (uint64_t i = 0; zero && i < pad_len; i++) zero = pad[i] == 0; + free(pad); + if (!zero) continue; + text = order[k]; + cave_v = v; + cave_off = off; + } + } + int rw = order[nl - 1]; + uint32_t to_thunk = 0, to_entry = 0, back = 0; + if (text < 0 || !(ph[rw].flags & GO_PF_W) || rw == text || !go_branches(cave_v, site_v, &to_thunk, &to_entry, &back)) goto done; + + uint64_t scratch_v = go_align_up(ph[rw].vaddr + ph[rw].memsz, 64); + struct gosys_trailer info; + memset(&info, 0, sizeof(info)); + info.text_orig_filesz = ph[text].filesz; + info.text_orig_flags = ph[text].flags; + info.rw_orig_memsz = ph[rw].memsz; + info.text_index = (uint32_t)text; + info.rw_index = (uint32_t)rw; + info.site_file_off = (uint64_t)site_off; + go_build_image(img, &strings, cave_v, scratch_v, to_entry, back, &info); + + wfd = go_open_for_write(fd, st, path, &made_writable); + if (wfd < 0) { + rc = -1; + goto done; + } + // The code first and the call site last: whatever is cut short leaves a program that runs + unsigned char sz[16]; + unsigned char mem[8]; + go_wr64(mem, scratch_v - ph[rw].vaddr + GOSYS_SCRATCH_SIZE); + go_wr64(sz, cave_v + GOSYS_BLOB_SIZE - ph[text].vaddr); + go_wr64(sz + 8, cave_v + GOSYS_BLOB_SIZE - ph[text].vaddr); + rc = go_pwrite_all(wfd, img, GOSYS_BLOB_SIZE, cave_off); + if (rc == 0) rc = go_pwrite_all(wfd, mem, 8, ph[rw].pos + 40); + if (rc == 0) rc = go_pwrite_all(wfd, sz, 16, ph[text].pos + 32); + if (rc == 0 && !(ph[text].flags & GO_PF_X)) { + wr32(word, ph[text].flags | GO_PF_X); + rc = go_pwrite_all(wfd, word, 4, ph[text].pos + 4); + } + if (rc == 0) { + wr32(word, to_thunk); + rc = go_pwrite_all(wfd, word, 4, (uint64_t)site_off); + } + changed = rc == 0; + +done: + free(img); + free(have); + if (wfd >= 0) { + // Keep the times: make and friends must not see a rebuilt program. + const struct timespec times[2] = { st->st_atim, st->st_mtim }; + futimens(wfd, times); + close(wfd); + } + if (made_writable) fchmod(fd, st->st_mode & 07777); + if (rc != 0) return -1; + return changed ? 1 : 0; +} + +#endif /* DDNATV_HAVE_GOSYS */ diff --git a/tools/nativeguest/hook/hardlinks.c b/tools/nativeguest/hook/hardlinks.c new file mode 100644 index 0000000000..ed8a32f7b2 --- /dev/null +++ b/tools/nativeguest/hook/hardlinks.c @@ -0,0 +1,628 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Hard links: link() falls back to a copy that reports the link count of a real link, in every +// process of the rootfs. + +// Emulated hard links. Android does not let apps create hard links, so link() falls back to a copy +// (ddnatv_emulate_hardlinkat). Programs that check the result through the link count, such as the +// lock files of shadow (link(file.PID, file.lock), then stat(file.PID).st_nlink == 2), and those +// that look for files linked to each other (tar, rsync -H, du, find -samefile), are shown what a +// real link would give: every copy of one emulated link reports the inode number of the original +// and the number of copies as its link count. +// +// The copies are recorded in a table that every process of the rootfs maps +// ($DDNATV_ROOT/var/lib/ddnatv/hardlinks), so "ln a b" in one process and "stat a" in the next +// agree, also after the app restarts. Copies are recorded by device and inode, so a relative name, +// an absolute name and an open descriptor of the same file all match, and with their modification +// time: a copy written to since (it no longer shares the original's content) or a new file that got +// the inode number of a removed copy (removed outside the hook, e.g. in root mode) do not match. +// +// Readers (every stat) take no lock: a sequence number that writers make odd while they change the +// table tells them to read again. Writers (link, unlink, rename) take an fcntl lock on the file. +// Without a rootfs (or when the file cannot be made) the table is private to the process and its +// children, as it was before. + +#define DDNATV_HL_MAGIC 0x6b6e6c43u // "Clnk" +#define DDNATV_HL_VERSION 1u +#define DDNATV_HL_SLOTS 8192u // a power of two +#define DDNATV_HL_MAX_USED 6144u // at most 3/4 full, so that lookups stay short +#define DDNATV_HL_EMPTY 0u +#define DDNATV_HL_USED 1u +#define DDNATV_HL_DELETED 2u + +typedef struct { + uint64_t dev, ino; // this copy + int64_t mtime_sec, mtime_nsec; // its modification time when it was linked (compared in whole + // seconds: stat() and statx() need not agree on the fraction) + uint64_t group_dev, group_ino; // the original, whose inode number every copy reports + uint32_t state; + uint32_t nlink; // copies in the group + uint32_t pad[2]; +} ddnatv_hl_slot_t; + +typedef struct { + uint32_t magic, version; + uint32_t seq; // odd while a writer changes the table + uint32_t used, deleted; + uint32_t pad[11]; + ddnatv_hl_slot_t slots[DDNATV_HL_SLOTS]; +} ddnatv_hl_table_t; + +// The file and the mapping, in whole 64 KB: a size that is a multiple of every page size +#define DDNATV_HL_MAP_SIZE ((sizeof(ddnatv_hl_table_t) + 0xffff) & ~(size_t)0xffff) + +static ddnatv_hl_table_t *g_hl_table = NULL; // set once, then never changed (until a test resets it) +static int g_hl_shared = 0; // mapped from the rootfs' file +static long g_hl_next_try = 0; // when to look for the file again (monotonic seconds) +static pthread_mutex_t g_hardlinks_lock = PTHREAD_MUTEX_INITIALIZER; + +#ifndef DDNATV_HOST_TEST +static void init_ddnatv_hook(void); +#endif + +static size_t hl_table_path(char *buf, size_t size) { +#ifndef DDNATV_HOST_TEST + // The rootfs is known once a path was rewritten; "ln a b" or "stat a" name only relative ones + init_ddnatv_hook(); +#endif + if (g_ddnatv_root_len == 0) return 0; + size_t n = ddnatv_append(buf, size, 0, g_ddnatv_root, g_ddnatv_root_len); + static const char rel[] = "/var/lib/ddnatv/hardlinks"; + n = ddnatv_append(buf, size, n, rel, sizeof(rel) - 1); + return n == g_ddnatv_root_len + sizeof(rel) - 1 ? n : 0; +} + +static long hl_now_seconds(void) { + struct timespec ts; +#ifdef CLOCK_MONOTONIC_COARSE + if (clock_gettime(CLOCK_MONOTONIC_COARSE, &ts) == 0) return (long)ts.tv_sec; +#endif + if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) return (long)ts.tv_sec; + return 0; +} + +static int hl_open_file(const char *path, int create) { + return (int)syscall(SYS_openat, AT_FDCWD, path, O_RDWR | O_CLOEXEC | (create ? O_CREAT : 0), 0600); +} + +// Takes the writers' lock on the table's file (blocking); -1 when there is no file to lock. +static int hl_lock_file(void) { + if (!g_hl_shared) return -1; + char path[PATH_MAX]; + if (!hl_table_path(path, sizeof(path))) return -1; + int fd = hl_open_file(path, 0); + if (fd < 0) return -1; + struct flock fl; + memset(&fl, 0, sizeof(fl)); + fl.l_type = F_WRLCK; + fl.l_whence = SEEK_SET; + while (fcntl(fd, F_SETLKW, &fl) != 0 && errno == EINTR) { + } + return fd; +} + +static void hl_unlock_file(int fd) { + if (fd >= 0) syscall(SYS_close, fd); // closing the file drops the lock +} + +static void hl_init_header(ddnatv_hl_table_t *t) { + memset(t, 0, sizeof(*t)); + t->version = DDNATV_HL_VERSION; + __atomic_store_n(&t->magic, DDNATV_HL_MAGIC, __ATOMIC_RELEASE); +} + +// The size of an open file. Not fstat(): this library's own fstat() looks into the table, which +// would wait for the lock that the caller holds. +static off_t hl_file_size(int fd) { + return lseek(fd, 0, SEEK_END); +} + +// Maps the table. Readers (create = 0) get NULL while no process has made the file yet, and look +// for it again a second later; writers make it, or fall back to a table of this process. Readers +// never wait for the lock (a stat() while it is held, or in a child forked while another thread +// held it, would wait forever): they find no table then. +static ddnatv_hl_table_t *hl_table(int create) { + ddnatv_hl_table_t *t = __atomic_load_n(&g_hl_table, __ATOMIC_ACQUIRE); + if (t) return t; + if (!create && __atomic_load_n(&g_hl_next_try, __ATOMIC_RELAXED) > hl_now_seconds()) return NULL; + int saved_errno = errno; + if (create) { + pthread_mutex_lock(&g_hardlinks_lock); + } else if (pthread_mutex_trylock(&g_hardlinks_lock) != 0) { + errno = saved_errno; + return NULL; + } + t = g_hl_table; + if (!t) { + char path[PATH_MAX]; + path[0] = '\0'; + int have_path = hl_table_path(path, sizeof(path)) != 0; + int fd = have_path ? hl_open_file(path, 0) : -1; + if (fd < 0 && create && path[0]) { + // var/lib/ddnatv may not exist yet + char dir[PATH_MAX]; + size_t n = ddnatv_append(dir, sizeof(dir), 0, path, strlen(path) - strlen("/hardlinks")); + if (n > 0) syscall(SYS_mkdirat, AT_FDCWD, dir, 0700); + fd = hl_open_file(path, 1); + } + if (fd >= 0) { + off_t size = hl_file_size(fd); + int ok = size >= 0; + if (ok && (size_t)size < DDNATV_HL_MAP_SIZE) { + // New (or an older, shorter format): made by a writer, under the lock + ok = 0; + if (create) { + struct flock fl; + memset(&fl, 0, sizeof(fl)); + fl.l_type = F_WRLCK; + fl.l_whence = SEEK_SET; + while (fcntl(fd, F_SETLKW, &fl) != 0 && errno == EINTR) { + } + size = hl_file_size(fd); + ok = size >= 0 && + ((size_t)size >= DDNATV_HL_MAP_SIZE || ftruncate(fd, DDNATV_HL_MAP_SIZE) == 0); + } + } + if (ok) { + void *m = mmap(NULL, DDNATV_HL_MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (m != MAP_FAILED) { + t = (ddnatv_hl_table_t *)m; + if (t->magic != DDNATV_HL_MAGIC || t->version != DDNATV_HL_VERSION) { + if (create) { + // Still under the lock taken above when the file was new; otherwise take it + struct flock fl; + memset(&fl, 0, sizeof(fl)); + fl.l_type = F_WRLCK; + fl.l_whence = SEEK_SET; + while (fcntl(fd, F_SETLKW, &fl) != 0 && errno == EINTR) { + } + if (t->magic != DDNATV_HL_MAGIC || t->version != DDNATV_HL_VERSION) hl_init_header(t); + } else { + munmap(m, DDNATV_HL_MAP_SIZE); + t = NULL; + } + } + if (t) g_hl_shared = 1; + } + } + syscall(SYS_close, fd); // the mapping stays; also drops the lock + } + if (!t && create) { + // No rootfs file: this process and its children share a table + void *m = mmap(NULL, DDNATV_HL_MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); + if (m != MAP_FAILED) { + t = (ddnatv_hl_table_t *)m; + hl_init_header(t); + g_hl_shared = 0; + } + } + if (t) { + __atomic_store_n(&g_hl_table, t, __ATOMIC_RELEASE); + } else if (have_path) { + // No table yet: looked for again a second later (without a rootfs there is none to wait for) + __atomic_store_n(&g_hl_next_try, hl_now_seconds() + 1, __ATOMIC_RELAXED); + } + } + pthread_mutex_unlock(&g_hardlinks_lock); + errno = saved_errno; + return t; +} + +// Whether any emulated link may exist; what the stat() hooks check first. +static inline int hardlinks_maybe_any(void) { + ddnatv_hl_table_t *t = hl_table(0); + return t && __atomic_load_n(&t->used, __ATOMIC_RELAXED) > 0; +} + +static inline uint32_t hl_hash(uint64_t dev, uint64_t ino) { + uint64_t h = ino * 0x9E3779B97F4A7C15ull ^ (dev + 0x632BE59BD9B4E019ull) * 0xC2B2AE3D27D4EB4Full; + return (uint32_t)(h >> 40) & (DDNATV_HL_SLOTS - 1); +} + +// The slot of a copy, or -1. Writers only (under the locks). +static long hl_find_locked(ddnatv_hl_table_t *t, uint64_t dev, uint64_t ino) { + uint32_t i = hl_hash(dev, ino); + for (uint32_t n = 0; n < DDNATV_HL_SLOTS; n++, i = (i + 1) & (DDNATV_HL_SLOTS - 1)) { + ddnatv_hl_slot_t *s = &t->slots[i]; + if (s->state == DDNATV_HL_EMPTY) return -1; + if (s->state == DDNATV_HL_USED && s->ino == ino && s->dev == dev) return (long)i; + } + return -1; +} + +// Writers: the process' mutex, the file's lock, then the sequence number made odd. +static int hl_write_begin(ddnatv_hl_table_t *t) { + pthread_mutex_lock(&g_hardlinks_lock); + int fd = hl_lock_file(); + uint32_t seq = __atomic_load_n(&t->seq, __ATOMIC_RELAXED); + // An odd number left by a writer that died: the lock was given up with it + if (!(seq & 1)) seq++; + __atomic_store_n(&t->seq, seq, __ATOMIC_RELAXED); + __atomic_thread_fence(__ATOMIC_RELEASE); + return fd; +} + +static void hl_write_end(ddnatv_hl_table_t *t, int fd) { + __atomic_store_n(&t->seq, __atomic_load_n(&t->seq, __ATOMIC_RELAXED) + 1, __ATOMIC_RELEASE); + hl_unlock_file(fd); + pthread_mutex_unlock(&g_hardlinks_lock); +} + +// Rebuilds the table without the slots of removed copies, which make every lookup longer. +static void hl_compact_locked(ddnatv_hl_table_t *t) { + ddnatv_hl_slot_t *keep = (ddnatv_hl_slot_t *)malloc(sizeof(ddnatv_hl_slot_t) * DDNATV_HL_MAX_USED); + if (!keep) return; + uint32_t n = 0; + for (uint32_t i = 0; i < DDNATV_HL_SLOTS && n < DDNATV_HL_MAX_USED; i++) { + if (t->slots[i].state == DDNATV_HL_USED) keep[n++] = t->slots[i]; + } + memset(t->slots, 0, sizeof(t->slots)); + for (uint32_t k = 0; k < n; k++) { + uint32_t i = hl_hash(keep[k].dev, keep[k].ino); + while (t->slots[i].state != DDNATV_HL_EMPTY) i = (i + 1) & (DDNATV_HL_SLOTS - 1); + t->slots[i] = keep[k]; + } + t->used = n; + t->deleted = 0; + free(keep); +} + +static int hl_put_locked(ddnatv_hl_table_t *t, const struct stat *st, uint64_t group_dev, uint64_t group_ino) { + long i = hl_find_locked(t, st->st_dev, st->st_ino); + if (i < 0) { + if (t->used >= DDNATV_HL_MAX_USED) return -1; + if (t->used + t->deleted >= DDNATV_HL_SLOTS - DDNATV_HL_SLOTS / 8) hl_compact_locked(t); + uint32_t j = hl_hash(st->st_dev, st->st_ino); + while (t->slots[j].state == DDNATV_HL_USED) j = (j + 1) & (DDNATV_HL_SLOTS - 1); + if (t->slots[j].state == DDNATV_HL_DELETED) t->deleted--; + i = (long)j; + t->used++; + } + ddnatv_hl_slot_t *s = &t->slots[i]; + s->dev = st->st_dev; + s->ino = st->st_ino; + s->mtime_sec = st->st_mtim.tv_sec; + s->mtime_nsec = st->st_mtim.tv_nsec; + s->group_dev = group_dev; + s->group_ino = group_ino; + s->nlink = 1; + s->state = DDNATV_HL_USED; + return 0; +} + +static void hl_remove_locked(ddnatv_hl_table_t *t, long i) { + t->slots[i].state = DDNATV_HL_DELETED; + t->used--; + t->deleted++; +} + +// Gives every copy of a group its size; a group of one is a plain file again. +static void hl_update_group_locked(ddnatv_hl_table_t *t, uint64_t group_dev, uint64_t group_ino) { + uint32_t n = 0; + long last = -1; + for (uint32_t i = 0; i < DDNATV_HL_SLOTS; i++) { + ddnatv_hl_slot_t *s = &t->slots[i]; + if (s->state == DDNATV_HL_USED && s->group_ino == group_ino && s->group_dev == group_dev) { + n++; + last = (long)i; + } + } + if (n == 1) { + hl_remove_locked(t, last); + return; + } + for (uint32_t i = 0; i < DDNATV_HL_SLOTS && n > 1; i++) { + ddnatv_hl_slot_t *s = &t->slots[i]; + if (s->state == DDNATV_HL_USED && s->group_ino == group_ino && s->group_dev == group_dev) s->nlink = n; + } +} + +// Removes the copy in slot i. A group reports the inode number of one of its copies (the original); +// when that copy goes, the group reports another one's: the number of a removed file can be given to +// a new file, which must not show up as linked to the copies that are left. +static void hl_remove_copy_locked(ddnatv_hl_table_t *t, long i) { + uint64_t group_dev = t->slots[i].group_dev, group_ino = t->slots[i].group_ino; + int reported = t->slots[i].dev == group_dev && t->slots[i].ino == group_ino; + hl_remove_locked(t, i); + if (reported) { + uint64_t new_dev = 0, new_ino = 0; + int found = 0; + for (uint32_t j = 0; j < DDNATV_HL_SLOTS; j++) { + ddnatv_hl_slot_t *s = &t->slots[j]; + if (s->state != DDNATV_HL_USED || s->group_ino != group_ino || s->group_dev != group_dev) continue; + if (!found) { + new_dev = s->dev; + new_ino = s->ino; + found = 1; + } + s->group_dev = new_dev; + s->group_ino = new_ino; + } + if (found) { + group_dev = new_dev; + group_ino = new_ino; + } + } + hl_update_group_locked(t, group_dev, group_ino); +} + +// Records that the file [copy] is an emulated hard link of [old]. +static void register_emulated_hardlink(const struct stat *old, const struct stat *copy) { + ddnatv_hl_table_t *t = hl_table(1); + if (!t) return; + int saved_errno = errno; + int fd = hl_write_begin(t); + uint64_t group_dev = old->st_dev, group_ino = old->st_ino; + long i = hl_find_locked(t, old->st_dev, old->st_ino); + if (i >= 0 && t->slots[i].mtime_sec == old->st_mtim.tv_sec) { + // Linking a copy again: the new copy joins the same group + group_dev = t->slots[i].group_dev; + group_ino = t->slots[i].group_ino; + } else { + // A stale slot of an earlier file with this inode number + if (i >= 0) hl_remove_copy_locked(t, i); + hl_put_locked(t, old, group_dev, group_ino); + } + if (hl_put_locked(t, copy, group_dev, group_ino) == 0 || hl_find_locked(t, old->st_dev, old->st_ino) >= 0) { + hl_update_group_locked(t, group_dev, group_ino); + } + hl_write_end(t, fd); + errno = saved_errno; +} + +// Forgets a copy whose name was removed; the last copy of a group goes back to a plain file. +static void unregister_emulated_hardlink(dev_t dev, ino_t ino) { + ddnatv_hl_table_t *t = hl_table(0); + if (!t || __atomic_load_n(&t->used, __ATOMIC_RELAXED) == 0) return; + int saved_errno = errno; + int fd = hl_write_begin(t); + long i = hl_find_locked(t, dev, ino); + if (i >= 0) hl_remove_copy_locked(t, i); + hl_write_end(t, fd); + errno = saved_errno; +} + +// Reads the slot of a copy without a lock: 1 and [out] when there is one. +static int hl_read(ddnatv_hl_table_t *t, uint64_t dev, uint64_t ino, ddnatv_hl_slot_t *out) { + for (int tries = 0; tries < 64; tries++) { + uint32_t seq = __atomic_load_n(&t->seq, __ATOMIC_ACQUIRE); + if (seq & 1) { + sched_yield(); + continue; + } + int found = 0; + uint32_t i = hl_hash(dev, ino); + for (uint32_t n = 0; n < DDNATV_HL_SLOTS; n++, i = (i + 1) & (DDNATV_HL_SLOTS - 1)) { + const volatile ddnatv_hl_slot_t *s = &t->slots[i]; + uint32_t state = s->state; + if (state == DDNATV_HL_EMPTY) break; + if (state == DDNATV_HL_USED && s->ino == ino && s->dev == dev) { + memcpy(out, (const void *)s, sizeof(*out)); + found = 1; + break; + } + } + __atomic_thread_fence(__ATOMIC_ACQUIRE); + if (__atomic_load_n(&t->seq, __ATOMIC_RELAXED) == seq) return found; + } + return 0; // a writer that does not finish: as if there were no links +} + +// Makes a stat() result of an emulated hard link look like a real one: the inode number of the +// original and the number of copies as the link count. +static void apply_emulated_hardlink(struct stat *st) { + if (!st || !hardlinks_maybe_any()) return; + ddnatv_hl_slot_t s; + if (!hl_read(g_hl_table, st->st_dev, st->st_ino, &s)) return; + if (s.mtime_sec != (int64_t)st->st_mtim.tv_sec) return; + if (s.nlink > (uint32_t)st->st_nlink) st->st_nlink = (nlink_t)s.nlink; + st->st_ino = (ino_t)s.group_ino; +} + +// The app's own user and group, which the hook presents as root: getuid() and getpwuid() say so, +// and stat() does as well, so that a program that compares a file's owner with getuid() sees the +// files it made as its own (git's "dubious ownership", sshd's /run/sshd, tmux's socket directory, +// ssh's ~/.ssh/config). -1 until known; a test sets them. +static uid_t g_app_uid = (uid_t)-1; +static gid_t g_app_gid = (gid_t)-1; + +static void load_app_ids(void) { +#ifdef DDNATV_HOST_TEST + uid_t uid = getuid(); + gid_t gid = getgid(); +#else + // The real ones (getuid() and syscall() are the hook's own, which answer 0) + static uid_t (*orig_getuid)(void) = NULL; + static gid_t (*orig_getgid)(void) = NULL; + if (!orig_getuid) orig_getuid = (uid_t (*)(void))dlsym(RTLD_NEXT, "getuid"); + if (!orig_getgid) orig_getgid = (gid_t (*)(void))dlsym(RTLD_NEXT, "getgid"); + if (!orig_getuid || !orig_getgid) return; + uid_t uid = orig_getuid(); + gid_t gid = orig_getgid(); +#endif + __atomic_store_n(&g_app_gid, gid, __ATOMIC_RELAXED); + __atomic_store_n(&g_app_uid, uid, __ATOMIC_RELAXED); +} + +static void present_owner_as_root(uid_t *uid, gid_t *gid) { + if (__atomic_load_n(&g_app_uid, __ATOMIC_RELAXED) == (uid_t)-1) load_app_ids(); + uid_t app_uid = __atomic_load_n(&g_app_uid, __ATOMIC_RELAXED); + gid_t app_gid = __atomic_load_n(&g_app_gid, __ATOMIC_RELAXED); + if (app_uid == (uid_t)-1) return; + if (uid && *uid == app_uid) *uid = 0; + if (gid && *gid == app_gid) *gid = 0; +} + +// What the stat() family returns: emulated hard links as real ones, the app's files as root's. +static void apply_stat_emulation(struct stat *st) { + if (!st) return; + apply_emulated_hardlink(st); + present_owner_as_root(&st->st_uid, &st->st_gid); +} + +static int real_fstatat(int dirfd, const char *path, struct stat *st, int flags) { +#ifdef DDNATV_HOST_TEST + return fstatat(dirfd, path, st, flags); +#else + static int (*orig_fstatat)(int, const char *, struct stat *, int) = NULL; + if (!orig_fstatat) orig_fstatat = (int (*)(int, const char *, struct stat *, int))dlsym(RTLD_NEXT, "fstatat"); + return orig_fstatat ? orig_fstatat(dirfd, path, st, flags) : fstatat(dirfd, path, st, flags); +#endif +} + +// Before a name is removed or replaced (unlink, rename over it): whether it is an emulated hard +// link, and which. Costs nothing until the process has made one. +static int lookup_emulated_hardlink_at(int dirfd, const char *path, dev_t *dev, ino_t *ino) { + if (!path || !hardlinks_maybe_any()) return 0; + int saved_errno = errno; + struct stat st; + int found = 0; + if (real_fstatat(dirfd, path, &st, AT_SYMLINK_NOFOLLOW) == 0) { + ddnatv_hl_slot_t s; + found = hl_read(g_hl_table, st.st_dev, st.st_ino, &s); + *dev = st.st_dev; + *ino = st.st_ino; + } + errno = saved_errno; + return found; +} + +static int ddnatv_emulate_hardlinkat(int olddirfd, const char *rold, int newdirfd, const char *rnew) { + if (!rold || !rnew) { + errno = EINVAL; + return -1; + } + struct stat st; +#ifdef DDNATV_HOST_TEST + if (fstatat(olddirfd, rold, &st, 0) != 0) { + return -1; + } +#else + static int (*orig_fstatat)(int, const char *, struct stat *, int) = NULL; + if (!orig_fstatat) orig_fstatat = (int (*)(int, const char *, struct stat *, int))dlsym(RTLD_NEXT, "fstatat"); + if (orig_fstatat) { + if (orig_fstatat(olddirfd, rold, &st, 0) != 0) return -1; + } else { + if (fstatat(olddirfd, rold, &st, 0) != 0) return -1; + } +#endif + if (S_ISDIR(st.st_mode)) { + errno = EPERM; + return -1; + } + + // Clean up stale dangling symlink or stale dead-process lock file at rnew +#ifndef DDNATV_HOST_TEST + struct stat lst; + int have_lst = 0; + if (orig_fstatat) { + if (orig_fstatat(newdirfd, rnew, &lst, AT_SYMLINK_NOFOLLOW) == 0) have_lst = 1; + } else { + if (fstatat(newdirfd, rnew, &lst, AT_SYMLINK_NOFOLLOW) == 0) have_lst = 1; + } + if (have_lst) { + if (S_ISLNK(lst.st_mode)) { + unlinkat(newdirfd, rnew, 0); + } else if (strstr(rnew, ".lock")) { + static int (*orig_openat)(int, const char *, int, ...) = NULL; + if (!orig_openat) orig_openat = (int (*)(int, const char *, int, ...))dlsym(RTLD_NEXT, "openat"); + int rfd = orig_openat ? orig_openat(newdirfd, rnew, O_RDONLY | O_CLOEXEC) + : openat(newdirfd, rnew, O_RDONLY | O_CLOEXEC); + if (rfd >= 0) { + char pbuf[32] = {0}; + ssize_t pr = read(rfd, pbuf, sizeof(pbuf) - 1); + close(rfd); + if (pr > 0) { + pid_t lpid = (pid_t)atoi(pbuf); + if (lpid > 0 && kill(lpid, 0) == -1 && errno == ESRCH) { + unlinkat(newdirfd, rnew, 0); + } + } else { + unlinkat(newdirfd, rnew, 0); + } + } + } + } +#endif + +#ifdef DDNATV_HOST_TEST + int fd_new = openat(newdirfd, rnew, O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC, st.st_mode & 0777); + if (fd_new < 0) return -1; + int fd_old = openat(olddirfd, rold, O_RDONLY | O_CLOEXEC); +#else + static int (*orig_openat)(int, const char *, int, ...) = NULL; + if (!orig_openat) orig_openat = (int (*)(int, const char *, int, ...))dlsym(RTLD_NEXT, "openat"); + int fd_new = orig_openat ? orig_openat(newdirfd, rnew, O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC, st.st_mode & 0777) + : openat(newdirfd, rnew, O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC, st.st_mode & 0777); + if (fd_new < 0) return -1; + int fd_old = orig_openat ? orig_openat(olddirfd, rold, O_RDONLY | O_CLOEXEC) + : openat(olddirfd, rold, O_RDONLY | O_CLOEXEC); +#endif + if (fd_old < 0) { + int err = errno; + close(fd_new); + unlinkat(newdirfd, rnew, 0); + errno = err; + return -1; + } + + ssize_t sent = 0; + int copy_failed = 0; + while (sent < st.st_size) { + ssize_t s = sendfile(fd_new, fd_old, NULL, (size_t)(st.st_size - sent)); + if (s > 0) { + sent += s; + } else { + break; + } + } + if (sent < st.st_size) { + char cbuf[16384]; + ssize_t nread; + while ((nread = read(fd_old, cbuf, sizeof(cbuf))) > 0) { + ssize_t nwritten = 0; + while (nwritten < nread) { + ssize_t w = write(fd_new, cbuf + nwritten, nread - nwritten); + if (w < 0) { + copy_failed = 1; + break; + } + nwritten += w; + } + if (copy_failed) break; + } + if (nread < 0) copy_failed = 1; + } + + fchmod(fd_new, st.st_mode & 0777); + // A hard link shares the times of the original (tar, dpkg and make compare them). + const struct timespec times[2] = { st.st_atim, st.st_mtim }; + futimens(fd_new, times); + struct stat st_new; + memset(&st_new, 0, sizeof(st_new)); +#ifndef DDNATV_HOST_TEST + static int (*orig_fstat)(int, struct stat *) = NULL; + if (!orig_fstat) orig_fstat = (int (*)(int, struct stat *))dlsym(RTLD_NEXT, "fstat"); + if (orig_fstat) orig_fstat(fd_new, &st_new); + else fstat(fd_new, &st_new); +#else + fstat(fd_new, &st_new); +#endif + + close(fd_old); + close(fd_new); + + if (copy_failed) { + unlinkat(newdirfd, rnew, 0); + errno = EIO; + return -1; + } + + register_emulated_hardlink(&st, &st_new); + return 0; +} + +static inline int ddnatv_emulate_hardlink(const char *rold, const char *rnew) { + return ddnatv_emulate_hardlinkat(AT_FDCWD, rold, AT_FDCWD, rnew); +} diff --git a/tools/nativeguest/hook/identity.c b/tools/nativeguest/hook/identity.c new file mode 100644 index 0000000000..9599d7e0b2 --- /dev/null +++ b/tools/nativeguest/hook/identity.c @@ -0,0 +1,838 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Fake root: user and group ids, the shadow lock, and passwd/group lookups from the rootfs. + +#ifndef DDNATV_HOST_TEST + +// Fakeroot identity hooks for APT and DPKG to operate without superuser restrictions +uid_t getuid(void) { return 0; } +uid_t geteuid(void) { return 0; } +gid_t getgid(void) { return 0; } +gid_t getegid(void) { return 0; } + +int setuid(uid_t uid) { (void)uid; return 0; } +int seteuid(uid_t uid) { (void)uid; return 0; } +int setgid(gid_t gid) { (void)gid; return 0; } +int setegid(gid_t gid) { (void)gid; return 0; } +int setreuid(uid_t ruid, uid_t euid) { (void)ruid; (void)euid; return 0; } +int setregid(gid_t rgid, gid_t egid) { (void)rgid; (void)egid; return 0; } +int setresuid(uid_t ruid, uid_t euid, uid_t suid) { (void)ruid; (void)euid; (void)suid; return 0; } +int setresgid(gid_t rgid, gid_t egid, gid_t sgid) { (void)rgid; (void)egid; (void)sgid; return 0; } + +int getgroups(int size, gid_t list[]) { + if (size > 0 && list != NULL) list[0] = 0; + return 1; +} +// What programs built with _FORTIFY_SOURCE call when the buffer's size is known (the check is +// glibc's): without it the count came from the hook (1) and the list from the kernel (the app's +// groups, more than one), and sshd ended the login on "getgroups: Invalid argument" +extern void __chk_fail(void) __attribute__((__noreturn__)); +int __getgroups_chk(int size, gid_t list[], size_t listlen) { + if (size > 0 && (size_t)size * sizeof(gid_t) > listlen) __chk_fail(); + return getgroups(size, list); +} +int setgroups(size_t size, const gid_t *list) { (void)size; (void)list; return 0; } +int initgroups(const char *user, gid_t group) { (void)user; (void)group; return 0; } + +int getgrouplist(const char *user, gid_t group, gid_t *groups, int *ngroups) { + (void)user; + if (!ngroups) { + errno = EINVAL; + return -1; + } + if (*ngroups > 0 && groups) { + groups[0] = group; + *ngroups = 1; + return 1; + } + // Too small (a caller asking for the size first): -1 and the number needed, as glibc does. + *ngroups = 1; + return -1; +} + +// The session's host name, as proot's --kernel-release gave it: Steam names the device after it +int uname(struct utsname *buf) { + static int (*orig_uname)(struct utsname *) = NULL; + if (!orig_uname) orig_uname = (int (*)(struct utsname *))dlsym(RTLD_NEXT, "uname"); + int ret = orig_uname ? orig_uname(buf) : -1; + if (ret == 0 && buf && g_hostname[0]) { + ddnatv_copy_cstr(buf->nodename, sizeof(buf->nodename), g_hostname); + ddnatv_copy_cstr(buf->domainname, sizeof(buf->domainname), "localdomain"); + } + return ret; +} + +int gethostname(char *name, size_t len) { + static int (*orig_gethostname)(char *, size_t) = NULL; + if (!orig_gethostname) orig_gethostname = (int (*)(char *, size_t))dlsym(RTLD_NEXT, "gethostname"); + if (!g_hostname[0]) return orig_gethostname ? orig_gethostname(name, len) : -1; + size_t n = strlen(g_hostname) + 1; + if (!name || n > len) { + if (name && len) memcpy(name, g_hostname, len); + errno = ENAMETOOLONG; + return -1; + } + memcpy(name, g_hostname, n); + return 0; +} + +#endif /* !DDNATV_HOST_TEST */ + +static uid_t real_uid(void) { +#ifdef DDNATV_HOST_TEST + return 10000; +#else + static uid_t (*orig_getuid)(void) = NULL; + if (!orig_getuid) orig_getuid = (uid_t (*)(void))dlsym(RTLD_NEXT, "getuid"); + return orig_getuid ? orig_getuid() : 0; +#endif +} + +static gid_t real_gid(void) { +#ifdef DDNATV_HOST_TEST + return 10000; +#else + static gid_t (*orig_getgid)(void) = NULL; + if (!orig_getgid) orig_getgid = (gid_t (*)(void))dlsym(RTLD_NEXT, "getgid"); + return orig_getgid ? orig_getgid() : 0; +#endif +} + +#ifdef DDNATV_HOST_TEST +#define DDNATV_NSS_SYM(name) hook_##name +#define DDNATV_SHADOW_SYM(name) hook_##name +static int g_test_orig_nss_r_ret = 0; +static int g_test_orig_nss_r_found = 0; + +int hook_link(const char *oldpath, const char *newpath) { + int ret = link(oldpath, newpath); + if (ret != 0 && (errno == EXDEV || errno == EPERM || errno == EACCES || errno == ENOTSUP || errno == ENOSYS)) { + ret = ddnatv_emulate_hardlink(oldpath, newpath); + } + return ret; +} + +int hook_linkat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath, int flags) { + int ret = linkat(olddirfd, oldpath, newdirfd, newpath, flags); + if (ret != 0 && (errno == EXDEV || errno == EPERM || errno == EACCES || errno == ENOTSUP || errno == ENOSYS)) { + ret = ddnatv_emulate_hardlinkat(olddirfd, oldpath, newdirfd, newpath); + } + return ret; +} + +int hook_stat(const char *path, struct stat *st) { + int ret = stat(path, st); + if (ret == 0) apply_stat_emulation(st); + return ret; +} + +int hook_unlink(const char *path) { + dev_t hl_dev = 0; + ino_t hl_ino = 0; + int hardlinked = lookup_emulated_hardlink_at(AT_FDCWD, path, &hl_dev, &hl_ino); + int ret = unlink(path); + if (ret == 0 && hardlinked) unregister_emulated_hardlink(hl_dev, hl_ino); + return ret; +} +#else +#define DDNATV_NSS_SYM(name) name +#define DDNATV_SHADOW_SYM(name) name +#endif + +// Hook lckpwdf and ulckpwdf (shadow password database locking) +// In glibc, lckpwdf() attempts to open /etc/.pwd.lock directly using internal syscalls +// which fails with EROFS on Android because host /etc is mounted read-only. +static int g_pwd_lock_fd = -1; +static pthread_mutex_t g_pwd_lock_mutex = PTHREAD_MUTEX_INITIALIZER; + +int DDNATV_SHADOW_SYM(lckpwdf)(void) { +#ifndef DDNATV_HOST_TEST + init_ddnatv_hook(); + pthread_mutex_lock(&g_pwd_lock_mutex); + if (g_pwd_lock_fd != -1) { + pthread_mutex_unlock(&g_pwd_lock_mutex); + return 0; // Already locked + } + char buf[PATH_MAX]; + const char *target = rewrite_path("/etc/.pwd.lock", buf, sizeof(buf)); + static int (*orig_open)(const char *, int, ...) = NULL; + if (!orig_open) orig_open = (int (*)(const char *, int, ...))dlsym(RTLD_NEXT, "open"); + if (orig_open && target) { + g_pwd_lock_fd = orig_open(target, O_WRONLY | O_CREAT | O_CLOEXEC, 0600); + if (g_pwd_lock_fd >= 0) { + struct flock fl; + memset(&fl, 0, sizeof(fl)); + fl.l_type = F_WRLCK; + fl.l_whence = SEEK_SET; + if (fcntl(g_pwd_lock_fd, F_SETLK, &fl) != 0) { + int saved = errno; + close(g_pwd_lock_fd); + g_pwd_lock_fd = -1; + pthread_mutex_unlock(&g_pwd_lock_mutex); + errno = saved; + return -1; + } + } + } + if (g_pwd_lock_fd < 0) { + g_pwd_lock_fd = -2; // In-memory lock held + } + pthread_mutex_unlock(&g_pwd_lock_mutex); +#endif + return 0; +} + +int DDNATV_SHADOW_SYM(ulckpwdf)(void) { +#ifndef DDNATV_HOST_TEST + pthread_mutex_lock(&g_pwd_lock_mutex); + if (g_pwd_lock_fd >= 0) { + close(g_pwd_lock_fd); + } + g_pwd_lock_fd = -1; + pthread_mutex_unlock(&g_pwd_lock_mutex); +#endif + return 0; +} + + +// Group lookup helper: reads $DDNATV_ROOT/etc/group or falls back to known entries +static int ddnatv_lookup_group(const char *search_name, gid_t search_gid, int by_name, + struct group *grp, char *buf, size_t buflen) { + if (!grp || !buf || buflen < 64) { + return ERANGE; + } + + int found = 0; + char found_name[64] = {0}; + char found_pass[32] = {0}; + gid_t found_gid = 0; + char found_members[256] = {0}; + + // 1. Try reading /etc/group from The native userland rootfs +#ifndef DDNATV_HOST_TEST + char path_buf[PATH_MAX]; + const char *grp_path = rewrite_path("/etc/group", path_buf, sizeof(path_buf)); + static int (*orig_open)(const char *, int, ...) = NULL; + if (!orig_open) orig_open = (int (*)(const char *, int, ...))dlsym(RTLD_NEXT, "open"); + int fd = (orig_open && grp_path) ? orig_open(grp_path, O_RDONLY | O_CLOEXEC) : -1; + if (fd >= 0) { + char file_buf[8192]; + ssize_t n = read(fd, file_buf, sizeof(file_buf) - 1); + close(fd); + if (n > 0) { + file_buf[n] = '\0'; + char *line = file_buf; + while (*line && !found) { + char *next_line = strchr(line, '\n'); + if (next_line) { + *next_line = '\0'; + } + size_t llen = strlen(line); + if (llen > 0 && line[llen - 1] == '\r') line[llen - 1] = '\0'; + + // format: name:pass:gid:members + char *p1 = strchr(line, ':'); + if (p1) { + *p1 = '\0'; + char *p2 = strchr(p1 + 1, ':'); + if (p2) { + *p2 = '\0'; + char *p3 = strchr(p2 + 1, ':'); + if (p3) { + *p3 = '\0'; + const char *gname = line; + const char *gpass = p1 + 1; + gid_t ggid = (gid_t)strtoul(p2 + 1, NULL, 10); + const char *gmem = p3 + 1; + + if (by_name && search_name && strcmp(gname, search_name) == 0) { + snprintf(found_name, sizeof(found_name), "%s", gname); + snprintf(found_pass, sizeof(found_pass), "%s", gpass); + found_gid = ggid; + snprintf(found_members, sizeof(found_members), "%s", gmem); + found = 1; + } else if (!by_name && ggid == search_gid) { + snprintf(found_name, sizeof(found_name), "%s", gname); + snprintf(found_pass, sizeof(found_pass), "%s", gpass); + found_gid = ggid; + snprintf(found_members, sizeof(found_members), "%s", gmem); + found = 1; + } + } + } + } + if (!next_line) break; + line = next_line + 1; + } + } + } +#endif + + // 2. Fallbacks for well-known groups if absent from file + if (!found) { + if (by_name) { + if (!search_name) return ENOENT; + if (strcmp(search_name, "root") == 0 || strcmp(search_name, "ddnatv") == 0) { + snprintf(found_name, sizeof(found_name), "%s", search_name); + snprintf(found_pass, sizeof(found_pass), "x"); + found_gid = 0; + snprintf(found_members, sizeof(found_members), "%s", search_name); + found = 1; + } else if (strcmp(search_name, "_ssh") == 0) { + snprintf(found_name, sizeof(found_name), "_ssh"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_gid = 100; + found = 1; + } else if (strcmp(search_name, "ssh") == 0) { + snprintf(found_name, sizeof(found_name), "ssh"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_gid = 101; + found = 1; + } else if (strcmp(search_name, "nogroup") == 0 || strcmp(search_name, "nobody") == 0) { + snprintf(found_name, sizeof(found_name), "%s", search_name); + snprintf(found_pass, sizeof(found_pass), "x"); + found_gid = 65534; + found = 1; + } + } else { + if (search_gid == 0 || search_gid == real_gid()) { + snprintf(found_name, sizeof(found_name), "root"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_gid = search_gid; + snprintf(found_members, sizeof(found_members), "root"); + found = 1; + } + } + } + + if (!found) { + return ENOENT; + } + + // 3. Assemble struct group into caller's buf + size_t mem_ptr_count = 1; + char *m_copy = found_members; + while (*m_copy) { + if (*m_copy == ',') mem_ptr_count++; + m_copy++; + } + if (found_members[0] != '\0') mem_ptr_count++; + + size_t mem_array_bytes = (mem_ptr_count + 1) * sizeof(char *); + mem_array_bytes = (mem_array_bytes + sizeof(void *) - 1) & ~(sizeof(void *) - 1); + + size_t name_len = strlen(found_name) + 1; + size_t pass_len = strlen(found_pass) + 1; + size_t mem_str_len = strlen(found_members) + 1; + + if (mem_array_bytes + name_len + pass_len + mem_str_len > buflen) { + return ERANGE; + } + + char **mem_array = (char **)buf; + char *str_cursor = buf + mem_array_bytes; + + grp->gr_name = str_cursor; + memcpy(str_cursor, found_name, name_len); + str_cursor += name_len; + + grp->gr_passwd = str_cursor; + memcpy(str_cursor, found_pass, pass_len); + str_cursor += pass_len; + + grp->gr_gid = found_gid; + + size_t m_idx = 0; + if (found_members[0] != '\0') { + char *m_tok = str_cursor; + memcpy(str_cursor, found_members, mem_str_len); + str_cursor += mem_str_len; + + char *curr = m_tok; + while (curr && *curr) { + char *comma = strchr(curr, ','); + if (comma) { + *comma = '\0'; + } + if (*curr) { + mem_array[m_idx++] = curr; + } + curr = comma ? comma + 1 : NULL; + } + } + mem_array[m_idx] = NULL; + grp->gr_mem = mem_array; + + return 0; +} + +// Passwd lookup helper: reads $DDNATV_ROOT/etc/passwd or falls back to known entries +static int ddnatv_lookup_passwd(const char *search_name, uid_t search_uid, int by_name, + struct passwd *pwd, char *buf, size_t buflen) { + if (!pwd || !buf || buflen < 128) { + return ERANGE; + } + + int found = 0; + char found_name[64] = {0}; + char found_pass[32] = {0}; + uid_t found_uid = 0; + gid_t found_gid = 0; + char found_gecos[64] = {0}; + char found_dir[128] = {0}; + char found_shell[64] = {0}; + + // 1. Try reading /etc/passwd from The native userland rootfs +#ifndef DDNATV_HOST_TEST + char path_buf[PATH_MAX]; + const char *pwd_path = rewrite_path("/etc/passwd", path_buf, sizeof(path_buf)); + static int (*orig_open)(const char *, int, ...) = NULL; + if (!orig_open) orig_open = (int (*)(const char *, int, ...))dlsym(RTLD_NEXT, "open"); + int fd = (orig_open && pwd_path) ? orig_open(pwd_path, O_RDONLY | O_CLOEXEC) : -1; + if (fd >= 0) { + char file_buf[8192]; + ssize_t n = read(fd, file_buf, sizeof(file_buf) - 1); + close(fd); + if (n > 0) { + file_buf[n] = '\0'; + char *line = file_buf; + while (*line && !found) { + char *next_line = strchr(line, '\n'); + if (next_line) { + *next_line = '\0'; + } + size_t llen = strlen(line); + if (llen > 0 && line[llen - 1] == '\r') line[llen - 1] = '\0'; + + // format: name:pass:uid:gid:gecos:dir:shell + char *f[7] = {0}; + char *curr = line; + int f_idx = 0; + while (curr && f_idx < 7) { + f[f_idx++] = curr; + char *col = strchr(curr, ':'); + if (col && f_idx < 7) { + *col = '\0'; + curr = col + 1; + } else { + break; + } + } + if (f_idx >= 7) { + const char *uname = f[0]; + const char *upass = f[1]; + uid_t uuid = (uid_t)strtoul(f[2], NULL, 10); + gid_t ugid = (gid_t)strtoul(f[3], NULL, 10); + const char *ugecos = f[4]; + const char *udir = f[5]; + const char *ushell = f[6]; + + if (by_name && search_name && strcmp(uname, search_name) == 0) { + snprintf(found_name, sizeof(found_name), "%s", uname); + snprintf(found_pass, sizeof(found_pass), "%s", upass); + found_uid = uuid; + found_gid = ugid; + snprintf(found_gecos, sizeof(found_gecos), "%s", ugecos); + snprintf(found_dir, sizeof(found_dir), "%s", udir); + snprintf(found_shell, sizeof(found_shell), "%s", ushell); + found = 1; + } else if (!by_name && uuid == search_uid) { + snprintf(found_name, sizeof(found_name), "%s", uname); + snprintf(found_pass, sizeof(found_pass), "%s", upass); + found_uid = uuid; + found_gid = ugid; + snprintf(found_gecos, sizeof(found_gecos), "%s", ugecos); + snprintf(found_dir, sizeof(found_dir), "%s", udir); + snprintf(found_shell, sizeof(found_shell), "%s", ushell); + found = 1; + } + } + if (!next_line) break; + line = next_line + 1; + } + } + } +#endif + + // 2. Fallbacks for well-known users if absent from file + if (!found) { + if (by_name) { + if (!search_name) return ENOENT; + if (strcmp(search_name, "root") == 0) { + snprintf(found_name, sizeof(found_name), "root"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_uid = 0; + found_gid = 0; + snprintf(found_gecos, sizeof(found_gecos), "root"); + snprintf(found_dir, sizeof(found_dir), "/root"); + snprintf(found_shell, sizeof(found_shell), "/bin/bash"); + found = 1; + } else if (strcmp(search_name, "ddnatv") == 0) { + snprintf(found_name, sizeof(found_name), "ddnatv"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_uid = 0; + found_gid = 0; + snprintf(found_gecos, sizeof(found_gecos), "The native userland"); + snprintf(found_dir, sizeof(found_dir), "/home/ddnatv"); + snprintf(found_shell, sizeof(found_shell), "/bin/bash"); + found = 1; + } else if (strcmp(search_name, "_ssh") == 0) { + snprintf(found_name, sizeof(found_name), "_ssh"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_uid = 100; + found_gid = 100; + snprintf(found_gecos, sizeof(found_gecos), "OpenSSH daemon"); + snprintf(found_dir, sizeof(found_dir), "/run/sshd"); + snprintf(found_shell, sizeof(found_shell), "/usr/sbin/nologin"); + found = 1; + } else if (strcmp(search_name, "sshd") == 0) { + snprintf(found_name, sizeof(found_name), "sshd"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_uid = 101; + found_gid = 101; + snprintf(found_gecos, sizeof(found_gecos), "Privilege-separated SSH"); + snprintf(found_dir, sizeof(found_dir), "/run/sshd"); + snprintf(found_shell, sizeof(found_shell), "/usr/sbin/nologin"); + found = 1; + } else if (strcmp(search_name, "nobody") == 0) { + snprintf(found_name, sizeof(found_name), "nobody"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_uid = 65534; + found_gid = 65534; + snprintf(found_gecos, sizeof(found_gecos), "nobody"); + snprintf(found_dir, sizeof(found_dir), "/nonexistent"); + snprintf(found_shell, sizeof(found_shell), "/usr/sbin/nologin"); + found = 1; + } + } else { + if (search_uid == 0 || search_uid == real_uid()) { + snprintf(found_name, sizeof(found_name), "root"); + snprintf(found_pass, sizeof(found_pass), "x"); + found_uid = search_uid; + found_gid = 0; + snprintf(found_gecos, sizeof(found_gecos), "root"); + snprintf(found_dir, sizeof(found_dir), "/home"); + snprintf(found_shell, sizeof(found_shell), "/bin/bash"); + found = 1; + } + } + } + + if (!found) { + return ENOENT; + } + + // 3. Assemble struct passwd into caller's buf + size_t name_len = strlen(found_name) + 1; + size_t pass_len = strlen(found_pass) + 1; + size_t gecos_len = strlen(found_gecos) + 1; + size_t dir_len = strlen(found_dir) + 1; + size_t shell_len = strlen(found_shell) + 1; + + size_t total_str_bytes = name_len + pass_len + gecos_len + dir_len + shell_len; + if (total_str_bytes > buflen) { + return ERANGE; + } + + char *str_cursor = buf; + + pwd->pw_name = str_cursor; + memcpy(str_cursor, found_name, name_len); + str_cursor += name_len; + + pwd->pw_passwd = str_cursor; + memcpy(str_cursor, found_pass, pass_len); + str_cursor += pass_len; + + pwd->pw_uid = found_uid; + pwd->pw_gid = found_gid; + + pwd->pw_gecos = str_cursor; + memcpy(str_cursor, found_gecos, gecos_len); + str_cursor += gecos_len; + + pwd->pw_dir = str_cursor; + memcpy(str_cursor, found_dir, dir_len); + str_cursor += dir_len; + + pwd->pw_shell = str_cursor; + memcpy(str_cursor, found_shell, shell_len); + str_cursor += shell_len; + + return 0; +} + +#ifndef DDNATV_HOST_TEST +// The shadow database (/etc/shadow) of the rootfs. libc reads the real /etc/shadow of the machine, +// which Android does not have: pam_unix's account check for root found no entry and answered +// "Authentication failure", so chfn, chsh and `adduser --gecos` (the installation of PostgreSQL) +// failed. The fields are "name:hash:lastchange:min:max:warn:inactive:expire:flag", numbers empty +// when unset (libc stores -1 then). +static int ddnatv_lookup_shadow(const char *name, struct spwd *sp, char *buf, size_t buflen) { + if (!name || !sp || !buf) return EINVAL; + char path_buf[PATH_MAX]; + const char *path = rewrite_path("/etc/shadow", path_buf, sizeof(path_buf)); + static int (*orig_open)(const char *, int, ...) = NULL; + if (!orig_open) orig_open = (int (*)(const char *, int, ...))dlsym(RTLD_NEXT, "open"); + int fd = (orig_open && path) ? orig_open(path, O_RDONLY | O_CLOEXEC) : -1; + if (fd < 0) return ENOENT; + FILE *f = fdopen(fd, "r"); + if (!f) { + close(fd); + return ENOENT; + } + size_t name_len = strlen(name); + char line[1024]; + int err = ENOENT; + while (fgets(line, sizeof(line), f)) { + if (strncmp(line, name, name_len) != 0 || line[name_len] != ':') continue; + line[strcspn(line, "\r\n")] = '\0'; + char *fields[9] = {0}; + int n = 0; + char *cursor = line; + while (n < 9) { + fields[n++] = cursor; + char *colon = strchr(cursor, ':'); + if (!colon) break; + *colon = '\0'; + cursor = colon + 1; + } + size_t need = strlen(fields[0]) + 1 + strlen(fields[1] ? fields[1] : "") + 1; + if (n < 2 || need > buflen) { + err = n < 2 ? ENOENT : ERANGE; + break; + } + char *out = buf; + sp->sp_namp = out; + memcpy(out, fields[0], strlen(fields[0]) + 1); + out += strlen(fields[0]) + 1; + sp->sp_pwdp = out; + memcpy(out, fields[1], strlen(fields[1]) + 1); + long number[6]; + for (int i = 0; i < 6; i++) { + const char *v = (2 + i < n) ? fields[2 + i] : NULL; + number[i] = (v && v[0] != '\0') ? strtol(v, NULL, 10) : -1; + } + sp->sp_lstchg = number[0]; + sp->sp_min = number[1]; + sp->sp_max = number[2]; + sp->sp_warn = number[3]; + sp->sp_inact = number[4]; + sp->sp_expire = number[5]; + sp->sp_flag = (8 < n && fields[8][0] != '\0') ? strtoul(fields[8], NULL, 10) : (unsigned long)-1; + err = 0; + break; + } + fclose(f); + return err; +} + +int getspnam_r(const char *name, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **result) { + static int (*orig_getspnam_r)(const char *, struct spwd *, char *, size_t, struct spwd **) = NULL; + if (!orig_getspnam_r) orig_getspnam_r = (int (*)(const char *, struct spwd *, char *, size_t, struct spwd **))dlsym(RTLD_NEXT, "getspnam_r"); + int ret = ENOENT; + if (orig_getspnam_r) { + ret = orig_getspnam_r(name, spbuf, buf, buflen, result); + if ((ret == 0 && result && *result) || ret == ERANGE) return ret; + } + int err = ddnatv_lookup_shadow(name, spbuf, buf, buflen); + if (err == 0) { + if (result) *result = spbuf; + return 0; + } + if (result) *result = NULL; + return err == ENOENT ? (ret != 0 ? ret : ENOENT) : err; +} + +struct spwd *getspnam(const char *name) { + static struct spwd entry; + static char entry_buf[1024]; + struct spwd *found = NULL; + int err = getspnam_r(name, &entry, entry_buf, sizeof(entry_buf), &found); + if (err != 0) { + errno = err; + return NULL; + } + return found; +} +#endif /* !DDNATV_HOST_TEST */ + +static struct group s_grp_storage; +static char s_grp_buf[2048]; +static struct passwd s_pwd_storage; +static char s_pwd_buf[2048]; + +struct group *DDNATV_NSS_SYM(getgrgid)(gid_t gid) { +#ifndef DDNATV_HOST_TEST + static struct group *(*orig_getgrgid)(gid_t) = NULL; + if (!orig_getgrgid) orig_getgrgid = (struct group *(*)(gid_t))dlsym(RTLD_NEXT, "getgrgid"); + struct group *res = orig_getgrgid ? orig_getgrgid(gid) : NULL; + if (res) return res; +#endif + + int err = ddnatv_lookup_group(NULL, gid, 0, &s_grp_storage, s_grp_buf, sizeof(s_grp_buf)); + if (err == 0) return &s_grp_storage; + return NULL; +} + +struct group *DDNATV_NSS_SYM(getgrnam)(const char *name) { +#ifndef DDNATV_HOST_TEST + static struct group *(*orig_getgrnam)(const char *) = NULL; + if (!orig_getgrnam) orig_getgrnam = (struct group *(*)(const char *))dlsym(RTLD_NEXT, "getgrnam"); + struct group *res = orig_getgrnam ? orig_getgrnam(name) : NULL; + if (res) return res; +#endif + + int err = ddnatv_lookup_group(name, 0, 1, &s_grp_storage, s_grp_buf, sizeof(s_grp_buf)); + if (err == 0) return &s_grp_storage; + return NULL; +} + +int DDNATV_NSS_SYM(getgrgid_r)(gid_t gid, struct group *grp, char *buf, size_t buflen, struct group **result) { +#ifndef DDNATV_HOST_TEST + static int (*orig_getgrgid_r)(gid_t, struct group *, char *, size_t, struct group **) = NULL; + if (!orig_getgrgid_r) orig_getgrgid_r = (int (*)(gid_t, struct group *, char *, size_t, struct group **))dlsym(RTLD_NEXT, "getgrgid_r"); + int ret = orig_getgrgid_r ? orig_getgrgid_r(gid, grp, buf, buflen, result) : ENOENT; +#else + int ret = g_test_orig_nss_r_ret; + if (result) *result = (ret == 0 && g_test_orig_nss_r_found) ? grp : NULL; +#endif + if (ret == 0 && result && *result != NULL) return 0; + if (ret != 0 && ret != ENOENT) { + if (result) *result = NULL; + return ret; + } + + int err = ddnatv_lookup_group(NULL, gid, 0, grp, buf, buflen); + if (err == 0) { + if (result) *result = grp; + return 0; + } + if (result) *result = NULL; + return (err == ERANGE) ? ERANGE : 0; +} + +int DDNATV_NSS_SYM(getgrnam_r)(const char *name, struct group *grp, char *buf, size_t buflen, struct group **result) { +#ifndef DDNATV_HOST_TEST + static int (*orig_getgrnam_r)(const char *, struct group *, char *, size_t, struct group **) = NULL; + if (!orig_getgrnam_r) orig_getgrnam_r = (int (*)(const char *, struct group *, char *, size_t, struct group **))dlsym(RTLD_NEXT, "getgrnam_r"); + int ret = orig_getgrnam_r ? orig_getgrnam_r(name, grp, buf, buflen, result) : ENOENT; +#else + int ret = g_test_orig_nss_r_ret; + if (result) *result = (ret == 0 && g_test_orig_nss_r_found) ? grp : NULL; +#endif + if (ret == 0 && result && *result != NULL) return 0; + if (ret != 0 && ret != ENOENT) { + if (result) *result = NULL; + return ret; + } + + int err = ddnatv_lookup_group(name, 0, 1, grp, buf, buflen); + if (err == 0) { + if (result) *result = grp; + return 0; + } + if (result) *result = NULL; + return (err == ERANGE) ? ERANGE : 0; +} + +// sshd's privilege-separated user is root's ids: The native userland cannot drop privileges (setuid() and +// setgid() only pretend to), and sshd's unprivileged part checks after dropping them that it cannot +// take them back, which ended it ("permanently_set_uid: was able to restore old [e]gid"). Like apt's +// sandbox user (APT::Sandbox::User "root"), it then runs as the rest does. +// +// The app's own ids are root's as well: the rootfs lists root with them for proot, and a server +// that allows "localuser:root" compares getpwnam("root") with a peer's credentials, which the hook +// reports as 0. Xwayland refused gamescope's own connection when the two disagreed. +static struct passwd *present_privsep_user_as_root(struct passwd *pwd) { + if (pwd && pwd->pw_name && strcmp(pwd->pw_name, "sshd") == 0) { + pwd->pw_uid = 0; + pwd->pw_gid = 0; + } + if (pwd && pwd->pw_uid == real_uid()) pwd->pw_uid = 0; + if (pwd && pwd->pw_gid == real_gid()) pwd->pw_gid = 0; + return pwd; +} + +struct passwd *DDNATV_NSS_SYM(getpwuid)(uid_t uid) { +#ifndef DDNATV_HOST_TEST + static struct passwd *(*orig_getpwuid)(uid_t) = NULL; + if (!orig_getpwuid) orig_getpwuid = (struct passwd *(*)(uid_t))dlsym(RTLD_NEXT, "getpwuid"); + struct passwd *res = orig_getpwuid ? orig_getpwuid(uid) : NULL; + if (res) return present_privsep_user_as_root(res); +#endif + + int err = ddnatv_lookup_passwd(NULL, uid, 0, &s_pwd_storage, s_pwd_buf, sizeof(s_pwd_buf)); + if (err == 0) return present_privsep_user_as_root(&s_pwd_storage); + return NULL; +} + +struct passwd *DDNATV_NSS_SYM(getpwnam)(const char *name) { +#ifndef DDNATV_HOST_TEST + static struct passwd *(*orig_getpwnam)(const char *) = NULL; + if (!orig_getpwnam) orig_getpwnam = (struct passwd *(*)(const char *))dlsym(RTLD_NEXT, "getpwnam"); + struct passwd *res = orig_getpwnam ? orig_getpwnam(name) : NULL; + if (res) return present_privsep_user_as_root(res); +#endif + + int err = ddnatv_lookup_passwd(name, 0, 1, &s_pwd_storage, s_pwd_buf, sizeof(s_pwd_buf)); + if (err == 0) return present_privsep_user_as_root(&s_pwd_storage); + return NULL; +} + +int DDNATV_NSS_SYM(getpwuid_r)(uid_t uid, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result) { +#ifndef DDNATV_HOST_TEST + static int (*orig_getpwuid_r)(uid_t, struct passwd *, char *, size_t, struct passwd **) = NULL; + if (!orig_getpwuid_r) orig_getpwuid_r = (int (*)(uid_t, struct passwd *, char *, size_t, struct passwd **))dlsym(RTLD_NEXT, "getpwuid_r"); + int ret = orig_getpwuid_r ? orig_getpwuid_r(uid, pwd, buf, buflen, result) : ENOENT; +#else + int ret = g_test_orig_nss_r_ret; + if (result) *result = (ret == 0 && g_test_orig_nss_r_found) ? pwd : NULL; +#endif + if (ret == 0 && result && *result != NULL) { + present_privsep_user_as_root(*result); + return 0; + } + if (ret != 0 && ret != ENOENT) { + if (result) *result = NULL; + return ret; + } + + int err = ddnatv_lookup_passwd(NULL, uid, 0, pwd, buf, buflen); + if (err == 0) { + present_privsep_user_as_root(pwd); + if (result) *result = pwd; + return 0; + } + if (result) *result = NULL; + return (err == ERANGE) ? ERANGE : 0; +} + +int DDNATV_NSS_SYM(getpwnam_r)(const char *name, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result) { +#ifndef DDNATV_HOST_TEST + static int (*orig_getpwnam_r)(const char *, struct passwd *, char *, size_t, struct passwd **) = NULL; + if (!orig_getpwnam_r) orig_getpwnam_r = (int (*)(const char *, struct passwd *, char *, size_t, struct passwd **))dlsym(RTLD_NEXT, "getpwnam_r"); + int ret = orig_getpwnam_r ? orig_getpwnam_r(name, pwd, buf, buflen, result) : ENOENT; +#else + int ret = g_test_orig_nss_r_ret; + if (result) *result = (ret == 0 && g_test_orig_nss_r_found) ? pwd : NULL; +#endif + if (ret == 0 && result && *result != NULL) { + present_privsep_user_as_root(*result); + return 0; + } + if (ret != 0 && ret != ENOENT) { + if (result) *result = NULL; + return ret; + } + + int err = ddnatv_lookup_passwd(name, 0, 1, pwd, buf, buflen); + if (err == 0) { + present_privsep_user_as_root(pwd); + if (result) *result = pwd; + return 0; + } + if (result) *result = NULL; + return (err == ERANGE) ? ERANGE : 0; +} diff --git a/tools/nativeguest/hook/net.c b/tools/nativeguest/hook/net.c new file mode 100644 index 0000000000..19424c5796 --- /dev/null +++ b/tools/nativeguest/hook/net.c @@ -0,0 +1,1054 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Name resolution: DNS packets, the network's DNS servers, the fallback resolver, getaddrinfo() +// and the resolver state, and DNS queries to loopback redirected to a real server. + +// ---- DNS packets and servers ------------------------------------------------------------- +// Pure functions (no syscalls apart from if_nametoindex), so tests/native can check them directly. + +#define DDNATV_DNS_TYPE_A 1 +#define DDNATV_DNS_TYPE_AAAA 28 +#define DDNATV_DNS_MAX_SERVERS 8 + +typedef struct { + struct sockaddr_storage addr; + socklen_t len; +} ddnatv_dns_server_t; + +// Fills `server` with the DNS server `text` (an IPv4 or IPv6 address, IPv6 optionally with a +// "%interface" scope) on port 53. Returns 0 for loopback and unspecified addresses (nothing answers +// there on Android), for a link-local IPv6 address without a scope, and for anything invalid. +static int dns_server_from_string(const char *text, ddnatv_dns_server_t *server) { + memset(server, 0, sizeof(*server)); + if (!text) return 0; + struct in_addr a4; + if (inet_pton(AF_INET, text, &a4) == 1) { + if ((ntohl(a4.s_addr) >> 24) == 127 || a4.s_addr == 0) return 0; + struct sockaddr_in *sin = (struct sockaddr_in *)&server->addr; + sin->sin_family = AF_INET; + sin->sin_port = htons(53); + sin->sin_addr = a4; + server->len = sizeof(*sin); + return 1; + } + char host[INET6_ADDRSTRLEN + IF_NAMESIZE + 2]; + if (strlen(text) >= sizeof(host)) return 0; + strcpy(host, text); + unsigned int scope = 0; + char *pct = strchr(host, '%'); + if (pct) { + *pct++ = '\0'; + if (*pct >= '0' && *pct <= '9') { + scope = (unsigned int)strtoul(pct, NULL, 10); + } else { + scope = if_nametoindex(pct); + } + } + struct in6_addr a6; + if (inet_pton(AF_INET6, host, &a6) != 1) return 0; + if (IN6_IS_ADDR_LOOPBACK(&a6) || IN6_IS_ADDR_UNSPECIFIED(&a6)) return 0; + if (IN6_IS_ADDR_V4MAPPED(&a6) && (a6.s6_addr[12] == 127 || (a6.s6_addr[12] | a6.s6_addr[13] | a6.s6_addr[14] | a6.s6_addr[15]) == 0)) return 0; + if (IN6_IS_ADDR_LINKLOCAL(&a6) && scope == 0) return 0; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&server->addr; + sin6->sin6_family = AF_INET6; + sin6->sin6_port = htons(53); + sin6->sin6_addr = a6; + sin6->sin6_scope_id = scope; + server->len = sizeof(*sin6); + return 1; +} + +// The "nameserver" lines of a resolv.conf, in order: up to `max` usable servers, IPv4 and IPv6. +static int parse_nameservers(const char *text, ddnatv_dns_server_t *out, int max) { + int count = 0; + const char *line = text; + while (line && *line && count < max) { + const char *next = strchr(line, '\n'); + size_t len = next ? (size_t)(next - line) : strlen(line); + char buf[256]; + if (len >= sizeof(buf)) len = sizeof(buf) - 1; + memcpy(buf, line, len); + buf[len] = '\0'; + char *p = buf; + while (*p == ' ' || *p == '\t') p++; + if (strncmp(p, "nameserver", 10) == 0 && (p[10] == ' ' || p[10] == '\t')) { + p += 10; + while (*p == ' ' || *p == '\t') p++; + char *end = p; + while (*end && *end != ' ' && *end != '\t' && *end != '\r' && *end != '#' && *end != ';') end++; + *end = '\0'; + if (dns_server_from_string(p, &out[count])) count++; + } + line = next ? next + 1 : NULL; + } + return count; +} + +static int dns_server_equal(const ddnatv_dns_server_t *a, const ddnatv_dns_server_t *b) { + return a->len == b->len && memcmp(&a->addr, &b->addr, a->len) == 0; +} + +// Builds a recursive query for one name and record type; returns its length, or -1 when the name +// is not a valid DNS name (an empty label, a label over 63 bytes, over 253 bytes in all). +static int dns_build_query(const char *name, int qtype, uint16_t txid, unsigned char *packet, size_t size) { + if (!name || !packet || size < 12) return -1; + size_t name_len = strlen(name); + if (name_len > 0 && name[name_len - 1] == '.') name_len--; // "example.com." is absolute + if (name_len == 0 || name_len > 253) return -1; + memset(packet, 0, 12); + packet[0] = (unsigned char)(txid >> 8); + packet[1] = (unsigned char)(txid & 0xff); + packet[2] = 0x01; // recursion desired + packet[5] = 0x01; // one question + size_t pos = 12; + size_t start = 0; + for (;;) { + size_t end = start; + while (end < name_len && name[end] != '.') end++; + size_t len = end - start; + if (len == 0 || len > 63 || pos + 1 + len + 1 + 4 > size) return -1; + packet[pos++] = (unsigned char)len; + memcpy(packet + pos, name + start, len); + pos += len; + if (end == name_len) break; + start = end + 1; + } + packet[pos++] = 0; + packet[pos++] = (unsigned char)(qtype >> 8); + packet[pos++] = (unsigned char)(qtype & 0xff); + packet[pos++] = 0x00; + packet[pos++] = 0x01; // class IN + return (int)pos; +} + +// Offset after the (possibly compressed) name at `off`, or -1 when it is malformed. +static int dns_skip_name(const unsigned char *msg, int n, int off) { + for (int labels = 0; labels < 128; labels++) { + if (off >= n) return -1; + unsigned char len = msg[off]; + if (len == 0) return off + 1; + if ((len & 0xc0) == 0xc0) return off + 2 <= n ? off + 2 : -1; + if (len & 0xc0) return -1; + off += 1 + len; + } + return -1; +} + +// Copies the first address of type `qtype` (4 bytes for A, 16 for AAAA) from the reply `msg` to the +// query `txid` and returns 0. Returns 1 when the reply says there is no such address (the name does +// not exist, or has no record of that type): asking other servers would only send the name to more +// of them. Returns -1 for anything that is worth asking another server about: a failure (SERVFAIL, +// REFUSED), a truncated, malformed or foreign reply. +static int dns_parse_answer(const unsigned char *msg, int n, uint16_t txid, int qtype, unsigned char *out) { + if (!msg || n < 12) return -1; + if (((msg[0] << 8) | msg[1]) != txid) return -1; + if (!(msg[2] & 0x80)) return -1; // not a reply + int rcode = msg[3] & 0x0f; + if (rcode == 3) return 1; // NXDOMAIN + if (rcode != 0) return -1; + int qdcount = (msg[4] << 8) | msg[5]; + int ancount = (msg[6] << 8) | msg[7]; + int off = 12; + for (int q = 0; q < qdcount; q++) { + off = dns_skip_name(msg, n, off); + if (off < 0 || off + 4 > n) return -1; + off += 4; + } + int want = qtype == DDNATV_DNS_TYPE_AAAA ? 16 : 4; + for (int a = 0; a < ancount; a++) { + off = dns_skip_name(msg, n, off); + if (off < 0 || off + 10 > n) return -1; + int rtype = (msg[off] << 8) | msg[off + 1]; + int rclass = (msg[off + 2] << 8) | msg[off + 3]; + int rdlen = (msg[off + 8] << 8) | msg[off + 9]; + off += 10; + if (off + rdlen > n) return -1; + if (rtype == qtype && rclass == 1 && rdlen == want) { + memcpy(out, msg + off, (size_t)want); + return 0; + } + off += rdlen; + } + return (msg[2] & 0x02) ? -1 : 1; // no such record, unless the reply was truncated +} + +// ---- Sockets bound to a port the program chose ---------------------------------------------- +// Which descriptors are TCP/UDP sockets that bind() gave a port the program asked for (not 0, +// where the kernel picks one). listen() reports only those to the app, which connects to a +// reported port to see whether it serves web pages (sockets.c). Descriptors past the bitmap +// are taken as not chosen: they are not reported. +#define DDNATV_CHOSEN_PORT_FDS 65536 +static unsigned char g_chosen_port_fds[DDNATV_CHOSEN_PORT_FDS / 8]; + +static void set_chosen_port_fd(int fd, int chosen) { + if (fd < 0 || fd >= DDNATV_CHOSEN_PORT_FDS) return; + unsigned char bit = (unsigned char)(1u << (fd & 7)); + // Written only when it changes: a page of the bitmap is copied for a forked child only then + if (chosen) { + if (!(__atomic_load_n(&g_chosen_port_fds[fd >> 3], __ATOMIC_RELAXED) & bit)) + __atomic_fetch_or(&g_chosen_port_fds[fd >> 3], bit, __ATOMIC_RELAXED); + } else if (__atomic_load_n(&g_chosen_port_fds[fd >> 3], __ATOMIC_RELAXED) & bit) { + __atomic_fetch_and(&g_chosen_port_fds[fd >> 3], (unsigned char)~bit, __ATOMIC_RELAXED); + } +} + +static int is_chosen_port_fd(int fd) { + if (fd < 0 || fd >= DDNATV_CHOSEN_PORT_FDS) return 0; + return (__atomic_load_n(&g_chosen_port_fds[fd >> 3], __ATOMIC_RELAXED) >> (fd & 7)) & 1; +} + +#ifndef DDNATV_HOST_TEST + +// DNS resolution hooking and localhost DNS redirect +#define DNS_REDIRECT_MAX 64 +static struct { + int fd; + struct sockaddr_storage orig; + socklen_t orig_len; + uint32_t active; +} g_dns_redirects[DNS_REDIRECT_MAX]; +static pthread_mutex_t g_dns_redirect_mutex = PTHREAD_MUTEX_INITIALIZER; + +static void record_dns_redirect(int fd, const struct sockaddr *orig, socklen_t orig_len) { + if (fd < 0 || !orig) return; + if (orig_len > sizeof(struct sockaddr_storage)) orig_len = sizeof(struct sockaddr_storage); + pthread_mutex_lock(&g_dns_redirect_mutex); + int target_idx = (fd >= 0 ? fd : -fd) % DNS_REDIRECT_MAX; + g_dns_redirects[target_idx].fd = fd; + memcpy(&g_dns_redirects[target_idx].orig, orig, orig_len); + g_dns_redirects[target_idx].orig_len = orig_len; + g_dns_redirects[target_idx].active = 1; + pthread_mutex_unlock(&g_dns_redirect_mutex); +} + +static void clear_dns_redirect(int fd) { + if (fd < 0) return; + int target_idx = (fd >= 0 ? fd : -fd) % DNS_REDIRECT_MAX; + if (!g_dns_redirects[target_idx].active || g_dns_redirects[target_idx].fd != fd) { + return; + } + pthread_mutex_lock(&g_dns_redirect_mutex); + if (g_dns_redirects[target_idx].active && g_dns_redirects[target_idx].fd == fd) { + g_dns_redirects[target_idx].active = 0; + g_dns_redirects[target_idx].fd = -1; + g_dns_redirects[target_idx].orig_len = 0; + } + pthread_mutex_unlock(&g_dns_redirect_mutex); +} + +int close(int fd) { + static int (*orig_close)(int) = NULL; + if (!orig_close) orig_close = (int (*)(int))dlsym(RTLD_NEXT, "close"); + // The ARM translator's memory file (privileged.c): left open, as if it were closed + if (g_kept_fd_count > 0 && is_kept_fd(fd)) return 0; + clear_dns_redirect(fd); + set_chosen_port_fd(fd, 0); + return orig_close ? orig_close(fd) : -1; +} + +int dup2(int oldfd, int newfd) { + static int (*orig_dup2)(int, int) = NULL; + if (!orig_dup2) orig_dup2 = (int (*)(int, int))dlsym(RTLD_NEXT, "dup2"); + if (oldfd != newfd) { + clear_dns_redirect(newfd); + set_chosen_port_fd(newfd, is_chosen_port_fd(oldfd)); + } + return orig_dup2 ? orig_dup2(oldfd, newfd) : -1; +} + +int dup3(int oldfd, int newfd, int flags) { + static int (*orig_dup3)(int, int, int) = NULL; + if (!orig_dup3) orig_dup3 = (int (*)(int, int, int))dlsym(RTLD_NEXT, "dup3"); + if (oldfd != newfd) { + clear_dns_redirect(newfd); + set_chosen_port_fd(newfd, is_chosen_port_fd(oldfd)); + } + return orig_dup3 ? orig_dup3(oldfd, newfd, flags) : -1; +} + +static int get_dns_redirect(int fd, struct sockaddr_storage *orig, socklen_t *orig_len) { + if (fd < 0) return 0; + int found = 0; + pthread_mutex_lock(&g_dns_redirect_mutex); + int target_idx = (fd >= 0 ? fd : -fd) % DNS_REDIRECT_MAX; + if (g_dns_redirects[target_idx].active && g_dns_redirects[target_idx].fd == fd) { + if (orig) *orig = g_dns_redirects[target_idx].orig; + if (orig_len) *orig_len = g_dns_redirects[target_idx].orig_len; + found = 1; + } + pthread_mutex_unlock(&g_dns_redirect_mutex); + return found; +} + +// A DNS query to 127.0.0.0/8 or ::1 (or ::ffff:127.x), where nothing listens on Android. +static inline int is_loopback_dns(const struct sockaddr *addr, socklen_t addrlen) { + if (!addr || addrlen < sizeof(sa_family_t)) return 0; + if (addr->sa_family == AF_INET && addrlen >= sizeof(struct sockaddr_in)) { + const struct sockaddr_in *sin = (const struct sockaddr_in *)addr; + return (sin->sin_port == htons(53) && ((ntohl(sin->sin_addr.s_addr) >> 24) == 127)); + } + if (addr->sa_family == AF_INET6 && addrlen >= sizeof(struct sockaddr_in6)) { + const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)addr; + if (sin6->sin6_port != htons(53)) return 0; + return IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr) || + (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr) && sin6->sin6_addr.s6_addr[12] == 127); + } + return 0; +} + +static in_addr_t get_primary_dns(void) { + static in_addr_t cached_dns = 0; + static time_t last_check = 0; + static pthread_mutex_t dns_mutex = PTHREAD_MUTEX_INITIALIZER; + + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + time_t now = ts.tv_sec; + + // Fast path: cached value valid within 5s TTL + if (cached_dns != 0 && (now - last_check < 5)) { + return cached_dns; + } + + pthread_mutex_lock(&dns_mutex); + if (cached_dns != 0 && (now - last_check < 5)) { + in_addr_t val = cached_dns; + pthread_mutex_unlock(&dns_mutex); + return val; + } + last_check = now; + + in_addr_t new_dns = 0; + init_ddnatv_hook(); + + // 1. Check Android system property net.dns1 via Bionic libc + static int (*orig_sys_prop_get)(const char *, char *) = NULL; + static int prop_lookup_done = 0; + if (!prop_lookup_done) { + orig_sys_prop_get = (int (*)(const char *, char *))dlsym(RTLD_DEFAULT, "__system_property_get"); + prop_lookup_done = 1; + } + if (orig_sys_prop_get) { + char prop_val[256]; + if (orig_sys_prop_get("net.dns1", prop_val) > 0 && prop_val[0] != '\0') { + struct in_addr a; + if (inet_aton(prop_val, &a)) { + if ((ntohl(a.s_addr) >> 24) != 127 && a.s_addr != 0) { + new_dns = a.s_addr; + } + } + } + } + + // 2. Parse /etc/resolv.conf in The native userland rootfs + char resolv_path[PATH_MAX]; + if (g_ddnatv_root[0] != '\0') { + snprintf(resolv_path, sizeof(resolv_path), "%s/etc/resolv.conf", g_ddnatv_root); + } else { + snprintf(resolv_path, sizeof(resolv_path), "/etc/resolv.conf"); + } + + struct stat st; + if (stat(resolv_path, &st) == 0) { + if (new_dns == 0) { + FILE *f = fopen(resolv_path, "r"); + if (f) { + char line[256]; + while (fgets(line, sizeof(line), f)) { + char *p = line; + while (*p == ' ' || *p == '\t') p++; + if (strncmp(p, "nameserver", 10) == 0) { + p += 10; + while (*p == ' ' || *p == '\t') p++; + char *end = p; + while (*end && *end != ' ' && *end != '\t' && *end != '\r' && *end != '\n') end++; + *end = '\0'; + struct in_addr a; + if (inet_aton(p, &a)) { + // Only accept valid, non-loopback DNS servers + if ((ntohl(a.s_addr) >> 24) != 127 && a.s_addr != 0) { + new_dns = a.s_addr; + break; + } + } + } + } + fclose(f); + } + } + } + + if (new_dns == 0) { + new_dns = inet_addr("8.8.8.8"); + } + + cached_dns = new_dns; + pthread_mutex_unlock(&dns_mutex); + return cached_dns; +} + + +// The DNS servers in the rootfs resolv.conf (which the app writes from Android's network settings), +// read again at most every 5 seconds. +static int get_dns_servers(ddnatv_dns_server_t *out, int max) { + static ddnatv_dns_server_t cached[DDNATV_DNS_MAX_SERVERS]; + static int cached_count = 0; + static time_t last_check = 0; + static int checked = 0; + static pthread_mutex_t servers_mutex = PTHREAD_MUTEX_INITIALIZER; + + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + pthread_mutex_lock(&servers_mutex); + if (!checked || ts.tv_sec - last_check >= 5) { + checked = 1; + last_check = ts.tv_sec; + init_ddnatv_hook(); + char path[PATH_MAX]; + snprintf(path, sizeof(path), "%s/etc/resolv.conf", g_ddnatv_root[0] ? g_ddnatv_root : ""); + char text[4096]; + ssize_t n = -1; + int fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd >= 0) { + n = read(fd, text, sizeof(text) - 1); + close(fd); + } + text[n > 0 ? n : 0] = '\0'; + cached_count = parse_nameservers(text, cached, DDNATV_DNS_MAX_SERVERS); + } + int count = cached_count < max ? cached_count : max; + memcpy(out, cached, (size_t)count * sizeof(cached[0])); + pthread_mutex_unlock(&servers_mutex); + return count; +} + +// Where a DNS query to a loopback address goes instead: the network's DNS server, in the family of +// the socket (an IPv6 socket gets the first IPv6 server, else the IPv4 one as ::ffff:a.b.c.d). +// Returns the length of the address written to `out`. +static socklen_t dns_redirect_target(const struct sockaddr *orig, struct sockaddr_storage *out) { + memset(out, 0, sizeof(*out)); + if (orig->sa_family == AF_INET) { + memcpy(out, orig, sizeof(struct sockaddr_in)); + ((struct sockaddr_in *)out)->sin_addr.s_addr = get_primary_dns(); + return sizeof(struct sockaddr_in); + } + struct sockaddr_in6 *dst = (struct sockaddr_in6 *)out; + memcpy(dst, orig, sizeof(*dst)); + ddnatv_dns_server_t servers[DDNATV_DNS_MAX_SERVERS]; + int n = get_dns_servers(servers, DDNATV_DNS_MAX_SERVERS); + for (int i = 0; i < n; i++) { + if (servers[i].addr.ss_family == AF_INET6) { + const struct sockaddr_in6 *s6 = (const struct sockaddr_in6 *)&servers[i].addr; + dst->sin6_addr = s6->sin6_addr; + dst->sin6_scope_id = s6->sin6_scope_id; + return sizeof(*dst); + } + } + in_addr_t v4 = get_primary_dns(); + memset(&dst->sin6_addr, 0, sizeof(dst->sin6_addr)); + dst->sin6_addr.s6_addr[10] = 0xff; + dst->sin6_addr.s6_addr[11] = 0xff; + memcpy(&dst->sin6_addr.s6_addr[12], &v4, 4); + dst->sin6_scope_id = 0; + return sizeof(*dst); +} + +// Puts the loopback address that a DNS socket was redirected from back into the source address of a +// reply (`cap` is the size of the caller's buffer), so resolvers that check the sender accept it. +static void restore_dns_source(int fd, struct sockaddr *addr, socklen_t cap, socklen_t *len) { + if (!addr || cap < sizeof(sa_family_t)) return; + in_port_t port; + if (addr->sa_family == AF_INET && cap >= sizeof(struct sockaddr_in)) { + port = ((const struct sockaddr_in *)addr)->sin_port; + } else if (addr->sa_family == AF_INET6 && cap >= sizeof(struct sockaddr_in6)) { + port = ((const struct sockaddr_in6 *)addr)->sin6_port; + } else { + return; + } + if (port != htons(53)) return; + struct sockaddr_storage orig; + socklen_t orig_len = 0; + if (!get_dns_redirect(fd, &orig, &orig_len) || orig.ss_family != addr->sa_family) return; + memcpy(addr, &orig, orig_len < cap ? orig_len : cap); + if (len) *len = orig_len; +} + +#define DDNATV_ADDRINFO_MAGIC 0x434f5254 + +// One addrinfo for an IPv4 (4 bytes) or IPv6 (16 bytes) address; freed by the freeaddrinfo hook. +static struct addrinfo *alloc_addrinfo(const char *node, int family, const void *addr, int port, int socktype, int protocol) { + struct addrinfo *ai = (struct addrinfo *)calloc(1, sizeof(struct addrinfo)); + if (!ai) return NULL; + socklen_t len = family == AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in); + void *sa = calloc(1, len); + if (!sa) { + free(ai); + return NULL; + } + if (family == AF_INET6) { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; + sin6->sin6_family = AF_INET6; + sin6->sin6_port = htons((uint16_t)port); + memcpy(&sin6->sin6_addr, addr, 16); + } else { + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + sin->sin_family = AF_INET; + sin->sin_port = htons((uint16_t)port); + memcpy(&sin->sin_addr, addr, 4); + } + + ai->ai_flags = DDNATV_ADDRINFO_MAGIC; + ai->ai_family = family; + ai->ai_socktype = socktype ? socktype : SOCK_STREAM; + ai->ai_protocol = protocol; + ai->ai_addrlen = len; + ai->ai_addr = (struct sockaddr *)sa; + ai->ai_canonname = node ? strdup(node) : NULL; + ai->ai_next = NULL; + return ai; +} + +static uint16_t generate_dns_txid(void) { + uint16_t txid = 0; + static ssize_t (*libc_getrandom)(void *, size_t, unsigned int) = NULL; + static int getrandom_checked = 0; + if (!getrandom_checked) { + libc_getrandom = (ssize_t (*)(void *, size_t, unsigned int))dlsym(RTLD_DEFAULT, "getrandom"); + getrandom_checked = 1; + } + if (libc_getrandom) { + if (libc_getrandom(&txid, sizeof(txid), 1 /* GRND_NONBLOCK */) == sizeof(txid) && txid != 0) { + return txid; + } + } +#if defined(SYS_getrandom) || defined(__NR_getrandom) +#ifndef __NR_getrandom +#define __NR_getrandom SYS_getrandom +#endif + long r = syscall(__NR_getrandom, &txid, sizeof(txid), 1 /* GRND_NONBLOCK */); + if (r == (long)sizeof(txid) && txid != 0) { + return txid; + } +#endif + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + uint32_t val = (uint32_t)(ts.tv_nsec ^ (ts.tv_sec << 16) ^ (uintptr_t)&txid); + txid = (uint16_t)((val & 0xffff) ^ (val >> 16)); + if (txid == 0) txid = 0x5a6b; + return txid; +} + +static void add_dns_server(ddnatv_dns_server_t *list, int *count, int max, const ddnatv_dns_server_t *server) { + if (*count >= max) return; + for (int i = 0; i < *count; i++) { + if (dns_server_equal(&list[i], server)) return; + } + list[(*count)++] = *server; +} + +// Looks one address of `name` up itself, for when glibc found none: asks the network's DNS servers, +// then public ones (IPv4 first, then IPv6, for IPv6-only networks without IPv4 translation), and +// stops at the first that answers. `qtype` is DDNATV_DNS_TYPE_A (4 bytes into `out`) or +// DDNATV_DNS_TYPE_AAAA (16 bytes). `*server` is -1 to ask them in turn, or the index of the only +// server to ask; on return it holds the server that answered (-1 when none did). +static int dns_lookup(const char *name, int qtype, unsigned char *out, int *server) { + if (!name || !out) return -1; + int family = qtype == DDNATV_DNS_TYPE_AAAA ? AF_INET6 : AF_INET; + if (inet_pton(family, name, out) == 1) return 0; + + static const char *const k_public_dns[] = { + "8.8.8.8", "1.1.1.1", "9.9.9.9", "2001:4860:4860::8888", "2606:4700:4700::1111", + }; + ddnatv_dns_server_t servers[DDNATV_DNS_MAX_SERVERS + 6]; + int max = (int)(sizeof(servers) / sizeof(servers[0])); + int count = 0; + ddnatv_dns_server_t s; + // the network's own servers in resolv.conf's order first, its IPv6 ones too: the first IPv4 one + // (get_primary_dns) can be the app's public fallback, which must not see private names first + ddnatv_dns_server_t network[DDNATV_DNS_MAX_SERVERS]; + int network_count = get_dns_servers(network, DDNATV_DNS_MAX_SERVERS); + for (int i = 0; i < network_count; i++) add_dns_server(servers, &count, max, &network[i]); + char primary[INET_ADDRSTRLEN]; + in_addr_t p_dns = get_primary_dns(); // also covers net.dns1 of older Android versions + if (inet_ntop(AF_INET, &p_dns, primary, sizeof(primary)) && dns_server_from_string(primary, &s)) { + add_dns_server(servers, &count, max, &s); + } + for (size_t i = 0; i < sizeof(k_public_dns) / sizeof(k_public_dns[0]); i++) { + if (dns_server_from_string(k_public_dns[i], &s)) add_dns_server(servers, &count, max, &s); + } + + unsigned char packet[512]; + uint16_t txid = generate_dns_txid(); + int packet_len = dns_build_query(name, qtype, txid, packet, sizeof(packet)); + if (packet_len < 0) return -1; + + int only = *server; + *server = -1; + for (int i = (only >= 0 ? only : 0); i < count && (only < 0 || i == only); i++) { + int sock = socket(servers[i].addr.ss_family, SOCK_DGRAM | SOCK_CLOEXEC, 0); + if (sock < 0) continue; + + struct timeval tv; + tv.tv_sec = 0; + tv.tv_usec = 600000; // 600ms fast failover + setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); + + // A connected socket only receives datagrams from that server. + if (connect(sock, (const struct sockaddr *)&servers[i].addr, servers[i].len) != 0 || + send(sock, packet, (size_t)packet_len, 0) != packet_len) { + close(sock); + continue; + } + unsigned char resp[1500]; + ssize_t n = recv(sock, resp, sizeof(resp), 0); + close(sock); + int result = n > 0 ? dns_parse_answer(resp, (int)n, txid, qtype, out) : -1; + if (result >= 0) { + *server = i; + return result == 0 ? 0 : -1; + } + } + return -1; +} + +// Whether the network's DNS servers are all IPv6 ones, as on an IPv6-only mobile network. +static int network_dns_is_ipv6_only(void) { + ddnatv_dns_server_t servers[DDNATV_DNS_MAX_SERVERS]; + int n = get_dns_servers(servers, DDNATV_DNS_MAX_SERVERS); + for (int i = 0; i < n; i++) { + if (servers[i].addr.ss_family != AF_INET6) return 0; + } + return n > 0; +} + +// glibc reads /etc/services with an open() of its own, which the path hooks never see, so a service +// name was looked up where Android has no such file: getaddrinfo(host, "https") failed with +// EAI_SERVICE. The rootfs's file is read here when glibc finds nothing. 0, ENOENT or ERANGE. +static int ddnatv_lookup_service(const char *name, int port, const char *proto, + struct servent *out, char *buf, size_t buflen) { + char path_buf[PATH_MAX]; + const char *path = rewrite_path("/etc/services", path_buf, sizeof(path_buf)); + FILE *f = path ? fopen(path, "re") : NULL; + if (!f) return ENOENT; + char line[512]; + int result = ENOENT; + while (result == ENOENT && fgets(line, sizeof(line), f)) { + char *hash = strchr(line, '#'); + if (hash) *hash = '\0'; + char *save = NULL; + char *svc = strtok_r(line, " \t\r\n", &save); + char *pp = svc ? strtok_r(NULL, " \t\r\n", &save) : NULL; + char *slash = pp ? strchr(pp, '/') : NULL; + if (!slash) continue; + *slash = '\0'; + const char *svc_proto = slash + 1; + int svc_port = atoi(pp); + if (proto && strcmp(proto, svc_proto) != 0) continue; + char *aliases[16]; + int naliases = 0; + int matched = name ? strcmp(svc, name) == 0 : svc_port == port; + for (char *a = strtok_r(NULL, " \t\r\n", &save); a && naliases < 15; a = strtok_r(NULL, " \t\r\n", &save)) { + aliases[naliases++] = a; + if (name && strcmp(a, name) == 0) matched = 1; + } + if (!matched) continue; + // buf holds the alias pointers, then the strings + size_t need = sizeof(char *) * (size_t)(naliases + 1) + strlen(svc) + 1 + strlen(svc_proto) + 1; + for (int i = 0; i < naliases; i++) need += strlen(aliases[i]) + 1; + if (need > buflen) { result = ERANGE; break; } + char **list = (char **)(void *)buf; + char *p = buf + sizeof(char *) * (size_t)(naliases + 1); + out->s_name = strcpy(p, svc); p += strlen(svc) + 1; + out->s_proto = strcpy(p, svc_proto); p += strlen(svc_proto) + 1; + for (int i = 0; i < naliases; i++) { list[i] = strcpy(p, aliases[i]); p += strlen(aliases[i]) + 1; } + list[naliases] = NULL; + out->s_aliases = list; + out->s_port = (int)htons((uint16_t)svc_port); + result = 0; + } + fclose(f); + return result; +} + +int getservbyname_r(const char *name, const char *proto, struct servent *result_buf, char *buf, size_t buflen, + struct servent **result) { + static int (*orig)(const char *, const char *, struct servent *, char *, size_t, struct servent **) = NULL; + if (!orig) orig = (int (*)(const char *, const char *, struct servent *, char *, size_t, struct servent **))dlsym(RTLD_NEXT, "getservbyname_r"); + int ret = orig ? orig(name, proto, result_buf, buf, buflen, result) : ENOENT; + if (ret == 0 && result && *result) return 0; + if (!name || !result_buf || !buf) return ret; + int err = ddnatv_lookup_service(name, 0, proto, result_buf, buf, buflen); + if (result) *result = err == 0 ? result_buf : NULL; + return err == ERANGE ? ERANGE : 0; +} + +int getservbyport_r(int port, const char *proto, struct servent *result_buf, char *buf, size_t buflen, + struct servent **result) { + static int (*orig)(int, const char *, struct servent *, char *, size_t, struct servent **) = NULL; + if (!orig) orig = (int (*)(int, const char *, struct servent *, char *, size_t, struct servent **))dlsym(RTLD_NEXT, "getservbyport_r"); + int ret = orig ? orig(port, proto, result_buf, buf, buflen, result) : ENOENT; + if (ret == 0 && result && *result) return 0; + if (!result_buf || !buf) return ret; + int err = ddnatv_lookup_service(NULL, ntohs((uint16_t)port), proto, result_buf, buf, buflen); + if (result) *result = err == 0 ? result_buf : NULL; + return err == ERANGE ? ERANGE : 0; +} + +struct servent *getservbyname(const char *name, const char *proto) { + static __thread struct servent entry; + static __thread char buf[1024]; + struct servent *found = NULL; + return getservbyname_r(name, proto, &entry, buf, sizeof(buf), &found) == 0 ? found : NULL; +} + +struct servent *getservbyport(int port, const char *proto) { + static __thread struct servent entry; + static __thread char buf[1024]; + struct servent *found = NULL; + return getservbyport_r(port, proto, &entry, buf, sizeof(buf), &found) == 0 ? found : NULL; +} + +static int synthesize_fallback_addrinfo(const char *node, const char *service, + const struct addrinfo *hints, + struct addrinfo **res) { + if (!node || !res) return EAI_NONAME; + + int socktype = (hints && hints->ai_socktype) ? hints->ai_socktype : SOCK_STREAM; + int protocol = (hints && hints->ai_protocol) ? hints->ai_protocol + : socktype == SOCK_DGRAM ? IPPROTO_UDP : socktype == SOCK_STREAM ? IPPROTO_TCP : 0; + int family = hints ? hints->ai_family : AF_UNSPEC; + if (family != AF_UNSPEC && family != AF_INET && family != AF_INET6) return EAI_FAMILY; + + // As glibc: no service is port 0, a number is that port, a name comes from /etc/services + int port = 0; + if (service && *service) { + char *end = NULL; + errno = 0; + long p = strtol(service, &end, 10); + if (end && *end == '\0' && errno == 0) { + if (p < 0 || p > 65535) return EAI_SERVICE; + port = (int)p; + } else { + struct servent se, *found = NULL; + char se_buf[1024]; + if (getservbyname_r(service, socktype == SOCK_DGRAM ? "udp" : "tcp", &se, se_buf, sizeof(se_buf), &found) != 0 || !found) + return EAI_SERVICE; + port = ntohs((uint16_t)found->s_port); + } + } + + // The address families the caller asked for: an IPv6-only caller must not get an IPv4 address, + // and AF_UNSPEC gets both, IPv6 first on a network whose DNS servers are all IPv6 ones. The second + // lookup only asks the server that answered the first, and is skipped when none answered. + int want4 = family == AF_UNSPEC || family == AF_INET; + int want6 = family == AF_UNSPEC || family == AF_INET6; + int v6_first = want6 && (!want4 || network_dns_is_ipv6_only()); + unsigned char resolved[16]; + int server = -1; + struct addrinfo *first = NULL; + struct addrinfo *second = NULL; + if (dns_lookup(node, v6_first ? DDNATV_DNS_TYPE_AAAA : DDNATV_DNS_TYPE_A, resolved, &server) == 0) { + first = alloc_addrinfo(node, v6_first ? AF_INET6 : AF_INET, resolved, port, socktype, protocol); + } + if (want4 && want6 && server >= 0 && + dns_lookup(node, v6_first ? DDNATV_DNS_TYPE_A : DDNATV_DNS_TYPE_AAAA, resolved, &server) == 0) { + second = alloc_addrinfo(node, v6_first ? AF_INET : AF_INET6, resolved, port, socktype, protocol); + } + if (first && second) { + first->ai_next = second; + } + struct addrinfo *ai = first ? first : second; + if (ai) { + *res = ai; + return 0; + } + + return EAI_NONAME; +} + +int getaddrinfo(const char *node, const char *service, + const struct addrinfo *hints, + struct addrinfo **res) { + static int (*orig_getaddrinfo)(const char *, const char *, const struct addrinfo *, struct addrinfo **) = NULL; + if (!orig_getaddrinfo) orig_getaddrinfo = (int (*)(const char *, const char *, const struct addrinfo *, struct addrinfo **))dlsym(RTLD_NEXT, "getaddrinfo"); + + struct addrinfo mod_hints; + if (hints) { + mod_hints = *hints; + // On Android, unprivileged apps are blocked by SELinux from querying netlink routing interfaces. + // Glibc's AI_ADDRCONFIG flag causes getaddrinfo to fail or return no addresses when netlink fails. + // Clearing AI_ADDRCONFIG ensures normal, robust DNS resolution. + mod_hints.ai_flags &= ~AI_ADDRCONFIG; + } else { + memset(&mod_hints, 0, sizeof(mod_hints)); + mod_hints.ai_family = AF_UNSPEC; + mod_hints.ai_flags = 0; + } + + int ret = orig_getaddrinfo ? orig_getaddrinfo(node, service, &mod_hints, res) : EAI_FAIL; + // A numeric-only lookup must never turn into a DNS query. + if ((ret != 0 || !res || !*res) && node && !(hints && (hints->ai_flags & AI_NUMERICHOST))) { + int fallback = synthesize_fallback_addrinfo(node, service, hints, res); + // When the fallback finds nothing either, glibc's own error (EAI_AGAIN: try again later, + // EAI_NONAME: no such name) is the more precise one. + // A request the fallback rejects outright (no such service, an unsupported family) is that + // error whatever glibc's was + if (fallback == 0 || ret == 0 || fallback == EAI_SERVICE || fallback == EAI_FAMILY) ret = fallback; + } + return ret; +} + +void freeaddrinfo(struct addrinfo *res) { + static void (*orig_freeaddrinfo)(struct addrinfo *) = NULL; + if (!orig_freeaddrinfo) orig_freeaddrinfo = (void (*)(struct addrinfo *))dlsym(RTLD_NEXT, "freeaddrinfo"); + + if (!res) return; + if (res->ai_flags == DDNATV_ADDRINFO_MAGIC) { + struct addrinfo *curr = res; + while (curr) { + struct addrinfo *next = curr->ai_next; + if (curr->ai_canonname) free(curr->ai_canonname); + if (curr->ai_addr) free(curr->ai_addr); + free(curr); + curr = next; + } + return; + } + if (orig_freeaddrinfo) orig_freeaddrinfo(res); +} + +// gethostbyname() and gethostbyname2() read /etc/resolv.conf with glibc's own open(), on Android's +// /etc, so they asked no DNS server and only /etc/hosts answered. When glibc finds nothing, the +// name is looked up with getaddrinfo() above, which knows the network's servers; a name DNS does +// not have still gets no address (HOST_NOT_FOUND). +static int hostent_from_getaddrinfo(const char *name, int af, struct hostent *ret, char *buf, size_t buflen, + struct hostent **result, int *herr) { + *result = NULL; + if (!name || (af != AF_INET && af != AF_INET6)) { *herr = NO_RECOVERY; return EINVAL; } + struct addrinfo hints; + memset(&hints, 0, sizeof(hints)); + hints.ai_family = af; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_CANONNAME; + struct addrinfo *res = NULL; + int rc = getaddrinfo(name, NULL, &hints, &res); + if (rc != 0 || !res) { + *herr = (rc == EAI_NONAME || rc == EAI_NODATA || rc == EAI_ADDRFAMILY) ? HOST_NOT_FOUND + : rc == EAI_AGAIN ? TRY_AGAIN : NO_RECOVERY; + if (res) freeaddrinfo(res); + return rc == EAI_AGAIN ? EAGAIN : ENOENT; + } + size_t addr_len = af == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr); + int count = 0; + for (struct addrinfo *a = res; a && count < 16; a = a->ai_next) if (a->ai_family == af) count++; + const char *canon = res->ai_canonname ? res->ai_canonname : name; + size_t canon_len = strlen(canon) + 1; + size_t need = sizeof(char *) * (size_t)(count + 1) + sizeof(char *) + addr_len * (size_t)count + canon_len + sizeof(void *); + if (count == 0 || need > buflen) { + freeaddrinfo(res); + if (count == 0) { *herr = NO_DATA; return ENOENT; } + *herr = NETDB_INTERNAL; + return ERANGE; + } + // pointers first, aligned, then the addresses and the name + char *p = buf + ((sizeof(void *) - ((uintptr_t)buf % sizeof(void *))) % sizeof(void *)); + char **addr_list = (char **)p; + p += sizeof(char *) * (size_t)(count + 1); + char **aliases = (char **)p; + p += sizeof(char *); + aliases[0] = NULL; + int i = 0; + for (struct addrinfo *a = res; a && i < count; a = a->ai_next) { + if (a->ai_family != af) continue; + const void *src = af == AF_INET ? (const void *)&((struct sockaddr_in *)a->ai_addr)->sin_addr + : (const void *)&((struct sockaddr_in6 *)a->ai_addr)->sin6_addr; + memcpy(p, src, addr_len); + addr_list[i++] = p; + p += addr_len; + } + addr_list[i] = NULL; + memcpy(p, canon, canon_len); + ret->h_name = p; + ret->h_aliases = aliases; + ret->h_addrtype = af; + ret->h_length = (int)addr_len; + ret->h_addr_list = addr_list; + freeaddrinfo(res); + *result = ret; + *herr = 0; + return 0; +} + +int gethostbyname2_r(const char *name, int af, struct hostent *ret, char *buf, size_t buflen, + struct hostent **result, int *h_errnop) { + static int (*orig)(const char *, int, struct hostent *, char *, size_t, struct hostent **, int *) = NULL; + if (!orig) orig = (int (*)(const char *, int, struct hostent *, char *, size_t, struct hostent **, int *))dlsym(RTLD_NEXT, "gethostbyname2_r"); + int herr = 0; + int rc = orig ? orig(name, af, ret, buf, buflen, result, &herr) : ENOSYS; + if (rc == 0 && result && *result) { if (h_errnop) *h_errnop = 0; return 0; } + if (rc == ERANGE) { if (h_errnop) *h_errnop = herr; return rc; } + int fallback_herr = 0; + struct hostent *found = NULL; + rc = hostent_from_getaddrinfo(name, af, ret, buf, buflen, &found, &fallback_herr); + if (result) *result = found; + if (h_errnop) *h_errnop = fallback_herr; + return rc; +} + +int gethostbyname_r(const char *name, struct hostent *ret, char *buf, size_t buflen, + struct hostent **result, int *h_errnop) { + return gethostbyname2_r(name, AF_INET, ret, buf, buflen, result, h_errnop); +} + +static __thread struct hostent t_hostent; +static __thread char t_hostent_buf[4096]; + +struct hostent *gethostbyname2(const char *name, int af) { + struct hostent *result = NULL; + int herr = 0; + gethostbyname2_r(name, af, &t_hostent, t_hostent_buf, sizeof(t_hostent_buf), &result, &herr); + h_errno = result ? 0 : herr; + return result; +} + +struct hostent *gethostbyname(const char *name) { + return gethostbyname2(name, AF_INET); +} + +// Whether a resolver state names a server other than loopback. glibc keeps IPv6 servers in the +// extension (their nsaddr_list entry has family 0), so an IPv6-only resolv.conf counts too. +// The network's own servers, IPv6 ones too (an IPv6-only network has no IPv4 server to ask), for a +// state glibc left with none it can use: it read no /etc/resolv.conf. glibc frees the IPv6 entries. +static void fill_fallback_servers(res_state statp) { + ddnatv_dns_server_t servers[DDNATV_DNS_MAX_SERVERS]; + int n = get_dns_servers(servers, DDNATV_DNS_MAX_SERVERS); + for (int i = 0; i < MAXNS; i++) { + free(statp->_u._ext.nsaddrs[i]); + statp->_u._ext.nsaddrs[i] = NULL; + } + int count = 0; + for (int i = 0; i < n && count < MAXNS; i++) { + if (servers[i].addr.ss_family == AF_INET) { + memcpy(&statp->nsaddr_list[count], &servers[i].addr, sizeof(struct sockaddr_in)); + statp->nsaddr_list[count].sin_port = htons(53); + statp->_u._ext.nsaddrs[count] = NULL; + count++; + } else if (servers[i].addr.ss_family == AF_INET6) { + struct sockaddr_in6 *six = malloc(sizeof(*six)); + if (!six) continue; + memcpy(six, &servers[i].addr, sizeof(*six)); + six->sin6_port = htons(53); + memset(&statp->nsaddr_list[count], 0, sizeof(statp->nsaddr_list[count])); + statp->_u._ext.nsaddrs[count] = six; + count++; + } + } + if (count == 0) { + statp->nsaddr_list[0].sin_family = AF_INET; + statp->nsaddr_list[0].sin_port = htons(53); + statp->nsaddr_list[0].sin_addr.s_addr = get_primary_dns(); + statp->nsaddr_list[1].sin_family = AF_INET; + statp->nsaddr_list[1].sin_port = htons(53); + inet_pton(AF_INET, "8.8.8.8", &statp->nsaddr_list[1].sin_addr); + count = 2; + } + statp->nscount = count; +} + +static int res_state_has_usable_server(res_state statp) { + for (int i = 0; i < statp->nscount && i < MAXNS; i++) { + if (statp->nsaddr_list[i].sin_family == AF_INET) { + in_addr_t a = statp->nsaddr_list[i].sin_addr.s_addr; + if ((ntohl(a) >> 24) != 127 && a != 0) return 1; + } else if (statp->_u._ext.nsaddrs[i] != NULL) { + const struct in6_addr *a6 = &statp->_u._ext.nsaddrs[i]->sin6_addr; + if (!IN6_IS_ADDR_LOOPBACK(a6) && !IN6_IS_ADDR_UNSPECIFIED(a6)) return 1; + } + } + return 0; +} + +int res_init(void) { + static int (*orig_res_init)(void) = NULL; + // glibc's symbols are __res_init and __res_ninit (resolv.h makes the names macros): looked up as + // res_init and res_ninit they were never found, the state stayed without RES_INIT, and Chromium + // (Steam's store) failed to read a DNS configuration + if (!orig_res_init) orig_res_init = (int (*)(void))dlsym(RTLD_NEXT, "__res_init"); + if (!orig_res_init) orig_res_init = (int (*)(void))dlsym(RTLD_NEXT, "res_init"); + int ret = orig_res_init ? orig_res_init() : 0; + res_state statp = __res_state(); + if (statp) { + if (!res_state_has_usable_server(statp)) fill_fallback_servers(statp); + statp->retrans = 1; + statp->retry = 2; + } + return ret; +} + +int res_ninit(res_state statp) { + static int (*orig_res_ninit)(res_state) = NULL; + if (!orig_res_ninit) orig_res_ninit = (int (*)(res_state))dlsym(RTLD_NEXT, "__res_ninit"); + if (!orig_res_ninit) orig_res_ninit = (int (*)(res_state))dlsym(RTLD_NEXT, "res_ninit"); + if (statp) { + memset(statp, 0, sizeof(*statp)); + statp->_vcsock = -1; + for (int i = 0; i < MAXNS; i++) { + statp->_u._ext.nssocks[i] = -1; + } + } + int ret = orig_res_ninit ? orig_res_ninit(statp) : 0; + if (statp) { + if (!res_state_has_usable_server(statp)) fill_fallback_servers(statp); + statp->retrans = 1; + statp->retry = 2; + } + return ret; +} + +int res_nquery(res_state statp, const char *dname, int class, int type, + unsigned char *answer, int anslen) { + static int (*orig_res_nquery)(res_state, const char *, int, int, unsigned char *, int) = NULL; + if (!orig_res_nquery) orig_res_nquery = (int (*)(res_state, const char *, int, int, unsigned char *, int))dlsym(RTLD_NEXT, "res_nquery"); + // DNS SRV queries are optional for APT mirrors and frequently cause delays or issues + if (type == 33 /* T_SRV */) { + h_errno = NO_DATA; + return -1; + } + return orig_res_nquery ? orig_res_nquery(statp, dname, class, type, answer, anslen) : -1; +} + +int res_query(const char *dname, int class, int type, + unsigned char *answer, int anslen) { + static int (*orig_res_query)(const char *, int, int, unsigned char *, int) = NULL; + if (!orig_res_query) orig_res_query = (int (*)(const char *, int, int, unsigned char *, int))dlsym(RTLD_NEXT, "res_query"); + if (type == 33 /* T_SRV */) { + h_errno = NO_DATA; + return -1; + } + return orig_res_query ? orig_res_query(dname, class, type, answer, anslen) : -1; +} + +int res_nsearch(res_state statp, const char *dname, int class, int type, + unsigned char *answer, int anslen) { + static int (*orig_res_nsearch)(res_state, const char *, int, int, unsigned char *, int) = NULL; + if (!orig_res_nsearch) orig_res_nsearch = (int (*)(res_state, const char *, int, int, unsigned char *, int))dlsym(RTLD_NEXT, "res_nsearch"); + if (type == 33 /* T_SRV */) { + h_errno = NO_DATA; + return -1; + } + return orig_res_nsearch ? orig_res_nsearch(statp, dname, class, type, answer, anslen) : -1; +} + +int res_search(const char *dname, int class, int type, + unsigned char *answer, int anslen) { + static int (*orig_res_search)(const char *, int, int, unsigned char *, int) = NULL; + if (!orig_res_search) orig_res_search = (int (*)(const char *, int, int, unsigned char *, int))dlsym(RTLD_NEXT, "res_search"); + if (type == 33 /* T_SRV */) { + h_errno = NO_DATA; + return -1; + } + return orig_res_search ? orig_res_search(dname, class, type, answer, anslen) : -1; +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/paths.c b/tools/nativeguest/hook/paths.c new file mode 100644 index 0000000000..4c1340b339 --- /dev/null +++ b/tools/nativeguest/hook/paths.c @@ -0,0 +1,697 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Path translation: Ubuntu paths (/usr, /etc, ...) mapped into the rootfs, Android's own mounts +// left alone, and the library directories of the rootfs. + +// ---- Path translation ------------------------------------------------------------------- +// Pure string functions (no syscalls), so tests/native can check them directly. They run on +// every file-system call, so they avoid snprintf and compute the rootfs prefix length once. + +static char g_ddnatv_root[PATH_MAX] = {0}; +static size_t g_ddnatv_root_len = 0; + +static void ddnatv_set_root(const char *root, size_t len) { + if (!root) len = 0; + if (len > sizeof(g_ddnatv_root) - 1) len = sizeof(g_ddnatv_root) - 1; + if (len > 0) memcpy(g_ddnatv_root, root, len); + g_ddnatv_root[len] = '\0'; + g_ddnatv_root_len = len; +} + +// Mounts that proot used to provide: "src:dst" pairs from DDNATV_BINDS ('|' separated), longest dst first. +// A path under dst is read from src; src equal to dst keeps a host path that would otherwise be +// looked up in the rootfs. +struct ddnatv_bind { + char *src, *dst; + size_t src_len, dst_len; + int identity; + int order; // position in DDNATV_BINDS: the earlier of two mounts of one folder is its guest path +}; +// as many as the session has: a fixed table dropped what came after its 128th entry +static struct ddnatv_bind *g_binds = NULL; +static int g_nbinds = 0; +static char *g_binds_raw = NULL; +// The session's host name (DDNATV_HOSTNAME), what proot put in uname(): Android's kernel says "localhost" +static char g_hostname[65]; +// A Flatpak sandbox's: the session's rootfs (DDNATV_LINK_ROOT), whose hook stored absolute guest +// link targets as paths in it, as the kernel follows them there; in the sandbox they are guest paths +static char g_link_root[PATH_MAX]; +static size_t g_link_root_len = 0; + +static int ddnatv_bind_longer_first(const void *a, const void *b) { + const struct ddnatv_bind *x = a, *y = b; + return (y->dst_len > x->dst_len) - (y->dst_len < x->dst_len); +} + +static void ddnatv_load_binds(const char *spec) { + if (!spec || !spec[0]) return; + char *raw = strdup(spec); + char *copy = strdup(spec); + if (!raw || !copy) { free(raw); free(copy); return; } + char *save = NULL; + size_t count = 1; + for (const char *c = spec; *c; c++) count += *c == '|'; + g_binds = calloc(count, sizeof(*g_binds)); + if (!g_binds) { free(raw); free(copy); return; } + for (char *entry = strtok_r(copy, "|", &save); entry && (size_t)g_nbinds < count; entry = strtok_r(NULL, "|", &save)) { + char *colon = strchr(entry, ':'); + const char *src = entry; + const char *dst = colon ? colon + 1 : entry; + if (colon) *colon = '\0'; + if (src[0] != '/' || dst[0] != '/' || strcmp(dst, "/") == 0) continue; + struct ddnatv_bind *b = &g_binds[g_nbinds++]; + b->src = strdup(src); + b->dst = strdup(dst); + b->src_len = strlen(src); + b->dst_len = strlen(dst); + while (b->dst_len > 1 && b->dst[b->dst_len - 1] == '/') b->dst[--b->dst_len] = '\0'; + while (b->src_len > 1 && b->src[b->src_len - 1] == '/') b->src[--b->src_len] = '\0'; + b->identity = strcmp(b->src, b->dst) == 0; + b->order = g_nbinds - 1; + } + free(copy); + qsort(g_binds, (size_t)g_nbinds, sizeof(g_binds[0]), ddnatv_bind_longer_first); + g_binds_raw = raw; +} + +// Appends s[0..len) to out[0..used) and NUL-terminates, truncating like snprintf. +// Returns the new length. +static size_t ddnatv_append(char *out, size_t outsz, size_t used, const char *s, size_t len) { + if (outsz == 0) return 0; + size_t room = used < outsz - 1 ? outsz - 1 - used : 0; + if (len > room) len = room; + if (len > 0) memcpy(out + used, s, len); + out[used + len] = '\0'; + return used + len; +} + +// Copies the string src into out[0..outsz), truncated and NUL-terminated as strncpy() followed by +// out[outsz - 1] = '\0' leaves it, but writes only the bytes of the string: strncpy() fills the rest +// of a PATH_MAX buffer with zeros, 4 KB of writes for a path of 30 characters, and in a child that a +// shell has just forked every page written is a copy-on-write fault. +static size_t ddnatv_copy_cstr(char *out, size_t outsz, const char *src) { + if (outsz == 0) return 0; + size_t len = strnlen(src, outsz - 1); + memcpy(out, src, len); + out[len] = '\0'; + return len; +} + +static inline int is_path_prefix(const char *path, const char *prefix, size_t prefix_len) { + if (strncmp(path, prefix, prefix_len) != 0) return 0; + return path[prefix_len] == '/' || path[prefix_len] == '\0'; +} + +static inline const char *get_rootfs_subpath(const char *target) { + if (!target || g_ddnatv_root_len == 0) return NULL; + if (strncmp(target, g_ddnatv_root, g_ddnatv_root_len) == 0 && + (target[g_ddnatv_root_len] == '/' || target[g_ddnatv_root_len] == '\0')) { + return target + g_ddnatv_root_len; + } + return NULL; +} + +// A guest path that a session mount puts outside the rootfs (/run/droiddeck, a game library): a +// program or script there is the guest's, and a script's "#!/bin/sh" is the rootfs shell. The +// kernel ran them with Android's /system/bin/sh, which found no /usr/bin/kwin_wayland. +static int is_mapped_guest_path(const char *path) { + if (!path || path[0] != '/') return 0; + for (int i = 0; i < g_nbinds; i++) { + const struct ddnatv_bind *b = &g_binds[i]; + if (b->identity) continue; + if (is_path_prefix(path, b->dst, b->dst_len)) return 1; + // its real place too: a relative program is made absolute from the real working directory + if (is_path_prefix(path, b->src, b->src_len) && get_rootfs_subpath(b->src) == NULL) return 1; + } + return 0; +} + +// Android's own mounts and files, which must never be redirected into the rootfs. +// `path` starts with '/'; a prefix can only match when its second character does. +static int is_android_host_path(const char *path) { + switch (path[1]) { + case 'a': return is_path_prefix(path, "/apex", 5); + case 'c': return is_path_prefix(path, "/config", 7); + case 'd': return is_path_prefix(path, "/dev", 4) || is_path_prefix(path, "/d", 2) || + is_path_prefix(path, "/data", 5); + case 'l': return is_path_prefix(path, "/linkerconfig", 13); + case 'o': return is_path_prefix(path, "/odm", 4) || is_path_prefix(path, "/oem", 4); + case 'p': return is_path_prefix(path, "/proc", 5) || is_path_prefix(path, "/product", 8); + case 's': return strcmp(path, "/sbin/su") == 0 || strcmp(path, "/su") == 0 || + is_path_prefix(path, "/sys", 4) || is_path_prefix(path, "/system", 7) || + is_path_prefix(path, "/system_ext", 11) || is_path_prefix(path, "/sdcard", 7) || + is_path_prefix(path, "/storage", 8); + case 'v': return is_path_prefix(path, "/vendor", 7); + default: return 0; + } +} + +static const char *rewrite_path_in_root(const char *path, char *buffer, size_t bufsize); + +#if defined(__aarch64__) +static long raw_readlinkat(int dirfd, const char *path, char *buf, size_t size) { + register long x8 __asm__("x8") = 78; // readlinkat, made directly: the hook's own readlink would map the path again + register long x0 __asm__("x0") = dirfd; + register long x1 __asm__("x1") = (long)path; + register long x2 __asm__("x2") = (long)buf; + register long x3 __asm__("x3") = (long)size; + __asm__ volatile("svc #0" : "+r"(x0) : "r"(x8), "r"(x1), "r"(x2), "r"(x3) : "memory"); + return x0; +} +#endif + +static __thread int t_bind_link_depth = 0; + +// A mount stand-in can hold symbolic links with absolute guest targets (/sys/class/hidraw/hidraw16 -> +// /sys/devices/droiddeck/...): proot follows them inside the guest, the kernel on Android's own /sys. +// A link met on the way to a deeper path is replaced by its target, mapped again; the last component is +// left as it is (lstat() and readlink() must see the link). +static const char *resolve_bind_links(const char *host, size_t src_len, char *buffer, size_t bufsize) { +#if defined(__aarch64__) + size_t len = strlen(host); + if (len >= PATH_MAX || t_bind_link_depth >= 8) return host; + for (size_t i = src_len + 1; i < len; i++) { + if (host[i] != '/') continue; + char prefix[PATH_MAX]; + memcpy(prefix, host, i); + prefix[i] = '\0'; + char target[PATH_MAX]; + long n = raw_readlinkat(AT_FDCWD, prefix, target, sizeof(target) - 1); + if (n <= 0) continue; + target[n] = '\0'; + if (target[0] != '/') continue; + char guest[PATH_MAX]; + size_t used = ddnatv_append(guest, sizeof(guest), 0, target, (size_t)n); + ddnatv_append(guest, sizeof(guest), used, host + i, len - i); + t_bind_link_depth++; + const char *mapped = rewrite_path_in_root(guest, buffer, bufsize); + if (mapped != buffer) ddnatv_copy_cstr(buffer, bufsize, mapped); + t_bind_link_depth--; + return buffer; + } +#else + (void)src_len; (void)bufsize; +#endif + return host == buffer ? buffer : host; +} + +// Wine opens every file through its prefix's drive link (dosdevices/z: -> /), so the link must be +// followed in the guest's view even where the prefix is plain rootfs: the kernel would look for the +// rest of the path on Android's own tree. Only that component is checked, not each one of every path. +static const char *resolve_drive_links(const char *host, char *buffer, size_t bufsize) { + const char *devices = strstr(host, "/dosdevices/"); + if (!devices) return host; + return resolve_bind_links(host, (size_t)(devices - host) + 11, buffer, bufsize); +} + +// Maps an absolute Ubuntu path into the rootfs. Returns `path` (possibly advanced past +// redundant leading "/" and "/." components) when it needs no change, else `buffer`. +static const char *rewrite_path_in_root(const char *path, char *buffer, size_t bufsize) { + if (!path) return NULL; + if (path[0] != '/' || g_ddnatv_root_len == 0) return path; + + // Strip multiple redundant leading slashes: //foo -> /foo + while (path[0] == '/' && path[1] == '/') { + path++; + } + + // Strip leading /./: /./boot -> /boot + while (path[0] == '/' && path[1] == '.' && (path[2] == '/' || path[2] == '\0')) { + if (path[2] == '/') { + path += 2; + } else { + path = "/"; + break; + } + } + + // Root directory + if (path[1] == '\0') { + ddnatv_append(buffer, bufsize, 0, g_ddnatv_root, g_ddnatv_root_len); + return buffer; + } + + for (int i = 0; i < g_nbinds; i++) { + const struct ddnatv_bind *b = &g_binds[i]; + if (path[1] == b->dst[1] && is_path_prefix(path, b->dst, b->dst_len)) { + if (b->identity) return path; + size_t n = ddnatv_append(buffer, bufsize, 0, b->src, b->src_len); + ddnatv_append(buffer, bufsize, n, path + b->dst_len, strlen(path + b->dst_len)); + return resolve_bind_links(buffer, b->src_len, buffer, bufsize); + } + } + + // Already inside The native userland rootfs + if (get_rootfs_subpath(path) != NULL) { + return resolve_drive_links(path, buffer, bufsize); + } + + // The real place of a mounted folder, which getcwd() and /proc/self/fd links answer for it: Steam + // made a game's path from one on the SD card library and found no sekiro.exe in the rootfs + for (int i = 0; i < g_nbinds; i++) { + const struct ddnatv_bind *b = &g_binds[i]; + if (!b->identity && path[1] == b->src[1] && is_path_prefix(path, b->src, b->src_len)) + return resolve_drive_links(path, buffer, bufsize); + } + + // POSIX shared memory (/dev/shm) redirection to The native userland rootfs tmp/shm + if (strncmp(path, "/dev/shm", 8) == 0 && (path[8] == '/' || path[8] == '\0')) { + size_t n = ddnatv_append(buffer, bufsize, 0, g_ddnatv_root, g_ddnatv_root_len); + n = ddnatv_append(buffer, bufsize, n, "/tmp/shm", 8); + ddnatv_append(buffer, bufsize, n, path + 8, strlen(path + 8)); + return buffer; + } + + // Real host Android kernel & system mounts + if (is_android_host_path(path)) { + return path; + } + + // Any other absolute path belongs to The native userland rootfs (/boot, /media, /snap, /etc, /usr, ...) + size_t n = ddnatv_append(buffer, bufsize, 0, g_ddnatv_root, g_ddnatv_root_len); + ddnatv_append(buffer, bufsize, n, path, strlen(path)); + return resolve_drive_links(buffer, buffer, bufsize); +} + +// A link target the session's hook stored as a path in its rootfs, given back as the guest path it +// stands for (see g_link_root). Rewrites target[0..len) in place; returns the new length. +static size_t link_root_guest_target(char *target, size_t len) { + if (!g_link_root_len || len < g_link_root_len || memcmp(target, g_link_root, g_link_root_len) != 0) return len; + if (len == g_link_root_len) { target[0] = '/'; target[1] = '\0'; return 1; } + if (target[g_link_root_len] != '/') return len; + memmove(target, target + g_link_root_len, len - g_link_root_len + 1); + return len - g_link_root_len; +} + +// The guest path a symbolic link at absolute guest path `path` leads to, followed in the guest's +// view: the kernel resolves a relative target next to the link's real place, and in a mount that is +// elsewhere (Flatpak's /run/user/0/wayland-0 -> ../../flatpak/wayland-0, where /run/flatpak/wayland-0 +// is another mount). Returns `path` when it is no link. +static const char *follow_guest_link(const char *path, char *out, size_t outsz) { +#if defined(__aarch64__) + const char *cur = path; + for (int depth = 0; depth < 8; depth++) { + char host_buf[PATH_MAX]; + const char *host = rewrite_path_in_root(cur, host_buf, sizeof(host_buf)); + // /dev/stdin and /dev/fd are mounts of /proc/self/fd, whose links ("pipe:[123]") only the kernel opens + if (strncmp(host, "/proc/", 6) == 0) return cur; + char target[PATH_MAX]; + long n = raw_readlinkat(AT_FDCWD, host, target, sizeof(target) - 1); + if (n <= 0) return cur; + target[n] = '\0'; + n = (long)link_root_guest_target(target, (size_t)n); + char joined[PATH_MAX]; + if (target[0] == '/') { + ddnatv_copy_cstr(joined, sizeof(joined), target); + } else { + const char *slash = strrchr(cur, '/'); + size_t dir_len = slash ? (size_t)(slash - cur) : 0; + size_t used = ddnatv_append(joined, sizeof(joined), 0, cur, dir_len); + used = ddnatv_append(joined, sizeof(joined), used, "/", 1); + ddnatv_append(joined, sizeof(joined), used, target, strlen(target)); + } + // lexically, as the guest sees it + size_t len = 0; + out[0] = '\0'; + for (const char *p = joined; *p;) { + while (*p == '/') p++; + const char *end = strchr(p, '/'); + size_t part = end ? (size_t)(end - p) : strlen(p); + if (part == 0) break; + if (part == 1 && p[0] == '.') { + } else if (part == 2 && p[0] == '.' && p[1] == '.') { + while (len > 0 && out[len - 1] != '/') len--; + if (len > 0) len--; + out[len] = '\0'; + } else if (len + 1 + part < outsz) { + out[len++] = '/'; + memcpy(out + len, p, part); + len += part; + out[len] = '\0'; + } + p += part; + } + if (len == 0) { out[0] = '/'; out[1] = '\0'; } + cur = out; + } + return cur; +#else + (void)out; (void)outsz; + return path; +#endif +} + +// On ENOENT, stat()/lstat()/readlink() retry /usr/bin <-> /bin and /usr/sbin <-> /sbin, for +// rootfs trees where bin and sbin are real directories. Returns 1 for the bin pair, 2 for the +// sbin pair (with the other spelling in `alt`), 0 when `sub` is in neither. +#define DDNATV_USRMERGE_BIN 1 +#define DDNATV_USRMERGE_SBIN 2 +static int usrmerge_alt_path(const char *sub, char *alt, size_t altsz) { + const char *dir; + const char *rest; + int pair; + if (strncmp(sub, "/usr/bin/", 9) == 0) { + dir = "/bin/"; rest = sub + 9; pair = DDNATV_USRMERGE_BIN; + } else if (strncmp(sub, "/bin/", 5) == 0) { + dir = "/usr/bin/"; rest = sub + 5; pair = DDNATV_USRMERGE_BIN; + } else if (strncmp(sub, "/usr/sbin/", 10) == 0) { + dir = "/sbin/"; rest = sub + 10; pair = DDNATV_USRMERGE_SBIN; + } else if (strncmp(sub, "/sbin/", 6) == 0) { + dir = "/usr/sbin/"; rest = sub + 6; pair = DDNATV_USRMERGE_SBIN; + } else { + return 0; + } + size_t n = ddnatv_append(alt, altsz, 0, g_ddnatv_root, g_ddnatv_root_len); + n = ddnatv_append(alt, altsz, n, dir, strlen(dir)); + ddnatv_append(alt, altsz, n, rest, strlen(rest)); + return pair; +} + +// Whether postprocess_readlink() below can change a link's target of length target_len, read +// through linkpath: only a target that starts with the rootfs path (at least that long) or a relative +// one into /etc/alternatives (at least "../alternatives", 15 characters, from a directory next to it; +// any "../" under /etc/alternatives itself). lstat() of a link reads it only then, to report its +// rewritten length. +static int readlink_result_may_change(const char *linkpath, long long target_len) { + if (g_ddnatv_root_len > 0 && target_len >= (long long)g_ddnatv_root_len) return 1; + if (!linkpath || linkpath[0] != '/') return 0; + if (strncmp(linkpath, "/etc/alternatives", 17) == 0) return target_len >= 2; + return target_len >= 15; +} + +// Helper for path normalization +static void normalize_path(char *path) { + if (!path || !*path) return; + int is_abs = (path[0] == '/'); + char *stack[128]; + int top = 0; + + char tmp[4096]; + strncpy(tmp, path, sizeof(tmp) - 1); + tmp[sizeof(tmp) - 1] = '\0'; + + char *saveptr = NULL; + char *tok = strtok_r(tmp, "/", &saveptr); + while (tok) { + if (strcmp(tok, ".") == 0) { + // ignore + } else if (strcmp(tok, "..") == 0) { + if (top > 0) top--; + } else { + if (top < 128) stack[top++] = tok; + } + tok = strtok_r(NULL, "/", &saveptr); + } + + char *dst = path; + if (is_abs) *dst++ = '/'; + for (int i = 0; i < top; i++) { + size_t len = strlen(stack[i]); + memcpy(dst, stack[i], len); + dst += len; + if (i + 1 < top) *dst++ = '/'; + } + if (dst == path && is_abs) *dst++ = '/'; + *dst = '\0'; +} + +// /proc/self/fd/N, /proc/thread-self/fd/N and /proc/PID/fd/N: the real path of an open file. A program +// that finds a path this way (Bun and Zig programs do: their realpath() is an open and a readlink of +// this) goes on with system calls of its own, which the hook does not see, so a path inside the rootfs +// has to keep its real beginning there: "/home" for $DDNATV_ROOT/home is a path that does not exist +// for them ("ENOENT, realpath '/home'" in Kilo). It is what getcwd() answers, too. +static int is_proc_fd_link(const char *path) { + if (!path || strncmp(path, "/proc/", 6) != 0) return 0; + const char *p = path + 6; + if (strncmp(p, "self/", 5) == 0) { + p += 5; + } else if (strncmp(p, "thread-self/", 12) == 0) { + p += 12; + } else { + if (*p < '0' || *p > '9') return 0; + while (*p >= '0' && *p <= '9') p++; + if (*p != '/') return 0; + p++; + } + // fd/N and nothing after it: a path beneath the link goes through it to somewhere else + if (strncmp(p, "fd/", 3) != 0) return 0; + p += 3; + if (*p < '0' || *p > '9') return 0; + while (*p >= '0' && *p <= '9') p++; + return *p == '\0'; +} + +// The guest path of a folder that a session mount puts outside the rootfs, for what the kernel +// reports as its real place (getcwd(), /proc/self/cwd and fd links). Wine found no DOS drive for +// Sekiro's folder on the SD card library ("starting in the Windows directory"), and the game quit. +// Rewrites buf[0..len) in place when the guest path fits in cap; returns the new length. +static size_t guest_path_of_mount_source(char *buf, size_t len, size_t cap) { + const struct ddnatv_bind *best = NULL; + for (int i = 0; i < g_nbinds; i++) { + const struct ddnatv_bind *b = &g_binds[i]; + if (b->identity || get_rootfs_subpath(b->src) != NULL || len < b->src_len) continue; + if (memcmp(buf, b->src, b->src_len) != 0 || (len > b->src_len && buf[b->src_len] != '/')) continue; + if (!best || b->src_len > best->src_len || (b->src_len == best->src_len && b->order < best->order)) best = b; + } + if (!best) return len; + size_t rest = len - best->src_len; + if (best->dst_len + rest + 1 > cap) return len; + memmove(buf + best->dst_len, buf + best->src_len, rest); + memcpy(buf, best->dst, best->dst_len); + buf[best->dst_len + rest] = '\0'; + return best->dst_len + rest; +} + +static ssize_t postprocess_readlink(const char *linkpath, char *buf, ssize_t ret, size_t bufsiz) { + if (ret <= 0) return ret; + if ((size_t)ret < bufsiz) { + buf[ret] = '\0'; + ret = (ssize_t)link_root_guest_target(buf, (size_t)ret); + } + ret = (ssize_t)guest_path_of_mount_source(buf, (size_t)ret, bufsiz); + + // 1. Strip g_ddnatv_root if target starts with it + if (g_ddnatv_root_len > 0 && !is_proc_fd_link(linkpath)) { + size_t rlen = g_ddnatv_root_len; + if ((size_t)ret >= rlen && memcmp(buf, g_ddnatv_root, rlen) == 0 && + ((size_t)ret == rlen || buf[rlen] == '/')) { + size_t new_len = ret - rlen; + if (new_len == 0) { + buf[0] = '/'; + return 1; + } else { + memmove(buf, buf + rlen, new_len); + return (ssize_t)new_len; + } + } + } + + // 2. Normalize relative alternatives links. The result can only start with /etc/alternatives + // (or the link be in it) when "alternatives" is in the target or in the link's own path: the + // normalized path is made of their components. Most relative links have neither (the ones of + // /usr/lib and /usr/share/doc), and these skip the copies and the normalization, which were a + // tenth of what "cp -a" of a tree of them cost. + if (linkpath && linkpath[0] == '/' && (size_t)ret < PATH_MAX && ret >= 2 && buf[0] == '.' && buf[1] == '.' && + (memmem(buf, (size_t)ret, "alternatives", 12) != NULL || strstr(linkpath, "alternatives") != NULL)) { + char link_copy[PATH_MAX]; + memcpy(link_copy, buf, ret); + link_copy[ret] = '\0'; + + if (strncmp(link_copy, "..", 2) == 0) { + char parent[PATH_MAX]; + snprintf(parent, sizeof(parent), "%s", linkpath); + char *last_slash = strrchr(parent, '/'); + if (last_slash) { + if (last_slash == parent) { + *(last_slash + 1) = '\0'; + } else { + *last_slash = '\0'; + } + } + char combined[PATH_MAX * 2]; + snprintf(combined, sizeof(combined), "%s/%s", parent, link_copy); + normalize_path(combined); + + if (strncmp(combined, "/etc/alternatives", 17) == 0 || + strncmp(linkpath, "/etc/alternatives", 17) == 0) { + size_t clen = strlen(combined); + if (clen <= bufsiz) { + memcpy(buf, combined, clen); + return (ssize_t)clen; + } + } + } + } + + return ret; +} + +// Android's SELinux label, which the xattr hooks keep away from Ubuntu programs. +static const char k_selinux_xattr[] = "security.selinux"; + +static int is_selinux_xattr(const char *name) { + return name != NULL && strcmp(name, k_selinux_xattr) == 0; +} + +// Removes "security.selinux" from a listxattr() result (NUL-separated names); returns the new length. +static ssize_t drop_selinux_xattr(char *list, ssize_t len) { + if (!list || len <= 0) return len; + ssize_t out = 0; + ssize_t i = 0; + while (i < len) { + size_t name_len = strnlen(list + i, (size_t)(len - i)); + ssize_t entry = (ssize_t)name_len + 1; + if (entry > len - i) entry = len - i; + if (name_len != sizeof(k_selinux_xattr) - 1 || memcmp(list + i, k_selinux_xattr, name_len) != 0) { + memmove(list + out, list + i, (size_t)entry); + out += entry; + } + i += entry; + } + return out; +} + +// Library directories of the rootfs, in the order ld.so searches them. ld.so tries every +// directory for every library, so the multiarch ones that hold nearly all libraries come first +// (as in glibc's own default order). Keep in sync with Environment.kt, 00-env.sh and su.sh. +static const char *const k_rootfs_lib_dirs[] = { + "/lib/aarch64-linux-gnu", "/usr/lib/aarch64-linux-gnu", + "/lib/arm-linux-gnueabihf", "/usr/lib/arm-linux-gnueabihf", + "/lib", "/usr/lib", "/usr/local/lib", + "/usr/lib/systemd", "/lib/systemd", + "/usr/lib/aarch64-linux-gnu/systemd", "/lib/aarch64-linux-gnu/systemd", + "/usr/lib/arm-linux-gnueabihf/systemd", "/lib/arm-linux-gnueabihf/systemd", +}; + +// Whether the ':'-separated list holds the directory dir[0..dir_len) as one of its entries. +static int lib_dir_list_has(const char *list, const char *dir, size_t dir_len) { + if (!list) return 0; + for (const char *p = list; *p;) { + const char *end = strchr(p, ':'); + size_t len = end ? (size_t)(end - p) : strlen(p); + if (len == dir_len && memcmp(p, dir, len) == 0) return 1; + if (!end) break; + p = end + 1; + } + return 0; +} + +// Appends the rootfs library directories as a ':'-separated list (with a leading ':' when +// `separate` is set), leaving out those that `have` (a list too, or NULL) names already: the +// caller's LD_LIBRARY_PATH is usually this very list, and ld.so spends time on every directory of +// the list it is given, in every program that is started, and tries it again for each library that +// is not found. Returns the new length. +static size_t append_rootfs_lib_dirs_missing_from(char *out, size_t outsz, size_t used, int separate, const char *have) { + for (size_t i = 0; i < sizeof(k_rootfs_lib_dirs) / sizeof(k_rootfs_lib_dirs[0]); i++) { + // a Flatpak sandbox mounts /usr from its runtime + char buf[PATH_MAX]; + const char *full = rewrite_path_in_root(k_rootfs_lib_dirs[i], buf, sizeof(buf)); + size_t n = strlen(full); + if (have && have[0] != '\0' && lib_dir_list_has(have, full, n)) continue; + // whole directories only: a cut-off one would be searched in the wrong place + if (used + (separate ? 1 : 0) + n >= outsz) continue; + if (separate) used = ddnatv_append(out, outsz, used, ":", 1); + separate = 1; + used = ddnatv_append(out, outsz, used, full, n); + } + return used; +} + +// All of them. +static size_t append_rootfs_lib_dirs(char *out, size_t outsz, size_t used, int separate) { + return append_rootfs_lib_dirs_missing_from(out, outsz, used, separate, NULL); +} + +#ifndef DDNATV_HOST_TEST +// Relative *at() calls. A program that walks a path one component at a time (systemd's chase(), used +// by libudev; fts) opens "/" and then "sys", "class", ... relative to the last descriptor, and those +// names never pass through rewrite_path(): "/" is the rootfs, whose own sys/ is empty, so the stand-ins +// mounted at /sys/class/hidraw and the host's /sys were out of reach. The directories on the way to a +// mount (every proper ancestor of a mount's guest path) are recorded by device and inode; a name given +// relative to one of them is joined to its guest path and mapped like an absolute one. +struct ddnatv_at_dir { + unsigned long dev, ino; + char *guest; +}; +static struct ddnatv_at_dir *g_at_dirs = NULL; +static int g_n_at_dirs = 0; +static pthread_once_t g_at_once = PTHREAD_ONCE_INIT; + +#if defined(__aarch64__) +static long raw_fstatat(int dirfd, const char *path, struct stat *st, int flags) { + register long x8 __asm__("x8") = 79; // newfstatat + register long x0 __asm__("x0") = dirfd; + register long x1 __asm__("x1") = (long)path; + register long x2 __asm__("x2") = (long)st; + register long x3 __asm__("x3") = flags; + __asm__ volatile("svc #0" : "+r"(x0) : "r"(x8), "r"(x1), "r"(x2), "r"(x3) : "memory"); + return x0; +} +#endif + +static void ddnatv_add_at_dir(const char *guest) { +#if defined(__aarch64__) + for (int i = 0; i < g_n_at_dirs; i++) if (strcmp(g_at_dirs[i].guest, guest) == 0) return; + char buf[PATH_MAX]; + const char *host = rewrite_path_in_root(guest, buf, sizeof(buf)); + struct stat st; + if (raw_fstatat(AT_FDCWD, host, &st, 0) != 0 || !S_ISDIR(st.st_mode)) return; + struct ddnatv_at_dir *grown = realloc(g_at_dirs, sizeof(*grown) * (size_t)(g_n_at_dirs + 1)); + if (!grown) return; + g_at_dirs = grown; + g_at_dirs[g_n_at_dirs].dev = (unsigned long)st.st_dev; + g_at_dirs[g_n_at_dirs].ino = (unsigned long)st.st_ino; + g_at_dirs[g_n_at_dirs].guest = strdup(guest); + if (g_at_dirs[g_n_at_dirs].guest) g_n_at_dirs++; +#else + (void)guest; +#endif +} + +static void ddnatv_build_at_dirs(void) { + if (g_nbinds == 0) return; + ddnatv_add_at_dir("/"); + for (int i = 0; i < g_nbinds; i++) { + char guest[PATH_MAX]; + ddnatv_copy_cstr(guest, sizeof(guest), g_binds[i].dst); + for (char *slash = strrchr(guest, '/'); slash && slash > guest; slash = strrchr(guest, '/')) { + *slash = '\0'; + ddnatv_add_at_dir(guest); + } + } +} + +// The absolute host path for `rel` given relative to `dirfd`, or NULL when the call needs no change. +static const char *map_at(int dirfd, const char *rel, char *buf, size_t size) { +#if defined(__aarch64__) + if (dirfd == AT_FDCWD || !rel || rel[0] == '\0' || rel[0] == '/' || g_nbinds == 0) return NULL; + pthread_once(&g_at_once, ddnatv_build_at_dirs); + if (g_n_at_dirs == 0) return NULL; + struct stat st; + if (raw_fstatat(dirfd, "", &st, AT_EMPTY_PATH) != 0) return NULL; + for (int i = 0; i < g_n_at_dirs; i++) { + if (g_at_dirs[i].ino != (unsigned long)st.st_ino || g_at_dirs[i].dev != (unsigned long)st.st_dev) continue; + char guest[PATH_MAX]; + const char *base = g_at_dirs[i].guest; + size_t used = ddnatv_append(guest, sizeof(guest), 0, base, strlen(base)); + if (used > 1) used = ddnatv_append(guest, sizeof(guest), used, "/", 1); + ddnatv_append(guest, sizeof(guest), used, rel, strlen(rel)); + const char *mapped = rewrite_path_in_root(guest, buf, size); + if (mapped != buf) ddnatv_copy_cstr(buf, size, mapped); + return buf; + } +#else + (void)dirfd; (void)rel; (void)buf; (void)size; +#endif + return NULL; +} + +#define DDNATV_AT_REMAP_NAMED(dirfd, pathname, buf) \ + char buf[PATH_MAX]; \ + if (map_at((dirfd), (pathname), buf, sizeof(buf))) { \ + (dirfd) = AT_FDCWD; \ + (pathname) = buf; \ + } +#define DDNATV_AT_REMAP(dirfd, pathname) DDNATV_AT_REMAP_NAMED(dirfd, pathname, ddnatv_at_buf) +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/posix_shm.c b/tools/nativeguest/hook/posix_shm.c new file mode 100644 index 0000000000..afd8a6f655 --- /dev/null +++ b/tools/nativeguest/hook/posix_shm.c @@ -0,0 +1,174 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c. +// +// shm_open() and shm_unlink() of glibc open /dev/shm/NAME with a system call of their own, which +// the path hooks never see and Android has no /dev/shm for. They go through open() and unlink() +// here, which map /dev/shm. + +#ifndef DDNATV_HOST_TEST + +static int posix_shm_path(const char *name, char *path, size_t size) { + if (!name) { errno = EINVAL; return -1; } + while (*name == '/') name++; + size_t len = strlen(name); + if (len == 0 || len > NAME_MAX || strchr(name, '/') || strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + errno = len > NAME_MAX ? ENAMETOOLONG : EINVAL; + return -1; + } + if (snprintf(path, size, "/dev/shm/%s", name) >= (int)size) { errno = ENAMETOOLONG; return -1; } + return 0; +} + +int shm_open(const char *name, int oflag, mode_t mode) { + char path[PATH_MAX]; + if (posix_shm_path(name, path, sizeof(path)) < 0) return -1; + return open(path, (oflag & (O_ACCMODE | O_CREAT | O_EXCL | O_TRUNC)) | O_NOFOLLOW | O_CLOEXEC, mode); +} + +int shm_unlink(const char *name) { + char path[PATH_MAX]; + if (posix_shm_path(name, path, sizeof(path)) < 0) return -1; + return unlink(path); +} + +#endif /* !DDNATV_HOST_TEST */ + +#ifndef DDNATV_HOST_TEST +// glibc's posix_spawn child resets every signal handler to its default, the hook's SIGSYS handler +// included, before it runs the file actions, and "close everything from N" is close_range(), which +// Android's seccomp filter answers with SIGSYS: the child died of it (Python's subprocess with +// close_fds does this). It becomes one close per descriptor, added when the program is spawned so +// that descriptors opened in between and the ones earlier actions make are closed too; the targets +// of actions added after it stay open, as they would. A close of a descriptor that is not open is +// no error to glibc. +#define CLOSEFROM_SLOTS 64 +#define CLOSEFROM_KEEP 32 +static struct closefrom_entry { + posix_spawn_file_actions_t *actions; + int from; // -1: no close-from yet, only targets of actions seen + int highest; // the highest descriptor an action before close-from makes + int nkeep; + int keep[CLOSEFROM_KEEP]; + int closed_to; // the descriptors up to this one are closed by actions already added + int bad_source; // a dup2 after close-from duplicates a descriptor it closed: glibc's EBADF +} g_closefrom[CLOSEFROM_SLOTS]; +static pthread_mutex_t g_closefrom_lock = PTHREAD_MUTEX_INITIALIZER; + +static struct closefrom_entry *closefrom_entry(posix_spawn_file_actions_t *actions, int create) { + struct closefrom_entry *free_slot = NULL; + for (int i = 0; i < CLOSEFROM_SLOTS; i++) { + if (g_closefrom[i].actions == actions) return &g_closefrom[i]; + if (!g_closefrom[i].actions && !free_slot) free_slot = &g_closefrom[i]; + } + if (!create || !free_slot) return NULL; + memset(free_slot, 0, sizeof(*free_slot)); + free_slot->actions = actions; + free_slot->from = -1; + free_slot->highest = -1; + free_slot->closed_to = -1; + return free_slot; +} + +static void closefrom_note_target(posix_spawn_file_actions_t *actions, int fd) { + pthread_mutex_lock(&g_closefrom_lock); + struct closefrom_entry *e = closefrom_entry(actions, 1); + if (e) { + if (e->from < 0) { + if (fd > e->highest) e->highest = fd; + } else if (e->nkeep < CLOSEFROM_KEEP) { + e->keep[e->nkeep++] = fd; + } + } + pthread_mutex_unlock(&g_closefrom_lock); +} + +int posix_spawn_file_actions_addclosefrom_np(posix_spawn_file_actions_t *actions, int from) { + if (!actions || from < 0) return EINVAL; + pthread_mutex_lock(&g_closefrom_lock); + struct closefrom_entry *e = closefrom_entry(actions, 1); + if (e && (e->from < 0 || from < e->from)) e->from = from; + pthread_mutex_unlock(&g_closefrom_lock); + return e ? 0 : ENOMEM; +} + +int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t *actions, int fd, const char *path, int oflag, mode_t mode) { + static int (*orig)(posix_spawn_file_actions_t *, int, const char *, int, mode_t) = NULL; + if (!orig) orig = (int (*)(posix_spawn_file_actions_t *, int, const char *, int, mode_t))dlsym(RTLD_NEXT, "posix_spawn_file_actions_addopen"); + int ret = orig ? orig(actions, fd, path, oflag, mode) : ENOSYS; + if (ret == 0) closefrom_note_target(actions, fd); + return ret; +} + +int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *actions, int fd, int newfd) { + static int (*orig)(posix_spawn_file_actions_t *, int, int) = NULL; + if (!orig) orig = (int (*)(posix_spawn_file_actions_t *, int, int))dlsym(RTLD_NEXT, "posix_spawn_file_actions_adddup2"); + int ret = orig ? orig(actions, fd, newfd) : ENOSYS; + if (ret == 0) { + pthread_mutex_lock(&g_closefrom_lock); + struct closefrom_entry *e = closefrom_entry(actions, 0); + if (e && e->from >= 0 && fd >= e->from) { + int reopened = 0; + for (int k = 0; k < e->nkeep; k++) reopened |= e->keep[k] == fd; + if (!reopened) e->bad_source = 1; + } + pthread_mutex_unlock(&g_closefrom_lock); + closefrom_note_target(actions, newfd); + } + return ret; +} + +int posix_spawn_file_actions_init(posix_spawn_file_actions_t *actions) { + static int (*orig)(posix_spawn_file_actions_t *) = NULL; + if (!orig) orig = (int (*)(posix_spawn_file_actions_t *))dlsym(RTLD_NEXT, "posix_spawn_file_actions_init"); + pthread_mutex_lock(&g_closefrom_lock); + struct closefrom_entry *e = closefrom_entry(actions, 0); + if (e) e->actions = NULL; + pthread_mutex_unlock(&g_closefrom_lock); + return orig ? orig(actions) : ENOSYS; +} + +int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *actions) { + static int (*orig)(posix_spawn_file_actions_t *) = NULL; + if (!orig) orig = (int (*)(posix_spawn_file_actions_t *))dlsym(RTLD_NEXT, "posix_spawn_file_actions_destroy"); + pthread_mutex_lock(&g_closefrom_lock); + struct closefrom_entry *e = closefrom_entry(actions, 0); + if (e) e->actions = NULL; + pthread_mutex_unlock(&g_closefrom_lock); + return orig ? orig(actions) : ENOSYS; +} + +static int apply_closefrom(posix_spawn_file_actions_t *actions) { + pthread_mutex_lock(&g_closefrom_lock); + struct closefrom_entry *e = closefrom_entry(actions, 0); + if (!e || e->from < 0) { + pthread_mutex_unlock(&g_closefrom_lock); + return 0; + } + if (e->bad_source) { + pthread_mutex_unlock(&g_closefrom_lock); + return EBADF; + } + int highest = e->highest; + DIR *dir = opendir("/proc/self/fd"); + if (dir) { + int self = dirfd(dir); + struct dirent *entry; + while ((entry = readdir(dir)) != NULL) { + if (entry->d_name[0] < '0' || entry->d_name[0] > '9') continue; + int fd = atoi(entry->d_name); + if (fd != self && fd > highest) highest = fd; + } + closedir(dir); + } + int start = e->from > e->closed_to + 1 ? e->from : e->closed_to + 1; + for (int fd = start; fd <= highest; fd++) { + int kept = 0; + for (int k = 0; k < e->nkeep; k++) kept |= e->keep[k] == fd; + if (!kept && posix_spawn_file_actions_addclose(actions, fd) != 0) break; + e->closed_to = fd; + } + pthread_mutex_unlock(&g_closefrom_lock); + return 0; +} +#else +static int apply_closefrom(posix_spawn_file_actions_t *actions) { (void)actions; return 0; } +#endif diff --git a/tools/nativeguest/hook/privileged.c b/tools/nativeguest/hook/privileged.c new file mode 100644 index 0000000000..6b527ae4f3 --- /dev/null +++ b/tools/nativeguest/hook/privileged.c @@ -0,0 +1,815 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Calls an app may not make (chown, mknod, capabilities, prctl, landlock, seccomp, namespaces, +// close_range) and the generic syscall() entry point. + +// The ARM translator of x86 devices and emulators (ndk_translation, houdini) keeps memory files of +// its own open in the process (ndk_translation at descriptor 3) and needs them whenever it +// translates more code: a program that closes every descriptor it did not open (sshd at start, +// closefrom(3)) made it abort later ("CHECK failed" in mmap_posix.cc). Its memory files open when +// the hook starts survive close(), close_range() and closefrom(); phones that run ARM code +// themselves have none. +#define DDNATV_MAX_KEPT_FDS 4 +static int g_kept_fds[DDNATV_MAX_KEPT_FDS]; // ascending +static int g_kept_fd_count = 0; + +static int is_kept_fd(int fd) { + for (int i = 0; i < g_kept_fd_count; i++) { + if (g_kept_fds[i] == fd) return 1; + } + return 0; +} + +// Calls fn for each part of [first, last] that leaves out the descriptors in kept (ascending); +// the first nonzero answer of fn is returned, else 0. +static int for_each_range_without(unsigned int first, unsigned int last, const int *kept, int nkept, + int (*fn)(unsigned int, unsigned int, void *), void *arg) { + unsigned int from = first; + for (int i = 0; i < nkept && from <= last; i++) { + if (kept[i] < 0 || (unsigned int)kept[i] < from || (unsigned int)kept[i] > last) continue; + unsigned int k = (unsigned int)kept[i]; + if (k > from) { + int r = fn(from, k - 1, arg); + if (r != 0) return r; + } + if (k == last) return 0; + from = k + 1; + } + return from <= last ? fn(from, last, arg) : 0; +} + +#ifndef DDNATV_HOST_TEST + +// ndk_translation's file is "/memfd:child"; any memory file counts in a process whose executable is +// a translator's runner (houdini). ndk_translation shows a program its own path as /proc/self/exe, +// so the name is what tells there. +// +// This runs at the start of every program, so it costs three system calls on a phone that runs ARM +// code itself: the descriptors that are open (/proc/self/fd, read at once) are all that are asked +// about, where asking about each of the numbers from 3 to 63 was 61 readlink() calls in every +// process that was started. +// Set once this process knows that it has none (it looked, or was told by DDNATV_NT=0 in its +// environment, which prepare_ddnatv_env hands on to the programs it starts) +static int g_no_translator = 0; + +__attribute__((constructor(102))) static void find_translator_files(void) { + // The first program of a session looks; the ones it starts are told (a translator is there for + // all the programs of a machine or for none, and where it is not known they look as before) + const char *known = getenv("DDNATV_NT"); + if (known && known[0] == '0' && known[1] == '\0') { + g_no_translator = 1; + return; + } + ssize_t (*real_readlink)(const char *, char *, size_t) = (ssize_t (*)(const char *, char *, size_t))dlsym(RTLD_NEXT, "readlink"); + int (*real_open)(const char *, int, ...) = (int (*)(const char *, int, ...))dlsym(RTLD_NEXT, "open"); + int (*real_close)(int) = (int (*)(int))dlsym(RTLD_NEXT, "close"); + ssize_t (*real_getdents64)(int, void *, size_t) = (ssize_t (*)(int, void *, size_t))dlsym(RTLD_NEXT, "getdents64"); + if (!real_readlink || !real_open || !real_close) return; + int dir = real_getdents64 ? real_open("/proc/self/fd", O_RDONLY | O_DIRECTORY | O_CLOEXEC) : -1; + if (dir < 0) return; + // The numbers of the descriptors open now, those from 3 to 63 (the directory's own left out) + char entries[2048]; + unsigned char open_fds[64]; + int nopen = 0; + for (;;) { + long n = real_getdents64(dir, entries, sizeof(entries)); + if (n <= 0) break; + for (long off = 0; off < n;) { + // struct linux_dirent64: d_ino (8), d_off (8), d_reclen (2), d_type (1), then d_name + unsigned short reclen; + memcpy(&reclen, entries + off + 16, sizeof(reclen)); + const char *name = entries + off + 19; + off += reclen ? reclen : n; // a record without a length ends the buffer + if (name[0] < '0' || name[0] > '9') continue; // "." and ".." + int fd = atoi(name); + if (fd >= 3 && fd < 64 && fd != dir) open_fds[nopen++] = (unsigned char)fd; + } + // A short answer is the whole directory; asking again would only be told "no more" + if ((size_t)n + 64 <= sizeof(entries)) break; + } + real_close(dir); + if (nopen == 0) { + g_no_translator = 1; + return; + } + + char path[PATH_MAX]; + int runner = 0; + ssize_t n = real_readlink("/proc/self/exe", path, sizeof(path) - 1); + if (n > 0) { + path[n] = '\0'; + const char *base = strrchr(path, '/'); + base = base ? base + 1 : path; + runner = strncmp(base, "ndk_translation", 15) == 0 || strncmp(base, "houdini", 7) == 0; + } + // In ascending order, as the list is kept + for (int i = 0; i < nopen - 1; i++) { + for (int j = i + 1; j < nopen; j++) { + if (open_fds[j] < open_fds[i]) { + unsigned char t = open_fds[i]; + open_fds[i] = open_fds[j]; + open_fds[j] = t; + } + } + } + for (int i = 0; i < nopen && g_kept_fd_count < DDNATV_MAX_KEPT_FDS; i++) { + char link[32], target[64]; + snprintf(link, sizeof(link), "/proc/self/fd/%d", open_fds[i]); + ssize_t m = real_readlink(link, target, sizeof(target) - 1); + if (m <= 0) continue; + target[m] = '\0'; + if (strncmp(target, "/memfd:child", 12) == 0 || (runner && strncmp(target, "/memfd:", 7) == 0)) { + g_kept_fds[g_kept_fd_count++] = open_fds[i]; + } + } + if (g_kept_fd_count == 0) g_no_translator = 1; +} + +int chown(const char *pathname, uid_t owner, gid_t group) { (void)pathname; (void)owner; (void)group; return 0; } +int fchown(int fd, uid_t owner, gid_t group) { (void)fd; (void)owner; (void)group; return 0; } +int lchown(const char *pathname, uid_t owner, gid_t group) { (void)pathname; (void)owner; (void)group; return 0; } +int fchownat(int dirfd, const char *pathname, uid_t owner, gid_t group, int flags) { + DDNATV_AT_REMAP(dirfd, pathname); + (void)dirfd; (void)pathname; (void)owner; (void)group; (void)flags; return 0; +} +int chroot(const char *path) { (void)path; return 0; } + +// Hook mkfifo / mkfifoat / mknod / mknodat +int mkfifo(const char *pathname, mode_t mode); +int mkfifoat(int dirfd, const char *pathname, mode_t mode); + +int mknodat(int dirfd, const char *pathname, mode_t mode, dev_t dev) { + DDNATV_AT_REMAP(dirfd, pathname); + (void)dev; + if (!pathname) { + errno = EFAULT; + return -1; + } + char buf[PATH_MAX]; + const char *target = (pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + // A file type of 0 means a regular file, as in mknod(2), which also fails with EEXIST instead + // of touching an existing file. + if (S_ISREG(mode) || (mode & S_IFMT) == 0) { + // mknod(2) returns 0 on success, never a file descriptor: close the + // transient fd instead of leaking one per call (tar/dpkg extract + // thousands of files; leaked fds exhaust the table -> EBADF noise). + int fd = openat(dirfd, target, O_CREAT | O_EXCL | O_WRONLY | O_CLOEXEC, mode & 07777); + if (fd >= 0) { + close(fd); + return 0; + } + return -1; + } + if (S_ISFIFO(mode)) { + return mkfifoat(dirfd, target, mode); + } + return 0; +} + +int mknod(const char *pathname, mode_t mode, dev_t dev) { + return mknodat(AT_FDCWD, pathname, mode, dev); +} + +int mkfifoat(int dirfd, const char *pathname, mode_t mode) { + static int (*orig_mkfifoat)(int, const char *, mode_t) = NULL; + if (!orig_mkfifoat) orig_mkfifoat = (int (*)(int, const char *, mode_t))dlsym(RTLD_NEXT, "mkfifoat"); + if (!pathname) { + errno = EFAULT; + return -1; + } + char buf[PATH_MAX]; + const char *target = (pathname[0] == '/') ? rewrite_path(pathname, buf, sizeof(buf)) : pathname; + if (orig_mkfifoat) { + return orig_mkfifoat(dirfd, target, mode); + } + static int (*orig_mkfifo)(const char *, mode_t) = NULL; + if (!orig_mkfifo) orig_mkfifo = (int (*)(const char *, mode_t))dlsym(RTLD_NEXT, "mkfifo"); + if (orig_mkfifo && dirfd == AT_FDCWD) { + return orig_mkfifo(target, mode); + } + return -1; +} + +int mkfifo(const char *pathname, mode_t mode) { + return mkfifoat(AT_FDCWD, pathname, mode); +} + +// Hook sync / syncfs to prevent Android flash storage stalls during dpkg operations +void sync(void) { + // No-op +} + +int syncfs(int fd) { + (void)fd; + return 0; +} + +int capget(void *hdrp, void *datap) { + static int (*orig_capget)(void *, void *) = NULL; + if (!orig_capget) orig_capget = (int (*)(void *, void *))dlsym(RTLD_NEXT, "capget"); + if (orig_capget && orig_capget(hdrp, datap) == 0) { + return 0; + } + if (datap) { + uint32_t ver = hdrp ? *(const uint32_t *)hdrp : 0; + size_t nbytes = (ver == 0x20071026U || ver == 0x20080522U) ? 24 : 12; + memset(datap, 0, nbytes); + } + errno = 0; + return 0; +} +int capset(void *hdrp, const void *datap) { (void)hdrp; (void)datap; return 0; } + +int prctl(int option, ...) { + va_list ap; + va_start(ap, option); + unsigned long arg2 = va_arg(ap, unsigned long); + unsigned long arg3 = va_arg(ap, unsigned long); + unsigned long arg4 = va_arg(ap, unsigned long); + unsigned long arg5 = va_arg(ap, unsigned long); + va_end(ap); + + // PR_SET_NO_NEW_PRIVS = 38, PR_GET_NO_NEW_PRIVS = 39 +#ifdef PR_SET_NO_NEW_PRIVS + if (option == PR_SET_NO_NEW_PRIVS) return 0; +#endif + if (option == 38) return 0; +#ifdef PR_GET_NO_NEW_PRIVS + if (option == PR_GET_NO_NEW_PRIVS) return 1; +#endif + if (option == 39) return 1; + + // PR_SET_SECCOMP = 22, PR_GET_SECCOMP = 21 +#ifdef PR_SET_SECCOMP + if (option == PR_SET_SECCOMP) { errno = EINVAL; return -1; } +#endif + if (option == 22) { errno = EINVAL; return -1; } +#ifdef PR_GET_SECCOMP + if (option == PR_GET_SECCOMP) return 0; +#endif + if (option == 21) return 0; + + // PR_SET_SPECULATION_CTRL = 47 + if (option == 47) return 0; + + static int (*orig_prctl)(int, unsigned long, unsigned long, unsigned long, unsigned long) = NULL; + if (!orig_prctl) orig_prctl = (int (*)(int, unsigned long, unsigned long, unsigned long, unsigned long))dlsym(RTLD_NEXT, "prctl"); + return orig_prctl ? orig_prctl(option, arg2, arg3, arg4, arg5) : 0; +} + +// Limits that leave a process no new descriptors (RLIMIT_NOFILE below 16) or no file writes +// (RLIMIT_FSIZE 0) are not applied. Sandboxes give them to their unprivileged part (sshd's before +// login sets 1 and 0, with the seccomp filter above), and Android's ARM translator (emulators, x86 +// devices) needs new descriptors and memory files in the process: sshd's died in it ("CHECK failed" +// in its mmap) and the client's connection was reset. Other limits are set as asked. +static int sandbox_only_limit(int resource, const struct rlimit *rlim) { + if (!rlim) return 0; + if (resource == RLIMIT_NOFILE) return rlim->rlim_cur < 16; + if (resource == RLIMIT_FSIZE) return rlim->rlim_cur == 0; + return 0; +} + +int setrlimit(__rlimit_resource_t resource, const struct rlimit *rlim) { + if (sandbox_only_limit((int)resource, rlim)) return 0; + static int (*orig_setrlimit)(__rlimit_resource_t, const struct rlimit *) = NULL; +#if defined(__USE_FILE_OFFSET64) && !defined(__LP64__) + // With 64-bit file offsets on a 32-bit system this function is setrlimit64 + if (!orig_setrlimit) orig_setrlimit = (int (*)(__rlimit_resource_t, const struct rlimit *))dlsym(RTLD_NEXT, "setrlimit64"); +#else + if (!orig_setrlimit) orig_setrlimit = (int (*)(__rlimit_resource_t, const struct rlimit *))dlsym(RTLD_NEXT, "setrlimit"); +#endif + if (!orig_setrlimit) { + errno = ENOSYS; + return -1; + } + return orig_setrlimit(resource, rlim); +} +#if defined(__LP64__) +__asm__(".globl setrlimit64\n" ".set setrlimit64, setrlimit\n"); +#endif + +#ifndef LANDLOCK_CREATE_RULESET_VERSION +#define LANDLOCK_CREATE_RULESET_VERSION (1U << 0) +#endif + +#ifndef __NR_landlock_create_ruleset +#define __NR_landlock_create_ruleset 444 +#endif +#ifndef __NR_landlock_add_rule +#define __NR_landlock_add_rule 445 +#endif +#ifndef __NR_landlock_restrict_self +#define __NR_landlock_restrict_self 446 +#endif + +#ifndef __NR_seccomp +#if defined(__aarch64__) +#define __NR_seccomp 277 +#elif defined(__x86_64__) +#define __NR_seccomp 317 +#elif defined(__arm__) +#define __NR_seccomp 383 +#else +#define __NR_seccomp 277 +#endif +#endif + +#ifndef __NR_unshare +#if defined(__aarch64__) +#define __NR_unshare 97 +#elif defined(__x86_64__) +#define __NR_unshare 272 +#elif defined(__arm__) +#define __NR_unshare 337 +#else +#define __NR_unshare 97 +#endif +#endif + +#ifndef __NR_setns +#if defined(__aarch64__) +#define __NR_setns 268 +#elif defined(__x86_64__) +#define __NR_setns 308 +#elif defined(__arm__) +#define __NR_setns 375 +#else +#define __NR_setns 268 +#endif +#endif + +#ifndef __NR_clone3 +#define __NR_clone3 435 +#endif +#ifndef __NR_pidfd_open +#define __NR_pidfd_open 434 +#endif +#ifndef __NR_pidfd_send_signal +#define __NR_pidfd_send_signal 424 +#endif +#ifndef __NR_pidfd_getfd +#define __NR_pidfd_getfd 438 +#endif +#ifndef __NR_close_range +#define __NR_close_range 436 +#endif +#ifndef __NR_faccessat +#if defined(__aarch64__) +#define __NR_faccessat 48 +#elif defined(__arm__) +#define __NR_faccessat 334 +#elif defined(__x86_64__) +#define __NR_faccessat 269 +#endif +#endif +#ifndef __NR_faccessat2 +#define __NR_faccessat2 439 +#endif +#ifndef __NR_statx +#if defined(__aarch64__) || defined(__arm__) +#define __NR_statx 291 +#elif defined(__x86_64__) +#define __NR_statx 332 +#endif +#endif + +#ifndef SECCOMP_SET_MODE_STRICT +#define SECCOMP_SET_MODE_STRICT 0 +#endif +#ifndef SECCOMP_SET_MODE_FILTER +#define SECCOMP_SET_MODE_FILTER 1 +#endif +#ifndef SECCOMP_GET_ACTION_AVAIL +#define SECCOMP_GET_ACTION_AVAIL 2 +#endif + +int landlock_create_ruleset(const void *attr, size_t size, uint32_t flags) { + (void)attr; + (void)size; + (void)flags; + errno = ENOSYS; + return -1; +} + +int landlock_add_rule(int ruleset_fd, int rule_type, const void *rule_attr, uint32_t flags) { + (void)ruleset_fd; + (void)rule_type; + (void)rule_attr; + (void)flags; + errno = ENOSYS; + return -1; +} + +int landlock_restrict_self(int ruleset_fd, uint32_t flags) { + (void)ruleset_fd; + (void)flags; + errno = ENOSYS; + return -1; +} + +int seccomp(unsigned int operation, unsigned int flags, void *args) { + (void)flags; + (void)args; + if (operation != SECCOMP_SET_MODE_STRICT && + operation != SECCOMP_SET_MODE_FILTER && + operation != SECCOMP_GET_ACTION_AVAIL && + operation != 3 /* SECCOMP_GET_NOTIF_SIZES */) { + errno = EINVAL; + return -1; + } + errno = ENOSYS; + return -1; +} + +int unshare(int flags) { + (void)flags; + errno = ENOSYS; + return -1; +} + +int setns(int fd, int nstype) { + (void)fd; + (void)nstype; + errno = ENOSYS; + return -1; +} + +#ifndef CLOSE_RANGE_CLOEXEC +#define CLOSE_RANGE_CLOEXEC (1U << 2) +#endif + +static int close_range_all(unsigned int first, unsigned int last, int flags); + +static int close_range_part(unsigned int first, unsigned int last, void *flags) { + return close_range_all(first, last, *(int *)flags); +} + +int close_range(unsigned int first, unsigned int last, int flags) { + // Close-on-exec only (CLOSE_RANGE_CLOEXEC) leaves the translator's files open + if (g_kept_fd_count > 0 && !(flags & CLOSE_RANGE_CLOEXEC)) { + return for_each_range_without(first, last, g_kept_fds, g_kept_fd_count, close_range_part, &flags); + } + return close_range_all(first, last, flags); +} + +// glibc's closefrom() makes the close_range system call itself, past the function above +void closefrom(int lowfd) { + close_range(lowfd < 0 ? 0U : (unsigned int)lowfd, ~0U, 0); +} + +static int close_range_all(unsigned int first, unsigned int last, int flags) { + static int (*orig_close_range)(unsigned int, unsigned int, int) = NULL; + if (!orig_close_range) { + orig_close_range = (int (*)(unsigned int, unsigned int, int))dlsym(RTLD_NEXT, "close_range"); + } +#ifdef __NR_close_range + static long (*orig_raw_syscall)(long, ...) = NULL; + if (!orig_raw_syscall) orig_raw_syscall = (long (*)(long, ...))dlsym(RTLD_NEXT, "syscall"); + if (orig_raw_syscall) { + long sret = orig_raw_syscall(__NR_close_range, first, last, flags); + if (sret == 0) return 0; + if (sret < 0 && errno != ENOSYS) return -1; + } +#endif + if (orig_close_range) { + int cret = orig_close_range(first, last, flags); + if (cret == 0) return 0; + if (cret < 0 && errno != ENOSYS) return -1; + } + + int set_cloexec = (flags & CLOSE_RANGE_CLOEXEC) != 0; + + DIR *d = opendir("/proc/self/fd"); + if (d) { + int dfd = dirfd(d); + struct dirent *de; + while ((de = readdir(d)) != NULL) { + if (de->d_name[0] == '.') continue; + int fd = atoi(de->d_name); + if (fd >= (int)first && (last == ~0U || (unsigned int)fd <= last) && fd != dfd) { + if (set_cloexec) { + int fl = fcntl(fd, F_GETFD); + if (fl >= 0) { + fcntl(fd, F_SETFD, fl | FD_CLOEXEC); + } + } else { + close(fd); + } + } + } + closedir(d); + return 0; + } + int max_fd = (int)sysconf(_SC_OPEN_MAX); + if (max_fd <= 0 || max_fd > 1024) max_fd = 1024; + int end = (last < (unsigned int)max_fd) ? (int)last : max_fd; + for (int fd = (int)first; fd <= end; fd++) { + if (set_cloexec) { + int fl = fcntl(fd, F_GETFD); + if (fl >= 0) { + fcntl(fd, F_SETFD, fl | FD_CLOEXEC); + } + } else { + close(fd); + } + } + return 0; +} + +static __thread int t_syscall_redirect = 0; + +long syscall(long number, ...) { + va_list ap; + va_start(ap, number); + unsigned long arg1 = va_arg(ap, unsigned long); + unsigned long arg2 = va_arg(ap, unsigned long); + unsigned long arg3 = va_arg(ap, unsigned long); + unsigned long arg4 = va_arg(ap, unsigned long); + unsigned long arg5 = va_arg(ap, unsigned long); + unsigned long arg6 = va_arg(ap, unsigned long); + va_end(ap); + +#if defined(__NR_readlinkat) + if (number == __NR_readlinkat) { + return (long)readlinkat((int)arg1, (const char *)arg2, (char *)arg3, (size_t)arg4); + } +#endif +#if defined(__NR_readlink) + if (number == __NR_readlink) { + return (long)readlink((const char *)arg1, (char *)arg2, (size_t)arg3); + } +#endif +#if defined(__NR_linkat) + if (number == __NR_linkat) { + return (long)linkat((int)arg1, (const char *)arg2, (int)arg3, (const char *)arg4, (int)arg5); + } +#endif +#if defined(__NR_link) + if (number == __NR_link) { + return (long)link((const char *)arg1, (const char *)arg2); + } +#endif + +#ifdef __NR_landlock_create_ruleset + if (number == __NR_landlock_create_ruleset) { + return (long)landlock_create_ruleset((const void *)arg1, (size_t)arg2, (uint32_t)arg3); + } + if (number == __NR_landlock_add_rule) { + return (long)landlock_add_rule((int)arg1, (int)arg2, (const void *)arg3, (uint32_t)arg4); + } + if (number == __NR_landlock_restrict_self) { + return (long)landlock_restrict_self((int)arg1, (uint32_t)arg2); + } +#endif + +#ifdef __NR_seccomp + if (number == __NR_seccomp) { + return (long)seccomp((unsigned int)arg1, (unsigned int)arg2, (void *)arg3); + } +#endif + +#ifdef __NR_unshare + if (number == __NR_unshare) { + return (long)unshare((int)arg1); + } +#endif + +#ifdef __NR_setns + if (number == __NR_setns) { + return (long)setns((int)arg1, (int)arg2); + } +#endif + +#ifdef __NR_clone3 + if (number == __NR_clone3) { + errno = ENOSYS; + return -1; + } +#endif + +#ifdef __NR_pidfd_open + if (number == __NR_pidfd_open) { + errno = ENOSYS; + return -1; + } +#endif +#ifdef __NR_pidfd_send_signal + if (number == __NR_pidfd_send_signal) { + errno = ENOSYS; + return -1; + } +#endif +#ifdef __NR_pidfd_getfd + if (number == __NR_pidfd_getfd) { + errno = ENOSYS; + return -1; + } +#endif + +#ifdef __NR_close_range + if (number == __NR_close_range) { + // libblsession's close_range() calls syscall() again: the nested call goes straight to the kernel + if (t_syscall_redirect) return call_orig_syscall(number, arg1, arg2, arg3, 0, 0, 0); + t_syscall_redirect++; + long ret = (long)close_range((unsigned int)arg1, (unsigned int)arg2, (int)arg3); + t_syscall_redirect--; + return ret; + } +#endif + +#ifdef __NR_openat2 + if (number == __NR_openat2) { + // libblsession's openat2() calls syscall() again (an endless loop until the stack ran out): the nested + // call maps the path and goes straight to the kernel + if (t_syscall_redirect) { + char nested_buf[PATH_MAX]; + const char *path = (const char *)arg2; + if (path && path[0] == '/') path = rewrite_path(path, nested_buf, sizeof(nested_buf)); + return call_orig_syscall(number, arg1, (unsigned long)path, arg3, arg4, 0, 0); + } + t_syscall_redirect++; + long ret = (long)openat2((int)arg1, (const char *)arg2, (struct ddnatv_open_how *)arg3, (size_t)arg4); + t_syscall_redirect--; + return ret; + } +#endif + +#ifdef __NR_fchmodat2 + if (number == __NR_fchmodat2) { + return (long)fchmodat2((int)arg1, (const char *)arg2, (mode_t)arg3, (int)arg4); + } +#endif + +#if defined(__NR_statx) + if (number == __NR_statx) { + return (long)statx((int)arg1, (const char *)arg2, (int)arg3, (unsigned int)arg4, (struct statx *)arg5); + } +#endif + +#if defined(__NR_faccessat) + if (number == __NR_faccessat) { + if (t_syscall_redirect) { + char nested_buf[PATH_MAX]; + const char *path = (const char *)arg2; + if (path && path[0] == '/') path = rewrite_path(path, nested_buf, sizeof(nested_buf)); + return call_orig_syscall(number, arg1, (unsigned long)path, arg3, 0, 0, 0); + } + t_syscall_redirect++; + long ret = (long)faccessat((int)arg1, (const char *)arg2, (int)arg3, 0); + t_syscall_redirect--; + return ret; + } +#endif + +#if defined(__NR_faccessat2) + if (number == __NR_faccessat2) { + return (long)faccessat2((int)arg1, (const char *)arg2, (int)arg3, (int)arg4); + } +#endif + +#if defined(__NR_mknodat) + if (number == __NR_mknodat) { + return (long)mknodat((int)arg1, (const char *)arg2, (mode_t)arg3, (dev_t)arg4); + } +#endif + +#if defined(__NR_mknod) + if (number == __NR_mknod) { + return (long)mknod((const char *)arg1, (mode_t)arg2, (dev_t)arg3); + } +#endif + +#if defined(__NR_mkfifoat) + if (number == __NR_mkfifoat) { + return (long)mkfifoat((int)arg1, (const char *)arg2, (mode_t)arg3); + } +#endif + +#if defined(__NR_setresuid) + if (number == __NR_setresuid) return 0; +#endif +#if defined(__NR_setresuid32) + if (number == __NR_setresuid32) return 0; +#endif +#if defined(__NR_setresgid) + if (number == __NR_setresgid) return 0; +#endif +#if defined(__NR_setresgid32) + if (number == __NR_setresgid32) return 0; +#endif +#if defined(__NR_setuid) + if (number == __NR_setuid) return 0; +#endif +#if defined(__NR_setuid32) + if (number == __NR_setuid32) return 0; +#endif +#if defined(__NR_setgid) + if (number == __NR_setgid) return 0; +#endif +#if defined(__NR_setgid32) + if (number == __NR_setgid32) return 0; +#endif +#if defined(__NR_setreuid) + if (number == __NR_setreuid) return 0; +#endif +#if defined(__NR_setreuid32) + if (number == __NR_setreuid32) return 0; +#endif +#if defined(__NR_setregid) + if (number == __NR_setregid) return 0; +#endif +#if defined(__NR_setregid32) + if (number == __NR_setregid32) return 0; +#endif +#if defined(__NR_setgroups) + if (number == __NR_setgroups) return 0; +#endif +#if defined(__NR_setgroups32) + if (number == __NR_setgroups32) return 0; +#endif +#if defined(__NR_setfsuid) + if (number == __NR_setfsuid) return 0; +#endif +#if defined(__NR_setfsuid32) + if (number == __NR_setfsuid32) return 0; +#endif +#if defined(__NR_setfsgid) + if (number == __NR_setfsgid) return 0; +#endif +#if defined(__NR_setfsgid32) + if (number == __NR_setfsgid32) return 0; +#endif +#if defined(__NR_getuid) + if (number == __NR_getuid) return 0; +#endif +#if defined(__NR_getuid32) + if (number == __NR_getuid32) return 0; +#endif +#if defined(__NR_geteuid) + if (number == __NR_geteuid) return 0; +#endif +#if defined(__NR_geteuid32) + if (number == __NR_geteuid32) return 0; +#endif +#if defined(__NR_getgid) + if (number == __NR_getgid) return 0; +#endif +#if defined(__NR_getgid32) + if (number == __NR_getgid32) return 0; +#endif +#if defined(__NR_getegid) + if (number == __NR_getegid) return 0; +#endif +#if defined(__NR_getegid32) + if (number == __NR_getegid32) return 0; +#endif +#if defined(__NR_getresuid) + if (number == __NR_getresuid) { + uid_t *ruid = (uid_t *)arg1; + uid_t *euid = (uid_t *)arg2; + uid_t *suid = (uid_t *)arg3; + if (ruid) *ruid = 0; + if (euid) *euid = 0; + if (suid) *suid = 0; + return 0; + } +#endif +#if defined(__NR_getresuid32) + if (number == __NR_getresuid32) { + uid_t *ruid = (uid_t *)arg1; + uid_t *euid = (uid_t *)arg2; + uid_t *suid = (uid_t *)arg3; + if (ruid) *ruid = 0; + if (euid) *euid = 0; + if (suid) *suid = 0; + return 0; + } +#endif +#if defined(__NR_getresgid) + if (number == __NR_getresgid) { + gid_t *rgid = (gid_t *)arg1; + gid_t *egid = (gid_t *)arg2; + gid_t *sgid = (gid_t *)arg3; + if (rgid) *rgid = 0; + if (egid) *egid = 0; + if (sgid) *sgid = 0; + return 0; + } +#endif +#if defined(__NR_getresgid32) + if (number == __NR_getresgid32) { + gid_t *rgid = (gid_t *)arg1; + gid_t *egid = (gid_t *)arg2; + gid_t *sgid = (gid_t *)arg3; + if (rgid) *rgid = 0; + if (egid) *egid = 0; + if (sgid) *sgid = 0; + return 0; + } +#endif + + return call_orig_syscall(number, arg1, arg2, arg3, arg4, arg5, arg6); +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/setup.c b/tools/nativeguest/hook/setup.c new file mode 100644 index 0000000000..90c5d87afe --- /dev/null +++ b/tools/nativeguest/hook/setup.c @@ -0,0 +1,384 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Start-up (DDNATV_ROOT, certificate and time zone defaults), /proc/self/exe, rewrite_path() and +// the short names of Unix sockets. + +#ifndef DDNATV_HOST_TEST + +static char g_real_exe[PATH_MAX] = {0}; +// DDNATV_PRELOAD: guest paths of libraries every program loads before the hook (what +// /etc/ld.so.preload does for programs run by the rootfs's own ld.so), and the same as host paths. +static char *g_preload_guest = NULL; +static char *g_preload_host = NULL; +static int g_initialized = 0; + +static void init_ddnatv_hook(void) { + if (g_initialized) return; + const char *root = getenv("DDNATV_ROOT"); + if (root && strlen(root) > 0) { + size_t len = strlen(root); + if (len > sizeof(g_ddnatv_root) - 1) len = sizeof(g_ddnatv_root) - 1; + if (root[len - 1] == '/') len--; + ddnatv_set_root(root, len); + } else { + Dl_info info; + if (dladdr((void *)init_ddnatv_hook, &info) && info.dli_fname) { + const char *p = strstr(info.dli_fname, "/usr/lib/libddnatv-hook"); + if (p && p > info.dli_fname) { + size_t len = p - info.dli_fname; + if (len < sizeof(g_ddnatv_root)) { + ddnatv_set_root(info.dli_fname, len); + } + } + } + } + ddnatv_load_binds(getenv("DDNATV_BINDS")); + const char *hostname = getenv("DDNATV_HOSTNAME"); + if (hostname && hostname[0] && strlen(hostname) < sizeof(g_hostname)) ddnatv_copy_cstr(g_hostname, sizeof(g_hostname), hostname); + const char *link_root = getenv("DDNATV_LINK_ROOT"); + if (link_root && link_root[0] == '/' && strlen(link_root) < sizeof(g_link_root)) { + ddnatv_copy_cstr(g_link_root, sizeof(g_link_root), link_root); + g_link_root_len = strlen(g_link_root); + while (g_link_root_len > 1 && g_link_root[g_link_root_len - 1] == '/') g_link_root[--g_link_root_len] = 0; + } + const char *preload = getenv("DDNATV_PRELOAD"); + if (preload && preload[0] && g_ddnatv_root_len > 0) { + size_t libs = 1; + for (const char *p = preload; *p; p++) libs += *p == ':'; + size_t cap = libs * (PATH_MAX + 1); + char *host = malloc(cap); + if (host) { + size_t used = 0; + host[0] = '\0'; + char *copy = strdup(preload); + char *save = NULL; + for (char *lib = copy ? strtok_r(copy, ":", &save) : NULL; lib; lib = strtok_r(NULL, ":", &save)) { + if (lib[0] != '/') continue; + char mapped_buf[PATH_MAX]; + const char *mapped = rewrite_path_in_root(lib, mapped_buf, sizeof(mapped_buf)); + size_t mapped_len = strlen(mapped); + if (used + mapped_len + 2 > cap) break; + if (used) host[used++] = ':'; + used = ddnatv_append(host, cap, used, mapped, mapped_len); + } + free(copy); + g_preload_host = host; + g_preload_guest = strdup(preload); + } + } + const char *curr_real_exe = getenv("DDNATV_REAL_EXE"); + if (curr_real_exe && curr_real_exe[0] != '\0') { + ddnatv_copy_cstr(g_real_exe, sizeof(g_real_exe), curr_real_exe); + } + if (g_ddnatv_root[0] != '\0') { + const char *curr_tzdir = getenv("TZDIR"); + if (!curr_tzdir || curr_tzdir[0] == '\0') { + char tzdir_buf[PATH_MAX]; + snprintf(tzdir_buf, sizeof(tzdir_buf), "%s/usr/share/zoneinfo", g_ddnatv_root); + setenv("TZDIR", tzdir_buf, 0); + } + + const char *curr_cert = getenv("SSL_CERT_FILE"); + if (!curr_cert || curr_cert[0] == '\0' || strcmp(curr_cert, "/etc/ssl/certs/ca-certificates.crt") == 0) { + char cert_buf[PATH_MAX]; + snprintf(cert_buf, sizeof(cert_buf), "%s/etc/ssl/certs/ca-certificates.crt", g_ddnatv_root); + setenv("SSL_CERT_FILE", cert_buf, 1); + } + + const char *curr_cert_dir = getenv("SSL_CERT_DIR"); + if (!curr_cert_dir || curr_cert_dir[0] == '\0' || strcmp(curr_cert_dir, "/etc/ssl/certs") == 0) { + char cert_dir_buf[PATH_MAX]; + snprintf(cert_dir_buf, sizeof(cert_dir_buf), "%s/etc/ssl/certs:/system/etc/security/cacerts", g_ddnatv_root); + setenv("SSL_CERT_DIR", cert_dir_buf, 1); + } + + const char *curr_curl = getenv("CURL_CA_BUNDLE"); + if (!curr_curl || curr_curl[0] == '\0' || strcmp(curr_curl, "/etc/ssl/certs/ca-certificates.crt") == 0) { + char curl_buf[PATH_MAX]; + snprintf(curl_buf, sizeof(curl_buf), "%s/etc/ssl/certs/ca-certificates.crt", g_ddnatv_root); + setenv("CURL_CA_BUNDLE", curl_buf, 1); + } + + const char *curr_godebug = getenv("GODEBUG"); + if (!curr_godebug || curr_godebug[0] == '\0') { + setenv("GODEBUG", "netdns=cgo", 0); + } else if (strstr(curr_godebug, "netdns") == NULL) { + char godebug_buf[512]; + snprintf(godebug_buf, sizeof(godebug_buf), "%s,netdns=cgo", curr_godebug); + setenv("GODEBUG", godebug_buf, 1); + } + } + g_initialized = 1; +} + +// Before the program runs: init_ddnatv_hook() sets variables, and setenv() may move the block the +// environment is kept in. A program that had changed its environment (putenv, setenv) and passed it +// to execv() before its first call into the hook handed the exec code a block that was freed by the +// time it was read. +__attribute__((constructor(103))) static void init_ddnatv_hook_early(void) { + init_ddnatv_hook(); + // The kernel names the process after what it executed, the rootfs ld.so: process monitors, and + // the app's own checks of /proc//comm (steam, wineserver), saw only "ld-linux-aarch64.so.1" + const char *name = program_invocation_short_name; + if (g_ddnatv_root[0] != '\0' && name && name[0] && strncmp(name, "ld-linux", 8) != 0) { + prctl(PR_SET_NAME, (unsigned long)name, 0, 0, 0); + } +} + +void tzset(void) { + static void (*orig_tzset)(void) = NULL; + if (!orig_tzset) orig_tzset = (void (*)(void))dlsym(RTLD_NEXT, "tzset"); + init_ddnatv_hook(); + if (g_ddnatv_root[0] != '\0') { + const char *curr_tzdir = getenv("TZDIR"); + if (!curr_tzdir || curr_tzdir[0] == '\0') { + char tzdir_buf[PATH_MAX]; + snprintf(tzdir_buf, sizeof(tzdir_buf), "%s/usr/share/zoneinfo", g_ddnatv_root); + setenv("TZDIR", tzdir_buf, 0); + } + } + if (orig_tzset) orig_tzset(); +} + +static int is_proc_self_exe(const char *path) { + if (!path) return 0; + if (strcmp(path, "/proc/self/exe") == 0 || + strcmp(path, "/proc/thread-self/exe") == 0) { + return 1; + } + if (strncmp(path, "/proc/", 6) == 0) { + const char *p = path + 6; + while (*p >= '0' && *p <= '9') p++; + if (strcmp(p, "/exe") == 0) { + pid_t pid = (pid_t)atoi(path + 6); + if (pid == getpid()) { + return 1; + } + } + } + return 0; +} + +static ssize_t handle_proc_self_exe(char *buf, size_t bufsiz) { + if (!buf || bufsiz == 0) { + errno = EINVAL; + return -1; + } + init_ddnatv_hook(); + if (g_real_exe[0] == '\0') { + int fd = open("/proc/self/cmdline", O_RDONLY); + if (fd >= 0) { + char cmdline[8192]; + ssize_t n = read(fd, cmdline, sizeof(cmdline) - 1); + close(fd); + if (n > 0) { + cmdline[n] = '\0'; + char *args[64] = {0}; + int ac = 0; + char *p = cmdline; + while (p < cmdline + n && ac < 64) { + args[ac++] = p; + p += strlen(p) + 1; + } + for (int i = 0; i < ac; i++) { + if (strcmp(args[i], "--argv0") == 0 && i + 2 < ac) { + strncpy(g_real_exe, args[i + 2], sizeof(g_real_exe) - 1); + g_real_exe[sizeof(g_real_exe) - 1] = '\0'; + break; + } + } + if (g_real_exe[0] == '\0' && ac > 0 && args[0] && args[0][0] != '\0') { + strncpy(g_real_exe, args[0], sizeof(g_real_exe) - 1); + g_real_exe[sizeof(g_real_exe) - 1] = '\0'; + } + } + } + } + + if (g_real_exe[0] != '\0') { + char stripped[PATH_MAX]; + const char *out_path = g_real_exe; + if (g_ddnatv_root[0] != '\0') { + size_t rlen = g_ddnatv_root_len; + if (strncmp(g_real_exe, g_ddnatv_root, rlen) == 0 && + (g_real_exe[rlen] == '/' || g_real_exe[rlen] == '\0')) { + out_path = g_real_exe + rlen; + if (out_path[0] == '\0') out_path = "/"; + } + } + strncpy(stripped, out_path, sizeof(stripped) - 1); + stripped[sizeof(stripped) - 1] = '\0'; + + size_t len = strlen(stripped); + size_t copy_len = (len < bufsiz) ? len : bufsiz; + memcpy(buf, stripped, copy_len); + return (ssize_t)copy_len; + } + return -1; +} + +static const char *rewrite_path(const char *path, char *buffer, size_t bufsize) { + if (!path) return NULL; + // Relative paths must NEVER be rewritten to rootfs root + if (path[0] != '/') return path; + init_ddnatv_hook(); + return rewrite_path_in_root(path, buffer, bufsize); +} + +// rewrite_path() for calls that follow a symbolic link in the last component. In a mount whose +// source is elsewhere the kernel would follow the link's absolute guest target on Android's own +// tree (a Flatpak app's /app/bin/PINBALL.DAT -> /app/extra/Pinball/PINBALL.DAT), so the link is +// followed in the guest's view first. The rootfs's own links were made relative already. +static const char *rewrite_path_follow(const char *path, char *buffer, size_t bufsize) { + if (!path) return NULL; + if (path[0] != '/') return path; + init_ddnatv_hook(); + int moved = 0; + for (int i = 0; i < g_nbinds; i++) { + const struct ddnatv_bind *b = &g_binds[i]; + if (path[1] == b->dst[1] && is_path_prefix(path, b->dst, b->dst_len)) { moved = !b->identity; break; } + } + char from_source[PATH_MAX]; + if (!moved) { + // or a mount's real place, as /proc/self/exe and getcwd() give it (a Flatpak app's checkout) + const struct ddnatv_bind *best = NULL; + for (int i = 0; i < g_nbinds; i++) { + const struct ddnatv_bind *b = &g_binds[i]; + if (b->identity || !is_path_prefix(path, b->src, b->src_len)) continue; + if (!best || b->src_len > best->src_len) best = b; + } + if (!best) { + const char *host = rewrite_path_in_root(path, buffer, bufsize); +#if defined(__aarch64__) + // A link in the rootfs with an absolute guest target that the hook did not write (one made + // under proot, or copied from Proton's template prefix, as Wine's "z:" -> "/") is followed + // by the kernel on Android's own tree: Wine found no drive for any path and gave games + // \\?\unix\ names, which an NW.js game could not load its DLLs from. + if (is_android_host_path(path)) return host; + char target[PATH_MAX]; + long n = raw_readlinkat(AT_FDCWD, host, target, sizeof(target) - 1); + if (n <= 0 || target[0] != '/') return host; + target[n] = '\0'; + if (is_android_host_path(target) || + (g_ddnatv_root_len && strncmp(target, g_ddnatv_root, g_ddnatv_root_len) == 0)) return host; + char guest_path[PATH_MAX]; + ddnatv_copy_cstr(guest_path, sizeof(guest_path), path); + char guest_target[PATH_MAX]; + const char *followed = follow_guest_link(guest_path, guest_target, sizeof(guest_target)); + char mapped[PATH_MAX]; + ddnatv_copy_cstr(buffer, bufsize, rewrite_path_in_root(followed, mapped, sizeof(mapped))); + return buffer; +#else + return host; +#endif + } + size_t n = ddnatv_append(from_source, sizeof(from_source), 0, best->dst, best->dst_len); + ddnatv_append(from_source, sizeof(from_source), n, path + best->src_len, strlen(path + best->src_len)); + path = from_source; + } + char guest[PATH_MAX]; + const char *followed = follow_guest_link(path, guest, sizeof(guest)); + char mapped[PATH_MAX]; + const char *host = rewrite_path_in_root(followed, mapped, sizeof(mapped)); + // the result may be `followed` or `path` itself, which can live here + ddnatv_copy_cstr(buffer, bufsize, host); + return buffer; +} + +// Whether the rootfs keeps bin (pair DDNATV_USRMERGE_BIN) or sbin as a symlink into /usr, as +// Ubuntu 24.04 does. Checked once per process with one readlink(). +static int rootfs_pair_is_merged(int pair) { + static int known[3] = { 0, -1, -1 }; + if (known[pair] >= 0) return known[pair]; + static ssize_t (*orig_readlink)(const char *, char *, size_t) = NULL; + if (!orig_readlink) orig_readlink = (ssize_t (*)(const char *, char *, size_t))dlsym(RTLD_NEXT, "readlink"); + const char *dir = (pair == DDNATV_USRMERGE_BIN) ? "/bin" : "/sbin"; + const char *usr_dir = (pair == DDNATV_USRMERGE_BIN) ? "usr/bin" : "usr/sbin"; + char path[PATH_MAX]; + char link[16]; + size_t n = ddnatv_append(path, sizeof(path), 0, g_ddnatv_root, g_ddnatv_root_len); + ddnatv_append(path, sizeof(path), n, dir, strlen(dir)); + int saved_errno = errno; + ssize_t len = orig_readlink ? orig_readlink(path, link, sizeof(link) - 1) : -1; + errno = saved_errno; + int merged = 0; + if (len > 0) { + link[len] = '\0'; + size_t ulen = strlen(usr_dir); + merged = strncmp(link, usr_dir, ulen) == 0 && (link[ulen] == '\0' || (link[ulen] == '/' && link[ulen + 1] == '\0')); + } + known[pair] = merged; + return merged; +} + +// The other spelling of a missing rootfs path under bin/sbin, or NULL when there is none or both +// spellings reach the same directory (the retry could only fail again). +static const char *usrmerge_retry_path(const char *target, char *alt, size_t altsz) { + const char *sub = get_rootfs_subpath(target); + if (!sub) return NULL; + int pair = usrmerge_alt_path(sub, alt, altsz); + if (pair == 0 || rootfs_pair_is_merged(pair)) return NULL; + return alt; +} + +static const char *rewrite_unix_socket_path(const char *sun_path, char *out_buf, size_t out_size) { + if (!sun_path || out_size == 0) return sun_path; + // Abstract sockets start with null byte (\0); leave untouched + if (sun_path[0] == '\0') { + return sun_path; + } + + char full[PATH_MAX]; + const char *rw = (sun_path[0] == '/') ? rewrite_path(sun_path, full, sizeof(full)) : sun_path; + size_t rw_len = strlen(rw); + + // If rewritten path fits safely in sockaddr_un.sun_path (usually 108 bytes) + if (rw_len < out_size) { + strncpy(out_buf, rw, out_size - 1); + out_buf[out_size - 1] = '\0'; + return out_buf; + } + + // Path exceeds sockaddr_un 108-byte limit! + // Deterministically hash the path into /tmp to guarantee it fits safely (< 80 bytes) + // while remaining 100% deterministic between server and client. + unsigned long long hash = 14695981039346656037ULL; + for (const char *p = rw; *p; p++) { + hash ^= (unsigned char)(*p); + hash *= 1099511628211ULL; + } + + init_ddnatv_hook(); + if (g_ddnatv_root[0] != '\0') { + snprintf(out_buf, out_size, "%s/tmp/.ctx_sock_%016llx", g_ddnatv_root, hash); + } else { + snprintf(out_buf, out_size, "/tmp/.ctx_sock_%016llx", hash); + } + out_buf[out_size - 1] = '\0'; + return out_buf; +} + +static void unlink_mapped_unix_socket(const char *target) { + if (!target) return; + size_t t_len = strlen(target); + if (t_len >= 107) { + unsigned long long hash = 14695981039346656037ULL; + for (const char *p = target; *p; p++) { + hash ^= (unsigned char)(*p); + hash *= 1099511628211ULL; + } + char short_path[PATH_MAX]; + init_ddnatv_hook(); + if (g_ddnatv_root[0] != '\0') { + snprintf(short_path, sizeof(short_path), "%s/tmp/.ctx_sock_%016llx", g_ddnatv_root, hash); + } else { + snprintf(short_path, sizeof(short_path), "/tmp/.ctx_sock_%016llx", hash); + } + static int (*orig_unlink)(const char *) = NULL; + if (!orig_unlink) orig_unlink = (int (*)(const char *))dlsym(RTLD_NEXT, "unlink"); + if (orig_unlink) orig_unlink(short_path); + } +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/signals.c b/tools/nativeguest/hook/signals.c new file mode 100644 index 0000000000..0b5765070d --- /dev/null +++ b/tools/nativeguest/hook/signals.c @@ -0,0 +1,233 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// The SIGSYS handler for system calls Android's seccomp filter blocks, and the signal hooks that +// keep programs from replacing or blocking it. + +#ifndef DDNATV_HOST_TEST + +#ifndef SYS_SECCOMP +#define SYS_SECCOMP 1 +#endif + +static int (*get_real_sigaction(void))(int, const struct sigaction *, struct sigaction *); + +// A program's own SIGSYS handler, for the traps of a seccomp filter it installed itself (Firefox's +// and Chromium's sandboxes emulate the calls they trap there). Android's app filter traps with data +// 0; such a sandbox's traps carry their own nonzero data, which the kernel gives as si_errno. +static struct sigaction g_app_sigsys; +static int g_app_sigsys_set = 0; + +static void remember_app_sigsys(const struct sigaction *act, struct sigaction *oldact) { + if (oldact) { + if (g_app_sigsys_set) { + *oldact = g_app_sigsys; + } else { + memset(oldact, 0, sizeof(*oldact)); + oldact->sa_handler = SIG_DFL; + } + } + if (act) { + g_app_sigsys = *act; + g_app_sigsys_set = act->sa_handler != SIG_DFL && act->sa_handler != SIG_IGN; + } +} + +// Intercept SECCOMP blocked syscalls (SIGSYS), resolve sandbox/landlock gracefully, and advance PC +static void ddnatv_sigsys_handler(int sig, siginfo_t *info, void *ctx) { + if (!ctx || !info) return; + if (info->si_code != SYS_SECCOMP) { + int (*real_sig)(int, const struct sigaction *, struct sigaction *) = get_real_sigaction(); + if (real_sig) { + struct sigaction sa_dfl; + memset(&sa_dfl, 0, sizeof(sa_dfl)); + sa_dfl.sa_handler = SIG_DFL; + sigemptyset(&sa_dfl.sa_mask); + real_sig(sig, &sa_dfl, NULL); + } + raise(sig); + return; + } + if (info->si_errno != 0 && g_app_sigsys_set) { + if (g_app_sigsys.sa_flags & SA_SIGINFO) g_app_sigsys.sa_sigaction(sig, info, ctx); + else g_app_sigsys.sa_handler(sig); + return; + } + ucontext_t *uctx = (ucontext_t *)ctx; + + int sys_nr = info->si_syscall; + long ret_val = is_sigsys_synthetic_success_syscall(sys_nr) ? 0 : -ENOSYS; + +#if defined(__aarch64__) + uctx->uc_mcontext.regs[0] = (uint64_t)ret_val; + if (uctx->uc_mcontext.pc >= 4) { + uint32_t insn_at_pc = 0; + uint32_t insn_before_pc = 0; + memcpy(&insn_at_pc, (const void *)uctx->uc_mcontext.pc, sizeof(insn_at_pc)); + memcpy(&insn_before_pc, (const void *)(uctx->uc_mcontext.pc - 4), sizeof(insn_before_pc)); + // On SECCOMP_RET_TRAP, the kernel already advanced PC past svc #0 (*(pc - 4) is svc #0). + // Only advance PC if PC itself points to svc #0 and *(pc - 4) does not. + int at_is_svc = ((insn_at_pc & 0xffe0001fU) == 0xd4000001U); + int prev_is_svc = ((insn_before_pc & 0xffe0001fU) == 0xd4000001U); + if (at_is_svc && !prev_is_svc) { + uctx->uc_mcontext.pc += 4; + } + } +#elif defined(__arm__) + uctx->uc_mcontext.arm_r0 = (unsigned long)ret_val; + if (uctx->uc_mcontext.arm_pc >= 4) { + if (uctx->uc_mcontext.arm_cpsr & 0x20) { + uint16_t insn_at_pc = 0; + uint16_t insn_before_pc = 0; + memcpy(&insn_at_pc, (const void *)uctx->uc_mcontext.arm_pc, sizeof(insn_at_pc)); + memcpy(&insn_before_pc, (const void *)(uctx->uc_mcontext.arm_pc - 2), sizeof(insn_before_pc)); + int at_is_svc = ((insn_at_pc & 0xff00U) == 0xdf00U); + int prev_is_svc = ((insn_before_pc & 0xff00U) == 0xdf00U); + if (at_is_svc && !prev_is_svc) { + uctx->uc_mcontext.arm_pc += 2; + } + } else { + uint32_t insn_at_pc = 0; + uint32_t insn_before_pc = 0; + memcpy(&insn_at_pc, (const void *)uctx->uc_mcontext.arm_pc, sizeof(insn_at_pc)); + memcpy(&insn_before_pc, (const void *)(uctx->uc_mcontext.arm_pc - 4), sizeof(insn_before_pc)); + int at_is_svc = ((insn_at_pc & 0x0f000000U) == 0x0f000000U); + int prev_is_svc = ((insn_before_pc & 0x0f000000U) == 0x0f000000U); + if (at_is_svc && !prev_is_svc) { + uctx->uc_mcontext.arm_pc += 4; + } + } + } +#elif defined(__x86_64__) && defined(REG_RAX) + uctx->uc_mcontext.gregs[REG_RAX] = (greg_t)ret_val; + if (uctx->uc_mcontext.gregs[REG_RIP] >= 2) { + unsigned char insn_at[2] = {0}; + unsigned char insn_prev[2] = {0}; + memcpy(insn_at, (const void *)uctx->uc_mcontext.gregs[REG_RIP], sizeof(insn_at)); + memcpy(insn_prev, (const void *)(uctx->uc_mcontext.gregs[REG_RIP] - 2), sizeof(insn_prev)); + int at_is_sys = (insn_at[0] == 0x0f && insn_at[1] == 0x05); + int prev_is_sys = (insn_prev[0] == 0x0f && insn_prev[1] == 0x05); + if (at_is_sys && !prev_is_sys) { + uctx->uc_mcontext.gregs[REG_RIP] += 2; + } + } +#elif defined(__i386__) && defined(REG_EAX) + uctx->uc_mcontext.gregs[REG_EAX] = (greg_t)ret_val; + if (uctx->uc_mcontext.gregs[REG_EIP] >= 2) { + unsigned char insn_at[2] = {0}; + unsigned char insn_prev[2] = {0}; + memcpy(insn_at, (const void *)uctx->uc_mcontext.gregs[REG_EIP], sizeof(insn_at)); + memcpy(insn_prev, (const void *)(uctx->uc_mcontext.gregs[REG_EIP] - 2), sizeof(insn_prev)); + int at_is_sys = (insn_at[0] == 0xcd && insn_at[1] == 0x80); + int prev_is_sys = (insn_prev[0] == 0xcd && insn_prev[1] == 0x80); + if (at_is_sys && !prev_is_sys) { + uctx->uc_mcontext.gregs[REG_EIP] += 2; + } + } +#endif +} + +static int (*get_real_sigaction(void))(int, const struct sigaction *, struct sigaction *) { + static int (*real_sigaction)(int, const struct sigaction *, struct sigaction *) = NULL; + if (!real_sigaction) { + real_sigaction = (int (*)(int, const struct sigaction *, struct sigaction *))dlsym(RTLD_NEXT, "sigaction"); + if (!real_sigaction) { + real_sigaction = (int (*)(int, const struct sigaction *, struct sigaction *))dlsym(RTLD_DEFAULT, "sigaction"); + } + } + return real_sigaction; +} + +__attribute__((constructor(101))) static void install_sigsys_handler(void) { + int (*real_sig)(int, const struct sigaction *, struct sigaction *) = get_real_sigaction(); + if (!real_sig) return; + + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = ddnatv_sigsys_handler; + sa.sa_flags = SA_SIGINFO | SA_RESTART; + sigemptyset(&sa.sa_mask); + real_sig(SIGSYS, &sa, NULL); +} + +int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact) { + int (*real_sig)(int, const struct sigaction *, struct sigaction *) = get_real_sigaction(); + if (!real_sig) return -1; + + if (signum == SIGSYS) { + if (act && act->sa_sigaction == ddnatv_sigsys_handler) { + return real_sig(signum, act, oldact); + } + remember_app_sigsys(act, oldact); + return 0; + } + return real_sig(signum, act, oldact); +} + +int rt_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact, size_t sigsetsize) { + static int (*orig_rt_sigaction)(int, const struct sigaction *, struct sigaction *, size_t) = NULL; + if (!orig_rt_sigaction) orig_rt_sigaction = (int (*)(int, const struct sigaction *, struct sigaction *, size_t))dlsym(RTLD_NEXT, "rt_sigaction"); + + if (signum == SIGSYS) { + if (act && act->sa_sigaction == ddnatv_sigsys_handler) { + return orig_rt_sigaction ? orig_rt_sigaction(signum, act, oldact, sigsetsize) : 0; + } + remember_app_sigsys(act, oldact); + return 0; + } + return orig_rt_sigaction ? orig_rt_sigaction(signum, act, oldact, sigsetsize) : -1; +} + +int __libc_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact) { + return sigaction(signum, act, oldact); +} + +typedef void (*sighandler_t)(int); +sighandler_t signal(int signum, sighandler_t handler) { + static sighandler_t (*orig_signal)(int, sighandler_t) = NULL; + if (!orig_signal) orig_signal = (sighandler_t (*)(int, sighandler_t))dlsym(RTLD_NEXT, "signal"); + if (signum == SIGSYS) { + struct sigaction act, old; + memset(&act, 0, sizeof(act)); + act.sa_handler = handler; + remember_app_sigsys(&act, &old); + return old.sa_handler; + } + return orig_signal ? orig_signal(signum, handler) : NULL; +} + +int sigprocmask(int how, const sigset_t *set, sigset_t *oldset) { + static int (*orig_sigprocmask)(int, const sigset_t *, sigset_t *) = NULL; + if (!orig_sigprocmask) orig_sigprocmask = (int (*)(int, const sigset_t *, sigset_t *))dlsym(RTLD_NEXT, "sigprocmask"); + if (set && (how == SIG_BLOCK || how == SIG_SETMASK)) { + sigset_t mod_set = *set; + sigdelset(&mod_set, SIGSYS); + return orig_sigprocmask ? orig_sigprocmask(how, &mod_set, oldset) : 0; + } + return orig_sigprocmask ? orig_sigprocmask(how, set, oldset) : 0; +} + +int pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset) { + static int (*orig_pthread_sigmask)(int, const sigset_t *, sigset_t *) = NULL; + if (!orig_pthread_sigmask) orig_pthread_sigmask = (int (*)(int, const sigset_t *, sigset_t *))dlsym(RTLD_NEXT, "pthread_sigmask"); + if (set && (how == SIG_BLOCK || how == SIG_SETMASK)) { + sigset_t mod_set = *set; + sigdelset(&mod_set, SIGSYS); + return orig_pthread_sigmask ? orig_pthread_sigmask(how, &mod_set, oldset) : 0; + } + return orig_pthread_sigmask ? orig_pthread_sigmask(how, set, oldset) : 0; +} + +int rt_sigprocmask(int how, const sigset_t *set, sigset_t *oldset, size_t sigsetsize) { + static int (*orig_rt_sigprocmask)(int, const sigset_t *, sigset_t *, size_t) = NULL; + if (!orig_rt_sigprocmask) orig_rt_sigprocmask = (int (*)(int, const sigset_t *, sigset_t *, size_t))dlsym(RTLD_NEXT, "rt_sigprocmask"); + if (set && (how == SIG_BLOCK || how == SIG_SETMASK)) { + sigset_t mod_set; + memcpy(&mod_set, set, sizeof(mod_set)); + sigdelset(&mod_set, SIGSYS); + return orig_rt_sigprocmask ? orig_rt_sigprocmask(how, &mod_set, oldset, sigsetsize) : 0; + } + return orig_rt_sigprocmask ? orig_rt_sigprocmask(how, set, oldset, sigsetsize) : 0; +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/sockets.c b/tools/nativeguest/hook/sockets.c new file mode 100644 index 0000000000..2903505f9b --- /dev/null +++ b/tools/nativeguest/hook/sockets.c @@ -0,0 +1,351 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Sockets: Unix socket paths in the rootfs, the redirected DNS queries of loopback DNS, and the +// TCP servers programs start (the app offers to open them in the browser). + +// The TCP port a listening socket was bound to, 0 for other sockets. +static int listening_tcp_port(int fd) { + struct sockaddr_storage ss; + socklen_t len = sizeof(ss); + memset(&ss, 0, sizeof(ss)); + if (syscall(SYS_getsockname, fd, (struct sockaddr *)&ss, &len) != 0) return 0; + if (ss.ss_family == AF_INET && len >= (socklen_t)sizeof(struct sockaddr_in)) + return ntohs(((struct sockaddr_in *)&ss)->sin_port); + if (ss.ss_family == AF_INET6 && len >= (socklen_t)sizeof(struct sockaddr_in6)) + return ntohs(((struct sockaddr_in6 *)&ss)->sin6_port); + return 0; +} + +// Tells the app that this program listens on [port]: $DDNATV_ROOT/run/ddnatv/listening/PORT with +// "PID NAME" (ListeningPorts). Raw system calls: nothing of this library runs again. +static void report_listening_port(const char *root, size_t root_len, int port, const char *name) { + if (root_len == 0 || port <= 0 || port > 65535) return; + char path[PATH_MAX]; + int n = snprintf(path, sizeof(path), "%.*s/run/ddnatv/listening/%d", (int)root_len, root, port); + if (n <= 0 || n >= (int)sizeof(path)) return; + int out = (int)syscall(SYS_openat, AT_FDCWD, path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0600); + if (out < 0) return; // no app watching (the directory is the app's) + char line[160]; + int m = snprintf(line, sizeof(line), "%d %.100s\n", (int)getpid(), name && name[0] ? name : "?"); + if (m > 0) syscall(SYS_write, out, line, (size_t)(m < (int)sizeof(line) ? m : (int)sizeof(line) - 1)); + syscall(SYS_close, out); +} + +// The first port of the kernel's range for ports it picks itself, from the text of +// /proc/sys/net/ipv4/ip_local_port_range ("32768\t60999"); 32768, Linux's default, when there is none. +static int ephemeral_port_low(const char *range) { + if (!range) return 32768; + while (*range == ' ' || *range == '\t') range++; + int low = 0, digits = 0; + while (*range >= '0' && *range <= '9' && digits < 6) low = low * 10 + (*range++ - '0'), digits++; + return (digits > 0 && low > 0 && low <= 65535) ? low : 32768; +} + +// Whether listen() tells the app about a server on `port`, which it then connects to and sends an +// HTTP request (LocalServers). Only for a port the program chose (`chosen`) below the kernel's own +// range: a server whose port the kernel picked, or one in that range, is how programs talk to +// each other (Gradle's daemon, the Kotlin daemon, a JVM's debugger, test runners). Such a server +// often accepts one connection, so the app's own took the place of the program it waited for: +// that one read EOF ("Did not receive connection preamble" from Gradle, #51). Web servers people +// open (npm run dev, vite, python3 -m http.server, jupyter) are on ports such as 3000, 5173, 8000. +static int listening_port_is_reported(int chosen, int port, int ephemeral_low) { + return chosen && port > 0 && port < ephemeral_low; +} + +#ifndef DDNATV_HOST_TEST + +// The kernel's range, read once (raw system calls: nothing of this library runs again) +static int kernel_ephemeral_port_low(void) { + static int low = 0; + int v = __atomic_load_n(&low, __ATOMIC_RELAXED); + if (v) return v; + char text[64]; + ssize_t n = -1; + int fd = (int)syscall(SYS_openat, AT_FDCWD, "/proc/sys/net/ipv4/ip_local_port_range", O_RDONLY | O_CLOEXEC); + if (fd >= 0) { + n = syscall(SYS_read, fd, text, sizeof(text) - 1); + syscall(SYS_close, fd); + } + if (n > 0) text[n] = '\0'; + v = ephemeral_port_low(n > 0 ? text : NULL); + __atomic_store_n(&low, v, __ATOMIC_RELAXED); + return v; +} + +int listen(int sockfd, int backlog) { + static int (*orig_listen)(int, int) = NULL; + if (!orig_listen) orig_listen = (int (*)(int, int))dlsym(RTLD_NEXT, "listen"); + if (!orig_listen) { + errno = ENOSYS; + return -1; + } + int ret = orig_listen(sockfd, backlog); + if (ret == 0) { + int saved_errno = errno; + int port = is_chosen_port_fd(sockfd) ? listening_tcp_port(sockfd) : 0; + if (listening_port_is_reported(port > 0, port, kernel_ephemeral_port_low())) { + init_ddnatv_hook(); + extern char *program_invocation_short_name; + report_listening_port(g_ddnatv_root, g_ddnatv_root_len, port, program_invocation_short_name); + } + errno = saved_errno; + } + return ret; +} + +int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) { + static int (*orig_bind)(int, const struct sockaddr *, socklen_t) = NULL; + if (!orig_bind) orig_bind = (int (*)(int, const struct sockaddr *, socklen_t))dlsym(RTLD_NEXT, "bind"); + + if (addr && addrlen > offsetof(struct sockaddr_un, sun_path) && addr->sa_family == AF_UNIX) { + const struct sockaddr_un *sun = (const struct sockaddr_un *)addr; + if (sun->sun_path[0] != '\0') { + struct sockaddr_un mod_sun; + memset(&mod_sun, 0, sizeof(mod_sun)); + mod_sun.sun_family = AF_UNIX; + rewrite_unix_socket_path(sun->sun_path, mod_sun.sun_path, sizeof(mod_sun.sun_path)); + return orig_bind ? orig_bind(sockfd, (struct sockaddr *)&mod_sun, sizeof(mod_sun)) : -1; + } + } + int ret = orig_bind ? orig_bind(sockfd, addr, addrlen) : -1; + if (ret == 0 && addr) { + int saved_errno = errno; + int chosen = 0; + if (addr->sa_family == AF_INET && addrlen >= (socklen_t)sizeof(struct sockaddr_in)) + chosen = ((const struct sockaddr_in *)addr)->sin_port != 0; + else if (addr->sa_family == AF_INET6 && addrlen >= (socklen_t)sizeof(struct sockaddr_in6)) + chosen = ((const struct sockaddr_in6 *)addr)->sin6_port != 0; + set_chosen_port_fd(sockfd, chosen); + errno = saved_errno; + } + return ret; +} + +int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) { + static int (*orig_connect)(int, const struct sockaddr *, socklen_t) = NULL; + if (!orig_connect) orig_connect = (int (*)(int, const struct sockaddr *, socklen_t))dlsym(RTLD_NEXT, "connect"); + + if (addr && addrlen > offsetof(struct sockaddr_un, sun_path) && addr->sa_family == AF_UNIX) { + const struct sockaddr_un *sun = (const struct sockaddr_un *)addr; + if (sun->sun_path[0] != '\0') { + struct sockaddr_un mod_sun; + memset(&mod_sun, 0, sizeof(mod_sun)); + mod_sun.sun_family = AF_UNIX; + char guest[sizeof(sun->sun_path) + 1]; + size_t max = addrlen - offsetof(struct sockaddr_un, sun_path); + if (max > sizeof(sun->sun_path)) max = sizeof(sun->sun_path); + memcpy(guest, sun->sun_path, max); + guest[max] = '\0'; + char followed[PATH_MAX]; + const char *path = guest[0] == '/' ? follow_guest_link(guest, followed, sizeof(followed)) : guest; + rewrite_unix_socket_path(path, mod_sun.sun_path, sizeof(mod_sun.sun_path)); + return orig_connect ? orig_connect(sockfd, (struct sockaddr *)&mod_sun, sizeof(mod_sun)) : -1; + } + } + + if (addr && is_loopback_dns(addr, addrlen)) { + struct sockaddr_storage redirected; + socklen_t redirected_len = dns_redirect_target(addr, &redirected); + int ret = orig_connect ? orig_connect(sockfd, (struct sockaddr *)&redirected, redirected_len) : -1; + if (ret == 0 || errno == EINPROGRESS) { + int saved_errno = errno; + record_dns_redirect(sockfd, addr, addrlen); + errno = saved_errno; + } + return ret; + } + return orig_connect ? orig_connect(sockfd, addr, addrlen) : -1; +} + +ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, + const struct sockaddr *dest_addr, socklen_t addrlen) { + static ssize_t (*orig_sendto)(int, const void *, size_t, int, const struct sockaddr *, socklen_t) = NULL; + if (!orig_sendto) orig_sendto = (ssize_t (*)(int, const void *, size_t, int, const struct sockaddr *, socklen_t))dlsym(RTLD_NEXT, "sendto"); + + if (dest_addr && is_loopback_dns(dest_addr, addrlen)) { + struct sockaddr_storage redirected; + socklen_t redirected_len = dns_redirect_target(dest_addr, &redirected); + record_dns_redirect(sockfd, dest_addr, addrlen); + return orig_sendto ? orig_sendto(sockfd, buf, len, flags, (struct sockaddr *)&redirected, redirected_len) : -1; + } + return orig_sendto ? orig_sendto(sockfd, buf, len, flags, dest_addr, addrlen) : -1; +} + +#if defined(__NR_getuid32) +#define DDNATV_NR_REAL_GETUID __NR_getuid32 +#define DDNATV_NR_REAL_GETGID __NR_getgid32 +#else +#define DDNATV_NR_REAL_GETUID __NR_getuid +#define DDNATV_NR_REAL_GETGID __NR_getgid +#endif + +// Credentials sent over a Unix socket (SCM_CREDENTIALS) have to be the process's own: the kernel +// refuses others with EPERM, and programs fill them in with getuid(), which is root's 0 here. +// PulseAudio's clients send them on every connection, which then failed ("Connection terminated"). +// Returns 1 with the message copied into mod (its control data into ctrl) and the ids made real. +static int real_scm_credentials(const struct msghdr *msg, struct msghdr *mod, char *ctrl, size_t ctrl_size) { + if (!msg || !msg->msg_control || msg->msg_controllen < sizeof(struct cmsghdr) || msg->msg_controllen > ctrl_size) return 0; + int found = 0; + for (struct cmsghdr *c = CMSG_FIRSTHDR(msg); c; c = CMSG_NXTHDR((struct msghdr *)msg, c)) { + if (c->cmsg_level == SOL_SOCKET && c->cmsg_type == SCM_CREDENTIALS) found = 1; + } + if (!found) return 0; + memcpy(mod, msg, sizeof(*mod)); + memcpy(ctrl, msg->msg_control, msg->msg_controllen); + mod->msg_control = ctrl; + for (struct cmsghdr *c = CMSG_FIRSTHDR(mod); c; c = CMSG_NXTHDR(mod, c)) { + if (c->cmsg_level != SOL_SOCKET || c->cmsg_type != SCM_CREDENTIALS || c->cmsg_len < CMSG_LEN(sizeof(struct ucred))) continue; + // a record that claims more than the buffer holds is the kernel's to refuse, not ours to read + if (c->cmsg_len > mod->msg_controllen - (size_t)((char *)c - ctrl)) break; + struct ucred cred; + memcpy(&cred, CMSG_DATA(c), sizeof(cred)); + cred.pid = getpid(); + cred.uid = (uid_t)call_orig_syscall(DDNATV_NR_REAL_GETUID, 0, 0, 0, 0, 0, 0); + cred.gid = (gid_t)call_orig_syscall(DDNATV_NR_REAL_GETGID, 0, 0, 0, 0, 0, 0); + memcpy(CMSG_DATA(c), &cred, sizeof(cred)); + } + return 1; +} + +ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags) { + static ssize_t (*orig_sendmsg)(int, const struct msghdr *, int) = NULL; + if (!orig_sendmsg) orig_sendmsg = (ssize_t (*)(int, const struct msghdr *, int))dlsym(RTLD_NEXT, "sendmsg"); + struct msghdr cred_msg; + char cred_ctrl[512] __attribute__((aligned(8))); + if (real_scm_credentials(msg, &cred_msg, cred_ctrl, sizeof(cred_ctrl))) msg = &cred_msg; + + if (msg && msg->msg_name && is_loopback_dns((const struct sockaddr *)msg->msg_name, msg->msg_namelen)) { + struct sockaddr_storage redirected; + socklen_t redirected_len = dns_redirect_target((const struct sockaddr *)msg->msg_name, &redirected); + struct msghdr mod_msg; + memcpy(&mod_msg, msg, sizeof(mod_msg)); + mod_msg.msg_name = &redirected; + mod_msg.msg_namelen = redirected_len; + record_dns_redirect(sockfd, (const struct sockaddr *)msg->msg_name, msg->msg_namelen); + return orig_sendmsg ? orig_sendmsg(sockfd, &mod_msg, flags) : -1; + } + return orig_sendmsg ? orig_sendmsg(sockfd, msg, flags) : -1; +} + +static void present_peer_as_root(struct ucred *cred) { + if (cred->uid == (uid_t)call_orig_syscall(DDNATV_NR_REAL_GETUID, 0, 0, 0, 0, 0, 0)) cred->uid = 0; + if (cred->gid == (gid_t)call_orig_syscall(DDNATV_NR_REAL_GETGID, 0, 0, 0, 0, 0, 0)) cred->gid = 0; +} + +// A server compares a peer's credentials with the user the peer claims, which is getuid()'s 0 +// here, while the kernel reports the app's ids: dbus-daemon refused every EXTERNAL login ("Did not +// receive a reply"), so the Plasma desktop never started. +int getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optlen) { + static int (*orig_getsockopt)(int, int, int, void *, socklen_t *) = NULL; + if (!orig_getsockopt) orig_getsockopt = (int (*)(int, int, int, void *, socklen_t *))dlsym(RTLD_NEXT, "getsockopt"); + if (!orig_getsockopt) { + errno = ENOSYS; + return -1; + } + int ret = orig_getsockopt(sockfd, level, optname, optval, optlen); + if (ret == 0 && level == SOL_SOCKET && optname == SO_PEERCRED && optval && optlen && *optlen >= sizeof(struct ucred)) { + struct ucred cred; + memcpy(&cred, optval, sizeof(cred)); + present_peer_as_root(&cred); + memcpy(optval, &cred, sizeof(cred)); + } + return ret; +} + +static void received_credentials_as_root(struct msghdr *msg) { + if (!msg || !msg->msg_control || msg->msg_controllen < sizeof(struct cmsghdr)) return; + for (struct cmsghdr *c = CMSG_FIRSTHDR(msg); c; c = CMSG_NXTHDR(msg, c)) { + if (c->cmsg_level != SOL_SOCKET || c->cmsg_type != SCM_CREDENTIALS || c->cmsg_len < CMSG_LEN(sizeof(struct ucred))) continue; + struct ucred cred; + memcpy(&cred, CMSG_DATA(c), sizeof(cred)); + present_peer_as_root(&cred); + memcpy(CMSG_DATA(c), &cred, sizeof(cred)); + } +} + +ssize_t recvfrom(int sockfd, void *buf, size_t len, int flags, + struct sockaddr *src_addr, socklen_t *addrlen) { + static ssize_t (*orig_recvfrom)(int, void *, size_t, int, struct sockaddr *, socklen_t *) = NULL; + if (!orig_recvfrom) orig_recvfrom = (ssize_t (*)(int, void *, size_t, int, struct sockaddr *, socklen_t *))dlsym(RTLD_NEXT, "recvfrom"); + + socklen_t cap = addrlen ? *addrlen : 0; + ssize_t ret = orig_recvfrom ? orig_recvfrom(sockfd, buf, len, flags, src_addr, addrlen) : -1; + if (ret > 0 && src_addr && addrlen) { + int saved_errno = errno; + restore_dns_source(sockfd, src_addr, cap, addrlen); + errno = saved_errno; + } + return ret; +} + +// What programs built with _FORTIFY_SOURCE call when the buffer's size is known; the check is +// glibc's +extern void __chk_fail(void) __attribute__((__noreturn__)); +ssize_t __recvfrom_chk(int sockfd, void *buf, size_t len, size_t buflen, int flags, + struct sockaddr *src_addr, socklen_t *addrlen) { + if (len > buflen) __chk_fail(); + return recvfrom(sockfd, buf, len, flags, src_addr, addrlen); +} + +ssize_t recvmsg(int sockfd, struct msghdr *msg, int flags) { + static ssize_t (*orig_recvmsg)(int, struct msghdr *, int) = NULL; + if (!orig_recvmsg) orig_recvmsg = (ssize_t (*)(int, struct msghdr *, int))dlsym(RTLD_NEXT, "recvmsg"); + + socklen_t cap = msg ? msg->msg_namelen : 0; + ssize_t ret = orig_recvmsg ? orig_recvmsg(sockfd, msg, flags) : -1; + if (ret >= 0) received_credentials_as_root(msg); + if (ret > 0 && msg && msg->msg_name) { + int saved_errno = errno; + restore_dns_source(sockfd, (struct sockaddr *)msg->msg_name, cap, &msg->msg_namelen); + errno = saved_errno; + } + return ret; +} + +int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen) { + static int (*orig_getpeername)(int, struct sockaddr *, socklen_t *) = NULL; + if (!orig_getpeername) orig_getpeername = (int (*)(int, struct sockaddr *, socklen_t *))dlsym(RTLD_NEXT, "getpeername"); + + socklen_t cap = addrlen ? *addrlen : 0; + int ret = orig_getpeername ? orig_getpeername(sockfd, addr, addrlen) : -1; + if (ret == 0 && addr && addrlen) restore_dns_source(sockfd, addr, cap, addrlen); + return ret; +} + +// accept() as accept4() without flags, the call bionic makes for both: Android's seccomp filter +// for apps is made from what bionic calls. On the x86_64 emulator a translated accept() answered +// with its system call number (43) as the new descriptor, and sshd failed every connection with +// "fcntl(43, F_GETFL): Bad file descriptor" (Perl, Python and nginx use accept4 themselves). +int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) { + static int (*orig_accept4)(int, struct sockaddr *, socklen_t *, int) = NULL; + if (!orig_accept4) orig_accept4 = (int (*)(int, struct sockaddr *, socklen_t *, int))dlsym(RTLD_NEXT, "accept4"); + if (!orig_accept4) { + errno = ENOSYS; + return -1; + } + return orig_accept4(sockfd, addr, addrlen, 0); +} + +#ifndef AF_NETLINK +#define AF_NETLINK 16 +#endif +#ifndef NETLINK_AUDIT +#define NETLINK_AUDIT 9 +#endif + +int socket(int domain, int type, int protocol) { + static int (*orig_socket)(int, int, int) = NULL; + if (!orig_socket) orig_socket = (int (*)(int, int, int))dlsym(RTLD_NEXT, "socket"); + if (domain == AF_NETLINK && protocol == NETLINK_AUDIT) { + errno = EPROTONOSUPPORT; + return -1; + } + int fd = orig_socket ? orig_socket(domain, type, protocol) : -1; + // A new socket has not chosen a port, whatever the descriptor's last one had (close_range() and + // raw close system calls do not pass the hook's close()) + if (fd >= 0) set_chosen_port_fd(fd, 0); + return fd; +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/hook/static_programs.c b/tools/nativeguest/hook/static_programs.c new file mode 100644 index 0000000000..406fca0da9 --- /dev/null +++ b/tools/nativeguest/hook/static_programs.c @@ -0,0 +1,345 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// Statically linked programs: their seccomp-blocked system calls are patched before they run. + +// ---- Static programs ---------------------------------------------------------------------- +// A statically linked program (gcc -static) carries its own copy of glibc, whose system calls the +// preloaded hook never sees. The ones Android's seccomp filter answers with SIGSYS therefore kill it: +// set_robust_list at start-up, clone3 for every thread, rseq, and the others the hook's SIGSYS +// handler catches for dynamic programs. Before such a program runs, The native userland patches those call sites +// in its file to what that handler answers (0 for set_robust_list and the set*id family, -ENOSYS, +// which glibc falls back from, for the rest), as scripts/patch-bootstrap-ld.py does to the rootfs +// ld.so and libc at build time. The scanning is a pure function over a buffer, so tests/native can +// check it against the script. + +#define DDNATV_STATIC_WINDOW 16 // instructions between "mov x8, #nr" and its "svc #0" + +// AArch64: what the SIGSYS handler answers for syscall `nr`: 1 for 0, 2 for -ENOSYS, 0 to leave it. +// set_robust_list keeps the script's no-op (x0 then holds its non-error first argument). +static int a64_blocked_syscall(unsigned int nr) { + switch (nr) { + case 99: // set_robust_list + return 3; + case 100: // get_robust_list + case 143: case 144: case 145: case 146: case 147: case 149: // setregid setgid setreuid setuid setresuid setresgid + case 151: case 152: case 159: // setfsuid setfsgid setgroups + return 1; + case 97: case 217: case 218: case 219: // unshare add_key request_key keyctl + case 268: case 277: case 280: case 293: // setns seccomp bpf rseq + return 2; + default: + return (nr >= 424 && nr < 512) ? 2 : 0; // newer than Android's filter (clone3, close_range, ...) + } +} + +static uint32_t rd32(const unsigned char *p) { return (uint32_t)p[0] | ((uint32_t)p[1] << 8) | ((uint32_t)p[2] << 16) | ((uint32_t)p[3] << 24); } +static uint16_t rd16(const unsigned char *p) { return (uint16_t)(p[0] | (p[1] << 8)); } +static void wr32(unsigned char *p, uint32_t v) { p[0] = v & 0xff; p[1] = (v >> 8) & 0xff; p[2] = (v >> 16) & 0xff; p[3] = (v >> 24) & 0xff; } +static void wr16(unsigned char *p, uint16_t v) { p[0] = v & 0xff; p[1] = (v >> 8) & 0xff; } + +// An AArch64 instruction that ends the search for the "svc #0" of a "mov x8, #nr": a branch, another +// svc, or anything with x8 in its first register field (another write to x8, most likely). +static int a64_ends_syscall_window(uint32_t insn) { + if ((insn & 0x1f) == 8) return 1; + if ((insn & 0xffe0001f) == 0xd4000001u) return 1; // svc #imm + if ((insn & 0x7c000000u) == 0x14000000u) return 1; // b, bl + if ((insn & 0xff000010u) == 0x54000000u) return 1; // b.cond + if ((insn & 0x7e000000u) == 0x34000000u) return 1; // cbz, cbnz + if ((insn & 0x7e000000u) == 0x36000000u) return 1; // tbz, tbnz + if ((insn & 0xfe000000u) == 0xd6000000u) return 1; // br, blr, ret + return 0; +} + +static size_t a64_patch_seccomp_syscalls(unsigned char *data, size_t start, size_t end) { + size_t patched = 0; + start = (start + 3) & ~(size_t)3; + for (size_t pos = start; pos + 4 <= end; pos += 4) { + uint32_t insn = rd32(data + pos); + // movz x8, #nr / movz w8, #nr + if ((insn & 0x7fe0001fu) != 0x52800008u) continue; + int result = a64_blocked_syscall((insn >> 5) & 0xffff); + if (!result) continue; + for (size_t s = pos + 4, i = 0; s + 4 <= end && i < DDNATV_STATIC_WINDOW; s += 4, i++) { + uint32_t next = rd32(data + s); + if (next == 0xd4000001u) { // svc #0 + wr32(data + s, result == 3 ? 0xd503201fu /* nop */ + : result == 1 ? 0xd2800000u /* mov x0, #0 */ + : 0x928004a0u); /* mov x0, #-38 */ + patched++; + break; + } + if (a64_ends_syscall_window(next)) break; + } + } + return patched; +} + +// 32-bit ARM: the three calls glibc makes on its own, with the exact patterns of the script +// (ARM mode, Thumb-2 with r7, and Thumb-2 through __libc_do_syscall with r12). +static long thumb_bl_target(const unsigned char *data, size_t size, size_t off) { + if (off + 4 > size) return -1; + uint16_t hw1 = rd16(data + off), hw2 = rd16(data + off + 2); + if ((hw1 & 0xf800) != 0xf000 || (hw2 & 0xd000) != 0xd000) return -1; + long s = (hw1 >> 10) & 1; + long imm10 = hw1 & 0x3ff; + long j1 = (hw2 >> 13) & 1, j2 = (hw2 >> 11) & 1; + long imm11 = hw2 & 0x7ff; + long i1 = (j1 ^ s) ^ 1, i2 = (j2 ^ s) ^ 1; + long imm25 = (s << 24) | (i1 << 23) | (i2 << 22) | (imm10 << 12) | (imm11 << 1); + if (s) imm25 -= (1L << 25); + return (long)off + 4 + imm25; +} + +static size_t arm_patch_seccomp_syscalls(unsigned char *data, size_t start, size_t end) { + static const struct { uint32_t movw_r7; uint32_t repl; } arm[] = { + { 0xe3007152u, 0xe320f000u }, // movw r7, #338 (set_robust_list) -> nop + { 0xe30071b3u, 0xe3e00025u }, // movw r7, #435 (clone3) -> mvn r0, #37 + { 0xe300718eu, 0xe3e00025u }, // movw r7, #398 (rseq) -> mvn r0, #37 + }; + static const struct { uint16_t hw1, hw2; int nop_only; } thumb_r7[] = { + { 0xf240, 0x1752, 1 }, // movw r7, #338 + { 0xf240, 0x17b3, 0 }, // movw r7, #435 + { 0xf240, 0x178e, 0 }, // movw r7, #398 + }; + static const struct { uint16_t hw1, hw2; uint16_t repl1, repl2; } thumb_r12[] = { + { 0xf44f, 0x7ca9, 0xf04f, 0x0000 }, // mov.w r12, #338 -> mov.w r0, #0 + { 0xf44f, 0x7cc7, 0xf06f, 0x0025 }, // mov.w r12, #398 -> mvn.w r0, #37 + { 0xf240, 0x1cb3, 0xf06f, 0x0025 }, // movw r12, #435 -> mvn.w r0, #37 + }; + static const unsigned char do_syscall_stub[6] = { 0x80, 0xb5, 0x67, 0x46, 0x00, 0xdf }; + size_t patched = 0; + + size_t a4 = (start + 3) & ~(size_t)3, e4 = end & ~(size_t)3; + for (size_t pos = a4; pos + 4 < e4; pos += 4) { + uint32_t insn = rd32(data + pos); + for (size_t k = 0; k < sizeof(arm) / sizeof(arm[0]); k++) { + if (insn != arm[k].movw_r7) continue; + for (size_t s = pos + 4; s < e4 && s < pos + 68; s += 4) { + if (rd32(data + s) == 0xef000000u) { // svc #0 + wr32(data + s, arm[k].repl); + patched++; + break; + } + } + } + } + + size_t a2 = (start + 1) & ~(size_t)1, e2 = end & ~(size_t)1; + for (size_t t = a2; t + 4 < e2; t += 2) { + uint16_t hw1 = rd16(data + t), hw2 = rd16(data + t + 2); + int matched_r7 = 0; + for (size_t k = 0; k < sizeof(thumb_r7) / sizeof(thumb_r7[0]); k++) { + if (hw1 != thumb_r7[k].hw1 || hw2 != thumb_r7[k].hw2) continue; + matched_r7 = 1; + size_t limit = (e2 - 2 < t + 64 ? e2 - 2 : t + 64) + 2; + for (size_t s = t + 4; s < limit; s += 2) { + if (rd16(data + s) == 0xdf00) { // svc #0 + if (!thumb_r7[k].nop_only) { + wr16(data + t, 0xf06f); // mvn.w r0, #37 in place of the movw + wr16(data + t + 2, 0x0025); + } + wr16(data + s, 0xbf00); // nop + patched++; + break; + } + } + break; + } + if (matched_r7) continue; + for (size_t k = 0; k < sizeof(thumb_r12) / sizeof(thumb_r12[0]); k++) { + if (hw1 != thumb_r12[k].hw1 || hw2 != thumb_r12[k].hw2) continue; + size_t limit = (e2 - 4 < t + 48 ? e2 - 4 : t + 48) + 2; + for (size_t s = t + 4; s < limit; s += 2) { + long target = thumb_bl_target(data, end, s); + if (target >= (long)start && target + 6 <= (long)end && memcmp(data + target, do_syscall_stub, 6) == 0) { + wr16(data + s, thumb_r12[k].repl1); + wr16(data + s + 2, thumb_r12[k].repl2); + patched++; + break; + } + } + break; + } + } + return patched; +} + +#ifndef EM_ARM +#define EM_ARM 40 +#endif +#ifndef EM_AARCH64 +#define EM_AARCH64 183 +#endif + +// Patches the blocked syscalls in data[start, end), code of an ELF for `e_machine`; returns how many. +static size_t patch_seccomp_syscalls(unsigned char *data, size_t start, size_t end, uint16_t e_machine) { + if (!data || end <= start) return 0; + if (e_machine == EM_AARCH64) return a64_patch_seccomp_syscalls(data, start, end); + if (e_machine == EM_ARM) return arm_patch_seccomp_syscalls(data, start, end); + return 0; +} + +// Reads the program headers of an ELF file into `ph` (as 64-bit fields); returns their number, or -1. +struct ddnatv_phdr { uint32_t type, flags; uint64_t offset, filesz; }; +static int read_elf_phdrs(int fd, uint16_t *machine, struct ddnatv_phdr *ph, int max) { + unsigned char eh[64]; + if (pread(fd, eh, sizeof(eh), 0) < 52 || memcmp(eh, "\x7f" "ELF", 4) != 0 || eh[5] != 1) return -1; + int is64 = eh[4] == 2; + uint64_t phoff = is64 ? ((uint64_t)rd32(eh + 32) | ((uint64_t)rd32(eh + 36) << 32)) : rd32(eh + 28); + uint16_t phentsize = rd16(eh + (is64 ? 54 : 42)); + uint16_t phnum = rd16(eh + (is64 ? 56 : 44)); + *machine = rd16(eh + 18); + if (phentsize < (is64 ? 56 : 32) || phnum == 0 || phnum > max) return -1; + for (int i = 0; i < phnum; i++) { + unsigned char e[64]; + if (pread(fd, e, phentsize < sizeof(e) ? phentsize : sizeof(e), (off_t)(phoff + (uint64_t)i * phentsize)) < (is64 ? 56 : 32)) return -1; + ph[i].type = rd32(e); + if (is64) { + ph[i].flags = rd32(e + 4); + ph[i].offset = (uint64_t)rd32(e + 8) | ((uint64_t)rd32(e + 12) << 32); + ph[i].filesz = (uint64_t)rd32(e + 32) | ((uint64_t)rd32(e + 36) << 32); + } else { + ph[i].offset = rd32(e + 4); + ph[i].filesz = rd32(e + 16); + ph[i].flags = rd32(e + 24); + } + } + return phnum; +} + +// Whether the ELF has a Go build-ID note: Go programs make their own system calls and never these. +static int elf_is_go(int fd, const struct ddnatv_phdr *ph, int n) { + for (int i = 0; i < n; i++) { + if (ph[i].type != 4 /* PT_NOTE */ || ph[i].filesz < 16) continue; + unsigned char note[16]; + if (pread(fd, note, sizeof(note), (off_t)ph[i].offset) != sizeof(note)) continue; + if (rd32(note) == 4 && memcmp(note + 12, "Go\0\0", 4) == 0) return 1; + } + return 0; +} + +#define DDNATV_STATIC_XATTR "user.ddnatv.seccomp" +#define DDNATV_STATIC_MAX_CODE (256u * 1024 * 1024) + +#ifdef DDNATV_HAVE_GOSYS +static int prepare_go_program(int fd, const char *path, const struct stat *st); +static uint32_t go_blob_fingerprint(void); +static int go_disabled(void); +#endif + +// What was done to a file is recorded with its size and time, with the rootfs (a Go program carries +// the paths of it) and with the code Go programs are given (go_programs.c): a newer The native userland looks at +// the programs again. +static void static_marker(const struct stat *st, char *buf, size_t size) { + unsigned fingerprint = 0; + const char *off = ""; +#ifdef DDNATV_HAVE_GOSYS + fingerprint = go_blob_fingerprint(); + if (go_disabled()) off = " off"; +#endif + snprintf(buf, size, "3 %lld %lld.%09ld %08x %s%s", (long long)st->st_size, (long long)st->st_mtim.tv_sec, + (long)st->st_mtim.tv_nsec, fingerprint, g_ddnatv_root, off); +} + +// Makes a static program safe to start (see above). Runs before every start of one, so a program +// already handled (marked by an extended attribute that holds its size and modification time) costs +// one fstat and one getxattr; without extended attributes it is scanned again each time. Returns the +// number of patched calls, 0 when there was nothing to do, -1 when the file could not be handled +// (it is then started as it is). +// go_only: leave the file alone unless it is an AArch64 Go program. That is for a program that asks for +// Android's linker (GOOS=android): it is started like the dynamic ones, but it makes its own system +// calls, so it gets the code of the static Go programs (#42). +static int prepare_static_program_ex(const char *path, int go_only) { + int fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0) return -1; + struct stat st; + char marker[PATH_MAX + 96], seen[PATH_MAX + 96]; + if (fstat(fd, &st) != 0 || !S_ISREG(st.st_mode)) { + close(fd); + return -1; + } + static_marker(&st, marker, sizeof(marker)); + ssize_t seen_len = fgetxattr(fd, DDNATV_STATIC_XATTR, seen, sizeof(seen) - 1); + if (seen_len > 0) { + seen[seen_len] = '\0'; + if (strcmp(seen, marker) == 0) { + close(fd); + return 0; + } + } + + struct ddnatv_phdr ph[64]; + uint16_t machine = 0; + int n = read_elf_phdrs(fd, &machine, ph, 64); + if (go_only && !(n >= 0 && machine == EM_AARCH64 && elf_is_go(fd, ph, n))) { + close(fd); + return 0; + } + if (n < 0 || (machine != EM_AARCH64 && machine != EM_ARM) || elf_is_go(fd, ph, n)) { + // A Go program has no C library for the hook to be loaded into: it gets code of its own + int go_rc = 0; +#ifdef DDNATV_HAVE_GOSYS + if (n >= 0 && machine == EM_AARCH64 && elf_is_go(fd, ph, n)) go_rc = prepare_go_program(fd, path, &st); +#endif + if (n >= 0 && go_rc >= 0) { + struct stat after; + if (fstat(fd, &after) == 0) static_marker(&after, marker, sizeof(marker)); + fsetxattr(fd, DDNATV_STATIC_XATTR, marker, strlen(marker), 0); + } + close(fd); + return n < 0 || go_rc < 0 ? -1 : 0; + } + + int total = 0; + int wfd = -1; + int made_writable = 0; + for (int i = 0; i < n; i++) { + if (ph[i].type != 1 /* PT_LOAD */ || !(ph[i].flags & 1 /* PF_X */) || ph[i].filesz == 0) continue; + if (ph[i].filesz > DDNATV_STATIC_MAX_CODE || ph[i].offset > (uint64_t)st.st_size || + ph[i].filesz > (uint64_t)st.st_size - ph[i].offset) continue; + size_t len = (size_t)ph[i].filesz; + unsigned char *code = (unsigned char *)malloc(len); + if (!code) continue; + if (pread(fd, code, len, (off_t)ph[i].offset) != (ssize_t)len) { + free(code); + continue; + } + size_t patched = patch_seccomp_syscalls(code, 0, len, machine); + if (patched > 0) { + if (wfd < 0) { + wfd = open(path, O_WRONLY | O_CLOEXEC); + if (wfd < 0 && errno == EACCES && fchmod(fd, (st.st_mode | S_IWUSR) & 07777) == 0) { + made_writable = 1; + wfd = open(path, O_WRONLY | O_CLOEXEC); + } + } + // ETXTBSY: the program is running right now, so it was handled when it started. + if (wfd < 0 || pwrite(wfd, code, len, (off_t)ph[i].offset) != (ssize_t)len) { + free(code); + total = -1; + break; + } + total += (int)patched; + } + free(code); + } + if (wfd >= 0) { + // Keep the times: make and friends must not see a rebuilt program. + const struct timespec times[2] = { st.st_atim, st.st_mtim }; + futimens(wfd, times); + close(wfd); + } + if (made_writable) fchmod(fd, st.st_mode & 07777); + if (total >= 0) { + struct stat after; + if (fstat(fd, &after) == 0) { + static_marker(&after, marker, sizeof(marker)); + fsetxattr(fd, DDNATV_STATIC_XATTR, marker, strlen(marker), 0); + } + } + close(fd); + return total; +} + +static int prepare_static_program(const char *path) { return prepare_static_program_ex(path, 0); } diff --git a/tools/nativeguest/hook/syscalls.c b/tools/nativeguest/hook/syscalls.c new file mode 100644 index 0000000000..06cacd8646 --- /dev/null +++ b/tools/nativeguest/hook/syscalls.c @@ -0,0 +1,128 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// The system calls that Android's seccomp filter answers with SIGSYS, and which of them the +// SIGSYS handler (signals.c) turns into a fake success. + +static int is_sigsys_synthetic_success_syscall(int sys_nr) { +#if defined(__NR_setuid) + if (sys_nr == __NR_setuid) return 1; +#endif +#if defined(__NR_setuid32) + if (sys_nr == __NR_setuid32) return 1; +#endif +#if defined(__NR_setgid) + if (sys_nr == __NR_setgid) return 1; +#endif +#if defined(__NR_setgid32) + if (sys_nr == __NR_setgid32) return 1; +#endif +#if defined(__NR_setreuid) + if (sys_nr == __NR_setreuid) return 1; +#endif +#if defined(__NR_setreuid32) + if (sys_nr == __NR_setreuid32) return 1; +#endif +#if defined(__NR_setregid) + if (sys_nr == __NR_setregid) return 1; +#endif +#if defined(__NR_setregid32) + if (sys_nr == __NR_setregid32) return 1; +#endif +#if defined(__NR_setresuid) + if (sys_nr == __NR_setresuid) return 1; +#endif +#if defined(__NR_setresuid32) + if (sys_nr == __NR_setresuid32) return 1; +#endif +#if defined(__NR_setresgid) + if (sys_nr == __NR_setresgid) return 1; +#endif +#if defined(__NR_setresgid32) + if (sys_nr == __NR_setresgid32) return 1; +#endif +#if defined(__NR_setfsuid) + if (sys_nr == __NR_setfsuid) return 1; +#endif +#if defined(__NR_setfsuid32) + if (sys_nr == __NR_setfsuid32) return 1; +#endif +#if defined(__NR_setfsgid) + if (sys_nr == __NR_setfsgid) return 1; +#endif +#if defined(__NR_setfsgid32) + if (sys_nr == __NR_setfsgid32) return 1; +#endif +#if defined(__NR_setgroups) + if (sys_nr == __NR_setgroups) return 1; +#endif +#if defined(__NR_setgroups32) + if (sys_nr == __NR_setgroups32) return 1; +#endif +#if defined(__NR_set_robust_list) + if (sys_nr == __NR_set_robust_list) return 1; +#endif +#if defined(__NR_get_robust_list) + if (sys_nr == __NR_get_robust_list) return 1; +#endif + return 0; +} + +static int is_handled_sigsys_syscall(int sys_nr) { + if (is_sigsys_synthetic_success_syscall(sys_nr)) { + return 1; + } + + // Unified Linux 5.1+ syscall numbers across architectures + if (sys_nr >= 424 && sys_nr < 512) { + return 1; + } + + // Architecture-specific syscall numbers guarded per target ABI +#if defined(__aarch64__) + if (sys_nr == 97 /* __NR_unshare */ || + sys_nr == 217 /* __NR_add_key */ || + sys_nr == 218 /* __NR_request_key */ || + sys_nr == 219 /* __NR_keyctl */ || + sys_nr == 268 /* __NR_setns */ || + sys_nr == 277 /* __NR_seccomp */ || + sys_nr == 280 /* __NR_bpf */ || + sys_nr == 293 /* __NR_rseq */) { + return 1; + } +#elif defined(__arm__) + if (sys_nr == 309 /* __NR_add_key */ || + sys_nr == 310 /* __NR_request_key */ || + sys_nr == 311 /* __NR_keyctl */ || + sys_nr == 337 /* __NR_unshare */ || + sys_nr == 375 /* __NR_setns */ || + sys_nr == 383 /* __NR_seccomp */ || + sys_nr == 386 /* __NR_bpf */ || + sys_nr == 398 /* __NR_rseq */) { + return 1; + } +#elif defined(__x86_64__) + if (sys_nr == 248 /* __NR_add_key */ || + sys_nr == 249 /* __NR_request_key */ || + sys_nr == 250 /* __NR_keyctl */ || + sys_nr == 272 /* __NR_unshare */ || + sys_nr == 308 /* __NR_setns */ || + sys_nr == 317 /* __NR_seccomp */ || + sys_nr == 321 /* __NR_bpf */ || + sys_nr == 334 /* __NR_rseq */) { + return 1; + } +#elif defined(__i386__) + if (sys_nr == 286 /* __NR_add_key */ || + sys_nr == 287 /* __NR_request_key */ || + sys_nr == 288 /* __NR_keyctl */ || + sys_nr == 310 /* __NR_unshare */ || + sys_nr == 346 /* __NR_setns */ || + sys_nr == 354 /* __NR_seccomp */ || + sys_nr == 357 /* __NR_bpf */ || + sys_nr == 386 /* __NR_rseq */) { + return 1; + } +#endif + return 0; +} diff --git a/tools/nativeguest/hook/sysv_shm.c b/tools/nativeguest/hook/sysv_shm.c new file mode 100644 index 0000000000..0b43e1fe2c --- /dev/null +++ b/tools/nativeguest/hook/sysv_shm.c @@ -0,0 +1,561 @@ +// Part of libddnatv-hook.so, included by ddnatv-hook.c (one translation unit, so the +// parts share their static functions and are built with the same command as before). +// +// System V shared memory (shmget, shmat, shmdt, shmctl). Android's seccomp filter blocks these system +// calls for apps (the SIGSYS handler turns them into ENOSYS), but X uses them: a program draws an image +// into a segment and the X server reads it from there (the MIT-SHM extension), and Qt, GTK and SDL +// programs expect it. The segments are files of their own in /tmp/.ddnatv-sysv-shm of the rootfs, +// which every process of the app can open and map: +// +// id-N the segment's description: "PID KEY MODE SIZE" (who made it, its key, its rights, its size) +// seg-N its memory (a file of SIZE bytes, mapped MAP_SHARED) +// key-K for a segment with a key: the N it belongs to (K in hex) +// att-N-P process P has the segment attached (made by shmat(), removed by its last shmdt()) +// +// N is chosen at random and claimed with O_EXCL, so processes never pick the same one. IPC_RMID +// removes the files at once: programs that attached the segment keep their mapping (as on Linux), +// later attaches fail, which is what X programs expect (they remove a segment as soon as the X +// server has attached it). A segment nobody removed stays until the session's directory is cleared. + +#ifndef DDNATV_HOST_TEST + +#ifndef MAP_FIXED_NOREPLACE +#define MAP_FIXED_NOREPLACE 0x100000 +#endif +#ifndef SHM_REMAP +#define SHM_REMAP 040000 +#endif + +#define SHM_DIR "/tmp/.ddnatv-sysv-shm" +#define SHM_MAX_ATTACH 512 + +struct shm_meta { + int pid; + long key; + unsigned mode; + size_t size; +}; + +struct shm_attach { + void *addr; + size_t size; + int id; +}; + +static struct shm_attach g_shm_attach[SHM_MAX_ATTACH]; +static pthread_mutex_t g_shm_lock = PTHREAD_MUTEX_INITIALIZER; + +// root + /tmp/.ddnatv-sysv-shm[/name] +static int shm_path(char *out, size_t outsz, const char *name) { + int n = snprintf(out, outsz, "%s%s%s%s", g_ddnatv_root, SHM_DIR, name ? "/" : "", name ? name : ""); + return n > 0 && (size_t)n < outsz ? 0 : -1; +} + +static int shm_open_file(const char *name, int flags, unsigned mode) { + char path[PATH_MAX]; + if (shm_path(path, sizeof(path), name) != 0) return -1; + return (int)syscall(SYS_openat, AT_FDCWD, path, flags | O_CLOEXEC, mode); +} + +static void shm_unlink_file(const char *name) { + char path[PATH_MAX]; + if (shm_path(path, sizeof(path), name) == 0) syscall(SYS_unlinkat, AT_FDCWD, path, 0); +} + +static int shm_ensure_dir(void) { + char path[PATH_MAX]; + if (shm_path(path, sizeof(path), NULL) != 0) return -1; + if (syscall(SYS_mkdirat, AT_FDCWD, path, 0700) == 0 || errno == EEXIST) return 0; + // /tmp of the rootfs missing too (a rootfs being set up) + char tmp[PATH_MAX]; + snprintf(tmp, sizeof(tmp), "%s/tmp", g_ddnatv_root); + syscall(SYS_mkdirat, AT_FDCWD, tmp, 01777); + return (syscall(SYS_mkdirat, AT_FDCWD, path, 0700) == 0 || errno == EEXIST) ? 0 : -1; +} + +static int shm_read_small(const char *name, char *buf, size_t bufsz) { + int fd = shm_open_file(name, O_RDONLY, 0); + if (fd < 0) return -1; + ssize_t n = (ssize_t)syscall(SYS_read, fd, buf, bufsz - 1); + syscall(SYS_close, fd); + if (n < 0) return -1; + buf[n] = '\0'; + return (int)n; +} + +// The description of segment `id`; waits a moment for one being written. 0, or -1 (errno EINVAL). +static int shm_read_meta(int id, struct shm_meta *meta) { + char name[32], text[128]; + snprintf(name, sizeof(name), "id-%d", id); + for (int attempt = 0; attempt < 50; attempt++) { + int n = shm_read_small(name, text, sizeof(text)); + if (n < 0) break; + unsigned long size = 0; + if (n > 0 && sscanf(text, "%d %lx %o %lu", &meta->pid, &meta->key, &meta->mode, &size) == 4) { + meta->size = (size_t)size; + return 0; + } + struct timespec pause = { 0, 1000000 }; + nanosleep(&pause, NULL); + } + errno = EINVAL; + return -1; +} + +static int shm_process_alive(int pid) { + return pid > 0 && (kill(pid, 0) == 0 || errno == EPERM); +} + +static void shm_remove(int id, long key) { + char name[32]; + if (key != IPC_PRIVATE) { + // only when the key still names this segment + char text[32]; + snprintf(name, sizeof(name), "key-%lx", key); + if (shm_read_small(name, text, sizeof(text)) > 0 && atoi(text) == id) shm_unlink_file(name); + } + snprintf(name, sizeof(name), "seg-%d", id); + shm_unlink_file(name); + snprintf(name, sizeof(name), "id-%d", id); + shm_unlink_file(name); +} + +static int shm_mark_attached(int id, int attached) { + char name[48]; + snprintf(name, sizeof(name), "att-%d-%d", id, (int)getpid()); + if (!attached) { + shm_unlink_file(name); + return 0; + } + int fd = shm_open_file(name, O_WRONLY | O_CREAT, 0600); + if (fd < 0) return -1; + syscall(SYS_close, fd); + return 0; +} + +// The collector holds this exclusively while it scans and removes, shmat() shared while it checks a +// segment, maps it and marks itself, so that no segment is collected while it is being attached. +static int shm_lock_dir(int op) { + int fd = shm_open_file(".lock", O_RDWR | O_CREAT, 0600); + if (fd < 0) return -1; + long rc; + do { + rc = syscall(SYS_flock, fd, op); + } while (rc != 0 && errno == EINTR); + if (rc != 0) { + syscall(SYS_close, fd); + return -1; + } + return fd; +} + +static void shm_unlock_dir(int fd) { + if (fd >= 0) syscall(SYS_close, fd); +} + +// Deletes the marks of attached processes that have ended. Every segment stays until IPC_RMID, as on +// Linux: a private one's maker can hand its id to a process that attaches after the maker has ended. +static void shm_collect(void) { + char path[PATH_MAX]; + if (shm_path(path, sizeof(path), NULL) != 0) return; + int lock = shm_lock_dir(LOCK_EX); + if (lock < 0) return; + int dfd = (int)syscall(SYS_openat, AT_FDCWD, path, O_RDONLY | O_DIRECTORY | O_CLOEXEC); + if (dfd < 0) { + shm_unlock_dir(lock); + return; + } + char dents[4096]; + for (;;) { + long n = syscall(SYS_getdents64, dfd, dents, sizeof(dents)); + if (n <= 0) break; + for (long at = 0; at < n;) { + unsigned short reclen; + memcpy(&reclen, dents + at + 16, sizeof(reclen)); + if (reclen == 0) break; + const char *entry = dents + at + 19; + int id = 0, pid = 0; + if (strncmp(entry, "att-", 4) == 0 && sscanf(entry + 4, "%d-%d", &id, &pid) == 2 && !shm_process_alive(pid)) + shm_unlink_file(entry); + at += reclen; + } + } + syscall(SYS_close, dfd); + shm_unlock_dir(lock); +} + +static int shm_create(long key, size_t size, unsigned mode) { + // a different sequence of ids for every call, also within one second and one process + static unsigned calls = 0; + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + unsigned seed = (unsigned)getpid() * 2654435761u ^ (unsigned)now.tv_nsec ^ (unsigned)now.tv_sec * 40503u ^ + __atomic_add_fetch(&calls, 1, __ATOMIC_RELAXED) * 0x9e3779b9u; + for (int attempt = 0; attempt < 64; attempt++) { + seed = seed * 1103515245u + 12345u; + int id = (int)((seed >> 1) & 0x3fffffff); + if (id == 0) continue; + char name[32]; + snprintf(name, sizeof(name), "id-%d", id); + int meta_fd = shm_open_file(name, O_WRONLY | O_CREAT | O_EXCL, 0600); + if (meta_fd < 0) { + if (errno == EEXIST) continue; + return -1; + } + snprintf(name, sizeof(name), "seg-%d", id); + int seg_fd = shm_open_file(name, O_RDWR | O_CREAT | O_TRUNC, 0600); + long page = sysconf(_SC_PAGESIZE); + if (page <= 0) page = 4096; + if (size > (size_t)INTPTR_MAX - (size_t)page) { + // no file (and no mapping) can be that large + if (seg_fd >= 0) syscall(SYS_close, seg_fd); + syscall(SYS_close, meta_fd); + shm_remove(id, IPC_PRIVATE); + errno = EINVAL; + return -1; + } + size_t rounded = (size + (size_t)page - 1) / (size_t)page * (size_t)page; + if (seg_fd < 0 || ftruncate(seg_fd, (off_t)rounded) != 0) { + int saved = errno; + if (seg_fd >= 0) syscall(SYS_close, seg_fd); + syscall(SYS_close, meta_fd); + shm_remove(id, IPC_PRIVATE); + errno = saved == EFBIG ? EINVAL : (saved ? saved : ENOMEM); + return -1; + } + syscall(SYS_close, seg_fd); + char text[128]; + int len = snprintf(text, sizeof(text), "%d %lx %o %lu\n", getpid(), key, mode & 0777, (unsigned long)size); + ssize_t written = (ssize_t)syscall(SYS_write, meta_fd, text, (size_t)len); + syscall(SYS_close, meta_fd); + if (written != len) { + shm_remove(id, IPC_PRIVATE); + errno = ENOSPC; + return -1; + } + return id; + } + errno = ENOSPC; + return -1; +} + +// Writes `text` to the file `name` at once: into "new-ID" first, then renamed over it (`exclusive`: only +// when `name` does not exist yet, else -1 with EEXIST). Readers see the old file or the whole new one. +static int shm_publish(const char *name, int id, const char *text, size_t len, int exclusive) { + char tmp_name[32], tmp[PATH_MAX], path[PATH_MAX]; + snprintf(tmp_name, sizeof(tmp_name), "new-%d", id); + if (shm_path(tmp, sizeof(tmp), tmp_name) != 0 || shm_path(path, sizeof(path), name) != 0) { + errno = ENAMETOOLONG; + return -1; + } + int fd = (int)syscall(SYS_openat, AT_FDCWD, tmp, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0600); + if (fd < 0) return -1; + ssize_t written = (ssize_t)syscall(SYS_write, fd, text, len); + syscall(SYS_close, fd); + if (written != (ssize_t)len) { + syscall(SYS_unlinkat, AT_FDCWD, tmp, 0); + errno = ENOSPC; + return -1; + } + long rc; + if (exclusive) { + rc = syscall(SYS_renameat2, AT_FDCWD, tmp, AT_FDCWD, path, 1 /* RENAME_NOREPLACE */); + if (rc != 0 && (errno == ENOSYS || errno == EINVAL)) { + // a kernel or file system without RENAME_NOREPLACE: claim the name, then write it + int kfd = (int)syscall(SYS_openat, AT_FDCWD, path, O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC, 0600); + syscall(SYS_unlinkat, AT_FDCWD, tmp, 0); + if (kfd < 0) return -1; + written = (ssize_t)syscall(SYS_write, kfd, text, len); + syscall(SYS_close, kfd); + if (written == (ssize_t)len) return 0; + syscall(SYS_unlinkat, AT_FDCWD, path, 0); + errno = ENOSPC; + return -1; + } + } else { + rc = syscall(SYS_renameat2, AT_FDCWD, tmp, AT_FDCWD, path, 0); +#ifdef SYS_renameat + if (rc != 0 && errno == ENOSYS) rc = syscall(SYS_renameat, AT_FDCWD, tmp, AT_FDCWD, path); +#endif + } + if (rc != 0) { + int saved = errno; + syscall(SYS_unlinkat, AT_FDCWD, tmp, 0); + errno = saved; + return -1; + } + return 0; +} + +int shmget(key_t key, size_t size, int shmflg) { + init_ddnatv_hook(); + if (g_ddnatv_root[0] == '\0') { + errno = ENOSYS; + return -1; + } + if (shm_ensure_dir() != 0) return -1; + if ((shmflg & IPC_CREAT) || key == IPC_PRIVATE) shm_collect(); + if (key == IPC_PRIVATE) { + if (size == 0) { + errno = EINVAL; + return -1; + } + return shm_create(IPC_PRIVATE, size, (unsigned)shmflg); + } + char key_name[32]; + snprintf(key_name, sizeof(key_name), "key-%lx", (long)key); + for (int attempt = 0; attempt < 8; attempt++) { + char text[32]; + if (shm_read_small(key_name, text, sizeof(text)) > 0) { + int id = atoi(text); + struct shm_meta meta; + if (id > 0 && shm_read_meta(id, &meta) == 0) { + if ((shmflg & IPC_CREAT) && (shmflg & IPC_EXCL)) { + errno = EEXIST; + return -1; + } + if (size > meta.size) { + errno = EINVAL; + return -1; + } + return id; + } + shm_unlink_file(key_name); // names a segment that is gone + } + if (!(shmflg & IPC_CREAT)) { + errno = ENOENT; + return -1; + } + if (size == 0) { + errno = EINVAL; + return -1; + } + int id = shm_create((long)key, size, (unsigned)shmflg); + if (id < 0) return -1; + // The key file appears with its id in it, never empty: written under a name of its own, then + // renamed to the key's name unless another process made the key's segment meanwhile + int len = snprintf(text, sizeof(text), "%d\n", id); + int published = shm_publish(key_name, id, text, (size_t)len, 1); + if (published == 0) return id; + int saved = errno; + shm_remove(id, IPC_PRIVATE); + if (saved != EEXIST) { + errno = saved; + return -1; + } + // another process made the key's segment at the same time: use that one + } + errno = EAGAIN; + return -1; +} + +static void *shmat_locked(int shmid, const void *shmaddr, int shmflg); + +void *shmat(int shmid, const void *shmaddr, int shmflg) { + init_ddnatv_hook(); + // without the lock the collector could remove the segment mid-attach + int lock = g_ddnatv_root[0] != '\0' ? shm_lock_dir(LOCK_SH) : -1; + if (lock < 0) { + errno = EINVAL; + return (void *)-1; + } + void *addr = shmat_locked(shmid, shmaddr, shmflg); + int saved = errno; + shm_unlock_dir(lock); + errno = saved; + return addr; +} + +static int shm_attached_here_locked(int id); + +static void *shmat_locked(int shmid, const void *shmaddr, int shmflg) { + struct shm_meta meta; + if (g_ddnatv_root[0] == '\0' || shm_read_meta(shmid, &meta) != 0) { + errno = EINVAL; + return (void *)-1; + } + int readonly = (shmflg & SHM_RDONLY) != 0; + char name[32]; + snprintf(name, sizeof(name), "seg-%d", shmid); + int fd = shm_open_file(name, readonly ? O_RDONLY : O_RDWR, 0); + if (fd < 0) { + errno = EINVAL; + return (void *)-1; + } + void *want = (void *)shmaddr; + int flags = MAP_SHARED; + if (want) { + if (shmflg & SHM_RND) want = (void *)((uintptr_t)want & ~((uintptr_t)SHMLBA - 1)); + else if ((uintptr_t)want & ((uintptr_t)sysconf(_SC_PAGESIZE) - 1)) { + syscall(SYS_close, fd); + errno = EINVAL; + return (void *)-1; + } + // an address in use is replaced only with SHM_REMAP, as on Linux (MAP_FIXED_NOREPLACE: a kernel + // older than 4.17 takes it as a hint, which the check below catches) + flags |= (shmflg & SHM_REMAP) ? MAP_FIXED : MAP_FIXED_NOREPLACE; + } + // a place in the table first, so that every attach can be detached + int slot = -1; + pthread_mutex_lock(&g_shm_lock); + for (int i = 0; i < SHM_MAX_ATTACH; i++) { + if (!g_shm_attach[i].addr && !g_shm_attach[i].size) { + g_shm_attach[i].size = 1; // reserved + slot = i; + break; + } + } + pthread_mutex_unlock(&g_shm_lock); + if (slot < 0) { + syscall(SYS_close, fd); + errno = EMFILE; + return (void *)-1; + } + void *addr = mmap(want, meta.size, readonly ? PROT_READ : (PROT_READ | PROT_WRITE), flags, fd, 0); + int saved = errno; + syscall(SYS_close, fd); + if (addr != MAP_FAILED && want && addr != want) { + munmap(addr, meta.size); + addr = MAP_FAILED; + saved = EINVAL; + } + pthread_mutex_lock(&g_shm_lock); + // the mark keeps the segment from being collected; without one the attach is undone + if (addr != MAP_FAILED && shm_mark_attached(shmid, 1) != 0) { + saved = errno; + if (shm_attached_here_locked(shmid) == 0) shm_mark_attached(shmid, 0); + munmap(addr, meta.size); + addr = MAP_FAILED; + if (saved != ENOMEM) saved = EINVAL; + } + if (addr == MAP_FAILED) { + g_shm_attach[slot].size = 0; + } else { + g_shm_attach[slot].addr = addr; + g_shm_attach[slot].size = meta.size; + g_shm_attach[slot].id = shmid; + } + pthread_mutex_unlock(&g_shm_lock); + if (addr == MAP_FAILED) { + errno = saved == ENOMEM ? ENOMEM : EINVAL; + return (void *)-1; + } + return addr; +} + +int shmdt(const void *shmaddr) { + pthread_mutex_lock(&g_shm_lock); + for (int i = 0; i < SHM_MAX_ATTACH; i++) { + if (g_shm_attach[i].addr && g_shm_attach[i].addr == shmaddr) { + void *addr = g_shm_attach[i].addr; + size_t size = g_shm_attach[i].size; + int id = g_shm_attach[i].id; + g_shm_attach[i].addr = NULL; + g_shm_attach[i].size = 0; + // counted and unmarked under the lock, so that an attach of this process meanwhile keeps its mark + if (shm_attached_here_locked(id) == 0) shm_mark_attached(id, 0); + pthread_mutex_unlock(&g_shm_lock); + munmap(addr, size); + return 0; + } + } + pthread_mutex_unlock(&g_shm_lock); + errno = EINVAL; + return -1; +} + +static int shm_attached_here_locked(int id) { + int count = 0; + for (int i = 0; i < SHM_MAX_ATTACH; i++) { + if (g_shm_attach[i].addr && g_shm_attach[i].id == id) count++; + } + return count; +} + +static int shm_attached_here(int id) { + int count = 0; + pthread_mutex_lock(&g_shm_lock); + for (int i = 0; i < SHM_MAX_ATTACH; i++) { + if (g_shm_attach[i].addr && g_shm_attach[i].id == id) count++; + } + pthread_mutex_unlock(&g_shm_lock); + return count; +} + +int shmctl(int shmid, int cmd, struct shmid_ds *buf) { + init_ddnatv_hook(); + if (g_ddnatv_root[0] == '\0') { + errno = ENOSYS; + return -1; + } + switch (cmd) { + case IPC_INFO: + case SHM_INFO: + if (buf) { + // the caller's buffer is the structure of the command (struct shminfo or struct shm_info) + memset(buf, 0, cmd == IPC_INFO ? sizeof(struct shminfo) : sizeof(struct shm_info)); + if (cmd == IPC_INFO) { + struct shminfo *info = (struct shminfo *)buf; + info->shmmax = sizeof(unsigned long) > 4 ? (unsigned long)1 << 40 : 0x7fffffffUL; + info->shmmin = 1; + info->shmmni = 4096; + info->shmseg = 4096; + info->shmall = (unsigned long)1 << 30; + } + } + return 0; + case SHM_LOCK: + case SHM_UNLOCK: + return 0; + default: + break; + } + struct shm_meta meta; + if (shm_read_meta(shmid, &meta) != 0) { + errno = EINVAL; + return -1; + } + switch (cmd) { + case IPC_STAT: + case SHM_STAT: + case SHM_STAT_ANY: + if (!buf) { + errno = EFAULT; + return -1; + } + memset(buf, 0, sizeof(*buf)); + buf->shm_perm.__key = (key_t)meta.key; + // The owner's rights for everyone of the app: X compares the uid of its client with the owner's, + // and the two can differ in The native userland (root emulated for one, not the other) + unsigned owner = meta.mode & 0600; + buf->shm_perm.mode = (unsigned short)(owner | (owner >> 3) | (owner >> 6)); + buf->shm_perm.uid = buf->shm_perm.cuid = geteuid(); + buf->shm_perm.gid = buf->shm_perm.cgid = getegid(); + buf->shm_segsz = meta.size; + buf->shm_cpid = meta.pid; + buf->shm_lpid = getpid(); + buf->shm_nattch = (shmatt_t)(shm_attached_here(shmid) + (meta.pid != getpid() ? 1 : 0)); + buf->shm_ctime = time(NULL); + return cmd == IPC_STAT ? 0 : shmid; + case IPC_SET: { + if (!buf) { + errno = EFAULT; + return -1; + } + // the new rights are kept (owner and group stay the app's: there is no other user to give it to) + char name[32], text[128]; + snprintf(name, sizeof(name), "id-%d", shmid); + int len = snprintf(text, sizeof(text), "%d %lx %o %lu\n", meta.pid, meta.key, buf->shm_perm.mode & 0777u, + (unsigned long)meta.size); + return shm_publish(name, shmid, text, (size_t)len, 0) == 0 ? 0 : -1; + } + case IPC_RMID: + shm_remove(shmid, meta.key); + return 0; + default: + errno = EINVAL; + return -1; + } +} + +#endif /* !DDNATV_HOST_TEST */ diff --git a/tools/nativeguest/seccomp-sim.c b/tools/nativeguest/seccomp-sim.c new file mode 100644 index 0000000000..e1b50a09c6 --- /dev/null +++ b/tools/nativeguest/seccomp-sim.c @@ -0,0 +1,92 @@ +// Runs a program under a seccomp filter that answers the system calls Android's app policy blocks +// with SIGSYS, the way a stock app process does, for testing on builds that have no filter: +// seccomp-sim [-a NR,NR...] PROGRAM [ARGS...] +// seccomp-sim -f FILTER PROGRAM [ARGS...] +// -a leaves the listed system calls allowed (to find which one kills a program). -f installs a +// filter as it is (raw struct sock_filter entries), such as the app filter a device's zygote makes. +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static const int blocked[] = {99, 100, 97, 217, 218, 219, 268, 277, 280, 293, 143, 144, 145, 146, 147, 149, 151, 152, 159}; + +#define MAX_ALLOWED 64 +#define NBLOCKED (sizeof(blocked) / sizeof(blocked[0])) + +static int run_filter_file(const char *path, char **argv) { + static struct sock_filter filter[BPF_MAXINSNS]; + FILE *f = fopen(path, "rb"); + if (!f) { + perror("seccomp-sim: -f"); + return 2; + } + size_t n = fread(filter, sizeof(filter[0]), BPF_MAXINSNS, f); + int extra = fgetc(f) != EOF; + fclose(f); + if (n == 0 || extra) { + fprintf(stderr, "seccomp-sim: %s holds no filter of at most %d instructions\n", path, BPF_MAXINSNS); + return 2; + } + struct sock_fprog prog = { .len = (unsigned short)n, .filter = filter }; + if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) || prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog)) { + perror("seccomp-sim"); + return 1; + } + execv(argv[0], argv); + perror("seccomp-sim: exec"); + return 127; +} + +int main(int argc, char **argv) { + if (argc > 3 && strcmp(argv[1], "-f") == 0) return run_filter_file(argv[2], argv + 3); + int skip[MAX_ALLOWED], nskip = 0, arg = 1; + if (argc > 3 && strcmp(argv[1], "-a") == 0) { + for (char *p = argv[2];; p++) { + char *end = NULL; + long nr = strtol(p, &end, 10); + if (end == p || (*end != '\0' && *end != ',') || *p < '0' || *p > '9' || + nr < 0 || nr > 1023 || nskip == MAX_ALLOWED) { + fprintf(stderr, "seccomp-sim: -a takes up to %d comma-separated system call numbers, not \"%s\"\n", MAX_ALLOWED, argv[2]); + return 2; + } + skip[nskip++] = (int)nr; + if (*end == '\0') break; + p = end; + } + arg = 3; + } + if (arg >= argc) return 2; + struct sock_filter filter[4 + 2 * MAX_ALLOWED + 2 + 2 * NBLOCKED + 1]; + int n = 0; + filter[n++] = (struct sock_filter)BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, arch)); + filter[n++] = (struct sock_filter)BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, AUDIT_ARCH_AARCH64, 1, 0); + filter[n++] = (struct sock_filter)BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW); + filter[n++] = (struct sock_filter)BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, nr)); + for (int i = 0; i < nskip; i++) { + filter[n++] = (struct sock_filter)BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, skip[i], 0, 1); + filter[n++] = (struct sock_filter)BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW); + } + filter[n++] = (struct sock_filter)BPF_JUMP(BPF_JMP | BPF_JGE | BPF_K, 424, 0, 1); + filter[n++] = (struct sock_filter)BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_TRAP); + for (size_t i = 0; i < NBLOCKED; i++) { + filter[n++] = (struct sock_filter)BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, blocked[i], 0, 1); + filter[n++] = (struct sock_filter)BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_TRAP); + } + filter[n++] = (struct sock_filter)BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW); + struct sock_fprog prog = { .len = (unsigned short)n, .filter = filter }; + if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) || prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog)) { + perror("seccomp-sim"); + return 1; + } + execv(argv[arg], argv + arg); + perror("seccomp-sim: exec"); + return 127; +} diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 5afaae5f61..57fe792465 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -77,7 +77,7 @@ def required(): paths += [f'assets/graphics_driver/adrenotools-{name}.tzst' for name in ['turnip26.3.0-a6xx', 'turnip26.3.0-quest2']] paths += ['assets/linuxfs/' + name for name in ['libfakeinput.so', 'libblsession.so', - 'libblfastpath.so', 'libssbs.so', 'usr/local/bin/droiddeck-clipboard', + 'libblfastpath.so', 'libddnatv-hook.so', 'libssbs.so', 'usr/local/bin/droiddeck-clipboard', 'usr/local/bin/droiddeck-gog-maintenance', 'usr/local/bin/gamescope', 'usr/local/lib/droiddeck/uruntime', 'usr/local/lib/droiddeck-pipewire.tzst']] diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index c0fb5742b8..c2fc95d30c 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -417,12 +417,14 @@ class DroiddeckctlTest(FakeAdbTest): return ctl.subprocess.CompletedProcess(args, 127, b"", b"/system/bin/sh: content: inaccessible or not found") if args[:2] == ("shell", "am"): return ctl.subprocess.CompletedProcess(args, 0, b"Broadcast completed: result=0", b"") + if args[:2] == ("shell", "pidof " + ctl.PACKAGE): + return ctl.subprocess.CompletedProcess(args, 0, b"4940\n", b"") return ctl.subprocess.CompletedProcess(args, 0, next(answers), b"") with unittest.mock.patch.object(ctl, "run_adb", adb), unittest.mock.patch.object(ctl.time, "sleep"): answer = ctl.provider_call("adb", "fake-1", "state", arg="a b", request={"x": 1}) self.assertEqual({"ok": True, "command": "state"}, answer) - broadcast = calls[1] + broadcast = next(c for c in calls if c[:2] == ("shell", "am")) self.assertEqual(("shell", "am", "broadcast", "-a", ctl.PACKAGE + ".AGENT_CALL", "-p", ctl.PACKAGE), broadcast[:7]) self.assertIn("'a b'", broadcast) self.assertEqual(ctl.encode_request({"x": 1}), broadcast[broadcast.index("request") + 1]) @@ -823,5 +825,48 @@ class ScenarioTest(FakeAdbTest): self.assertEqual([{"appId": 7, "timeout": 15.0}] * 2, [c["request"] for c in self.calls("quit")]) +class ProviderFallbackTest(unittest.TestCase): + MISSING = "/system/bin/sh: content: inaccessible or not found\n" + + def adb(self, answers): + calls = [] + + def run(adb, serial, *args, timeout=None): + calls.append(args) + for prefix, (code, out, err) in answers: + if " ".join(args).startswith(" ".join(prefix)): + return unittest.mock.Mock(returncode=code, stdout=out.encode(), stderr=err.encode()) + raise AssertionError(f"unexpected adb call {args}") + return calls, unittest.mock.patch.object(ctl, "run_adb", run) + + def test_a_command_that_prints_the_shell_error_is_not_run_again(self): + result = 'Result: Bundle[{json={"ok":true,"stdout":{"text":"' + self.MISSING.strip() + '"}}}]' + calls, patch = self.adb([(["shell", "content"], (0, result, ""))]) + with patch: + self.assertTrue(ctl.provider_call("adb", "s", "native", request={"argv": ["x"]})["ok"]) + self.assertEqual(1, len(calls)) + + def test_a_shell_without_content_uses_the_broadcast(self): + calls, patch = self.adb([ + (["shell", "content"], (127, "", self.MISSING)), + (["shell", "pidof"], (0, "4940\n", "")), + (["shell", "am", "broadcast"], (0, "Broadcast completed", "")), + (["shell"], (0, '{"ok": true}', "")), + ]) + with patch: + self.assertTrue(ctl.provider_call("adb", "s", "state")["ok"]) + self.assertEqual(["shell", "am", "broadcast"], list(calls[2][:3])) + + def test_the_broadcast_needs_the_app_running(self): + calls, patch = self.adb([ + (["shell", "content"], (127, "", self.MISSING)), + (["shell", "pidof"], (1, "", "")), + ]) + with patch, self.assertRaises(ctl.ControlError) as raised: + ctl.provider_call("adb", "s", "state") + self.assertEqual("APP_NOT_RUNNING", raised.exception.code) + self.assertFalse(any(c[:3] == ("shell", "am", "broadcast") for c in calls)) + + if __name__ == "__main__": unittest.main() diff --git a/tools/tests/test_preload_snapshots.py b/tools/tests/test_preload_snapshots.py index 6629d1ab22..2d0ee01642 100644 --- a/tools/tests/test_preload_snapshots.py +++ b/tools/tests/test_preload_snapshots.py @@ -150,6 +150,30 @@ class PreloadSnapshotTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, 'successful main'): snapshots.artifact_bytes(self.data['origin'], self.root / 'cache') + def test_origin_apk_without_a_newer_output_reads_the_rest(self): + from zipfile import ZipFile + newest = 'libddnatv-hook.so' + apk = io.BytesIO() + with ZipFile(apk, 'w') as z: + for name, value in self.binaries.items(): + if name != newest: + z.writestr('assets/linuxfs/' + name, value) + outer = io.BytesIO() + with ZipFile(outer, 'w') as z: + z.writestr('app-release.apk', apk.getvalue()) + digest = snapshots.sha(outer.getvalue()) + origin = dict(self.data['origin'], artifact_sha256=digest) + build = dict(event='push', head_branch='main', conclusion='success', head_sha=origin['commit'], + path='.github/workflows/build.yml', repository=dict(full_name=snapshots.REPO)) + artifact = dict(name='droiddeck-apk', workflow_run=dict(id=origin['run']), digest='sha256:' + digest) + cache = self.root / 'cache' + cache.mkdir() + (cache / (digest + '.zip')).write_bytes(outer.getvalue()) + with patch.object(snapshots, 'api', side_effect=[build, artifact]): + content = snapshots.artifact_bytes(origin, cache) + self.assertNotIn(newest, content) + self.assertEqual(set(content), snapshots.FILES - {newest}) + def test_corrupt_archive_is_rejected(self): with self.assertRaisesRegex(ValueError, 'checksum'): snapshots.unpack(self.content + b'tampered', self.data) From f16b023f0d87bbe720bc7a5e67195a8742ea33a9 Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Thu, 12 Nov 2026 00:34:06 +0900 Subject: [PATCH 011/101] fix(ubisoft): R2 games get a session matching the subsystems they ask for (#2450) uplay_r2.dll speaks the same UplayDll.proto as uplay_r1.dll, but its InitReq names the subsystems the game uses (fields 4 to 11) and its ApiContext only creates objects for those. It copies gameInstall and storage into their objects without checking for them, so the gameInstall droiddeck-upc always sent crashed Prince of Persia: The Lost Crown (6145), which asks for overlay, product and store only: an access violation reading 0x68 in uplay_r264.dll+0xaca2 two seconds after the session. - When the request names subsystems, gameInstall (14) is sent only with subSystemInstall and storage (17) only with subSystemStorage, and an empty multiplayerInit (20) is added. Requests that name none keep the old session. - streamingReq (27) is answered: the streaming type is None, other streaming queries are not found. - The log records the subsystems each init asked for. Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- docs/development/ubisoft-launch.md | 21 ++++- tools/ubisoft-launcher/src/launcher.rs | 105 ++++++++++++++++++++++--- tools/ubisoft-launcher/src/main.rs | 7 +- 3 files changed, 116 insertions(+), 17 deletions(-) diff --git a/docs/development/ubisoft-launch.md b/docs/development/ubisoft-launch.md index f7321f4d72..5c18429758 100644 --- a/docs/development/ubisoft-launch.md +++ b/docs/development/ubisoft-launch.md @@ -34,7 +34,7 @@ followed by a proto2 message, except on `uplay_service_ipc_pipe_`. |---|---|---| | `game_start_ipc_pipe_` | `UbisoftGameLauncher.exe` | `game_starter.Upstream{1:{1:{1: build, 2: product, 10: exe, 11: arguments, ...}}}` → `Downstream{2:{1:{1:0 (overlay off), 2:0, 3: / + "/" + , 4: /, 8:3, 9:{1:{1,113,0,1,0} 1:{3,123,0,0,0}}}}}` | | `uplay_api_process_ipc_pipe_` | game | `Req.initProcessReq{1: product, 2: game pid, 5: env set}` → `Rsp.initProcessRsp(13){1:1, 3:0 (overlay off), 4:3, 6:0}`. Kept open. Answering it is what releases the starter (below). Far Cry 3 Blood Dragon sends only `{2: pid, 5:1}`; a missing pid is taken from the pipe's client process | -| `uplay_ipc_pipe_` | game (`uplay_r1.dll`) | `Req.initReq(1)` → `Rsp.initRsp(1)`, answered every time it is asked. `Req.installerReq(13)` with `initInstallerReq` → `Rsp.installerRsp(10){1:{1:1, 2:"", 3: language}}`. `Req.userReq(11).getCredentialsReq(1){1: id}` → `Rsp.userRsp(8).getCredentialsRsp(1){1: id, 2: username, 3: "" (password), 4: userId, 5: email}` | +| `uplay_ipc_pipe_` | game (`uplay_r1.dll`, `uplay_r2.dll`) | `Req.initReq(1)` → `Rsp.initRsp(1)`, answered every time it is asked. `Req.installerReq(13)` with `initInstallerReq` → `Rsp.installerRsp(10){1:{1:1, 2:"", 3: language}}`. `Req.userReq(11).getCredentialsReq(1){1: id}` → `Rsp.userRsp(8).getCredentialsRsp(1){1: id, 2: username, 3: "" (password), 4: userId, 5: email}`. `Req.streamingReq(27)` → `Rsp.streamingRsp(20){1: id, 2:1, 4:{1:0}}` for the streaming type (not streamed), `{1: id, 2:4}` for any other streaming query | | `uplay_aux_ipc_pipe_` | `uplay_aux_r1(64).dll` (Denuvo) | `{1: rid, 2: init}` → `{1: rid, 2:{1:1, 2: pid, 3:3367, 3:3368, 3:3962}}`; `{1: rid, 3:{2:{2: challenge}}}` → `{1: rid, 3:{2:{2:1, 3:0, 4: game token, 5:""}}}` | | `uplay_service_ipc_pipe_` | Ubisoft helpers | Server sends `{3:{1:1, 3:{1: }}}` once, then only reads, unframed | | `orbit_ipc_pipe_` | game (`ubiorbitapi_r2.dll`) | `mg.protocol.orbitdll` from the DLL's own `proto_orbitdll/OrbitDll.proto`. `Req{1: id, 12: init{1: product}}` → `Rsp{1: id, 12:{1: save folder, 2:1}}`; `getLoginDetails(2)` → `{1: username, 2:"", 3:""}`; `getOsi(3){1: sub}` → `{2:1}` (failed, no online-services pipe) | @@ -53,9 +53,25 @@ followed by a proto2 message, except on `uplay_service_ipc_pipe_`. | 7 isInOfflineMode | 0 | | 8 upcTicket | the PC ticket from `GetUplayPCTicket`, never the Denuvo token | | 11, 12, 15, 16, 18, 19, 21, 23 | the values a real launch carries (`{1:0}`, 0, overlay `{1:0, 2:3}`, hardware score `{6211, 22395, 1.0f}`, empty, `{1:1, 2:1}`, `{2:1}`, empty) | +| 14 gameInstall | `{1:1, 2: installed chunks, 3: language}` | | 17 storage | `{1: "C:/users/steamuser/Saved Games/Ubisoft///"}`; the game appends file names directly, so the trailing slash matters | | 22 ubiServices | `{1: applicationId}` from the account's entitlements, left out when unknown | +### R2 titles + +`uplay_r2.dll` speaks the same `mg.protocol.uplaydll` messages (its embedded `UplayDll.proto` is identical to +`uplay_r1.dll`'s), but its `InitReq` names the subsystems the game uses: fields 4 to 11 (friend, overlay, +product, storage, install, multiplayer, store, streaming). Its `ApiContext` creates one object per requested +subsystem and copies the session into them. Friends, overlay, game session, store and crossboot are checked +for a missing object first; install and storage are not. A `gameInstall` sent to a game that did not ask for +install is copied into a null object: Prince of Persia: The Lost Crown (6145) asks for overlay, product and store +only, and crashed reading `0x68` in `uplay_r264.dll+0xaca2` two seconds after the session arrived. + +So when the request names subsystems, 14 is sent only with `subSystemInstall` (8), 17 only with +`subSystemStorage` (7), and an empty `multiplayerInit` (20) is added, which `uplay_r2.dll` asks for even when +empty. A request that names none gets the session above unchanged. The Lost Crown also opens a second context +that asks for every subsystem, and it gets the full session. + The overlay is reported off in all three places. `uplay_r1.dll` still loads `overlay.dll` from the runtime folder right after the session arrives, whatever the session says; without that file it gives up with `UplayAPI [ERROR]: Startup failed: cannot load uplay library` (Assassin's Creed Chronicles: China @@ -91,7 +107,6 @@ titles without Denuvo never open the aux pipe. ## Not covered yet -- R2 (`UPC_*`) titles use `uplay_r2.dll`; their pipe traffic has not been captured, so whether the - same server answers them is unverified. +- R2 titles other than The Lost Crown, and R2 requests beyond the session, credentials, product list and streaming type. - Orbit's online-services pipe (`getOsi` is declined) and Orbit titles other than Far Cry 3 Blood Dragon. - Achievements, friends, overlay, cloud saves. diff --git a/tools/ubisoft-launcher/src/launcher.rs b/tools/ubisoft-launcher/src/launcher.rs index 3d5fcac4c5..343708dba0 100644 --- a/tools/ubisoft-launcher/src/launcher.rs +++ b/tools/ubisoft-launcher/src/launcher.rs @@ -145,8 +145,10 @@ impl Config { Msg::new().msg(13, Msg::new().uint(1, 1).uint(3, 0).uint(4, OVERLAY_NONE).uint(6, 0)).0 } - /// `Rsp.initRsp`: the account, its products and the PC ticket. - pub fn session(&self) -> Vec { + /// `Rsp.initRsp`: the account, its products and the PC ticket. `uplay_r2.dll` copies the + /// install and storage state into objects it only creates for the subsystems the game asked + /// for, without checking them, so those parts follow the request when it names subsystems. + pub fn session(&self, wants: Option) -> Vec { let account = Msg::new() .text(1, &self.user_id) .text(2, &self.username) @@ -161,16 +163,25 @@ impl Config { body = body .msg(6, Msg::new().uint(1, self.product as u64).text(2, "")) .uint(7, 0) - .text(8, &self.ticket) - .msg(14, Msg::new().uint(1, 1).msg(2, self.chunks()).text(3, &self.language)) + .text(8, &self.ticket); + if wants.map_or(true, |w| w.install) { + body = body.msg(14, Msg::new().uint(1, 1).msg(2, self.chunks()).text(3, &self.language)); + } + body = body .msg(11, Msg::new().uint(1, 0)) .uint(12, 0) .msg(15, Msg::new().uint(1, 0).uint(2, OVERLAY_NONE)) - .msg(16, Msg::new().uint(1, 6211).uint(2, 22395).float(3, 1.0)) - .msg(17, Msg::new().text(1, &self.saves)) + .msg(16, Msg::new().uint(1, 6211).uint(2, 22395).float(3, 1.0)); + if wants.map_or(true, |w| w.storage) { + body = body.msg(17, Msg::new().text(1, &self.saves)); + } + body = body .bytes(18, b"") .msg(19, Msg::new().uint(1, 1).uint(2, 1)) .msg(21, Msg::new().uint(2, 1)); + if wants.is_some() { + body = body.bytes(20, b""); + } if !self.app_id.is_empty() { body = body.msg(22, Msg::new().text(1, &self.app_id)); } @@ -244,9 +255,24 @@ const ACKNOWLEDGED: &[(u32, u32, u32, u32, u64)] = &[ (25, 4, 17, 4, 1), // played with ]; -/// The id-and-result answer to a request in [ACKNOWLEDGED], with a name for the log. +/// `Rsp.streamingRsp` (20) for `Req.streamingReq` (27): the game is not streamed, so its streaming +/// type is `StreamingType_None` and every other streaming query is not found. +fn streaming(req: &[(u32, Value<'_>)]) -> (Vec, String) { + let id = pb::num(req, 1).unwrap_or(0); + let rsp = if pb::has(req, 3) { + Msg::new().uint(1, id).uint(2, 1).msg(4, Msg::new().uint(1, 0)) + } else { + Msg::new().uint(1, id).uint(2, 4) + }; + (Msg::new().msg(20, rsp).0, format!("streaming id {id} -> not streamed")) +} + +/// The id-and-result answer to a request in [ACKNOWLEDGED] or a streaming query, with a name for the log. pub fn acknowledge(body: &[u8]) -> Option<(Vec, String)> { let f = pb::fields(body)?; + if let Some(req) = pb::sub(&f, 27).and_then(pb::fields) { + return Some(streaming(&req)); + } for &(req, sub, rsp, rsp_sub, result) in ACKNOWLEDGED { let Some(inner) = pb::sub(&f, req).and_then(pb::fields) else { continue }; let Some(leaf) = pb::sub(&inner, sub).and_then(pb::fields) else { continue }; @@ -257,8 +283,27 @@ pub fn acknowledge(body: &[u8]) -> Option<(Vec, String)> { None } +/// The subsystems an `InitReq` asks for (fields 4 to 11). +#[derive(Clone, Copy, Debug, Default, PartialEq)] +pub struct Subsystems { + pub install: bool, + pub storage: bool, +} + +impl Subsystems { + /// `None` when the request names no subsystem at all. + pub fn of(init: &[u8]) -> Option { + let f = pb::fields(init)?; + if !(4..=11).any(|n| pb::has(&f, n)) { + return None; + } + let on = |n| pb::num(&f, n).unwrap_or(0) != 0; + Some(Subsystems { storage: on(7), install: on(8) }) + } +} + pub enum SessionReq { - Init, + Init(Option), Installer, ProductList(u64), Credentials(u64), @@ -271,7 +316,7 @@ pub fn session_request(body: &[u8]) -> SessionReq { if pb::sub(&f, 13).and_then(pb::fields).is_some_and(|i| pb::has(&i, 1)) { SessionReq::Installer } else if pb::has(&f, 1) { - SessionReq::Init + SessionReq::Init(pb::sub(&f, 1).and_then(Subsystems::of)) } else if let Some(get) = leaf(11, 1) { SessionReq::Credentials(pb::num(&get, 1).unwrap_or(0)) } else if let Some(list) = leaf(23, 1) { @@ -357,7 +402,7 @@ mod tests { #[test] fn the_session_carries_the_ticket_products_and_save_root() { - let rsp = config().session(); + let rsp = config().session(None); let init = pb::fields(pb::sub(&pb::fields(&rsp).unwrap(), 1).unwrap()).unwrap(); assert_eq!(pb::num(&init, 1), Some(1)); assert_eq!(pb::num(&init, 4), Some(109)); @@ -376,9 +421,47 @@ mod tests { assert_eq!((pb::num(&second, 1), pb::num(&second, 2), pb::sub(&second, 3)), (Some(64), Some(1), Some(&b"custo05"[..]))); } + fn session_fields(rsp: &[u8]) -> Vec { + let init = pb::fields(pb::sub(&pb::fields(rsp).unwrap(), 1).unwrap()).unwrap(); + init.iter().map(|(n, _)| *n).collect() + } + + #[test] + fn an_r2_session_leaves_out_the_install_and_storage_the_game_did_not_ask_for() { + let req = Msg::new().msg(1, Msg::new().uint(1, 6145).uint(2, 512).uint(3, 2).uint(4, 1).uint(5, 1).uint(7, 1).uint(8, 0)); + let SessionReq::Init(wants) = session_request(&req.0) else { panic!() }; + assert_eq!(wants, Some(Subsystems { install: false, storage: true })); + let fields = session_fields(&config().session(wants)); + assert!(!fields.contains(&14)); + assert!(fields.contains(&17)); + assert!(fields.contains(&20)); + let all = session_fields(&config().session(Some(Subsystems { install: true, storage: true }))); + assert!(all.contains(&14) && all.contains(&17)); + } + + #[test] + fn streaming_queries_say_the_game_is_not_streamed() { + let (answer, _) = acknowledge(&[0xda, 0x01, 0x06, 0x08, 0x80, 0x80, 0x08, 0x1a, 0x00]).unwrap(); + let rsp = pb::fields(pb::sub(&pb::fields(&answer).unwrap(), 20).unwrap()).unwrap(); + assert_eq!((pb::num(&rsp, 1), pb::num(&rsp, 2)), (Some(0x20000), Some(1))); + assert_eq!(pb::num(&pb::fields(pb::sub(&rsp, 4).unwrap()).unwrap(), 1), Some(0)); + let (answer, _) = acknowledge(&Msg::new().msg(27, Msg::new().uint(1, 7).bytes(2, b"")).0).unwrap(); + let rsp = pb::fields(pb::sub(&pb::fields(&answer).unwrap(), 20).unwrap()).unwrap(); + assert_eq!((pb::num(&rsp, 1), pb::num(&rsp, 2)), (Some(7), Some(4))); + } + + #[test] + fn an_r1_session_without_subsystems_keeps_install_and_storage() { + let SessionReq::Init(wants) = session_request(&Msg::new().msg(1, Msg::new().uint(1, 109).uint(2, 4242)).0) else { panic!() }; + assert_eq!(wants, None); + let fields = session_fields(&config().session(wants)); + assert!(fields.contains(&14) && fields.contains(&17)); + assert!(!fields.contains(&20)); + } + #[test] fn requests_are_told_apart() { - assert!(matches!(session_request(&Msg::new().msg(1, Msg::new().uint(1, 109)).0), SessionReq::Init)); + assert!(matches!(session_request(&Msg::new().msg(1, Msg::new().uint(1, 109)).0), SessionReq::Init(None))); assert!(matches!(session_request(&Msg::new().msg(13, Msg::new().bytes(1, b"")).0), SessionReq::Installer)); assert!(matches!(session_request(&[0xba, 0x01, 0x06, 0x0a, 0x04, 0x08, 0x80, 0x80, 0x04]), SessionReq::ProductList(65536))); let (answer, _) = acknowledge(&[0x42, 0x08, 0x0a, 0x06, 0x08, 0x80, 0x80, 0x08, 0x10, 0x00]).unwrap(); diff --git a/tools/ubisoft-launcher/src/main.rs b/tools/ubisoft-launcher/src/main.rs index 425522e638..0b7126a919 100644 --- a/tools/ubisoft-launcher/src/main.rs +++ b/tools/ubisoft-launcher/src/main.rs @@ -145,10 +145,11 @@ mod service { let mut pushes = 0; while let Some(req) = frames.next() { match launcher::session_request(&req) { - SessionReq::Init => { + SessionReq::Init(wants) => { pushes += 1; - send(&pipe, &state.cfg.session()); - state.say(&format!("session: init answered ({pushes})")); + send(&pipe, &state.cfg.session(wants)); + let asked = wants.map_or("no subsystems named".to_string(), |w| format!("install {}, storage {}", w.install, w.storage)); + state.say(&format!("session: init answered ({pushes}; {asked}; {})", hex(&req, 48))); } SessionReq::Installer => { send(&pipe, &state.cfg.installer()); From c265b66e80d69688e001bdeba404a7e422a31e52 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 10:59:04 -0500 Subject: [PATCH 012/101] fix(agent): start sessions from their own task so repeat starts aren't swallowed (#2468) * fix(agent): start sessions from their own task so repeat starts aren't swallowed * fix(ci): fall back to the kernel.org Ubuntu mirror when Canonical's are unreachable * fix(ci): fall back to the Berkeley ports mirror on arm64 runners --- app/src/main/AndroidManifest.xml | 1 + tools/ci/install-ubuntu-packages.sh | 21 ++++++++++++++------- tools/droiddeckctl | 3 +++ tools/tests/test_ci_checks.py | 25 +++++++++++++++++++++++-- tools/tests/test_droiddeckctl.py | 12 ++++++++++++ 5 files changed, 53 insertions(+), 9 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d5bb0dc0d0..514b4d9146 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -258,6 +258,7 @@ android:exported="true" android:excludeFromRecents="true" android:noHistory="true" + android:taskAffinity="${applicationId}.agent" android:permission="android.permission.DUMP" android:theme="@style/SessionTheme" /> diff --git a/tools/ci/install-ubuntu-packages.sh b/tools/ci/install-ubuntu-packages.sh index dcccc0eb6b..d1bd5e698a 100644 --- a/tools/ci/install-ubuntu-packages.sh +++ b/tools/ci/install-ubuntu-packages.sh @@ -31,15 +31,22 @@ install_packages() { if install_packages; then exit 0 fi -echo "::warning::Runner mirror failed or timed out; retrying with the official Ubuntu mirror." [ -f "$ubuntu_sources" ] || exit 1 sources=$(mktemp --suffix=.sources) trap 'rm -f "$sources"' EXIT -mirror=https://archive.ubuntu.com/ubuntu +# The last mirror of each list is outside Canonical's network, so it still answers when runners cannot reach Canonical. +mirrors=(https://archive.ubuntu.com/ubuntu https://mirrors.edge.kernel.org/ubuntu) case "$(dpkg --print-architecture)" in - arm64) mirror=https://ports.ubuntu.com/ubuntu-ports ;; + arm64) mirrors=(https://ports.ubuntu.com/ubuntu-ports https://mirrors.ocf.berkeley.edu/ubuntu-ports) ;; esac -sed -E "s@^URIs:.*@URIs: $mirror@" "$ubuntu_sources" > "$sources" -chmod 644 "$sources" -options[1]="Dir::Etc::sourcelist=$sources" -install_packages +status=1 +for mirror in "${mirrors[@]}"; do + echo "::warning::Ubuntu mirror failed or timed out; retrying with $mirror." + sed -E "s@^URIs:.*@URIs: $mirror@" "$ubuntu_sources" > "$sources" + chmod 644 "$sources" + options[1]="Dir::Etc::sourcelist=$sources" + status=0 + install_packages || status=$? + [ "$status" = 0 ] && exit 0 +done +exit "$status" diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 7c4116384b..3e37811d28 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -171,6 +171,9 @@ def start_agent_activity(adb: str, serial: str, request: dict) -> None: output = (result.stdout + result.stderr).decode(errors="replace") if result.returncode != 0 or "status: ok" not in output.lower(): raise ControlError(output.strip() or "The agent start Activity did not launch", "ACTIVITY_START_FAILED") + if "activity not started" in output.lower(): + raise ControlError("Android handed the start request to an existing DroidDeck task instead of starting it: " + + output.strip(), "ACTIVITY_START_FAILED") def confirm_start(adb: str, serial: str, request: dict, previous: dict) -> dict: diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py index f2e258a020..125dba0398 100644 --- a/tools/tests/test_ci_checks.py +++ b/tools/tests/test_ci_checks.py @@ -58,11 +58,17 @@ class CiChecksTest(unittest.TestCase): with tempfile.TemporaryDirectory() as directory: root = Path(directory) sudo = root / 'sudo' - sudo.write_text('#!/bin/bash\nprintf "%s\\n" "$*" >> "$APT_LOG"\nexit "${APT_RESULT:-0}"\n') + sudo.write_text('#!/bin/bash\nprintf "%s\\n" "$*" >> "$APT_LOG"\n' + 'for arg; do case "$arg" in Dir::Etc::sourcelist=*) ' + 'grep -h "^URIs:" "${arg#*=}" >> "$APT_LOG.mirrors";; esac; done\n' + 'exit "${APT_RESULT:-0}"\n') sudo.chmod(0o755) query = root / 'dpkg-query' query.write_text('#!/bin/sh\nexit 1\n') query.chmod(0o755) + dpkg = root / 'dpkg' + dpkg.write_text('#!/bin/sh\necho "${DPKG_ARCH:-amd64}"\n') + dpkg.chmod(0o755) log = root / 'apt.log' sources = root / 'ubuntu.sources' sources.write_text('URIs: http://mirror.invalid/ubuntu\n') @@ -71,8 +77,23 @@ class CiChecksTest(unittest.TestCase): installer = ROOT / 'tools/ci/install-ubuntu-packages.sh' result = subprocess.run(['bash', str(installer), 'qemu-user'], env=dict(env, APT_RESULT='17')) self.assertEqual(result.returncode, 17) - self.assertEqual(len(log.read_text().splitlines()), 2) + self.assertEqual(len(log.read_text().splitlines()), 3) + mirrors = Path(str(log) + '.mirrors') + self.assertEqual(mirrors.read_text().splitlines(), [ + 'URIs: http://mirror.invalid/ubuntu', + 'URIs: https://archive.ubuntu.com/ubuntu', + 'URIs: https://mirrors.edge.kernel.org/ubuntu', + ]) log.unlink() + mirrors.unlink() + result = subprocess.run(['bash', str(installer), 'qemu-user'], env=dict(env, APT_RESULT='17', DPKG_ARCH='arm64')) + self.assertEqual(result.returncode, 17) + self.assertEqual(mirrors.read_text().splitlines()[1:], [ + 'URIs: https://ports.ubuntu.com/ubuntu-ports', + 'URIs: https://mirrors.ocf.berkeley.edu/ubuntu-ports', + ]) + log.unlink() + mirrors.unlink() subprocess.run(['bash', str(installer), 'qemu-user'], env=env, check=True) update, install = log.read_text().splitlines() for command in (update, install): diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index c2fc95d30c..ab929de931 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -213,6 +213,18 @@ class DroiddeckctlTest(FakeAdbTest): started = [e["args"] for e in self.calls() if e["args"][:3] == ["shell", "am", "start"]] self.assertIn("com.antutu.benchmark.full/com.droiddeck.launcher.agent.AgentStartActivity", started[0]) + def test_a_start_delivered_to_an_existing_task_is_a_failure(self): + output = (b"Starting: Intent { cmp=com.droiddeck.launcher/.agent.AgentStartActivity (has extras) }\n" + b"Warning: Activity not started, intent has been delivered to currently running top-most instance.\n" + b"Status: ok\nActivity: com.droiddeck.launcher/.FrontEndActivity\nComplete\n") + + def adb(_adb, _serial, *args, timeout=30): + return ctl.subprocess.CompletedProcess(args, 0, output, b"") + + with unittest.mock.patch.object(ctl, "run_adb", adb), self.assertRaises(ctl.ControlError) as caught: + ctl.start_agent_activity("adb", "fake-1", {"mode": "steam"}) + self.assertEqual("ACTIVITY_START_FAILED", caught.exception.code) + def test_a_malformed_package_is_refused_before_adb(self): with unittest.mock.patch.dict(os.environ, {"DROIDDECK_PACKAGE": "com.example;reboot"}): variant = load("droiddeckctl") From 2dbc007a950c3cb646b1b0cd3e5695e6813b1323 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 12:10:33 -0500 Subject: [PATCH 013/101] fix(ci): fall back to the kernel.org Ubuntu mirror when Canonical's are unreachable (#2469) * fix(ci): fall back to the kernel.org Ubuntu mirror when Canonical's are unreachable * fix(ci): fall back to the Berkeley ports mirror on arm64 runners From 61031e3c4b76f98261cf97ef526e6df68d512d90 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 12:44:39 -0500 Subject: [PATCH 014/101] feat(lab): build and run Lab builds of DroidDeck on the device itself (#2375) * feat(lab): load an on-device Lab build over the installed app * feat(lab): build Lab builds on the device and report the APK commit to agents * fix(lab): dd-agent connects loopback adb before starting Claude Code * feat(lab): tell the app's own agent to continue after a Lab build restart * fix(lab): size the build heap from the device's memory * feat(lab): keep earlier Lab builds and list them in Updates * feat(lab): notify when DroidDeck comes back on a Lab build or turns one off * feat(lab): estimate the time left and compile the installed commit ahead of the first build * fix(lab): report a failed command as a failed build and update progress every five seconds * feat(lab): a kept build for another version can be rebuilt * feat(lab): record which installed commit the build caches are warm for * fix(lab): the app's agent hands its builds to the app, so they outlive the agent's turn * perf(lab): BuildConfig describes the installed base, so a Lab commit does not change it * perf(lab): compile with the Kotlin daemon, since in-process Kotlin compiles always redo the whole app * fix(lab): a build whose last task was up to date no longer counts as failed * feat(lab): dd-lab-build --explain logs why tasks ran and Kotlin's build report * fix(lab): keep a waiting build when another is staged or Lab is turned off, and never restart during a session * fix(lab): keep the installed build's label and exact commit, and refuse AppLanguage changes * fix(lab): setup verifies its downloads and waits for adb before preparing * fix(agent): quote apostrophes in opened URLs and keep the sign-in pid --- .../main/java/com/droiddeck/launcher/App.kt | 6 +- .../launcher/agent/AgentBridgeProvider.kt | 2 + .../com/droiddeck/launcher/lab/LabNotice.kt | 60 ++++ .../com/droiddeck/launcher/lab/LabOverlay.kt | 276 ++++++++++++++++++ .../droiddeck/launcher/ui/BuildWatermark.kt | 3 +- .../com/droiddeck/launcher/ui/LabBuilds.kt | 162 ++++++++++ .../com/droiddeck/launcher/ui/UpdatesPage.kt | 7 +- app/src/main/res/values/strings.xml | 23 ++ .../droiddeck/launcher/lab/LabOverlayTest.kt | 154 ++++++++++ docs/lab-builds.md | 63 ++++ tools/agent/android-open | 9 + tools/agent/dd-agent | 5 + tools/agent/dd-gh-login | 24 ++ tools/agent/dd-lab-build | 226 ++++++++++++++ tools/agent/setup | 76 +++++ 15 files changed, 1091 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/lab/LabNotice.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/lab/LabOverlay.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/LabBuilds.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/lab/LabOverlayTest.kt create mode 100644 docs/lab-builds.md create mode 100755 tools/agent/android-open create mode 100755 tools/agent/dd-agent create mode 100755 tools/agent/dd-gh-login create mode 100755 tools/agent/dd-lab-build create mode 100755 tools/agent/setup diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index be81fc6960..b4c1621a47 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -7,8 +7,11 @@ import com.droiddeck.launcher.session.EnhancedSessionLogShare import com.droiddeck.launcher.session.GpuClockPin class App : Application() { - override fun attachBaseContext(base: android.content.Context) = + override fun attachBaseContext(base: android.content.Context) { super.attachBaseContext(com.droiddeck.launcher.core.AppLanguage.wrap(base)) + val process = if (android.os.Build.VERSION.SDK_INT >= 28) Application.getProcessName() else packageName + com.droiddeck.launcher.lab.LabOverlay.load(this, process == packageName) + } override fun onConfigurationChanged(newConfig: android.content.res.Configuration) { super.onConfigurationChanged(newConfig) @@ -39,6 +42,7 @@ class App : Application() { if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic" || process == "$packageName:shortcuts_sync" || process == "$packageName:bottom_desktop") return CrashHandler.install(this) + com.droiddeck.launcher.lab.LabNotice.started(this) com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) com.droiddeck.launcher.session.SessionPrefs.applyNtsyncDefault(this) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt index 6b055221e5..93922c8050 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt @@ -288,6 +288,8 @@ class AgentBridgeProvider : ContentProvider() { return JSONObject() .put("schema", SCHEMA) .put("build", BuildConfig.BUILD_LABEL) + .put("apkCommit", com.droiddeck.launcher.lab.LabOverlay.apkCommit) + .put("lab", com.droiddeck.launcher.lab.LabOverlay.active?.label ?: JSONObject.NULL) .put("appVersion", context.packageManager.getPackageInfo(context.packageName, 0).versionName) .put("runtime", JSONObject() .put("installed", LinuxRuntime.isInstalled(context)) diff --git a/app/src/main/java/com/droiddeck/launcher/lab/LabNotice.kt b/app/src/main/java/com/droiddeck/launcher/lab/LabNotice.kt new file mode 100644 index 0000000000..85e1bab990 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/lab/LabNotice.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.lab + +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.download.StoreDownloadService + +/** + * Says what happened to a Lab build when the app starts, so a restart onto a new build does not + * look like a crash, and a build Android or the safety checks turned off is not lost silently. + */ +object LabNotice { + private const val CHANNEL_ID = "lab" + private const val NOTIFICATION_ID = 4120 + + /** Where a start that just moved a Lab build into use opens; the agent that built it sets it. */ + @Volatile var openOnInstall: String = "updates" + + fun started(context: Context) { + val app = context.applicationContext + val active = LabOverlay.active + val skipped = LabOverlay.skipped + val current = LabOverlay.current(app) + when { + LabOverlay.promoted && active != null -> + post(app, app.getString(R.string.lab_installed_title), app.getString(R.string.lab_installed_text, active.label), openOnInstall) + skipped == LabOverlay.SKIPPED_APP_IMAGE && current != null -> + post(app, app.getString(R.string.lab_paused_title), app.getString(R.string.lab_paused_text, current.label), "updates") + skipped == LabOverlay.Reason.OTHER_INSTALL.name || skipped == LabOverlay.Reason.DID_NOT_START.name -> { + val reason = if (skipped == LabOverlay.Reason.OTHER_INSTALL.name) R.string.lab_off_other_install else R.string.lab_off_did_not_start + post(app, app.getString(R.string.lab_off_title), app.getString(reason), "updates") + } + } + } + + private fun post(app: Context, title: String, text: String, nav: String) { + val manager = app.getSystemService(NotificationManager::class.java) ?: return + manager.createNotificationChannel(NotificationChannel(CHANNEL_ID, app.getString(R.string.upd_lab), NotificationManager.IMPORTANCE_DEFAULT)) + val open = PendingIntent.getActivity( + app, NOTIFICATION_ID, + Intent(app, FrontEndActivity::class.java).putExtra(StoreDownloadService.EXTRA_NAV, nav) + .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT, + ) + val notification = Notification.Builder(app, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_stat_session) + .setContentTitle(title) + .setContentText(text) + .setStyle(Notification.BigTextStyle().bigText(text)) + .setContentIntent(open) + .setAutoCancel(true) + .build() + runCatching { manager.notify(NOTIFICATION_ID, notification) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/lab/LabOverlay.kt b/app/src/main/java/com/droiddeck/launcher/lab/LabOverlay.kt new file mode 100644 index 0000000000..7fb7f7a26d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/lab/LabOverlay.kt @@ -0,0 +1,276 @@ +package com.droiddeck.launcher.lab + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.content.Intent +import android.content.res.Resources +import android.content.res.loader.ResourcesLoader +import android.content.res.loader.ResourcesProvider +import android.os.Build +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.os.ParcelFileDescriptor +import android.util.Log +import androidx.annotation.RequiresApi +import androidx.annotation.VisibleForTesting +import com.droiddeck.launcher.BuildConfig +import org.json.JSONObject +import java.io.File + +/** + * A Lab build: app code and resources an on-device agent built from this install's own commit, + * loaded over the installed APK at startup so it can be tried without reinstalling or re-signing. + * + * `files/lab/next` holds a build waiting for the next start and `files/lab/active` the one in use, + * each with `overlay.apk` (the build's dex files and linked resources) and `overlay.json`. A build + * that is replaced, turned off or refused moves to `files/lab/builds`, so it can be used again. + */ +object LabOverlay { + data class Info(val label: String, val baseCommit: String, val baseApk: String, val built: Long = 0) + + enum class Reason { REPLACED, TURNED_OFF, OTHER_INSTALL, DID_NOT_START, UNREADABLE } + + /** A build kept in `files/lab/builds`; [usable] when it was made for this install. */ + data class Saved(val dir: File, val info: Info?, val reason: Reason?, val usable: Boolean) + + private const val TAG = "LabOverlay" + private const val MAX_FAILED_STARTS = 2 + private const val STABLE_AFTER_MS = 10_000L + private const val KEEP_BUILDS = 12 + const val SKIPPED_APP_IMAGE = "app image present" + + /** The installed APK's commit; this class always comes from the APK, never from a Lab build. */ + val apkCommit: String = BuildConfig.SOURCE_COMMIT + + @Volatile var active: Info? = null + private set + @Volatile var skipped: String? = null + private set + /** This start moved a newly staged build into use. */ + @Volatile var promoted = false + private set + + private var loader: Any? = null + + @VisibleForTesting + internal var injectDex: (ClassLoader, File) -> Unit = ::prependDex + @VisibleForTesting + internal var openResources: (File) -> Any? = { if (Build.VERSION.SDK_INT >= 30) createLoader(it) else null } + @VisibleForTesting + internal var appImage: (Context) -> Boolean = ::hasAppImage + + fun root(context: Context) = File(context.filesDir, "lab") + + /** Called from [Application.attachBaseContext], before any class the build may change is loaded. */ + fun load(app: Application, mainProcess: Boolean) { + active = null + skipped = null + promoted = false + try { + val root = root(app) + if (mainProcess) promoted = promote(root) + val dir = File(root, "active") + val apk = File(dir, "overlay.apk") + val meta = File(dir, "overlay.json") + if (!apk.isFile || !meta.isFile) return + val info = parse(meta.readText()) ?: return refuse(root, mainProcess, Reason.UNREADABLE) + if (!madeFor(app, info)) return refuse(root, mainProcess, Reason.OTHER_INSTALL) + if (Build.VERSION.SDK_INT < 30) return skip("needs Android 11") + // Classes in an app image are loaded before attachBaseContext and would ignore the overlay; + // dd-lab-build recompiles the app without one (cmd package compile -m verify). + if (appImage(app)) return skip(SKIPPED_APP_IMAGE) + if (mainProcess) { + val starts = failedStarts(root) + 1 + if (starts > MAX_FAILED_STARTS) return refuse(root, true, Reason.DID_NOT_START) + File(root, "starts").writeText(starts.toString()) + } + apk.setReadOnly() + loader = openResources(apk) + injectDex(app.classLoader, apk) + active = info + addLoader(app.resources) + app.registerActivityLifecycleCallbacks(Callbacks(root, mainProcess)) + } catch (e: Throwable) { + Log.w(TAG, "Lab build not loaded", e) + skipped = e.message ?: e.javaClass.simpleName + } + } + + /** The APK's path changes with every install and update of the app, so it pins a build to one install. */ + fun madeFor(context: Context, info: Info) = info.baseCommit == apkCommit && info.baseApk == context.applicationInfo.sourceDir + + /** The build in `active`, whether or not this start loaded it. */ + fun current(context: Context): Info? = read(File(root(context), "active")) + + /** A build staged for the next start. */ + fun pending(context: Context): Info? = read(File(root(context), "next")) + + /** Kept builds, newest first. */ + fun saved(context: Context): List = File(root(context), "builds").listFiles().orEmpty() + .filter { File(it, "overlay.apk").isFile } + .sortedByDescending { it.name.toLongOrNull() ?: 0L } + .map { dir -> + val info = read(dir) + val reason = File(dir, "reason").takeIf { it.isFile }?.readText()?.trim()?.let { r -> Reason.entries.firstOrNull { it.name == r } } + Saved(dir, info, reason, info != null && madeFor(context, info)) + } + + /** Leaves the Lab build and restarts the app on the installed APK. */ + fun turnOff(context: Context) { + val root = root(context) + archive(root, File(root, "active"), Reason.TURNED_OFF) + archive(root, File(root, "next"), Reason.TURNED_OFF) + File(root, "next").deleteRecursively() + File(root, "starts").delete() + restart(context) + } + + /** Stages [build] for the next start and keeps a build that was waiting; the caller restarts the app. */ + fun stage(context: Context, build: Saved) { + val root = root(context) + val next = File(root, "next") + val waiting = File(root, "next.replaced").apply { deleteRecursively() } + next.renameTo(waiting) + next.deleteRecursively() + File(build.dir, "reason").delete() + if (!build.dir.renameTo(next)) { + waiting.renameTo(next) + error("could not stage ${build.dir.name}") + } + archive(root, waiting, Reason.REPLACED) + waiting.deleteRecursively() + } + + fun delete(build: Saved) { + build.dir.deleteRecursively() + } + + /** + * Android's background optimization can give the APK an app image again, which keeps a Lab + * build from loading. Recompiling without one needs a shell, which the caller provides. + */ + fun needsRecompile(context: Context) = appImage(context) + + fun recompileCommand(context: Context) = "cmd package compile -m verify -f ${context.packageName}" + + fun restart(context: Context) { + val launch = context.packageManager.getLaunchIntentForPackage(context.packageName) + ?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + if (launch != null) context.startActivity(launch) + Runtime.getRuntime().exit(0) + } + + @VisibleForTesting + internal fun parse(json: String): Info? = runCatching { + val o = JSONObject(json) + Info(o.getString("label"), o.getString("baseCommit"), o.getString("baseApk"), o.optLong("built")) + }.getOrNull() + + private fun read(dir: File): Info? = File(dir, "overlay.json").takeIf { it.isFile && File(dir, "overlay.apk").isFile }?.let { parse(it.readText()) } + + /** Moves `next` into use and keeps the build it replaces. Returns whether there was one to move. */ + @VisibleForTesting + internal fun promote(root: File): Boolean { + val next = File(root, "next") + if (!File(next, "overlay.apk").isFile || !File(next, "overlay.json").isFile) return false + val active = File(root, "active") + archive(root, active, Reason.REPLACED) + active.deleteRecursively() + if (!next.renameTo(active)) return false + File(root, "starts").delete() + return true + } + + @VisibleForTesting + internal fun archive(root: File, dir: File, reason: Reason) { + if (!File(dir, "overlay.apk").isFile) return + val builds = File(root, "builds").apply { mkdirs() } + var stamp = System.currentTimeMillis() + while (File(builds, stamp.toString()).exists()) stamp++ + val target = File(builds, stamp.toString()) + if (!dir.renameTo(target)) return + File(target, "reason").writeText(reason.name) + builds.listFiles().orEmpty().sortedByDescending { it.name.toLongOrNull() ?: 0L }.drop(KEEP_BUILDS).forEach { it.deleteRecursively() } + } + + @VisibleForTesting + internal fun failedStarts(root: File) = File(root, "starts").takeIf { it.isFile }?.readText()?.trim()?.toIntOrNull() ?: 0 + + private fun refuse(root: File, mainProcess: Boolean, reason: Reason) { + skipped = reason.name + Log.w(TAG, "Lab build turned off: $reason") + if (!mainProcess) return + archive(root, File(root, "active"), reason) + File(root, "starts").delete() + File(root, "last-off-reason").writeText(reason.name) + } + + private fun skip(reason: String) { + skipped = reason + Log.w(TAG, "Lab build not loaded: $reason") + } + + private fun hasAppImage(context: Context): Boolean { + val apk = File(context.applicationInfo.sourceDir) + val oat = File(apk.parentFile, "oat") + return oat.listFiles().orEmpty().any { File(it, "${apk.nameWithoutExtension}.art").isFile } + } + + @RequiresApi(30) + private fun createLoader(apk: File): ResourcesLoader = + ParcelFileDescriptor.open(apk, ParcelFileDescriptor.MODE_READ_ONLY).use { fd -> + ResourcesLoader().apply { addProvider(ResourcesProvider.loadFromApk(fd)) } + } + + /** Gives [resources] the Lab build's resources; contexts made from them inherit it. */ + fun addLoader(resources: Resources) { + if (Build.VERSION.SDK_INT < 30) return + val current = loader as? ResourcesLoader ?: return + resources.addLoaders(current) + } + + private fun prependDex(classLoader: ClassLoader, apk: File) { + val pathList = field(Class.forName("dalvik.system.BaseDexClassLoader"), "pathList").get(classLoader)!! + val elementsField = field(pathList.javaClass, "dexElements") + @Suppress("UNCHECKED_CAST") val installed = elementsField.get(pathList) as Array + val errors = ArrayList() + val made = try { + pathList.javaClass.getDeclaredMethod("makeDexElements", List::class.java, File::class.java, List::class.java, ClassLoader::class.java) + .apply { isAccessible = true }.invoke(null, listOf(apk), null, errors, classLoader) + } catch (_: NoSuchMethodException) { + pathList.javaClass.getDeclaredMethod( + "makeDexElements", List::class.java, File::class.java, List::class.java, ClassLoader::class.java, Boolean::class.javaPrimitiveType, + ).apply { isAccessible = true }.invoke(null, listOf(apk), null, errors, classLoader, false) + } + errors.firstOrNull()?.let { throw it } + @Suppress("UNCHECKED_CAST") val added = made as Array + if (added.isEmpty()) error("no dex in ${apk.name}") + val merged = java.lang.reflect.Array.newInstance(installed.javaClass.componentType!!, added.size + installed.size) + System.arraycopy(added, 0, merged, 0, added.size) + System.arraycopy(installed, 0, merged, added.size, installed.size) + elementsField.set(pathList, merged) + } + + private fun field(type: Class<*>, name: String) = type.getDeclaredField(name).apply { isAccessible = true } + + private class Callbacks(private val root: File, private val mainProcess: Boolean) : Application.ActivityLifecycleCallbacks { + private var settled = false + + override fun onActivityPreCreated(activity: Activity, savedInstanceState: Bundle?) = addLoader(activity.resources) + + override fun onActivityResumed(activity: Activity) { + if (settled || !mainProcess) return + settled = true + Handler(Looper.getMainLooper()).postDelayed({ File(root, "starts").delete() }, STABLE_AFTER_MS) + } + + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit + override fun onActivityStarted(activity: Activity) = Unit + override fun onActivityPaused(activity: Activity) = Unit + override fun onActivityStopped(activity: Activity) = Unit + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + override fun onActivityDestroyed(activity: Activity) = Unit + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt index 648d754aac..a9d0c3d1a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt @@ -38,7 +38,8 @@ object BuildWatermark { if (text.length <= TITLE_LIMIT) text else text.take(TITLE_LIMIT - 1).trimEnd() + "…" fun install(app: Application) { - val lines = lines() ?: return + val lab = com.droiddeck.launcher.lab.LabOverlay.active?.let { "LAB | ${truncate(it.label)}" } + val lines = (listOfNotNull(lab) + lines().orEmpty()).ifEmpty { return } app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { if (activity is QuestXrActivity) return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LabBuilds.kt b/app/src/main/java/com/droiddeck/launcher/ui/LabBuilds.kt new file mode 100644 index 0000000000..8bfc59306b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/LabBuilds.kt @@ -0,0 +1,162 @@ +package com.droiddeck.launcher.ui + +import android.text.format.DateUtils +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Code +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +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 +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.core.WirelessAdbFix +import com.droiddeck.launcher.lab.LabOverlay + +/** + * Lab builds on this device: the one in use, one waiting for a restart, and the kept ones. + * [onRebuild] offers to build a kept one again for this install, when something can. + */ +@Composable +internal fun LabBuilds(sessionRunning: Boolean = false, onRebuild: ((LabOverlay.Info) -> Unit)? = null) { + val context = LocalContext.current + var version by remember { mutableIntStateOf(0) } + var busy by remember { mutableStateOf(false) } + var error by remember { mutableStateOf(null) } + val current = remember(version) { LabOverlay.current(context) } + val pending = remember(version) { LabOverlay.pending(context) } + val saved = remember(version) { LabOverlay.saved(context) } + if (current == null && pending == null && saved.isEmpty()) return + val active = LabOverlay.active + val paused = active == null && current != null && LabOverlay.skipped == LabOverlay.SKIPPED_APP_IMAGE + val restartFailed = stringResource(R.string.lab_restart_failed) + val canRestart = !busy && !sessionRunning + + /** Android may have given the APK an app image again, which a Lab build cannot load over. */ + fun restart() { + busy = true + error = null + Thread({ + val result = runCatching { + if (LabOverlay.needsRecompile(context)) WirelessAdbFix.shell(context, LabOverlay.recompileCommand(context)) + } + android.os.Handler(android.os.Looper.getMainLooper()).post { + busy = false + if (result.isSuccess) LabOverlay.restart(context) + else error = restartFailed.format(result.exceptionOrNull()?.message.orEmpty()) + } + }, "lab-restart").start() + } + + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column(Modifier.fillMaxWidth().padding(top = 18.dp)) { + Text( + stringResource(R.string.lab_builds).uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, + color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 2.dp, top = 2.dp, bottom = 10.dp), + ) + Column(Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { + val rows = mutableListOf<@Composable () -> Unit>() + if (current != null) rows += { + BuildRow( + current, true, + when { + active != null -> stringResource(R.string.lab_in_use) + paused -> stringResource(R.string.lab_paused_row) + else -> stringResource(R.string.lab_not_loaded, LabOverlay.skipped.orEmpty()) + }, + warn = active == null, + ) { + if (paused) PrimaryButton(stringResource(R.string.lab_restart), compact = true, enabled = canRestart) { restart() } + SecondaryButton(stringResource(R.string.lab_turn_off), compact = true, enabled = canRestart) { LabOverlay.turnOff(context) } + } + } + if (pending != null) rows += { + BuildRow(pending, false, stringResource(R.string.lab_waiting), warn = false) { + PrimaryButton(stringResource(R.string.lab_restart), compact = true, enabled = canRestart) { restart() } + } + } + for (build in saved) rows += { + var armed by remember(build.dir) { mutableStateOf(false) } + val info = build.info + BuildRow( + info, false, + when { + armed -> stringResource(R.string.lab_delete_warning) + !build.usable -> stringResource(R.string.lab_other_install) + build.reason == LabOverlay.Reason.DID_NOT_START -> stringResource(R.string.lab_off_did_not_start) + else -> stringResource(R.string.lab_kept) + }, + warn = armed || !build.usable || build.reason == LabOverlay.Reason.DID_NOT_START, + ) { + if (!build.usable && !armed && info != null && onRebuild != null) SecondaryButton(stringResource(R.string.lab_rebuild), compact = true, enabled = !busy) { + onRebuild(info) + } + if (build.usable && !armed) SecondaryButton(stringResource(R.string.lab_use), compact = true, enabled = canRestart) { + runCatching { LabOverlay.stage(context, build) } + .onSuccess { version++; restart() } + .onFailure { error = it.message } + } + SecondaryButton(stringResource(if (armed) R.string.lab_delete_confirm else R.string.lab_delete), compact = true, enabled = !busy) { + if (armed) { + LabOverlay.delete(build) + version++ + } else armed = true + } + } + } + rows.forEachIndexed { index, row -> + row() + if (index < rows.lastIndex) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } + } + error?.let { Text(it, fontSize = 12.5.sp, color = AttentionAmber, modifier = Modifier.padding(start = 2.dp, top = 8.dp)) } + } +} + +@Composable +private fun BuildRow(info: LabOverlay.Info?, current: Boolean, status: String, warn: Boolean, actions: @Composable () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 60.dp).padding(horizontal = 14.dp, vertical = 10.dp), + ) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(34.dp).clip(Shape12) + .background(if (current) pal.signal.copy(alpha = 0.18f) else colors.surfaceVariant)) { + Icon(Icons.Outlined.Code, null, tint = if (current) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + } + Column(Modifier.weight(1f)) { + Text(info?.label ?: "?", fontSize = 14.5.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis) + val built = info?.built?.takeIf { it > 0 }?.let { DateUtils.getRelativeTimeSpanString(it * 1000, System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS).toString() } + Text(listOfNotNull(status, built).joinToString(" · "), fontSize = 12.5.sp, color = if (warn) AttentionAmber else colors.onSurfaceVariant, + maxLines = 2, overflow = TextOverflow.Ellipsis) + } + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { actions() } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index dd73939a7d..a1af06a863 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -120,11 +120,11 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie StatusPanel(s, u, ua, me) Box(Modifier.height(18.dp)) ChannelLabel() - ChannelPicker(u, ua) + ChannelPicker(u, ua, s.sessionRunning) } else { ChannelLabel() Row(horizontalArrangement = Arrangement.spacedBy(18.dp)) { - Box(Modifier.weight(1f)) { ChannelPicker(u, ua) } + Box(Modifier.weight(1f)) { ChannelPicker(u, ua, s.sessionRunning) } Box(Modifier.weight(1.15f)) { StatusPanel(s, u, ua, me) } } } @@ -262,7 +262,7 @@ private fun ChannelLabel() { } @Composable -private fun ChannelPicker(u: UpdatesState, ua: UpdatesActions) { +private fun ChannelPicker(u: UpdatesState, ua: UpdatesActions, sessionRunning: Boolean) { val colors = MaterialTheme.colorScheme val catalog = u.catalog val tests = catalog?.tests.orEmpty() @@ -285,6 +285,7 @@ private fun ChannelPicker(u: UpdatesState, ua: UpdatesActions) { tests.forEach { t -> TestRow(t, u.follow.pr == t.pr) { ua.onFollow(Follow(Channel.TEST, t.pr)) } } } } + LabBuilds(sessionRunning) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3351982981..309d3e4154 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1121,6 +1121,29 @@ Test builds Try a fix before it\'s released None right now + Lab build + Lab builds + In use + Paused after Android re-optimized DroidDeck + Not loaded: %1$s + Waiting for a restart + Kept + For another version + Rebuild + Deletes this build from the device + Restart on it + Turn off + Use + Delete + Delete now + Could not prepare the restart: %1$s. Pair wireless debugging in Setup and try again. + Lab build installed + DroidDeck restarted on %1$s + Lab build paused + Android re-optimized DroidDeck, so %1$s is not loaded. Open Updates to restart on it. + Lab build turned off + It was built for another version of DroidDeck. It is kept in Updates. + DroidDeck did not start on it twice PR #%1$d Not built for this copy of DroidDeck Updated %1$s diff --git a/app/src/test/java/com/droiddeck/launcher/lab/LabOverlayTest.kt b/app/src/test/java/com/droiddeck/launcher/lab/LabOverlayTest.kt new file mode 100644 index 0000000000..ee60999fbc --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/lab/LabOverlayTest.kt @@ -0,0 +1,154 @@ +package com.droiddeck.launcher.lab + +import android.app.Application +import com.droiddeck.launcher.BuildConfig +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE) +class LabOverlayTest { + private lateinit var app: Application + private lateinit var root: File + private val injected = mutableListOf() + private val originalInject = LabOverlay.injectDex + private val originalResources = LabOverlay.openResources + + @Before fun prepare() { + app = RuntimeEnvironment.getApplication() + app.applicationInfo.sourceDir = "/data/app/~~test==/com.droiddeck.launcher-test==/base.apk" + root = LabOverlay.root(app).apply { deleteRecursively(); mkdirs() } + LabOverlay.injectDex = { _, apk -> injected += apk } + LabOverlay.openResources = { null } + } + + @After fun restore() { + LabOverlay.injectDex = originalInject + LabOverlay.openResources = originalResources + root.deleteRecursively() + } + + private fun stage(dir: String, commit: String = BuildConfig.SOURCE_COMMIT, apk: String = app.applicationInfo.sourceDir) = + File(root, dir).apply { + mkdirs() + File(this, "overlay.apk").writeText("dex") + File(this, "overlay.json").writeText("""{"label":"feat/x @ abc1234","baseCommit":"$commit","baseApk":"$apk"}""") + } + + @Test fun aBuildForThisInstallIsLoaded() { + stage("active") + LabOverlay.load(app, mainProcess = true) + assertEquals("feat/x @ abc1234", LabOverlay.active?.label) + assertEquals(listOf(File(root, "active/overlay.apk")), injected) + assertEquals(1, LabOverlay.failedStarts(root)) + } + + @Test fun aStagedBuildIsPromotedAtStart() { + stage("next") + File(root, "starts").writeText("2") + LabOverlay.load(app, mainProcess = true) + assertFalse(File(root, "next").exists()) + assertNotNull(LabOverlay.active) + assertEquals(1, LabOverlay.failedStarts(root)) + } + + @Test fun aBuildForAnotherInstallIsTurnedOff() { + stage("active", commit = "0000000") + LabOverlay.load(app, mainProcess = true) + assertNull(LabOverlay.active) + assertTrue(injected.isEmpty()) + assertFalse(File(root, "active").exists()) + assertEquals("OTHER_INSTALL", File(root, "last-off-reason").readText()) + } + + @Test fun aBuildForAnEarlierInstallOfTheSameCommitIsTurnedOff() { + stage("active", apk = "/data/app/old/base.apk") + LabOverlay.load(app, mainProcess = true) + assertNull(LabOverlay.active) + assertEquals("OTHER_INSTALL", File(root, "last-off-reason").readText()) + } + + @Test fun aBuildThatKeepsFailingToStartIsTurnedOff() { + stage("active") + File(root, "starts").writeText("2") + LabOverlay.load(app, mainProcess = true) + assertNull(LabOverlay.active) + assertEquals("DID_NOT_START", File(root, "last-off-reason").readText()) + } + + @Test fun otherProcessesLoadWithoutCountingStarts() { + stage("active") + LabOverlay.load(app, mainProcess = false) + assertNotNull(LabOverlay.active) + assertEquals(0, LabOverlay.failedStarts(root)) + } + + @Test fun noBuildMeansNothingIsLoaded() { + LabOverlay.load(app, mainProcess = true) + assertNull(LabOverlay.active) + assertTrue(injected.isEmpty()) + assertFalse(LabOverlay.promoted) + } + + @Test fun aNewBuildKeepsTheOneItReplaces() { + stage("active") + stage("next") + LabOverlay.load(app, mainProcess = true) + assertTrue(LabOverlay.promoted) + val saved = LabOverlay.saved(app).single() + assertEquals(LabOverlay.Reason.REPLACED, saved.reason) + assertTrue(saved.usable) + } + + @Test fun aRefusedBuildIsKeptButNotUsable() { + stage("active", commit = "0000000") + LabOverlay.load(app, mainProcess = true) + val saved = LabOverlay.saved(app).single() + assertEquals(LabOverlay.Reason.OTHER_INSTALL, saved.reason) + assertFalse(saved.usable) + } + + @Test fun aKeptBuildCanBeStagedAgain() { + stage("active", commit = "0000000") + LabOverlay.load(app, mainProcess = true) + stage("active") + LabOverlay.archive(root, File(root, "active"), LabOverlay.Reason.TURNED_OFF) + val usable = LabOverlay.saved(app).first { it.usable } + LabOverlay.stage(app, usable) + assertNotNull(LabOverlay.pending(app)) + assertEquals(1, LabOverlay.saved(app).size) + LabOverlay.load(app, mainProcess = true) + assertTrue(LabOverlay.promoted) + assertNotNull(LabOverlay.active) + } + + @Test fun stagingAKeptBuildKeepsTheOneThatWasWaiting() { + stage("builds/1") + stage("next") + File(root, "next/overlay.json").writeText("""{"label":"feat/y @ def5678","baseCommit":"${BuildConfig.SOURCE_COMMIT}","baseApk":"${app.applicationInfo.sourceDir}"}""") + LabOverlay.stage(app, LabOverlay.saved(app).single()) + assertEquals("feat/x @ abc1234", LabOverlay.pending(app)?.label) + val kept = LabOverlay.saved(app).single() + assertEquals("feat/y @ def5678", kept.info?.label) + assertEquals(LabOverlay.Reason.REPLACED, kept.reason) + } + + @Test fun onlyTheNewestBuildsAreKept() { + repeat(15) { + stage("active") + LabOverlay.archive(root, File(root, "active"), LabOverlay.Reason.TURNED_OFF) + } + assertEquals(12, LabOverlay.saved(app).size) + } +} diff --git a/docs/lab-builds.md b/docs/lab-builds.md new file mode 100644 index 0000000000..4f2ddfb5f0 --- /dev/null +++ b/docs/lab-builds.md @@ -0,0 +1,63 @@ +# Lab builds + +A Lab build is DroidDeck app code and resources built on the device itself, by the on-device agent +or by hand, and loaded over the installed APK at the next start. Nothing is reinstalled or +re-signed, so a tester on a release build keeps their games, sign-ins and settings while trying a +change. + +## How it works + +- `tools/agent/dd-lab-build` builds the checkout with Gradle on the device (`processReleaseResources` + and `mergeDexRelease`), packs the linked resources and dex files into `overlay.apk`, writes + `overlay.json`, and stages both in the app's `files/lab/next`. It then recompiles the app without + an app image and restarts DroidDeck. +- Run by the app's own agent (`DD_AGENT` set), it writes `files/agent/lab-request` instead, and the + app runs the build in a process of its own, logging to `~/.cache/dd-lab-build.log`; the agent's + copy follows that log and exits with the build. A turn's processes end with the turn, so a build + started there would otherwise die when the agent stops or finishes early. +- At start, `LabOverlay` (called from `App.attachBaseContext`) promotes `next` to `active`, checks + that the build was made for this install, puts its dex files ahead of the APK's, and adds its + resources through `ResourcesLoader` to the app and every activity. Contexts made from them + (presentations on the second screen) inherit the loader. +- The watermark shows `LAB | @ `. When the app comes back on a new build it posts + a "Lab build installed" notification, so the restart does not look like a crash. +- A build that is replaced, turned off or refused is kept in `files/lab/builds` (the newest 12). + Updates lists them under Lab builds: the one in use can be turned off, one built for this + install can be used again, and any can be deleted. + +## What a Lab build cannot change + +The manifest, native code (`cpp`, `jniLibs`, Rust), Gradle files, `App`, `AppLanguage`, and `LabOverlay` itself: +they are loaded before a Lab build can be, or are not part of it. `dd-lab-build` refuses those +changes; they need a new APK. + +## Safety + +- A build is only used on the install it was built for: `overlay.json` carries the APK's commit + (`apkCommit` in `droiddeckctl state`) and the APK's path, which changes with every install and + update. A build for another install is turned off. +- Two starts in a row that do not reach a resumed activity for 10 seconds turn the build off. +- It needs Android 11 or later (`ResourcesLoader`) and no app image (classes in one load before the + Lab build). `dd-lab-build` runs `cmd package compile -m verify` before restarting. Android's + background optimization can bring an app image back; the build is then paused, a notification + says so, and Restart in Updates recompiles through the app's wireless debugging pairing. + +## Setting up a device + +From the DroidDeck terminal, in a checkout of this repository: + +```sh +tools/agent/setup +``` + +It installs Claude Code, git, gh and loopback adb, plus the build toolchain: JDK 17, the Android +SDK platform, and Google's x86-64 `aapt2` run under `qemu-user`. The first Lab build compiles the +whole app and takes about 8 minutes on a Snapdragon 865; later ones compile only what changed. +That needs the Kotlin daemon: Kotlin's in-process compiles always redo the whole app. BuildConfig +is given the installed commit, so committing a change does not change it. Setup +does that first build ahead of time with `dd-lab-build --prepare`, which compiles the installed +commit without making a Lab build. +`~/.cache/dd-lab-build.json` reports the stage, the current task, progress in thousandths and the +seconds left, estimated from how long each task took the last time (`~/.cache/dd-lab-build-times`). +`~/.cache/dd-lab-build-base` holds the installed commit the last successful build compiled, so the +Agent tab can offer to prepare again after DroidDeck updates. diff --git a/tools/agent/android-open b/tools/agent/android-open new file mode 100755 index 0000000000..9d8c550486 --- /dev/null +++ b/tools/agent/android-open @@ -0,0 +1,9 @@ +#!/bin/sh +# Opens a URL in Android's browser on the bottom screen. +url=$1 +[ -n "$url" ] || exit 1 +serial=${ADB_SERIAL:-127.0.0.1:5555} +adb connect "$serial" >/dev/null 2>&1 +quoted=$(printf "%s" "$url" | sed "s/'/'\\\\''/g") +adb -s "$serial" shell "am start --display 2 -a android.intent.action.VIEW -d '$quoted'" >/dev/null 2>&1 || + echo "Open this on any device: $url" >&2 diff --git a/tools/agent/dd-agent b/tools/agent/dd-agent new file mode 100755 index 0000000000..9a1b4d4132 --- /dev/null +++ b/tools/agent/dd-agent @@ -0,0 +1,5 @@ +#!/bin/sh +# Claude Code in the DroidDeck checkout, with sign-in links opened in Android's browser. +export ADB_SERIAL=${ADB_SERIAL:-127.0.0.1:5555} PATH="$HOME/.local/bin:$PATH" BROWSER="$HOME/.local/bin/android-open" +adb connect "$ADB_SERIAL" >/dev/null 2>&1 +cd "$HOME/DroidDeck" && exec claude "$@" diff --git a/tools/agent/dd-gh-login b/tools/agent/dd-gh-login new file mode 100755 index 0000000000..adf816a247 --- /dev/null +++ b/tools/agent/dd-gh-login @@ -0,0 +1,24 @@ +#!/bin/bash +# GitHub sign-in through Android's browser on the bottom screen, with the one-time code typed in. +serial=${ADB_SERIAL:-127.0.0.1:5555} +adb connect "$serial" >/dev/null 2>&1 +coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } +gh_pid=$GH_PID +typed= +while IFS= read -r line <&"${GH[0]}"; do + printf '%s\n' "$line" + code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) + if [ -n "$code" ] && [ -z "$typed" ]; then + typed=1 + echo >&"${GH[1]}" + adb -s "$serial" shell "am start --display 2 -a android.intent.action.VIEW -d https://github.com/login/device" >/dev/null 2>&1 + # Chrome drops characters from `input text` and from fast key events on this page. + keys= + for ((i = 0; i < ${#code}; i++)); do + c=${code:i:1} + [ "$c" = - ] || keys+="input -d 2 keyevent KEYCODE_$c; sleep 0.4; " + done + (sleep 7; adb -s "$serial" shell "$keys" >/dev/null 2>&1) & + fi +done +wait "$gh_pid" diff --git a/tools/agent/dd-lab-build b/tools/agent/dd-lab-build new file mode 100755 index 0000000000..44b62bd6b8 --- /dev/null +++ b/tools/agent/dd-lab-build @@ -0,0 +1,226 @@ +#!/bin/bash +# Builds this checkout as a Lab build of the installed DroidDeck and restarts the app on it. +# Usage: dd-lab-build [--no-restart | --prepare] [--explain] +# --prepare compiles the installed commit without making a Lab build, so later builds only +# compile what changed. Setup runs it once; it takes the longest. +# --explain logs why each task ran and Kotlin's build report, to find out what makes a build slow. +set -euo pipefail +pkg=com.droiddeck.launcher +serial=${ADB_SERIAL:-127.0.0.1:5555} +mode=build +explain=() +for arg in "$@"; do + case $arg in + --no-restart) mode=no-restart ;; + --prepare) mode=prepare ;; + --explain) explain=(--info -Pkotlin.build.report.output=file) ;; + esac +done +started=$(date +%s) +cache=$HOME/.cache +progress_file=$cache/dd-lab-build.json +times_file=$cache/dd-lab-build-times +mkdir -p "$cache" +# The Agent tab reads this file to show how far the build has got and how long is left. +progress() { # stage [permille task done total eta] + local task=${3:-}; task=${task//\\/}; task=${task//\"/\'}; task=${task//$'\n'/ } + printf '{"stage":"%s","mode":"%s","permille":%d,"task":"%s","done":%d,"total":%d,"eta":%d,"elapsed":%d,"pid":%d}\n' \ + "$1" "$mode" "${2:-0}" "$task" "${4:-0}" "${5:-0}" "${6:--1}" $(( $(date +%s) - started )) $$ > "$progress_file.part.$BASHPID" + mv "$progress_file.part.$BASHPID" "$progress_file" +} +fail() { progress failed 0 "$*"; echo "dd-lab-build: $*" >&2; exit 1; } +trap 'progress failed 0 stopped; exit 143' INT TERM +trap 'progress failed 0 "a command failed on line $LINENO"' ERR +device() { adb -s "$serial" shell "$@" | tr -d '\r'; } + +# The app's agent loses every process it started when its turn ends, a build included, so it asks +# the app to run the build in a process of its own and follows that build here. +agent=/data/user/0/$pkg/files/agent +if [ -n "${DD_AGENT:-}" ] && [ -z "${DD_LAB_DETACHED:-}" ] && [ -d "$agent" ]; then + trap - ERR + log=$cache/dd-lab-build.log + rm -f "$progress_file" + python3 -c 'import json,os,sys; print(json.dumps({"cwd": os.getcwd(), "args": sys.argv[1:]}))' "$@" > "$agent/lab-request.part" + mv "$agent/lab-request.part" "$agent/lab-request" + echo "DroidDeck runs this build itself, so it keeps going if this turn ends. Its log follows." + for _ in $(seq 1 30); do [ -f "$progress_file" ] && break; sleep 1; done + [ -f "$progress_file" ] || { echo "dd-lab-build: DroidDeck did not start the build; is it running?" >&2; exit 1; } + tail -n +1 -F "$log" 2>/dev/null & follow=$! + result=1 + while sleep 2; do + stage=$(sed -n 's/.*"stage":"\([a-z]*\)".*/\1/p' "$progress_file") + pid=$(sed -n 's/.*"pid":\([0-9]*\).*/\1/p' "$progress_file") + case $stage in + ready|prepared) result=0; break ;; + failed) break ;; + esac + [ -n "$pid" ] && [ -d "/proc/$pid" ] || break + done + sleep 1; kill $follow 2>/dev/null || true + exit $result +fi + +progress checking +repo=$(git rev-parse --show-toplevel) || fail "run it inside the DroidDeck checkout" +cd "$repo" +adb connect "$serial" >/dev/null 2>&1 || true + +state=$(python3 tools/droiddeckctl state 2>/dev/null | sed -n '/^{/,$p') || fail "could not read DroidDeck's state; is it running and is adb connected?" +# A Lab build reports its own label, so the APK's commit comes from apkCommit when the app has it. +label=$(python3 -c 'import json,sys; s=json.load(sys.stdin); print(s.get("apkCommit") or s["build"].rsplit(" at ", 1)[-1])' <<<"$state") || + fail "DroidDeck's state did not say which build is installed" +installed_label=$(python3 -c 'import json,re,sys; print(re.sub(r"^(?:\w+ \w+ · |lab on )+", "", json.load(sys.stdin)["build"]))' <<<"$state") +if ! base=$(git rev-parse --verify --quiet "$label^{commit}"); then + progress fetching 0 "the installed commit" + git fetch --quiet --tags origin >/dev/null 2>&1 || true + git fetch --quiet origin main >/dev/null 2>&1 || true + base=$(git rev-parse --verify --quiet "$label^{commit}") || fail "the installed build ($label) is not in this checkout or on GitHub's main; fetch it first" +fi + +if [ $mode = prepare ]; then + # Compiling the installed commit itself gives later builds of branches on it incremental caches. + if ! git merge-base --is-ancestor "$base" HEAD; then + git diff --quiet && git diff --cached --quiet || fail "HEAD does not build on the installed commit and has uncommitted changes" + was=$(git branch --show-current) + git checkout --quiet --detach "$base" + echo "Checked out the installed commit ${base:0:9} to prepare it${was:+; $was is unchanged}" + fi +else + git diff --quiet && git diff --cached --quiet || fail "commit your changes first" + git merge-base --is-ancestor "$base" HEAD || fail "HEAD does not build on the installed commit ${base:0:9}; branch from it" + blocked=$(git diff --name-only "$base" HEAD | grep -E 'AndroidManifest\.xml$|/cpp/|/jniLibs/|\.rs$|(^|/)build\.gradle$|/App\.kt$|/AppLanguage\.kt$|/lab/LabOverlay\.kt$' || true) + [ -z "$blocked" ] || fail "these need a new APK, not a Lab build: $(echo $blocked)" +fi +apk=$(device pm path $pkg | sed -n 's/^package://p' | grep 'base\.apk$' | head -1) +[ -n "$apk" ] || fail "DroidDeck is not installed" + +export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-arm64 ANDROID_HOME=$HOME/android-sdk +# BuildConfig describes the installed base, not each Lab commit; its commit changing would make the +# Kotlin compile redo the whole app (the overlay's own label names the Lab build). Updates reads the +# installed variant (non-adreno) from the build label. +export DROIDDECK_SOURCE_COMMIT=$base DROIDDECK_BUILD_LABEL="lab on $installed_label" DROIDDECK_BUILD_TREE_STATE=clean GITHUB_HEAD_REF=lab +printf 'sdk.dir=%s\n' "$ANDROID_HOME" > local.properties +if [ ! -d "$ANDROID_HOME/platforms/android-34" ]; then + progress sdk + yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null + "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null +fi + +# A full Kotlin compile of the app needs about 2.5 GB of heap and Gradle about 1 GB; smaller devices get +# what they can spare. Both daemons end with this script's process when the build is done. +total_mb=$(awk '/^MemTotal:/ {print int($2 / 1024)}' /proc/meminfo) +heap=$(( total_mb / 2 )); [ $heap -gt 4096 ] && heap=4096; [ $heap -lt 2048 ] && heap=2048 +heap=${DD_LAB_HEAP_MB:-$heap} +kotlin_heap=$(( heap * 2 / 3 )); gradle_heap=$(( heap - kotlin_heap )) + +# Only the Kotlin daemon compiles incrementally; in-process compiles always redo the whole app, and the +# caches they leave behind make the daemon's first incremental compile fail. +if [ "$(cat "$cache/dd-lab-build-strategy" 2>/dev/null)" != daemon ]; then + rm -rf app/build/kotlin/compileReleaseKotlin + echo daemon > "$cache/dd-lab-build-strategy" +fi + +# Google publishes aapt2 for x86-64 Linux only; setup wraps it in qemu-user at ~/aapt2/aapt2. +gradle=(./gradlew :app:processReleaseResources :app:mergeDexRelease --max-workers=2 -PskipRust=true -x buildVkBridgeServer + -Pandroid.aapt2FromMavenOverride=$HOME/aapt2/aapt2 -Pkotlin.compiler.execution.strategy=daemon + -Pkotlin.daemon.jvmargs=-Xmx${kotlin_heap}m -Dorg.gradle.jvmargs=-Xmx${gradle_heap}m --console=plain) +progress planning +mapfile -t plan < <("${gradle[@]}" --dry-run -q 2>/dev/null | awk '/^:/ {print $1}' || true) +total=${#plan[@]} + +# Each task's estimate is how long it took last time; a full compile of the app takes about 15 minutes. +declare -A estimate +[ -f "$times_file" ] && while read -r t s; do estimate[$t]=$s; done < "$times_file" +estimate_of() { local e=${estimate[$1]:-}; [ -n "$e" ] && echo "$e" || { [[ $1 == *compileReleaseKotlin ]] && echo 900 || echo 2; }; } +planned=0 +for t in "${plan[@]}"; do planned=$(( planned + $(estimate_of "$t") )); done +[ $planned -gt 0 ] || planned=1 + +current=$(mktemp) +measured=$(mktemp) +# " " +echo "0 starting $(date +%s) 0 0" > "$current" +report() { + local n task since done_s cur_est now part permille left + read -r n task since done_s cur_est < "$current" + now=$(date +%s) + part=$(( now - since )); [ $part -gt $(( cur_est * 95 / 100 )) ] && part=$(( cur_est * 95 / 100 )) + permille=$(( (done_s + part) * 1000 / planned )); [ $permille -gt 990 ] && permille=990 + left=$(( planned - done_s - part )); [ $left -lt 0 ] && left=0 + progress building "$permille" "$task" "$n" "$total" "$left" + echo "$n $task $(( (now - started) / 60 )) $left" +} +( + beat=0 + while sleep 5; do + set -- $(report) + beat=$(( beat + 1 )) + [ $(( beat % 12 )) = 0 ] && echo "[build $1/$total] still on $2, $3m in, about $(( $4 / 60 + 1 ))m left" + done +) & +heartbeat=$! +trap 'kill $heartbeat 2>/dev/null || true; rm -f "$current" "$measured"' EXIT +set +o pipefail +"${gradle[@]}" ${explain[@]+"${explain[@]}"} 2>&1 | { + n=0 done_s=0 task="" since=0 cur_est=0 ran=0 + while IFS= read -r line; do + printf '%s\n' "$line" + case $line in + "> Task "*) + now=$(date +%s) + # A task's line comes when it starts, or when it ends for one that did no work. + if [ -n "$task" ]; then + done_s=$(( done_s + cur_est )) + [ $ran = 1 ] && echo "$task $(( now - since ))" >> "$measured" + fi + rest=${line#> Task }; task=${rest%% *} + case $rest in *" "*) ran=0 ;; *) ran=1 ;; esac + n=$((n + 1)); since=$now; cur_est=$(estimate_of "$task") + echo "$n $task $since $done_s $cur_est" > "$current" + [ $ran = 1 ] && report >/dev/null && echo "[build $n/$total] $task" ;; + esac + done + if [ -n "$task" ] && [ $ran = 1 ]; then echo "$task $(( $(date +%s) - since ))" >> "$measured"; fi +} +status=${PIPESTATUS[0]} +set -o pipefail +kill $heartbeat 2>/dev/null || true +[ "$status" = 0 ] || fail "Gradle failed (exit $status); the reason is above" +# Tasks that did no work this time keep their earlier time. +{ [ -f "$times_file" ] && cat "$times_file"; cat "$measured"; } | awk '{t[$1] = $2} END {for (k in t) print k, t[k]}' > "$times_file.part" +mv "$times_file.part" "$times_file" +# The app reads which installed commit the build caches are warm for. +echo "$base" > "$cache/dd-lab-build-base" + +if [ $mode = prepare ]; then + progress prepared 1000 + echo "Prepared: Lab builds of branches on ${base:0:9} now compile only what changed ($(( ($(date +%s) - started) / 60 ))m)" + exit 0 +fi + +progress packaging 995 +linked=$(ls app/build/intermediates/linked_resources_binary_format/release/processReleaseResources/*.ap_ | head -1) +work=$(mktemp -d) +cp "$linked" "$work/overlay.apk" +(cd app/build/intermediates/dex/release/mergeDexRelease && zip -q "$work/overlay.apk" classes*.dex) +name="$(git branch --show-current) @ $(git rev-parse --short HEAD)" +python3 -c 'import json,sys,time; print(json.dumps({"label": sys.argv[1], "baseCommit": sys.argv[2], "baseApk": sys.argv[3], "built": int(time.time())}))' \ + "$name" "$label" "$apk" > "$work/overlay.json" + +lab=/data/user/0/$pkg/files/lab +mkdir -p "$lab" +rm -rf "$lab/next.part" "$lab/next" +mv "$work" "$lab/next.part" +mv "$lab/next.part" "$lab/next" +progress ready 1000 "$name" +echo "Lab build ready: $name ($(du -h "$lab/next/overlay.apk" | cut -f1)) in $(( ($(date +%s) - started) / 60 ))m" +[ $mode = build ] || exit 0 + +# Classes in an app image load before the Lab build can, so the app is recompiled without one. +device cmd package compile -m verify -f $pkg >/dev/null +progress restarting 1000 "$name" +echo "Restarting DroidDeck on the Lab build; it shows a notification when it is back" +# The app's own agent ends with the app, so it is told to carry on once the app is back. +if [ -n "${DD_AGENT:-}" ]; then mkdir -p "/data/user/0/$pkg/files/agent" && : > "/data/user/0/$pkg/files/agent/resume"; fi +device "nohup sh -c 'sleep 3; monkey -p $pkg -c android.intent.category.LAUNCHER 1' >/dev/null 2>&1 &" +for pid in $(device pidof $pkg); do kill "$pid" 2>/dev/null || true; done diff --git a/tools/agent/setup b/tools/agent/setup new file mode 100755 index 0000000000..49dd82592a --- /dev/null +++ b/tools/agent/setup @@ -0,0 +1,76 @@ +#!/bin/bash +# Sets up the on-device agent inside DroidDeck's Linux userland: Claude Code, git and gh, loopback +# adb for droiddeckctl, and the toolchain dd-lab-build uses to build Lab builds on the device. +# Run it from the DroidDeck terminal, inside a checkout of the DroidDeck repository. +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +export DEBIAN_FRONTEND=noninteractive +tmp=$(mktemp -d) +trap 'rm -rf "$tmp"' EXIT + +apt-get install -y --no-install-recommends git gh adb python3 zip unzip curl openjdk-17-jdk-headless qemu-user zipalign apksigner + +command -v claude >/dev/null || [ -x "$HOME/.local/bin/claude" ] || + { curl -fsSL -o "$tmp/install-claude.sh" https://claude.ai/install.sh && bash "$tmp/install-claude.sh"; } + +mkdir -p "$HOME/.local/bin" +for tool in dd-agent dd-lab-build dd-gh-login android-open; do install -m755 "$here/$tool" "$HOME/.local/bin/$tool"; done +grep -q 'droiddeck-agent-path' "$HOME/.bashrc" 2>/dev/null || + printf '\n# droiddeck-agent-path\nexport PATH="$HOME/.local/bin:$PATH" ADB_SERIAL=127.0.0.1:5555 BROWSER="$HOME/.local/bin/android-open"\n' >> "$HOME/.bashrc" + +# Google publishes aapt2 for x86-64 Linux only; it runs here under qemu-user with Ubuntu's x86-64 runtime. +x86=$HOME/x86root +mkdir -p "$HOME/aapt2/x86" "$x86/etc" +if [ ! -x "$HOME/aapt2/x86/aapt2" ]; then + agp=$(sed -n "s/.*com.android.tools.build:gradle:\([0-9.]*\).*/\1/p" "$here/../../build.gradle" | head -1) + [ -n "$agp" ] || { echo "setup: no Android Gradle plugin version in build.gradle" >&2; exit 1; } + aapt2=$(curl -fsSL "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/maven-metadata.xml" | + { grep -o "$agp-[0-9]*" || true; } | tail -1 | sed 's/<[^>]*>//g') + [ -n "$aapt2" ] || { echo "setup: Google publishes no aapt2 for AGP $agp" >&2; exit 1; } + curl -fsSL -o "$tmp/aapt2.jar" "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/$aapt2/aapt2-$aapt2-linux.jar" + unzip -o -q "$tmp/aapt2.jar" aapt2 -d "$HOME/aapt2/x86" + chmod +x "$HOME/aapt2/x86/aapt2" +fi +if [ ! -e "$x86/lib64/ld-linux-x86-64.so.2" ]; then + codename=$(. /etc/os-release && echo "$VERSION_CODENAME") + curl -fsSL "https://archive.ubuntu.com/ubuntu/dists/$codename/main/binary-amd64/Packages.gz" | gunzip > "$tmp/amd64-packages" + for package in libc6 libgcc-s1 libstdc++6 zlib1g; do + read -r file sum < <(awk -v p="$package" '$0 == "Package: " p {found = 1} found && /^Filename:/ {f = $2} + found && /^SHA256:/ {s = $2} found && /^$/ {exit} END {print f, s}' "$tmp/amd64-packages") + [ -n "$sum" ] || { echo "setup: $package is not in Ubuntu $codename's amd64 index" >&2; exit 1; } + curl -fsSL -o "$tmp/$package.deb" "https://archive.ubuntu.com/ubuntu/$file" + echo "$sum $tmp/$package.deb" | sha256sum -c --quiet - + dpkg-deb -x "$tmp/$package.deb" "$x86" + done + ln -sfn usr/lib64 "$x86/lib64" + ln -sfn usr/lib "$x86/lib" + : > "$x86/etc/ld.so.preload" +fi +# AGP only accepts a custom aapt2 whose file is named aapt2. +printf '#!/bin/sh\nexec qemu-x86_64 -L %s %s/aapt2/x86/aapt2 "$@"\n' "$x86" "$HOME" > "$HOME/aapt2/aapt2" +chmod +x "$HOME/aapt2/aapt2" +"$HOME/aapt2/aapt2" version + +sdk=$HOME/android-sdk +if [ ! -x "$sdk/cmdline-tools/latest/bin/sdkmanager" ]; then + mkdir -p "$sdk/cmdline-tools" + curl -fsSL -o "$tmp/cmdline-tools.zip" https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip + unzip -q -o "$tmp/cmdline-tools.zip" -d "$sdk/cmdline-tools" + rm -rf "$sdk/cmdline-tools/latest" + mv "$sdk/cmdline-tools/cmdline-tools" "$sdk/cmdline-tools/latest" +fi +export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-arm64 +yes | "$sdk/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null +"$sdk/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null + +adb connect 127.0.0.1:5555 || true +# The first build compiles the whole app; doing it now makes the agent's Lab builds incremental. +if [ "${DD_SKIP_PREPARE:-}" != 1 ]; then + echo "Approve the USB debugging prompt if one appears." + if timeout 120 adb -s 127.0.0.1:5555 wait-for-device; then + "$here/dd-lab-build" --prepare || echo "The first Lab build will compile the whole app" + else + echo "adb did not connect, so the first Lab build will compile the whole app" + fi +fi +echo "Done. Run dd-agent." From db933e4232f4bb0761969c34045f06f6d9ea0bbc Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 14:10:02 -0500 Subject: [PATCH 015/101] feat(agent): an Agent tab, a session drawer page, and a bubble over the game (#2376) * feat(agent): an Agent tab in the launcher that talks to Claude Code outside any session * feat(agent): the agent in the session drawer and as a bubble over the game * fix(agent): connect loopback adb, show unread replies, and fit the drawer page to the screen * feat(agent): first-run setup in the Agent tab, a harness choice with Codex, and no permission prompts * fix(agent): install helpers off the main thread and offer sign-in only after the install * fix(agent): connect adb only for commands that use it and run setup checks one at a time * fix(agent): show why a setup check failed * fix(agent): each harness has its own setup state and conversation * fix(agent): start the adb server before connecting and retry the connection check * fix(agent): switching harness clears the previous harness's setup results * feat(agent): a header, a composer with send and stop, and Markdown replies in the agent chat * fix(agent): leave room under the chat composer * feat(agent): continue the conversation after a Lab build restarts the app * feat(agent): show and remove what the agent stores in the Linux userland * fix(agent): the build tools take about 5 GB * feat(agent): DroidDeck opens on the Agent tab after restarting on a Lab build * feat(agent): conversation history, model and plan mode, live replies, full tool input and output, processes, attachments, queued messages and a Stop that ends the turn * fix(agent): check the Lab build less often while nothing is happening * fix(agent): an old Lab build's progress is not shown as a failure, and a restart counts as success * feat(agent): rebuild a kept Lab build from Updates, and tidy the chat's tool rows, costs, processes and times * feat(agent): a setup step that prepares fast Lab builds for the installed version, kept alive while it runs * fix(agent): the notification names a prepare and shows its percent without repeating the title * fix(agent): run the agent's Lab builds in the app's own process and continue the conversation that asked after the restart * fix(agent): setup's prepare runs the build itself instead of handing it to the app * feat(agent): a turn that ends without a reply says so and offers Retry, the resume is retried once, and each turn's raw output is kept * fix(agent): keep the previous turn's raw output too * fix(agent): a resumed Claude Code turn no longer ends at the result for a background task the last run left behind * fix(agent): install Codex's code-mode host with it, without which Codex runs no commands * feat(agent): setup and storage collapse into a summary card like Setup's, and Codex tool rows show the command without its shell wrapper * feat(agent): drop the agent bubble over sessions for now; the drawer keeps the agent * fix(agent): the Agent tab shows once the Linux runtime is downloaded, even while its proot pack is still being fetched * fix(agent): before the install brings adb, the connection step checks the app's own pairing instead of failing with adb not found * fix(agent): proot's binding warnings are not shown as a setup step's reason * fix(agent): the session drawer's Agent page fills the height under the drawer's header instead of a guess from the screen height * fix(agent): write the browser and GitHub helpers before every setup step, not only the install * fix(agent): find Wireless debugging's current port when the saved one no longer answers, so sign-ins open the browser after it restarts * fix(agent): only take a Wireless debugging port that answers, since mDNS can still advertise an old one * fix(agent): find a loopback Wireless debugging port by scanning when mDNS advertises none * fix(agent): keep a Codex turn going through reconnect notices and read gh login's status reliably * fix(agent): time out hung setup checks and keep their results and actions with their harness * fix(agent): keep the draft across settings and show the Agent tab once the runtime installs * fix(agent): keep the backslash when quoting apostrophes in a URL the browser helper opens * fix(agent): refresh apt's package lists before installing, since a fresh Linux runtime ships without them * fix(agent): sign-in links open through the app itself, so they work without Wireless debugging * fix(agent): the connection step passes only when adb really reaches the device, not on adb's own error * fix(agent): say Wireless debugging isn't reachable instead of adb's error * fix(agent): keep prompts, tool ids, attachments and retries with their own turn and chat * fix(agent): the service stops only once foreground, and Rebuild waits for a ready agent * fix(agent): the Codex install says what it is downloading, so a long download doesn't look stuck * fix(agent): pass the prompt to both CLIs the way they were tested on devices * fix(agent): the browser helper uses the running app's files directory, falls back to adb when the app cannot open a link, and the link is not logged --- .gitattributes | 1 + app/src/main/AndroidManifest.xml | 1 + app/src/main/assets/agent/android-open | 27 + app/src/main/assets/agent/dd-gh-login | 27 + .../main/java/com/droiddeck/launcher/App.kt | 2 + .../droiddeck/launcher/FrontEndActivity.kt | 3 + .../com/droiddeck/launcher/agent/AgentAdb.kt | 44 ++ .../launcher/agent/AgentAttachments.kt | 67 +++ .../droiddeck/launcher/agent/AgentChats.kt | 138 +++++ .../droiddeck/launcher/agent/AgentHarness.kt | 282 +++++++++ .../com/droiddeck/launcher/agent/AgentHost.kt | 534 ++++++++++++++++++ .../launcher/agent/AgentHostService.kt | 118 ++++ .../launcher/agent/AgentProcesses.kt | 105 ++++ .../droiddeck/launcher/agent/AgentSetup.kt | 175 ++++++ .../droiddeck/launcher/agent/AgentStorage.kt | 95 ++++ .../droiddeck/launcher/agent/LabProgress.kt | 53 ++ .../droiddeck/launcher/core/WirelessAdbFix.kt | 52 +- .../com/droiddeck/launcher/ui/AgentEntries.kt | 307 ++++++++++ .../com/droiddeck/launcher/ui/AgentPage.kt | 393 +++++++++++++ .../com/droiddeck/launcher/ui/AgentPanels.kt | 182 ++++++ .../droiddeck/launcher/ui/AgentSetupView.kt | 215 +++++++ .../droiddeck/launcher/ui/FrontEndContent.kt | 4 + .../com/droiddeck/launcher/ui/FrontEndRail.kt | 8 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 12 +- .../launcher/ui/SessionDrawerPage.kt | 8 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 11 +- .../com/droiddeck/launcher/ui/UpdatesPage.kt | 10 +- app/src/main/res/values/strings.xml | 95 ++++ .../droiddeck/launcher/agent/AgentHostTest.kt | 190 +++++++ .../launcher/agent/AgentStorageTest.kt | 29 + .../launcher/ui/AgentMarkdownTest.kt | 27 + .../launcher/ui/SessionDrawerPageTest.kt | 7 + tools/agent/setup | 1 + 33 files changed, 3210 insertions(+), 13 deletions(-) create mode 100644 app/src/main/assets/agent/android-open create mode 100644 app/src/main/assets/agent/dd-gh-login create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentAdb.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentAttachments.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentProcesses.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentStorage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/LabProgress.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentStorageTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt diff --git a/.gitattributes b/.gitattributes index 019aa1e8f9..43e03c53ca 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,3 +12,4 @@ app/src/main/assets/desktop-removal/*.txt text eol=lf *.pdf binary app/src/main/resources/ea/graphql/*.gql -text +app/src/main/assets/agent/* text eol=lf diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 514b4d9146..0f3addcb7b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -303,6 +303,7 @@ android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" android:theme="@style/SessionTheme" /> + /dev/null +if [ -d "$inbox" ] && printf '%s\n' "$url" > "$inbox/open-url.part" && mv -f "$inbox/open-url.part" "$inbox/open-url"; then + i=0 + while [ $i -lt 30 ] && [ -e "$inbox/open-url" ]; do + sleep 0.2 + i=$((i + 1)) + done + if [ -e "$inbox/open-url" ]; then + rm -f "$inbox/open-url" + elif [ -e "$inbox/open-url.failed" ]; then + rm -f "$inbox/open-url.failed" + else + sleep 0.3 + [ -e "$inbox/open-url.failed" ] && rm -f "$inbox/open-url.failed" || exit 0 + fi +fi +serial=${ADB_SERIAL:-127.0.0.1:5555} +adb connect "$serial" >/dev/null 2>&1 +quoted=$(printf "%s" "$url" | sed "s/'/'\\\\''/g") +adb -s "$serial" shell "am start --display ${DD_BROWSER_DISPLAY:-0} -a android.intent.action.VIEW -d '$quoted'" >/dev/null 2>&1 || + echo "Open this on any device: $url" >&2 diff --git a/app/src/main/assets/agent/dd-gh-login b/app/src/main/assets/agent/dd-gh-login new file mode 100644 index 0000000000..86ff4707e0 --- /dev/null +++ b/app/src/main/assets/agent/dd-gh-login @@ -0,0 +1,27 @@ +#!/bin/bash +# GitHub sign-in through Android's browser, with the one-time code typed in for the person. +serial=${ADB_SERIAL:-127.0.0.1:5555} +display=${DD_BROWSER_DISPLAY:-0} +adb connect "$serial" >/dev/null 2>&1 +coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } +# bash drops GH and GH_PID once gh exits, which can be before the loop reads its last line. +ghpid=$GH_PID +exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" +typed= +while IFS= read -r line <&"$ghout"; do + printf '%s\n' "$line" + code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) + if [ -n "$code" ] && [ -z "$typed" ]; then + typed=1 + echo >&"$ghin" + adb -s "$serial" shell "am start --display $display -a android.intent.action.VIEW -d https://github.com/login/device" >/dev/null 2>&1 + # Chrome drops characters from `input text` and from fast key events on this page. + keys= + for ((i = 0; i < ${#code}; i++)); do + c=${code:i:1} + [ "$c" = - ] || keys+="input -d $display keyevent KEYCODE_$c; sleep 0.4; " + done + (sleep 7; adb -s "$serial" shell "$keys" >/dev/null 2>&1) & + fi +done +wait "$ghpid" diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index b4c1621a47..79f42d118a 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -42,6 +42,8 @@ class App : Application() { if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic" || process == "$packageName:shortcuts_sync" || process == "$packageName:bottom_desktop") return CrashHandler.install(this) + com.droiddeck.launcher.agent.AgentHost.refresh(this) + if (com.droiddeck.launcher.agent.AgentHost.available) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index f429efcbf7..55fdf3f1f3 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1105,6 +1105,8 @@ class FrontEndActivity : ComponentActivity() { gameSpaceOffered = savedInstanceState?.getBoolean(STATE_GAME_SPACE_OFFERED) == true if (savedInstanceState == null) readIntegrationIntent(intent) readGameIntent(intent) + // A Lab build is usually the agent's work, so the app comes back where the agent is. + if (savedInstanceState == null && navRequest == null && com.droiddeck.launcher.lab.LabOverlay.promoted && com.droiddeck.launcher.agent.AgentHost.available) navRequest = "agent" gameSyncFolder = GameFileSync.folder(this) displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager refreshPhantomStatus() @@ -3079,6 +3081,7 @@ class FrontEndActivity : ComponentActivity() { android.widget.Toast.makeText(this, it, android.widget.Toast.LENGTH_LONG).show() } refresh() + com.droiddeck.launcher.agent.AgentHost.refresh(this) if (ok == true && LinuxRuntime.isInstalled(this)) protons.checkUpdates() } }, "runtime-operation").start() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentAdb.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentAdb.kt new file mode 100644 index 0000000000..223bb07a8c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentAdb.kt @@ -0,0 +1,44 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import com.droiddeck.launcher.core.WirelessAdbFix +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File + +/** + * Loopback adb for the agent, so droiddeckctl in the Linux userland reaches the app. It reuses + * the Wireless debugging pairing DroidDeck already made (for the phantom process fix): the paired + * key goes to the guest as an adb vendor key, and the serial is the paired TLS connect port. + * Without a pairing it falls back to adbd on 127.0.0.1:5555, which some devices and `adb tcpip` + * leave listening. + */ +object AgentAdb { + data class Link(val serial: String, val vendorKeys: String, val paired: Boolean) + + private const val LEGACY = "127.0.0.1:5555" + private const val VENDOR_KEY = "/root/.android/droiddeck-paired.adbkey" + + /** The display the browser opens on for sign-ins: the one the agent is being used on. */ + @Volatile var browserDisplay = 0 + + /** Blocks while it looks up the connect port when none is saved; call it off the main thread. */ + fun prepare(app: Context): Link { + val key = File(app.noBackupFilesDir, "wireless-adb-key.pem") + val address = WirelessAdbFix.liveConnectAddress(app) ?: WirelessAdbFix.savedConnectionAddress(app) + if (address == null || !key.isFile) return Link(LEGACY, VENDOR_KEY, false) + val guestKey = File(LinuxRuntime.rootDir(app), VENDOR_KEY.removePrefix("/")) + runCatching { + if (!guestKey.isFile || !guestKey.readBytes().contentEquals(key.readBytes())) { + guestKey.parentFile?.mkdirs() + guestKey.writeBytes(key.readBytes()) + guestKey.setReadable(false, false) + guestKey.setReadable(true, true) + } + } + val host = address.substringBeforeLast(':') + val port = address.substringAfterLast(':').toIntOrNull() + ?: WirelessAdbFix.findConnectPort(app, host.trim('[', ']')) + ?: return Link(LEGACY, VENDOR_KEY, false) + return Link("$host:$port", VENDOR_KEY, true) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentAttachments.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentAttachments.kt new file mode 100644 index 0000000000..6c843df797 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentAttachments.kt @@ -0,0 +1,67 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import android.net.Uri +import android.provider.OpenableColumns +import androidx.compose.runtime.mutableStateListOf +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File + +/** + * Files the user attaches to a message, copied into the Linux userland so the agent's own tools + * can read them (Claude Code's Read shows images and PDFs to the model). + */ +object AgentAttachments { + /** Guest paths waiting to go with the next message. */ + val pending = mutableStateListOf() + + private const val NEW = "new" + private const val GUEST_DIR = "/root/.cache/droiddeck/attachments" + private val IMAGE = setOf("png", "jpg", "jpeg", "webp", "gif", "bmp") + + fun hostDir(context: Context) = File(LinuxRuntime.rootDir(context.applicationContext), GUEST_DIR.removePrefix("/")) + + fun host(context: Context, guestPath: String) = File(LinuxRuntime.rootDir(context.applicationContext), guestPath.removePrefix("/")) + + fun isImage(path: String) = path.substringAfterLast('.', "").lowercase() in IMAGE + + /** Copies [uris] for [chat] (or a new conversation) on the calling thread; returns their guest paths. */ + fun copy(context: Context, chat: String?, uris: List): List { + val app = context.applicationContext + val folder = chat ?: NEW + val dir = File(hostDir(app), folder).apply { mkdirs() } + return uris.mapNotNull { uri -> + runCatching { + val name = displayName(app, uri).replace(Regex("[^A-Za-z0-9._-]"), "_").ifEmpty { "file" } + var target = File(dir, name) + var n = 1 + while (target.exists()) target = File(dir, "${name.substringBeforeLast('.')}-${n++}${name.substringAfterLast('.', "").let { if (it.isEmpty()) "" else ".$it" }}") + app.contentResolver.openInputStream(uri)!!.use { input -> target.outputStream().use { input.copyTo(it) } } + "$GUEST_DIR/$folder/${target.name}" + }.getOrNull() + } + } + + /** Moves files attached before [chat] existed into its folder, so deleting the chat removes them; returns their new guest paths. */ + fun adopt(context: Context, chat: String, files: List): List = files.map { path -> + if (!path.startsWith("$GUEST_DIR/$NEW/")) return@map path + val dir = File(hostDir(context), chat).apply { mkdirs() } + val moved = File(dir, path.substringAfterLast('/')) + if (host(context, path).renameTo(moved)) "$GUEST_DIR/$chat/${moved.name}" else path + } + + /** Deletes copies that will not be sent. */ + fun discard(context: Context, files: List) = files.forEach { host(context, it).delete() } + + /** The message the CLI gets: the user's text, then where the attached files are. */ + fun prompt(text: String, files: List): String { + if (files.isEmpty()) return text + val list = files.joinToString("\n") { "- $it" } + return "$text\n\nAttached files (read them with your tools):\n$list".trim() + } + + private fun displayName(context: Context, uri: Uri): String = + context.contentResolver.query(uri, arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)?.use { c -> + if (c.moveToFirst()) c.getString(0) else null + } ?: uri.lastPathSegment?.substringAfterLast('/') ?: "file" +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt new file mode 100644 index 0000000000..e228f1aa5d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt @@ -0,0 +1,138 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import androidx.annotation.VisibleForTesting +import com.droiddeck.launcher.agent.AgentHost.Entry +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +/** + * Conversations kept on the device, one JSON Lines file each in `files/agent/chats`: a header + * line with the harness, a line with the CLI's conversation id once it has one, then the entries. + */ +object AgentChats { + data class Chat(val id: String, val harness: String, val title: String, val updated: Long) + + class Loaded(val harness: String?, val conversation: String?, val entries: List) + + private const val MAX_OUTPUT = 24_000 + + fun dir(context: Context) = File(context.filesDir, "agent/chats") + + fun file(context: Context, id: String) = File(dir(context), "$id.jsonl") + + fun newId(context: Context): String { + var stamp = System.currentTimeMillis() + while (file(context, stamp.toString()).exists()) stamp++ + return stamp.toString() + } + + /** Newest first; chats with nothing asked yet are left out. */ + fun list(context: Context): List = dir(context).listFiles { f -> f.name.endsWith(".jsonl") }.orEmpty() + .mapNotNull { f -> + val loaded = read(f) + val title = loaded.entries.firstNotNullOfOrNull { (it as? Entry.Asked)?.text } ?: return@mapNotNull null + Chat(f.name.removeSuffix(".jsonl"), loaded.harness ?: ClaudeCode.id, title.lineSequence().first().take(120), f.lastModified()) + } + .sortedByDescending { it.updated } + + fun delete(context: Context, id: String) { + file(context, id).delete() + File(AgentAttachments.hostDir(context), id).deleteRecursively() + } + + fun start(file: File, harness: String) { + file.parentFile?.mkdirs() + file.writeText(JSONObject().put("harness", harness).toString() + "\n") + } + + fun appendConversation(file: File, conversation: String) = + runCatching { file.appendText(JSONObject().put("conversation", conversation).toString() + "\n") } + + fun append(file: File, entry: Entry) = runCatching { file.appendText(encode(entry) + "\n") } + + /** The transcript before chats were kept, moved into the first chat. */ + fun migrate(context: Context, harness: String, conversation: String?): String? { + val old = File(context.filesDir, "agent/transcript.jsonl") + if (!old.isFile) return null + val id = newId(context) + val target = file(context, id) + start(target, harness) + conversation?.let { appendConversation(target, it) } + target.appendText(old.readText()) + old.delete() + return id + } + + @VisibleForTesting + internal fun encode(entry: Entry): String = when (entry) { + is Entry.Asked -> JSONObject().put("asked", entry.text).apply { if (entry.files.isNotEmpty()) put("files", JSONArray(entry.files)) } + is Entry.Said -> JSONObject().put("said", entry.text) + is Entry.Thought -> JSONObject().put("thought", entry.text) + is Entry.Result -> JSONObject().put("result", entry.id).put("output", entry.output).put("failed", entry.failed) + is Entry.Used -> JSONObject().put("used", entry.tool).put("detail", entry.detail).put("id", entry.id).put("input", entry.input) + .apply { entry.output?.let { put("output", it).put("failed", entry.failed) } } + is Entry.Finished -> JSONObject().put("finished", true).put("error", entry.error ?: JSONObject.NULL).put("stopped", entry.stopped).apply { + entry.usage?.let { put("ms", it.durationMs).put("cost", it.costUsd).put("in", it.inputTokens).put("out", it.outputTokens) } + } + }.toString() + + @VisibleForTesting + internal fun read(file: File): Loaded { + var harness: String? = null + var conversation: String? = null + val entries = mutableListOf() + runCatching { + file.forEachLine { line -> + val o = runCatching { JSONObject(line) }.getOrNull() ?: return@forEachLine + when { + o.has("harness") -> harness = o.getString("harness") + o.has("conversation") -> conversation = o.getString("conversation") + else -> decode(o)?.let { merge(entries, it) } + } + } + } + return Loaded(harness, conversation, entries) + } + + private fun decode(o: JSONObject): Entry? = when { + o.has("asked") -> Entry.Asked(o.getString("asked"), o.optJSONArray("files")?.let { a -> (0 until a.length()).map { a.getString(it) } }.orEmpty()) + o.has("said") -> Entry.Said(o.getString("said")) + o.has("thought") -> Entry.Thought(o.getString("thought")) + o.has("used") -> Entry.Used(o.optString("id"), o.getString("used"), o.optString("detail"), o.optString("input"), + if (o.has("output")) o.optString("output") else null, o.optBoolean("failed")) + o.has("result") -> Entry.Result(o.getString("result"), o.optString("output"), o.optBoolean("failed")) + o.has("finished") -> Entry.Finished( + if (o.isNull("error")) null else o.optString("error"), o.optBoolean("stopped"), + if (o.has("ms")) AgentHost.Usage(o.optLong("ms"), o.optDouble("cost", 0.0), o.optLong("in"), o.optLong("out")) else null, + ) + else -> null + } + + /** + * A tool's result is shown on the call it answers, and a call seen again (an updated todo list) + * replaces it. Only the current turn is searched: Codex numbers its items again in each process. + */ + fun merge(entries: MutableList, entry: Entry): Boolean { + val turn = entries.indexOfLast { it is Entry.Asked } + if (entry is Entry.Used && entry.id.isNotEmpty()) { + val same = entries.indexOfLast { it is Entry.Used && it.id == entry.id } + if (same > turn) { + entries[same] = entry + return true + } + } + if (entry !is Entry.Result) { + entries += entry + return true + } + val index = entries.indexOfLast { it is Entry.Used && it.id == entry.id && entry.id.isNotEmpty() } + if (index <= turn) return false + entries[index] = (entries[index] as Entry.Used).copy(output = clip(entry.output), failed = entry.failed) + return true + } + + /** Long outputs keep their end, where errors and summaries usually are. */ + fun clip(output: String) = if (output.length <= MAX_OUTPUT) output else "…\n" + output.takeLast(MAX_OUTPUT) +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt new file mode 100644 index 0000000000..de45d4b51a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -0,0 +1,282 @@ +package com.droiddeck.launcher.agent + +import androidx.annotation.VisibleForTesting +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +/** One coding agent CLI in the Linux userland, run one process per turn. */ +interface AgentHarness { + val id: String + val name: String + /** Absolute guest path of the CLI. */ + val binary: String + /** Guest paths of everything the CLI needs installed, [binary] included. */ + val files: List get() = listOf(binary) + /** A guest shell script that installs the CLI. */ + val install: String + /** A guest command whose exit status is 0 when the CLI is signed in. */ + val signedIn: List + /** A guest command that signs in through $BROWSER. */ + val signIn: List + /** Whether [Options.plan] means anything to this CLI. */ + val plans: Boolean + /** Models to offer besides the CLI's default; [rootfs] is where the CLI's own files can be read. */ + fun models(rootfs: File): List + /** The guest command for one turn; [conversation] is null for the first one. */ + fun turn(message: String, conversation: String?, options: Options): List + /** One line of the CLI's output, or null when it carries nothing to show. */ + fun parse(line: String): AgentEvent? + + data class Model(val id: String, val label: String) + + data class Options(val model: String? = null, val plan: Boolean = false, val brief: String? = null) + + companion object { + val all: List = listOf(ClaudeCode, Codex) + fun byId(id: String?): AgentHarness = all.firstOrNull { it.id == id } ?: ClaudeCode + } +} + +/** What one line of output carries: whole entries, or text still being written. */ +data class AgentEvent( + val conversation: String? = null, + val entries: List = emptyList(), + val text: String? = null, + val thinking: String? = null, + /** Tokens the conversation's context holds after this step. */ + val context: Long? = null, + val usage: AgentHost.Usage? = null, +) + +/** Claude Code: `claude -p` with stream-json output, resumed by session id. */ +object ClaudeCode : AgentHarness { + override val id = "claude" + override val name = "Claude Code" + override val binary = "/root/.local/bin/claude" + override val install = "curl -fsSL https://claude.ai/install.sh | bash" + override val signedIn = listOf("sh", "-c", "$binary auth status | grep -q '\"loggedIn\": true'") + override val signIn = listOf(binary, "auth", "login", "--claudeai") + override val plans = true + + override fun models(rootfs: File) = listOf( + AgentHarness.Model("opus", "Opus"), AgentHarness.Model("sonnet", "Sonnet"), AgentHarness.Model("haiku", "Haiku"), + ) + + // DroidDeck runs the agent unattended on the user's own device; permission prompts have no one to answer them. + override fun turn(message: String, conversation: String?, options: AgentHarness.Options) = buildList { + addAll(listOf(binary, "-p", message, "--output-format", "stream-json", "--verbose", "--include-partial-messages")) + addAll(listOf("--permission-mode", if (options.plan) "plan" else "bypassPermissions")) + options.model?.let { addAll(listOf("--model", it)) } + options.brief?.let { addAll(listOf("--append-system-prompt", it)) } + if (conversation != null) addAll(listOf("--resume", conversation)) + } + + override fun parse(line: String): AgentEvent? { + val o = runCatching { JSONObject(line) }.getOrNull() ?: return null + val conversation = o.optString("session_id").takeIf { it.isNotEmpty() } + return when (o.optString("type")) { + "stream_event" -> { + val delta = o.optJSONObject("event")?.takeIf { it.optString("type") == "content_block_delta" }?.optJSONObject("delta") ?: return null + when (delta.optString("type")) { + "text_delta" -> AgentEvent(conversation, text = delta.optString("text")) + "thinking_delta" -> AgentEvent(conversation, thinking = delta.optString("thinking")) + else -> null + } + } + "assistant" -> { + val message = o.optJSONObject("message") + val content = message?.optJSONArray("content") ?: JSONArray() + val entries = (0 until content.length()).mapNotNull { i -> + val block = content.optJSONObject(i) ?: return@mapNotNull null + when (block.optString("type")) { + "text" -> block.optString("text").trim().takeIf { it.isNotEmpty() }?.let { AgentHost.Entry.Said(it) } + "thinking" -> block.optString("thinking").trim().takeIf { it.isNotEmpty() }?.let { AgentHost.Entry.Thought(it) } + "tool_use" -> { + val input = block.optJSONObject("input") + AgentHost.Entry.Used(block.optString("id"), block.optString("name"), detail(input), fullInput(block.optString("name"), input)) + } + else -> null + } + } + val usage = message?.optJSONObject("usage") + val context = usage?.let { it.optLong("input_tokens") + it.optLong("cache_read_input_tokens") + it.optLong("cache_creation_input_tokens") + it.optLong("output_tokens") } + AgentEvent(conversation, entries, context = context?.takeIf { it > 0 }) + } + "user" -> { + val content = o.optJSONObject("message")?.optJSONArray("content") ?: return conversation?.let { AgentEvent(it) } + val results = (0 until content.length()).mapNotNull { i -> + val block = content.optJSONObject(i)?.takeIf { it.optString("type") == "tool_result" } ?: return@mapNotNull null + AgentHost.Entry.Result(block.optString("tool_use_id"), resultText(block.opt("content")), block.optBoolean("is_error")) + } + AgentEvent(conversation, results) + } + // A resumed session first answers background tasks the last run left behind; that result is not the turn's. + "result" -> if (o.optJSONObject("origin")?.optString("kind") == "task-notification") conversation?.let { AgentEvent(it) } else AgentEvent( + conversation, + listOf(AgentHost.Entry.Finished(if (o.optBoolean("is_error")) o.optString("result").ifEmpty { o.optString("subtype") } else null)), + usage = AgentHost.Usage( + o.optLong("duration_ms"), o.optDouble("total_cost_usd", 0.0), + o.optJSONObject("usage")?.let { it.optLong("input_tokens") + it.optLong("cache_read_input_tokens") + it.optLong("cache_creation_input_tokens") } ?: 0, + o.optJSONObject("usage")?.optLong("output_tokens") ?: 0, + ), + ) + else -> conversation?.let { AgentEvent(it) } + } + } + + private fun resultText(content: Any?): String = when (content) { + is String -> content + is JSONArray -> (0 until content.length()).mapNotNull { i -> + val part = content.optJSONObject(i) ?: return@mapNotNull null + when (part.optString("type")) { + "text" -> part.optString("text") + "image" -> "[image]" + else -> null + } + }.joinToString("\n") + null, JSONObject.NULL -> "" + else -> content.toString() + } + + private fun detail(input: JSONObject?): String { + input ?: return "" + for (key in listOf("command", "file_path", "pattern", "url", "query", "description", "prompt")) { + input.optString(key).takeIf { it.isNotEmpty() }?.let { return firstLine(it) } + } + return "" + } + + @VisibleForTesting + internal fun fullInput(tool: String, input: JSONObject?): String { + input ?: return "" + return when { + tool == "Bash" -> input.optString("command") + tool == "Edit" -> "${input.optString("file_path")}\n\n- ${input.optString("old_string").replace("\n", "\n- ")}\n\n+ ${input.optString("new_string").replace("\n", "\n+ ")}" + tool == "Write" -> "${input.optString("file_path")}\n\n${input.optString("content")}" + tool == "TodoWrite" -> todos(input.optJSONArray("todos")) + else -> input.toString(2) + } + } + + private fun todos(list: JSONArray?) = (0 until (list?.length() ?: 0)).mapNotNull { i -> + val todo = list?.optJSONObject(i) ?: return@mapNotNull null + val mark = when (todo.optString("status")) { "completed" -> "[x]"; "in_progress" -> "[~]"; else -> "[ ]" } + "$mark ${todo.optString("content")}" + }.joinToString("\n") +} + +/** OpenAI Codex: `codex exec --json`, resumed by thread id. */ +object Codex : AgentHarness { + override val id = "codex" + override val name = "Codex" + override val binary = "/root/.local/bin/codex" + // Code mode runs in a helper that each release ships as its own download. + private const val HOST = "/root/.local/bin/codex-code-mode-host" + override val files get() = listOf(binary, HOST) + override val install = """ + set -e + release=${'$'}(curl -fsSL https://api.github.com/repos/openai/codex/releases/latest) + mkdir -p /root/.local/bin + for name in codex codex-code-mode-host; do + url=${'$'}(printf '%s' "${'$'}release" | grep -o "https://[^\"]*/${'$'}name-aarch64-unknown-linux-musl.tar.gz" | head -1) + echo "Downloading ${'$'}name" + curl -fsSL "${'$'}url" | tar -xz -C /tmp + install -m755 /tmp/${'$'}name-aarch64-unknown-linux-musl /root/.local/bin/${'$'}name + done + """.trimIndent() + override val signedIn = listOf(binary, "login", "status") + override val signIn = listOf(binary, "login") + override val plans = false + + /** Codex keeps the models its account can use in `~/.codex/models_cache.json` once it has run. */ + override fun models(rootfs: File): List = runCatching { + val o = JSONObject(File(rootfs, "root/.codex/models_cache.json").readText()) + val list = o.optJSONArray("models") ?: JSONArray() + (0 until list.length()).mapNotNull { i -> + val m = list.optJSONObject(i) ?: return@mapNotNull null + val slug = m.optString("slug").ifEmpty { m.optString("id") }.takeIf { it.isNotEmpty() } ?: return@mapNotNull null + if (m.has("visibility") && m.optString("visibility") != "list") return@mapNotNull null + AgentHarness.Model(slug, m.optString("display_name").ifEmpty { slug }) + } + }.getOrDefault(emptyList()) + + // Codex's own sandbox needs Landlock and seccomp, which proot does not provide. + override fun turn(message: String, conversation: String?, options: AgentHarness.Options) = buildList { + addAll(listOf(binary, "exec")) + if (conversation != null) addAll(listOf("resume", conversation)) + addAll(listOf("--json", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check")) + options.model?.let { addAll(listOf("-m", it)) } + // codex exec has no system prompt option, so a new conversation starts with the brief. + add(if (conversation == null && options.brief != null) "${options.brief}\n\n$message" else message) + } + + override fun parse(line: String): AgentEvent? { + val o = runCatching { JSONObject(line) }.getOrNull() ?: return null + val item = o.optJSONObject("item") + val id = item?.optString("id").orEmpty() + val entries = when (o.optString("type")) { + "thread.started" -> return AgentEvent(o.optString("thread_id").takeIf { it.isNotEmpty() }) + "item.started" -> when (item?.optString("type")) { + "command_execution" -> shellCommand(item.optString("command")).let { listOf(AgentHost.Entry.Used(id, "Shell", firstLine(it), it)) } + "mcp_tool_call" -> listOf(AgentHost.Entry.Used(id, item.optString("tool").ifEmpty { "Tool" }, item.optString("server"), item.optJSONObject("arguments")?.toString(2).orEmpty())) + "web_search" -> listOf(AgentHost.Entry.Used(id, "Search", item.optString("query"), item.optString("query"))) + else -> emptyList() + } + "item.updated" -> when (item?.optString("type")) { + "todo_list" -> listOf(todoEntry(id, item)) + else -> emptyList() + } + "item.completed" -> when (item?.optString("type")) { + "agent_message" -> item.optString("text").trim().takeIf { it.isNotEmpty() }?.let { listOf(AgentHost.Entry.Said(it)) }.orEmpty() + "reasoning" -> item.optString("text").trim().takeIf { it.isNotEmpty() }?.let { listOf(AgentHost.Entry.Thought(it)) }.orEmpty() + "command_execution" -> listOf(AgentHost.Entry.Result(id, item.optString("aggregated_output"), + item.has("exit_code") && !item.isNull("exit_code") && item.optInt("exit_code") != 0)) + "mcp_tool_call" -> listOf(AgentHost.Entry.Result(id, item.optJSONObject("result")?.toString(2) ?: item.optJSONObject("error")?.optString("message").orEmpty(), + item.optString("status") == "failed")) + "web_search" -> listOf(AgentHost.Entry.Result(id, "", false)) + "file_change" -> listOf( + AgentHost.Entry.Used(id, "Edit", changedFiles(item), changedFiles(item).replace(", ", "\n")), + AgentHost.Entry.Result(id, item.optString("status"), item.optString("status") == "failed"), + ) + "todo_list" -> listOf(todoEntry(id, item)) + "error" -> listOf(AgentHost.Entry.Said("⚠ " + item.optString("message"))) + else -> emptyList() + } + "turn.completed" -> return AgentEvent( + entries = listOf(AgentHost.Entry.Finished(null)), + usage = o.optJSONObject("usage")?.let { AgentHost.Usage(0, 0.0, it.optLong("input_tokens") + it.optLong("cached_input_tokens"), it.optLong("output_tokens")) }, + ) + "turn.failed" -> listOf(AgentHost.Entry.Finished(o.optJSONObject("error")?.optString("message") ?: "turn failed")) + // codex reports a dropped stream it is retrying as an error event, and the turn goes on. + "error" -> o.optString("message").let { message -> + if (message.startsWith("Reconnecting...")) emptyList() else listOf(AgentHost.Entry.Finished(message.ifEmpty { "error" })) + } + else -> emptyList() + } + return if (entries.isEmpty()) null else AgentEvent(entries = entries) + } + + private fun todoEntry(id: String, item: JSONObject): AgentHost.Entry.Used { + val items = item.optJSONArray("items") ?: JSONArray() + val text = (0 until items.length()).mapNotNull { i -> + val todo = items.optJSONObject(i) ?: return@mapNotNull null + "${if (todo.optBoolean("completed")) "[x]" else "[ ]"} ${todo.optString("text")}" + }.joinToString("\n") + return AgentHost.Entry.Used("$id-todo", "TodoWrite", "", text, output = "") + } + + private fun changedFiles(item: JSONObject): String { + val changes = item.optJSONArray("changes") ?: return "" + return (0 until changes.length()).mapNotNull { changes.optJSONObject(it)?.optString("path") }.joinToString(", ").take(400) + } +} + +@VisibleForTesting +internal fun firstLine(text: String) = text.lineSequence().first().take(160) + +private val SHELL_WRAPPER = Regex("^/bin/(?:ba)?sh -l?c '(.*)'$", RegexOption.DOT_MATCHES_ALL) + +/** Codex runs each command as `/bin/bash -lc ''`; the command is what the user wants to read. */ +@VisibleForTesting +internal fun shellCommand(command: String) = SHELL_WRAPPER.find(command)?.groupValues?.get(1)?.replace("'\''", "'") ?: command diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt new file mode 100644 index 0000000000..bbb99b744d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -0,0 +1,534 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import android.os.Environment +import android.os.Handler +import android.os.Looper +import android.os.SystemClock +import android.util.Log +import androidx.annotation.VisibleForTesting +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionPrefs +import java.io.File +import java.nio.file.Files + +/** + * The launcher's agent: a coding agent CLI ([AgentHarness]) from the Linux userland, run headless + * one process per turn, outside any game or desktop session. Conversations are kept on disk + * ([AgentChats]), so a restart (a Lab build, a crash) continues the same one. + */ +object AgentHost { + sealed interface Entry { + data class Asked(val text: String, val files: List = emptyList()) : Entry + data class Said(val text: String) : Entry + data class Thought(val text: String) : Entry + /** A tool call; [output] stays null until its result arrives. */ + data class Used(val id: String, val tool: String, val detail: String, val input: String = "", val output: String? = null, val failed: Boolean = false) : Entry + data class Result(val id: String, val output: String, val failed: Boolean) : Entry + data class Finished(val error: String?, val stopped: Boolean = false, val usage: Usage? = null) : Entry + } + + data class Usage(val durationMs: Long, val costUsd: Double, val inputTokens: Long, val outputTokens: Long) + + /** A message typed while the agent was working, sent when the turn ends. */ + data class Queued(val text: String, val files: List) + + enum class State { MISSING, IDLE, WORKING } + + private const val TAG = "AgentHost" + private const val WORKSPACE = "/root/DroidDeck" + private const val TICK_MS = 1_000L + private const val IDLE_TICK_MS = 5_000L + + /** Where the agent runs and what the user sees, which no file in the checkout tells it. */ + @VisibleForTesting + internal const val BRIEF = "You run inside DroidDeck on the user's handheld, in its Linux userland (Ubuntu under proot, aarch64), " + + "and the user talks to you from DroidDeck's Agent tab, often on a small screen, so keep replies short. " + + "droiddeckctl (in the /root/DroidDeck checkout, tools/droiddeckctl) inspects and drives the app over loopback adb (\$ADB_SERIAL). " + + "dd-lab-build builds the checkout as a Lab build and restarts DroidDeck on it (docs/lab-builds.md). DroidDeck runs the build in a " + + "process of its own and shows the user its progress and time left; dd-lab-build follows that build's log until it is done. " + + "Run it with run_in_background and keep checking its output, so the user can talk to you meanwhile. " + + "The restart ends this process, and this conversation continues on the new build. " + + "Files the user attaches are listed at the end of their message, under /root/.cache/droiddeck/attachments." + + val entries = mutableStateListOf() + val queue = mutableStateListOf() + var state by mutableStateOf(State.IDLE) + private set + var installed by mutableStateOf(false) + private set + /** The Linux runtime is there, so the agent can be set up. */ + var available by mutableStateOf(false) + private set + var harness by mutableStateOf(ClaudeCode) + private set + /** The chosen model for [harness]; null is the CLI's default. */ + var model by mutableStateOf(null) + private set + var plan by mutableStateOf(false) + private set + var chat by mutableStateOf(null) + private set + /** A reply finished since the conversation was last on screen. */ + var unseen by mutableStateOf(false) + private set + var failed by mutableStateOf(false) + private set + /** Text and thinking of the reply being written. */ + var live by mutableStateOf("") + private set + var liveThinking by mutableStateOf("") + private set + /** When the current turn started, on [SystemClock.elapsedRealtime]. */ + var turnStarted by mutableLongStateOf(0L) + private set + var now by mutableLongStateOf(0L) + private set + /** Tokens in the conversation's context after its last step. */ + var context by mutableLongStateOf(0L) + private set + var lab by mutableStateOf(null) + private set + + private class Turn(val process: Process, val pid: Int) + + private val main = Handler(Looper.getMainLooper()) + private var turn: Turn? = null + /** Counts turns, so a process that starts after its turn was stopped is not adopted by the next one. */ + private var generation = 0 + private var labProcess: Process? = null + /** The turn now running resends a message that got no reply, so it is not resent again. */ + private var retrying = false + private var resend: Runnable? = null + /** The running Lab build was asked for by the current turn, so stopping the turn stops it. */ + private var labFromTurn = false + private var conversation: String? = null + private var loaded = false + private var appContext: Context? = null + + val turnPid: Int get() = turn?.pid ?: 0 + + fun seen() { + unseen = false + } + + fun refresh(context: Context) { + val app = context.applicationContext + appContext = app + File(app.filesDir, "agent").mkdirs() + harness = AgentHarness.byId(prefs(app).getString(HARNESS_KEY, null)) + model = prefs(app).getString(modelKey(harness), null) + plan = prefs(app).getBoolean(PLAN_KEY, false) + available = LinuxRuntime.hasRootfs(app) + installed = harness.files.all { guestFileExists(app, it) } + if (!installed) state = State.MISSING else if (state == State.MISSING) state = State.IDLE + if (!loaded) { + loaded = true + val migrated = AgentChats.migrate(app, harness.id, prefs(app).getString(LEGACY_CONVERSATION_KEY, null)) + if (migrated != null) prefs(app).edit().remove(LEGACY_CONVERSATION_KEY).putString(CHAT_KEY, migrated).apply() + prefs(app).getString(CHAT_KEY, null)?.let { load(app, it) } + resumeAfterRestart(app) + tick() + } + } + + private fun load(app: Context, id: String) { + val file = AgentChats.file(app, id) + if (!file.isFile) return + val loaded = AgentChats.read(file) + if (chat != id) AgentAttachments.pending.clear() + chat = id + conversation = loaded.conversation + entries.clear() + entries.addAll(loaded.entries) + context = 0 + } + + /** Opens a kept conversation, switching to the CLI it belongs to. */ + fun open(context: Context, id: String) { + val app = context.applicationContext + if (state == State.WORKING || id == chat) return + val harnessId = AgentChats.read(AgentChats.file(app, id)).harness + if (harnessId != null && harnessId != harness.id) { + if (AgentSetup.busy) return + prefs(app).edit().putString(HARNESS_KEY, harnessId).apply() + AgentSetup.forget() + refresh(app) + } + load(app, id) + prefs(app).edit().putString(CHAT_KEY, id).apply() + } + + fun delete(context: Context, id: String) { + if (id == chat) { + if (state == State.WORKING) return + forget(context) + } + AgentChats.delete(context.applicationContext, id) + } + + /** + * A Lab build restarts the app, which ends the agent's process mid-turn. dd-lab-build leaves + * [RESUME] when the app's own agent ran it, so the same conversation picks up on the new build. + */ + private fun resumeAfterRestart(app: Context) { + val marker = File(app.filesDir, RESUME) + val claimed = File(app.filesDir, "$RESUME.claimed") + if (!marker.renameTo(claimed)) return + claimed.delete() + val asked = prefs(app).getString(LAB_CHAT_KEY, null) + prefs(app).edit().remove(LAB_CHAT_KEY).apply() + if (!installed) return + // The conversation that asked for the build hears about it, even if its turn had already ended. + if (asked != null && asked != chat && AgentChats.file(app, asked).isFile) { + load(app, asked) + prefs(app).edit().putString(CHAT_KEY, asked).apply() + } + if (asked != null || interrupted(entries)) send(app, app.getString(R.string.agent_resumed)) + } + + /** True when DroidDeck restarted in the middle of one of the agent's turns. */ + fun resuming(context: Context) = File(context.applicationContext.filesDir, RESUME).isFile + + @VisibleForTesting + internal fun interrupted(entries: List) = entries.isNotEmpty() && entries.last() !is Entry.Finished + + /** Switches the agent CLI; a conversation belongs to one CLI, so a new one starts. */ + fun choose(context: Context, choice: AgentHarness) { + if (choice == harness || state == State.WORKING || AgentSetup.busy) return + forget(context) + AgentSetup.forget() + prefs(context).edit().putString(HARNESS_KEY, choice.id).apply() + refresh(context) + } + + fun chooseModel(context: Context, id: String?) { + model = id + prefs(context).edit().putString(modelKey(harness), id).apply() + } + + fun choosePlan(context: Context, on: Boolean) { + plan = on + prefs(context).edit().putBoolean(PLAN_KEY, on).apply() + } + + fun models(context: Context) = harness.models(LinuxRuntime.rootDir(context.applicationContext)) + + /** Sends [text] now, or after the current turn when the agent is working. */ + fun send(context: Context, text: String, files: List = emptyList()) { + val app = context.applicationContext + val message = text.trim() + if (message.isEmpty() && files.isEmpty()) return + cancelResend() + if (state == State.WORKING) { + queue += Queued(message, files) + return + } + if (state != State.IDLE) return + val id = chat ?: AgentChats.newId(app).also { id -> + AgentChats.start(AgentChats.file(app, id), harness.id) + chat = id + conversation = null + prefs(app).edit().putString(CHAT_KEY, id).apply() + } + val attached = AgentAttachments.adopt(app, id, files) + record(app, Entry.Asked(message, attached)) + state = State.WORKING + val gen = ++generation + live = "" + liveThinking = "" + turnStarted = SystemClock.elapsedRealtime() + AgentHostService.start(app) + val current = harness + val prompt = AgentAttachments.prompt(message, attached) + val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF)) + val workdir = workspace(app) + Thread({ + val child = try { + guest(app, command, workdir).start() + } catch (e: Exception) { + Log.w(TAG, "could not start ${current.name}", e) + main.post { if (generation == gen) finish(app, e.message ?: "could not start") } + return@Thread + } + val started = Turn(child, AgentProcesses.pidOf(child)) + main.post { if (generation == gen && state == State.WORKING && turn == null) turn = started else AgentProcesses.killTree(started.pid) } + child.outputStream.close() + var ended = false + val raw = runCatching { + val log = File(app.filesDir, TURN_LOG).apply { parentFile?.mkdirs() } + log.renameTo(File(app.filesDir, "$TURN_LOG.1")) + log.bufferedWriter() + }.getOrNull() + runCatching { + child.inputStream.bufferedReader().forEachLine { line -> + runCatching { raw?.apply { write(line); newLine(); flush() } } + val event = current.parse(line) ?: return@forEachLine + if (event.entries.any { it is Entry.Finished }) ended = true + main.post { if (turn === started) apply(app, event) } + } + } + runCatching { raw?.close() } + val status = runCatching { child.waitFor() }.getOrDefault(-1) + main.post { + if (turn === started) { + turn = null + if (state == State.WORKING && !ended) finish(app, app.getString(R.string.agent_exited, current.name, status)) + } + } + }, "agent-output").start() + } + + /** Ends the turn now: its process and everything it started, a build included. */ + fun stop(context: Context) { + val app = context.applicationContext + val running = turn + turn = null + queue.clear() + if (labFromTurn && lab?.running == true) cancelLabBuild(app) + if (running != null) { + AgentProcesses.killTree(running.pid) + running.process.destroy() + } + if (state == State.WORKING) finish(app, null, stopped = true) + } + + fun unqueue(item: Queued) { + queue.remove(item) + } + + /** Starts a new conversation; the current one stays in the history. */ + fun forget(context: Context) { + stop(context) + entries.clear() + if (chat != null) AgentAttachments.pending.clear() + chat = null + conversation = null + this.context = 0 + prefs(context).edit().remove(CHAT_KEY).apply() + state = if (installed) State.IDLE else State.MISSING + } + + /** + * A process for [command] in the Linux userland, run the way the store helpers run theirs: + * proot over the installed rootfs, without a session. Loopback adb is connected first so + * droiddeckctl reaches the app. + */ + fun guest(app: Context, command: List, workdir: String = "/root", connectAdb: Boolean = true): ProcessBuilder { + val adb = AgentAdb.prepare(app) + val env = listOf( + "/usr/bin/env", "HOME=/root", "PATH=/root/.local/bin:/usr/local/bin:/usr/bin:/bin", "LANG=C.UTF-8", + "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", + "DD_AGENT=1", "DD_AGENT_INBOX=${File(app.filesDir, "agent").path}", "BROWSER=/root/.local/bin/android-open", "DD_BROWSER_DISPLAY=${AgentAdb.browserDisplay}", + ) + val shell = listOf( + "/bin/sh", "-c", + // proot ends the adb server with the command, so each command that needs adb connects it. + (if (connectAdb) "adb start-server >/dev/null 2>&1; adb connect \"\$ADB_SERIAL\" >/dev/null 2>&1; " else "") + + "cd \"$1\" 2>/dev/null; shift; exec \"$@\"", "sh", workdir, + ) + val proot = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), env + shell + command) + return ProcessBuilder(proot).redirectErrorStream(true).apply { + environment().apply { + remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") + put("PROOT_LOADER", LinuxRuntime.prootLoader(app).path) + put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(app).path) + if (SessionPrefs.prootNoSeccomp(app)) put("PROOT_NO_SECCOMP", "1") + LinuxRuntime.prootLibraryPath(app).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + } + } + } + + fun guestFileExists(context: Context, path: String): Boolean { + val file = File(LinuxRuntime.rootDir(context), path.removePrefix("/")) + return file.exists() || Files.isSymbolicLink(file.toPath()) + } + + private fun workspace(app: Context) = if (guestFileExists(app, WORKSPACE)) WORKSPACE else "/root" + + private fun apply(app: Context, event: AgentEvent) { + event.conversation?.takeIf { it != conversation }?.let { id -> + conversation = id + chat?.let { AgentChats.appendConversation(AgentChats.file(app, it), id) } + } + event.text?.let { live += it } + event.thinking?.let { liveThinking += it } + event.context?.let { context = it } + for (entry in event.entries) when (entry) { + is Entry.Finished -> finish(app, entry.error, usage = event.usage) + else -> { + if (entry is Entry.Said) live = "" + if (entry is Entry.Thought) liveThinking = "" + record(app, entry) + } + } + AgentHostService.update(app) + } + + private fun finish(app: Context, error: String?, stopped: Boolean = false, usage: Usage? = null) { + if (state != State.WORKING) return + turn = null + if (!stopped) labFromTurn = false + live = "" + liveThinking = "" + record(app, Entry.Finished(error, stopped, usage)) + state = State.IDLE + unseen = true + failed = error != null + AgentHostService.stop(app) + // Claude Code now and then ends a resumed turn at once without reading the message; nothing + // happened, so the message is sent once more. + val asked = entries.lastOrNull { it is Entry.Asked } as? Entry.Asked + if (!stopped && error == null && asked != null && answerless(entries) && !retrying) { + retrying = true + val retryChat = chat + resend = Runnable { + resend = null + if (state == State.IDLE && chat == retryChat) send(app, asked.text, asked.files) else retrying = false + }.also { main.postDelayed(it, RETRY_MS) } + return + } + retrying = false + if (!stopped && queue.isNotEmpty()) { + val next = queue.removeAt(0) + send(app, next.text, next.files) + } + } + + /** A message typed or retried by the user replaces the automatic resend. */ + private fun cancelResend() { + val pending = resend ?: return + main.removeCallbacks(pending) + resend = null + retrying = false + } + + private fun record(app: Context, entry: Entry) { + if (!AgentChats.merge(entries, entry)) return + chat?.let { AgentChats.append(AgentChats.file(app, it), entry) } + } + + /** The last turn ended without saying or doing anything. */ + fun answerless(entries: List): Boolean { + val start = entries.indexOfLast { it is Entry.Asked } + if (start < 0) return false + val turn = entries.subList(start + 1, entries.size) + return turn.lastOrNull() is Entry.Finished && turn.none { it is Entry.Said || it is Entry.Used || it is Entry.Thought } && + (turn.last() as Entry.Finished).let { it.error == null && !it.stopped } + } + + /** Sends the last message again, after a turn that ended without a reply. */ + fun retry(context: Context) { + val asked = entries.lastOrNull { it is Entry.Asked } as? Entry.Asked ?: return + send(context, asked.text, asked.files) + } + + /** The tool call still running in this turn, if any. */ + fun running(): Entry.Used? { + if (state != State.WORKING) return null + val start = entries.indexOfLast { it is Entry.Asked } + return entries.withIndex().lastOrNull { (i, e) -> i > start && e is Entry.Used && e.output == null }?.value as? Entry.Used + } + + /** The latest todo list the agent wrote in this conversation. */ + fun todos(): String? = entries.lastOrNull { it is Entry.Used && it.tool == "TodoWrite" }?.let { (it as Entry.Used).input } + + private fun tick() { + now = SystemClock.elapsedRealtime() + appContext?.let { app -> + claimLabRequest(app) + claimOpenUrl(app) + // proot comes from an add-on pack fetched after the app starts, so the runtime can become usable later. + if (!available && state != State.WORKING) available = LinuxRuntime.hasRootfs(app) + lab = LabProgress.read(LinuxRuntime.rootDir(app)) + AgentHostService.update(app) + } + val busy = state == State.WORKING || lab != null || AgentSetup.status.values.any { it == AgentSetup.Status.WORKING } + main.postDelayed(::tick, if (busy) TICK_MS else IDLE_TICK_MS) + } + + /** + * android-open, the userland's $BROWSER, leaves a URL here for the app to open, so sign-ins + * work without Wireless debugging. + */ + private fun claimOpenUrl(app: Context) { + val request = File(app.filesDir, OPEN_URL) + if (!request.isFile) return + val claimed = File(app.filesDir, "$OPEN_URL.claimed") + if (!request.renameTo(claimed)) return + val url = runCatching { claimed.readText().trim() }.getOrNull() + claimed.delete() + if (url == null || !(url.startsWith("https://") || url.startsWith("http://"))) return + val intent = android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)) + .addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) + val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(AgentAdb.browserDisplay).toBundle() + runCatching { app.startActivity(intent, options) } + .recoverCatching { app.startActivity(intent) } + .onFailure { + Log.w(TAG, "could not open a sign-in link: ${it.javaClass.simpleName}") + runCatching { File(app.filesDir, "$OPEN_URL.failed").writeText("") } + } + } + + /** + * dd-lab-build run by the agent hands its build to the app: the turn's processes end with the + * turn, and a build must outlive a turn that ends early or is stopped. + */ + private fun claimLabRequest(app: Context) { + val request = File(app.filesDir, LAB_REQUEST) + if (!request.isFile) return + val claimed = File(app.filesDir, "$LAB_REQUEST.claimed") + if (!request.renameTo(claimed)) return + val o = runCatching { org.json.JSONObject(claimed.readText()) }.getOrNull() + claimed.delete() + if (o == null || labProcess?.isAlive == true) return + val args = o.optJSONArray("args")?.let { a -> (0 until a.length()).map { a.getString(it) } }.orEmpty() + val cwd = o.optString("cwd").ifEmpty { WORKSPACE } + labFromTurn = state == State.WORKING + chat?.let { prefs(app).edit().putString(LAB_CHAT_KEY, it).apply() } + AgentHostService.setupStarted(app) + Thread({ + runCatching { + val child = guest(app, listOf("sh", "-c", + "mkdir -p /root/.cache; DD_LAB_DETACHED=1 exec dd-lab-build \"\$@\" > /root/.cache/dd-lab-build.log 2>&1", "dd-lab-build") + args, cwd).start() + main.post { labProcess = child } + child.outputStream.close() + child.inputStream.readBytes() + child.waitFor() + }.onFailure { Log.w(TAG, "could not run a Lab build", it) } + main.post { + labProcess = null + labFromTurn = false + AgentHostService.setupEnded(app) + } + }, "agent-lab-build").start() + } + + fun cancelLabBuild(context: Context) { + val progress = lab ?: return + LabProgress.cancel(LinuxRuntime.rootDir(context.applicationContext), progress) + lab = LabProgress.read(LinuxRuntime.rootDir(context.applicationContext)) + } + + private const val LEGACY_CONVERSATION_KEY = "session_id" + private const val HARNESS_KEY = "harness" + private const val CHAT_KEY = "chat" + private const val PLAN_KEY = "plan" + private const val RESUME = "agent/resume" + private const val LAB_REQUEST = "agent/lab-request" + private const val OPEN_URL = "agent/open-url" + private const val LAB_CHAT_KEY = "lab_chat" + /** The raw output of the latest turn, for working out what a CLI did when the chat shows nothing. */ + private const val TURN_LOG = "agent/turn.log" + private const val RETRY_MS = 3_000L + + private fun modelKey(harness: AgentHarness) = "model_${harness.id}" + + internal fun prefs(context: Context) = context.getSharedPreferences("agent", Context.MODE_PRIVATE) +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt new file mode 100644 index 0000000000..e8f3036d16 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt @@ -0,0 +1,118 @@ +package com.droiddeck.launcher.agent + +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.app.Service +import android.content.Context +import android.content.Intent +import android.os.IBinder +import android.os.SystemClock +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.R + +/** Keeps the app process alive while the agent works, and says what it is doing, with a way to stop it. */ +class AgentHostService : Service() { + override fun onBind(intent: Intent?): IBinder? = null + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + if (intent?.action == ACTION_STOP) { + if (AgentHost.lab?.running == true) AgentHost.cancelLabBuild(this) + AgentHost.stop(this) + return START_NOT_STICKY + } + awaiting = (awaiting - 1).coerceAtLeast(0) + startForeground(NOTIFICATION_ID, build(this)) + if (!started && awaiting == 0) stopSelf() + return START_NOT_STICKY + } + + companion object { + private const val CHANNEL_ID = "agent" + private const val NOTIFICATION_ID = 4107 + private const val ACTION_STOP = "com.droiddeck.launcher.agent.STOP" + private var lastText: String? = null + @Volatile private var started = false + /** + * startForegroundService calls not yet answered by onStartCommand. Stopping the service + * before it calls startForeground crashes the app, so it then stops itself instead. + */ + private var awaiting = 0 + /** Setup steps that keep the app alive while they run, besides the agent's turn. */ + private var setupSteps = 0 + + fun start(context: Context) { + lastText = null + started = true + runCatching { context.startForegroundService(Intent(context, AgentHostService::class.java)) } + .onSuccess { awaiting++ } + } + + fun stop(context: Context) { + if (setupSteps > 0) return + started = false + if (awaiting == 0) context.stopService(Intent(context, AgentHostService::class.java)) + } + + fun setupStarted(context: Context) { + setupSteps++ + start(context) + } + + fun setupEnded(context: Context) { + setupSteps = (setupSteps - 1).coerceAtLeast(0) + if (AgentHost.state != AgentHost.State.WORKING) stop(context) + } + + /** Refreshes the notification with the current step; unchanged text is not re-posted. */ + fun update(context: Context) { + if (!started) return + val text = describe(context) + if (text == lastText) return + lastText = text + context.getSystemService(NotificationManager::class.java)?.notify(NOTIFICATION_ID, build(context)) + } + + private fun describe(context: Context): String { + val lab = AgentHost.lab?.takeIf { it.running } + if (lab != null) return context.getString(R.string.agent_lab_progress, lab.permille / 10, minutes(lab.etaSeconds.toLong().coerceAtLeast(0))) + if (AgentHost.state != AgentHost.State.WORKING) return context.getString(R.string.agent_setting_up) + val tool = AgentHost.running() + val elapsed = minutes((SystemClock.elapsedRealtime() - AgentHost.turnStarted) / 1000) + return if (tool != null) "${tool.tool} · ${tool.detail}".take(120) + " · $elapsed" else context.getString(R.string.agent_thinking_for, elapsed) + } + + private fun minutes(seconds: Long) = if (seconds < 60) "${seconds.coerceAtLeast(0)}s" else "${seconds / 60}m ${seconds % 60}s" + + private fun build(context: Context): Notification { + val manager = context.getSystemService(NotificationManager::class.java) + manager?.createNotificationChannel(NotificationChannel(CHANNEL_ID, context.getString(R.string.agent_channel_name), + NotificationManager.IMPORTANCE_LOW).apply { setShowBadge(false) }) + val open = PendingIntent.getActivity(context, 0, + Intent(context, FrontEndActivity::class.java) + .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) + .putExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV, "agent"), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) + val stop = PendingIntent.getService(context, 1, Intent(context, AgentHostService::class.java).setAction(ACTION_STOP), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) + val lab = AgentHost.lab?.takeIf { it.running } + return Notification.Builder(context, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_stat_session) + .setContentTitle(context.getString(when { + lab?.prepare == true -> R.string.agent_lab_preparing + lab != null -> R.string.agent_lab_building + else -> R.string.agent_working + })) + .setContentText(describe(context)) + .setContentIntent(open) + .addAction(Notification.Action.Builder(null, context.getString(R.string.agent_stop), stop).build()) + .setOngoing(true) + .setOnlyAlertOnce(true) + .setShowWhen(false) + .apply { if (lab != null) setProgress(1000, lab.permille, lab.stage != "building") } + .setCategory(Notification.CATEGORY_PROGRESS) + .build() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentProcesses.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentProcesses.kt new file mode 100644 index 0000000000..c845db6813 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentProcesses.kt @@ -0,0 +1,105 @@ +package com.droiddeck.launcher.agent + +import android.os.Process +import android.os.SystemClock +import androidx.annotation.VisibleForTesting +import java.io.File + +/** + * Linux userland processes, read from /proc: proot runs them as real processes under the app's + * own uid, so the app can list and end them without a shell. + */ +object AgentProcesses { + data class Proc( + val pid: Int, val ppid: Int, val name: String, val args: String, + val seconds: Long, val rssKb: Long, val cpuPercent: Int, val agent: Boolean, + ) + + private const val HZ = 100L + private var lastTicks = emptyMap() + private var lastAt = 0L + + @VisibleForTesting + internal class Stat(val pid: Int, val ppid: Int, val ticks: Long, val startTicks: Long, val rssPages: Long) + + /** Guest processes, those under [turnPid] (the agent's current turn) first. */ + @Synchronized + fun snapshot(turnPid: Int): List { + val me = Process.myPid() + val uid = Process.myUid() + val stats = HashMap() + val args = HashMap() + for (dir in File("/proc").listFiles().orEmpty()) { + val pid = dir.name.toIntOrNull() ?: continue + if (pid == me) continue + val stat = runCatching { parseStat(File(dir, "stat").readText()) }.getOrNull() ?: continue + if (!owned(dir, uid)) continue + stats[pid] = stat + args[pid] = runCatching { File(dir, "cmdline").readBytes().toString(Charsets.UTF_8).trimEnd('\u0000').replace('\u0000', ' ') }.getOrDefault("") + } + val now = SystemClock.elapsedRealtime() + val uptimeTicks = now * HZ / 1000 + val elapsed = (now - lastAt).coerceAtLeast(1) + fun isProot(pid: Int) = args[pid].orEmpty().substringBefore(' ').endsWith("proot.so") || args[pid].orEmpty().substringBefore(' ').endsWith("/proot") + fun ancestors(pid: Int) = generateSequence(stats[pid]?.ppid) { stats[it]?.ppid }.takeWhile { it > 1 }.take(64) + val out = stats.values.filter { s -> + !isProot(s.pid) && args[s.pid].orEmpty().isNotEmpty() && ancestors(s.pid).any { isProot(it) } + }.map { s -> + val full = args[s.pid].orEmpty() + val cpu = lastTicks[s.pid]?.let { ((s.ticks - it) * 1000 * 100 / HZ / elapsed).toInt().coerceIn(0, 800) } ?: 0 + Proc( + s.pid, s.ppid, full.substringBefore(' ').substringAfterLast('/'), full, + ((uptimeTicks - s.startTicks) / HZ).coerceAtLeast(0), s.rssPages * 4, cpu, + turnPid > 0 && ancestors(s.pid).any { it == turnPid }, + ) + } + lastTicks = stats.mapValues { it.value.ticks } + lastAt = now + return out.sortedWith(compareByDescending { it.agent }.thenBy { it.seconds }) + } + + /** Ends [pid] and everything it started, children first so none is left to be re-parented. */ + fun killTree(pid: Int) { + if (pid <= 0) return + val children = HashMap>() + for (dir in File("/proc").listFiles().orEmpty()) { + val child = dir.name.toIntOrNull() ?: continue + val stat = runCatching { parseStat(File(dir, "stat").readText()) }.getOrNull() ?: continue + children.getOrPut(stat.ppid) { mutableListOf() } += child + } + val order = mutableListOf() + fun walk(p: Int) { + children[p].orEmpty().forEach(::walk) + order += p + } + walk(pid) + order.forEach { runCatching { Process.sendSignal(it, Process.SIGNAL_KILL) } } + } + + fun alive(pid: Int) = pid > 0 && File("/proc/$pid").exists() + + /** Processes whose command line contains [text], for ending a build the app did not start. */ + fun find(text: String): List = File("/proc").listFiles().orEmpty().mapNotNull { dir -> + val pid = dir.name.toIntOrNull() ?: return@mapNotNull null + if (pid == Process.myPid()) return@mapNotNull null + val args = runCatching { File(dir, "cmdline").readBytes().toString(Charsets.UTF_8).replace('\u0000', ' ') }.getOrDefault("") + pid.takeIf { args.contains(text) && owned(dir, Process.myUid()) } + } + + private fun owned(dir: File, uid: Int) = runCatching { + File(dir, "status").useLines { lines -> lines.first { it.startsWith("Uid:") }.split(Regex("\\s+"))[1].toInt() == uid } + }.getOrDefault(false) + + /** `/proc//stat`: the name in parentheses may hold spaces, so fields count from its end. */ + @VisibleForTesting + internal fun parseStat(text: String): Stat { + val pid = text.substringBefore(' ').toInt() + val f = text.substring(text.lastIndexOf(')') + 2).split(' ') + return Stat(pid, f[1].toInt(), f[11].toLong() + f[12].toLong(), f[19].toLong(), f[21].toLong()) + } + + /** The pid of a [java.lang.Process] the app started. */ + fun pidOf(process: java.lang.Process): Int = + runCatching { process.javaClass.getDeclaredField("pid").apply { isAccessible = true }.getInt(process) }.getOrNull() + ?: Regex("pid=(\\d+)").find(process.toString())?.groupValues?.get(1)?.toInt() ?: 0 +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt new file mode 100644 index 0000000000..47efab507d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -0,0 +1,175 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import android.os.Handler +import android.os.Looper +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File +import java.util.concurrent.TimeUnit + +/** + * First-run setup for the agent, as steps with a check and an action each. The first three are + * needed to talk to the agent; GitHub and the build tools are only needed to open pull requests + * and to make Lab builds on the device. + */ +object AgentSetup { + enum class Step(val required: Boolean) { CONNECTION(true), INSTALL(true), SIGN_IN(true), GITHUB(false), BUILD_TOOLS(false), PREPARE(false) } + enum class Status { UNKNOWN, DONE, TODO, WORKING, FAILED } + + val status = mutableStateMapOf() + /** The last line of output from the step that is running or just failed. */ + val detail = mutableStateMapOf() + var runtimeInstalled by mutableStateOf(true) + private set + + val ready: Boolean get() = Step.entries.filter { it.required }.all { status[it] == Status.DONE } + + /** A step's action is running; its result belongs to the harness it started for. */ + val busy: Boolean get() = status.values.any { it == Status.WORKING } + + /** Set once the required steps have all passed, so the chat opens without waiting for the checks. */ + fun completed(context: Context) = AgentHost.prefs(context).getBoolean(completedKey(AgentHost.harness), false) + + private fun completedKey(harness: AgentHarness) = "setup_completed_${harness.id}" + + private val main = Handler(Looper.getMainLooper()) + private const val REPO = "https://github.com/Droid-Deck/DroidDeck.git" + private const val CHECKOUT = "/root/DroidDeck" + private val HELPERS = listOf("android-open", "dd-gh-login") + private const val PROBE_TIMEOUT_S = 60L + + fun check(context: Context) { + val app = context.applicationContext + runtimeInstalled = LinuxRuntime.isInstalled(app) + if (!runtimeInstalled) return + AgentHost.refresh(app) + val harness = AgentHost.harness + val probes = mutableListOf>>() + for (step in Step.entries) if (status[step] != Status.WORKING) { + when (step) { + Step.INSTALL -> set(step, if (harness.files.all { AgentHost.guestFileExists(app, it) }) Status.DONE else Status.TODO) + Step.BUILD_TOOLS -> set(step, if (buildToolsInstalled(app)) Status.DONE else Status.TODO) + Step.PREPARE -> set(step, if (prepared(app)) Status.DONE else Status.TODO) + // The install brings the userland's adb; until then the app's own pairing is all there is to check. + Step.CONNECTION -> if (!AgentHost.guestFileExists(app, "/usr/bin/adb")) { + detail.remove(step) + Thread({ + val live = com.droiddeck.launcher.core.WirelessAdbFix.liveConnectAddress(app) != null + set(step, if (live) Status.DONE else Status.TODO) + }, "agent-connection").start() + } else probes += step to listOf("sh", "-c", + "for i in 1 2 3; do adb connect \"\$ADB_SERIAL\" >/dev/null 2>&1; " + + "state=\$(adb -s \"\$ADB_SERIAL\" get-state 2>&1); echo \"\$state\"; [ \"\$state\" = device ] && exit 0; sleep 1; done; exit 1") + Step.SIGN_IN -> if (AgentHost.guestFileExists(app, harness.binary)) probes += step to harness.signedIn else set(step, Status.TODO) + Step.GITHUB -> probes += step to listOf("gh", "auth", "status") + } + } + Thread({ for ((step, command) in probes) probe(app, harness, step, command) }, "agent-checks").start() + } + + /** Runs [step]'s action. [CONNECTION] is the app's own pairing flow, so the caller opens it. */ + fun run(context: Context, step: Step) { + val app = context.applicationContext + val harness = AgentHost.harness + val command = when (step) { + Step.CONNECTION -> return + Step.INSTALL -> { + listOf("sh", "-c", "set -e; export DEBIAN_FRONTEND=noninteractive; " + + "apt-get update; apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") + } + Step.SIGN_IN -> harness.signIn + Step.GITHUB -> listOf("dd-gh-login") + Step.BUILD_TOOLS -> listOf("sh", "-c", "set -e; [ -d $CHECKOUT/.git ] || git clone --filter=blob:none $REPO $CHECKOUT; " + + "cd $CHECKOUT; [ -x tools/agent/setup ] || { echo 'This DroidDeck version has no tools/agent/setup yet'; exit 1; }; tools/agent/setup") + Step.PREPARE -> listOf("sh", "-c", "cd $CHECKOUT && DD_LAB_DETACHED=1 dd-lab-build --prepare") + } + set(step, Status.WORKING) + detail.remove(step) + AgentHostService.setupStarted(app) + Thread({ + val result = runCatching { + installHelpers(app) + val child = AgentHost.guest(app, command).start() + child.outputStream.close() + child.inputStream.bufferedReader().forEachLine { line -> + val text = line.trim() + if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + } + child.waitFor() + } + main.post { + AgentHostService.setupEnded(app) + if (result.getOrNull() == 0) { + detail.remove(step) + status[step] = Status.UNKNOWN + check(app) + } else { + status[step] = Status.FAILED + if (result.isFailure) detail[step] = result.exceptionOrNull()?.message ?: "failed" + } + } + }, "agent-setup-${step.name.lowercase()}").start() + } + + fun buildToolsInstalled(app: Context) = AgentHost.guestFileExists(app, "/root/aapt2/aapt2") && AgentHost.guestFileExists(app, "$CHECKOUT/.git") + + /** dd-lab-build compiled this install's commit, so a Lab build compiles only what changed. */ + private fun prepared(app: Context) = runCatching { + File(LinuxRuntime.rootDir(app), "root/.cache/dd-lab-build-base").readText().trim() + .startsWith(com.droiddeck.launcher.lab.LabOverlay.apkCommit.take(7)) + }.getOrDefault(false) + + /** Drops what the checks found, which belonged to the previous harness. */ + fun forget() { + status.clear() + detail.clear() + } + + private fun probe(app: Context, harness: AgentHarness, step: Step, command: List) { + var output = "" + val ok = runCatching { + val child = AgentHost.guest(app, command, connectAdb = step == Step.CONNECTION).start() + child.outputStream.close() + val reader = Thread({ output = child.inputStream.bufferedReader().readText() }, "agent-check-output").apply { isDaemon = true; start() } + val exited = child.waitFor(PROBE_TIMEOUT_S, TimeUnit.SECONDS) + if (!exited) { + AgentProcesses.killTree(AgentProcesses.pidOf(child)) + child.destroyForcibly() + } + reader.join(2_000) + exited && child.exitValue() == 0 + }.onFailure { output = it.message.orEmpty() }.getOrDefault(false) + main.post { + if (AgentHost.harness != harness) return@post + if (status[step] != Status.WORKING) status[step] = if (ok) Status.DONE else Status.TODO + val last = output.lines().lastOrNull { it.isNotBlank() && !noise(it.trim()) }?.trim()?.take(160) + when { + ok -> detail.remove(step) + step == Step.CONNECTION -> detail[step] = app.getString(com.droiddeck.launcher.R.string.agent_connection_off) + step.required && last != null -> detail[step] = last + } + if (ready) AgentHost.prefs(app).edit().putBoolean(completedKey(harness), true).apply() + } + } + + /** proot warns about its bindings on every start; that says nothing about the step. */ + private fun noise(line: String) = line.startsWith("proot warning") + + private fun set(step: Step, value: Status) { + if (Looper.myLooper() == Looper.getMainLooper()) status[step] = value else main.post { status[step] = value } + } + + /** Written before every step, so the helpers a step relies on are there and match this DroidDeck version. */ + private fun installHelpers(app: Context) { + val bin = File(LinuxRuntime.rootDir(app), "root/.local/bin").apply { mkdirs() } + for (name in HELPERS) { + val target = File(bin, name) + app.assets.open("agent/$name").use { input -> target.outputStream().use { input.copyTo(it) } } + target.setExecutable(true, false) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentStorage.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentStorage.kt new file mode 100644 index 0000000000..9eacc4a6b6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentStorage.kt @@ -0,0 +1,95 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import android.os.Handler +import android.os.Looper +import androidx.annotation.VisibleForTesting +import androidx.compose.runtime.mutableStateMapOf +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File +import java.io.IOException +import java.nio.file.FileVisitResult +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.SimpleFileVisitor +import java.nio.file.attribute.BasicFileAttributes + +/** + * What the agent adds to the Linux userland, measured and removable piece by piece. Sign-ins + * (~/.claude, ~/.codex, gh's config) are left alone, so removing a CLI and installing it again + * does not sign out. + */ +object AgentStorage { + enum class Item(val paths: List) { + CLAUDE_CODE(listOf("/root/.local/share/claude", "/root/.local/bin/claude", "/root/cc")), + CODEX(listOf("/root/.local/bin/codex", "/root/.local/bin/codex-code-mode-host")), + BUILD_TOOLS(listOf("/root/android-sdk", "/root/aapt2", "/root/x86root", "/root/.gradle")), + SOURCE(listOf("/root/DroidDeck")), + CACHES(listOf("/root/.cache", "/root/.npm")), + } + + /** Bytes per item; missing while it is being measured. */ + val sizes = mutableStateMapOf() + val removing = mutableStateMapOf() + + private val main = Handler(Looper.getMainLooper()) + + fun measure(context: Context) { + val root = LinuxRuntime.rootDir(context.applicationContext) + Thread({ + for (item in Item.entries) { + val bytes = item.paths.sumOf { size(File(root, it.removePrefix("/")).toPath()) } + main.post { sizes[item] = bytes } + } + }, "agent-storage").start() + } + + fun remove(context: Context, item: Item) { + val app = context.applicationContext + val root = LinuxRuntime.rootDir(app) + removing[item] = true + Thread({ + for (path in item.paths) runCatching { delete(File(root, path.removePrefix("/")).toPath()) } + main.post { + removing.remove(item) + AgentHost.refresh(app) + AgentSetup.check(app) + measure(app) + } + }, "agent-storage-remove").start() + } + + /** Walks without following links, so a link out of the rootfs (into /sdcard, say) counts and removes only itself. */ + @VisibleForTesting + internal fun size(path: Path): Long { + if (!Files.exists(path, java.nio.file.LinkOption.NOFOLLOW_LINKS)) return 0 + var total = 0L + Files.walkFileTree(path, object : SimpleFileVisitor() { + override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult { + total += attrs.size() + return FileVisitResult.CONTINUE + } + override fun visitFileFailed(file: Path, exc: IOException) = FileVisitResult.CONTINUE + }) + return total + } + + @VisibleForTesting + internal fun delete(path: Path) { + if (!Files.exists(path, java.nio.file.LinkOption.NOFOLLOW_LINKS)) return + Files.walkFileTree(path, object : SimpleFileVisitor() { + override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult { + Files.deleteIfExists(file) + return FileVisitResult.CONTINUE + } + override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult { + Files.deleteIfExists(dir) + return FileVisitResult.CONTINUE + } + override fun visitFileFailed(file: Path, exc: IOException): FileVisitResult { + runCatching { Files.deleteIfExists(file) } + return FileVisitResult.CONTINUE + } + }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/LabProgress.kt b/app/src/main/java/com/droiddeck/launcher/agent/LabProgress.kt new file mode 100644 index 0000000000..ff16eeebd7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/LabProgress.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.agent + +import androidx.annotation.VisibleForTesting +import org.json.JSONObject +import java.io.File + +/** A Lab build in progress, as dd-lab-build reports it in `~/.cache/dd-lab-build.json`. */ +data class LabProgress( + val stage: String, val prepare: Boolean, val permille: Int, val task: String, + val done: Int, val total: Int, val etaSeconds: Int, val elapsedSeconds: Int, val pid: Int, +) { + val running get() = stage in RUNNING + val failed get() = stage == "failed" + + companion object { + private val RUNNING = setOf("checking", "fetching", "sdk", "planning", "building", "packaging", "restarting") + private const val PATH = "root/.cache/dd-lab-build.json" + /** A finished build stays on screen this long. */ + private const val SHOW_DONE_MS = 60_000L + + /** The build, while it runs and shortly after; null when there is none to show. */ + fun read(rootfs: File): LabProgress? { + val file = File(rootfs, PATH) + if (!file.isFile) return null + val parsed = parse(runCatching { file.readText() }.getOrNull() ?: return null) ?: return null + val progress = when { + !parsed.running || AgentProcesses.alive(parsed.pid) -> parsed + // The restart ends the app and the script with it, so a restart that got that far succeeded. + parsed.stage == "restarting" -> parsed.copy(stage = "ready") + else -> parsed.copy(stage = "failed", task = "stopped") + } + return progress.takeIf { it.running || System.currentTimeMillis() - file.lastModified() < SHOW_DONE_MS } + } + + /** Ends the build and Gradle's daemon, which keeps compiling after its client is gone. */ + fun cancel(rootfs: File, progress: LabProgress) { + AgentProcesses.killTree(progress.pid) + AgentProcesses.find("GradleDaemon").forEach(AgentProcesses::killTree) + runCatching { + File(rootfs, PATH).writeText(JSONObject().put("stage", "failed").put("task", "stopped").put("pid", 0).toString()) + } + } + + @VisibleForTesting + internal fun parse(json: String): LabProgress? = runCatching { + val o = JSONObject(json) + LabProgress( + o.getString("stage"), o.optString("mode") == "prepare", o.optInt("permille"), o.optString("task"), + o.optInt("done"), o.optInt("total"), o.optInt("eta", -1), o.optInt("elapsed"), o.optInt("pid"), + ) + }.getOrNull() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt index fcb5d08894..784b39d748 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt @@ -41,6 +41,7 @@ object WirelessAdbFix { writeAtomically(context, key, identity.second) } + @Synchronized private fun writeAtomically(context: Context, destination: File, contents: ByteArray) { val temporary = File(destination.parentFile, "${destination.name}.tmp") temporary.writeBytes(contents) @@ -70,6 +71,52 @@ object WirelessAdbFix { "$host:${saved.port ?: ""}" } + /** + * The saved pairing's connect address, looked up again when it no longer answers: Wireless + * debugging moves to another port whenever it restarts. + */ + fun liveConnectAddress(context: Context): String? { + val app = context.applicationContext + val saved = savedConnection(app) ?: return null + val host = if (':' in saved.host) "[${saved.host}]" else saved.host + saved.port?.takeIf { answers(saved.host, it) }?.let { return "$host:$it" } + val loopback = runCatching { InetAddress.getByName(saved.host).isLoopbackAddress }.getOrDefault(false) + val port = if (loopback) loopbackAdbPort(app) else findConnectPort(app, saved.host, accept = { answers(saved.host, it) }) + port ?: return null + saveConnection(app, saved.host, port) + return "$host:$port" + } + + /** + * Wireless debugging's port on this device. Apps can read neither service.adb.tls.port nor the + * socket table, and mDNS often advertises nothing, so the ephemeral range Linux gives adbd is + * scanned on loopback (closed ports refuse at once) and the open ports are tried with our key. + */ + private fun loopbackAdbPort(app: Context): Int? { + val open = java.util.concurrent.ConcurrentLinkedQueue() + val workers = 32 + val range = EPHEMERAL_PORTS + (0 until workers).map { worker -> + Thread { + var port = range.first + worker + while (port <= range.last) { + if (answers(LOOPBACK, port, 150)) open += port + port += workers + } + }.apply { start() } + }.forEach { it.join() } + loadOrCreateIdentity(app) + return open.sorted().firstOrNull { port -> + runCatching { Kadb.create(LOOPBACK, port, 1_000, 3_000).use { it.shell("true").exitCode == 0 } }.getOrDefault(false) + } + } + + private val EPHEMERAL_PORTS = 32768..60999 + + private fun answers(host: String, port: Int, timeoutMs: Int = 500) = runCatching { + java.net.Socket().use { it.connect(java.net.InetSocketAddress(host, port), timeoutMs) } + }.isSuccess + private fun saveConnection(context: Context, host: String, port: Int) { writeAtomically( context, @@ -94,7 +141,8 @@ object WirelessAdbFix { .invoke(null, "service.adb.tls.port") as? String }.getOrNull()?.trim()?.toIntOrNull()?.takeIf { it in 1..65535 } - fun findConnectPort(context: Context, pairedHost: String, timeoutSeconds: Long = 12): Int? { + /** [accept] can pass over stale services that still advertise a port Wireless debugging left. */ + fun findConnectPort(context: Context, pairedHost: String, timeoutSeconds: Long = 12, accept: (Int) -> Boolean = { true }): Int? { val manager = context.applicationContext.getSystemService(Context.NSD_SERVICE) as NsdManager val paired = runCatching { InetAddress.getByName(pairedHost) }.getOrNull() ?: return null val matches: (InetAddress) -> Boolean = @@ -122,7 +170,7 @@ object WirelessAdbFix { override fun onServiceResolved(serviceInfo: NsdServiceInfo) { val address = serviceInfo.host - if (address != null && matches(address) && finished.compareAndSet(false, true)) { + if (address != null && matches(address) && accept(serviceInfo.port) && finished.compareAndSet(false, true)) { resolvedPort.set(serviceInfo.port) latch.countDown() } else { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt new file mode 100644 index 0000000000..63dde38872 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt @@ -0,0 +1,307 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.animateContentSize +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.CheckCircle +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.Description +import androidx.compose.material.icons.outlined.ErrorOutline +import androidx.compose.material.icons.outlined.ExpandLess +import androidx.compose.material.icons.outlined.ExpandMore +import androidx.compose.material.icons.outlined.Psychology +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.text.withStyle +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentAttachments +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentHost.Entry + +@Composable +internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + when (entry) { + is Entry.Asked -> Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.spacedBy(6.dp)) { + if (entry.files.isNotEmpty()) Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { entry.files.forEach { AttachmentChip(it, null) } } + if (entry.text.isNotEmpty()) SelectionContainer { + Text(entry.text, fontSize = 15.sp, color = pal.onPrimary, + modifier = Modifier.widthIn(max = 560.dp).clip(Shape16).background(pal.primary).padding(horizontal = 14.dp, vertical = 10.dp)) + } + } + is Entry.Said -> SelectionContainer { AgentMarkdown(entry.text, Modifier.widthIn(max = 760.dp).padding(horizontal = 4.dp)) } + is Entry.Thought -> AgentThought(entry.text, live = false) + is Entry.Used -> if (entry.tool == "TodoWrite") AgentTodos(entry.input) else AgentToolCall(entry, running) + is Entry.Result -> Unit + is Entry.Finished -> if (last && AgentHost.answerless(AgentHost.entries)) AgentNoReply() else AgentTurnEnd(entry) + } +} + +@Composable +private fun AgentTurnEnd(entry: Entry.Finished) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val text = when { + entry.stopped -> stringResource(R.string.agent_stopped) + entry.error != null -> stringResource(R.string.agent_failed, entry.error) + else -> entry.usage?.let { u -> + buildList { + if (u.durationMs > 0) add(clock(u.durationMs / 1000)) + if (u.costUsd >= 0.005) add("$" + String.format(java.util.Locale.US, "%.2f", u.costUsd)) + if (u.inputTokens > 0 || u.outputTokens > 0) add(stringResource(R.string.agent_tokens, tokens(u.inputTokens), tokens(u.outputTokens))) + }.joinToString(" · ") + } + } ?: return + if (text.isEmpty()) return + Text(text, fontSize = 12.sp, color = if (entry.error != null && !entry.stopped) colors.error else pal.onSurfaceVariant, + modifier = Modifier.padding(horizontal = 4.dp)) +} + +@Composable +private fun AgentNoReply() { + val context = LocalContext.current + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.padding(horizontal = 4.dp)) { + Text(stringResource(R.string.agent_no_reply), fontSize = 13.sp, color = AttentionAmber) + SecondaryButton(stringResource(R.string.agent_retry), compact = true) { AgentHost.retry(context) } + } +} + +internal fun tokens(n: Long) = if (n >= 1000) "${n / 1000}k" else n.toString() + +@Composable +internal fun AgentThought(text: String, live: Boolean) { + val pal = LocalPalette.current + var open by rememberSaveable(text.take(40)) { mutableStateOf(false) } + Column(Modifier.padding(horizontal = 4.dp).animateContentSize()) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.clip(Shape12).clickable { open = !open }.padding(vertical = 4.dp)) { + Icon(Icons.Outlined.Psychology, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + Text(stringResource(if (live) R.string.agent_thinking else R.string.agent_thought), fontSize = 13.sp, color = pal.onSurfaceVariant, + modifier = Modifier.padding(start = 6.dp)) + Icon(if (open) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } + if (open || live) Text( + if (open) text else text.takeLast(240), fontSize = 13.sp, fontStyle = FontStyle.Italic, color = pal.onSurfaceVariant, lineHeight = 19.sp, + maxLines = if (open) Int.MAX_VALUE else 3, overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 760.dp).padding(start = 22.dp), + ) + } +} + +@Composable +private fun AgentTodos(list: String) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Column( + Modifier.widthIn(max = 560.dp).padding(horizontal = 4.dp).clip(Shape12).background(pal.surfaceVariant).padding(horizontal = 12.dp, vertical = 8.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + for (line in list.lines().filter { it.isNotBlank() }) { + val done = line.startsWith("[x]") + val doing = line.startsWith("[~]") + Row(verticalAlignment = Alignment.CenterVertically) { + Box(Modifier.size(14.dp).clip(Shape12).background(when { + done -> pal.good + doing -> pal.primary + else -> pal.line + })) + Text(line.drop(4), fontSize = 13.sp, color = if (done) pal.onSurfaceVariant else colors.onSurface, + fontWeight = if (doing) FontWeight.SemiBold else null, modifier = Modifier.padding(start = 8.dp)) + } + } + } +} + +/** A tool call: one line with its status, opening to the full input and output. */ +@Composable +private fun AgentToolCall(entry: Entry.Used, running: Boolean) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var open by rememberSaveable(entry.id.ifEmpty { entry.detail }) { mutableStateOf(false) } + Column( + Modifier.fillMaxWidth().padding(horizontal = 4.dp).clip(Shape12).background(pal.surfaceVariant).animateContentSize(), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().clickable { open = !open }.testTag("agent-tool").padding(horizontal = 10.dp, vertical = 8.dp), + ) { + Box(Modifier.size(16.dp), contentAlignment = Alignment.Center) { + when { + running -> CircularProgressIndicator(Modifier.size(13.dp), strokeWidth = 2.dp, color = pal.primary) + entry.failed -> Icon(Icons.Outlined.ErrorOutline, null, tint = colors.error, modifier = Modifier.size(16.dp)) + entry.output != null -> Icon(Icons.Outlined.CheckCircle, null, tint = pal.good, modifier = Modifier.size(16.dp)) + else -> Icon(Icons.Outlined.Close, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } + } + Text(entry.tool, fontSize = 12.5.sp, fontWeight = FontWeight.SemiBold, color = pal.primary, modifier = Modifier.padding(start = 8.dp)) + Text(entry.detail, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f).padding(start = 8.dp)) + Icon(if (open) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) + } + if (open) Column(Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + if (entry.input.isNotBlank()) CodeBox(stringResource(R.string.agent_tool_input), entry.input, colors.onSurface) + when { + entry.output == null && running -> Text(stringResource(R.string.agent_tool_running), fontSize = 12.sp, color = pal.onSurfaceVariant) + entry.output == null -> Text(stringResource(R.string.agent_tool_no_result), fontSize = 12.sp, color = pal.onSurfaceVariant) + entry.output.isBlank() -> Text(stringResource(R.string.agent_tool_empty), fontSize = 12.sp, color = pal.onSurfaceVariant) + else -> CodeBox(stringResource(R.string.agent_tool_output), entry.output, if (entry.failed) colors.error else colors.onSurface) + } + } + } +} + +@Composable +private fun CodeBox(label: String, text: String, color: Color) { + val pal = LocalPalette.current + Column { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp, color = pal.onSurfaceVariant, modifier = Modifier.padding(bottom = 3.dp)) + SelectionContainer { + Text( + text, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = color, lineHeight = 17.sp, + modifier = Modifier.fillMaxWidth().heightIn(max = 360.dp).clip(Shape12).background(MaterialTheme.colorScheme.surface) + .verticalScroll(rememberScrollState()).padding(10.dp), + ) + } + } +} + +/** An attached file: a thumbnail for images, the name otherwise; [onRemove] adds a remove mark. */ +@Composable +internal fun AttachmentChip(path: String, onRemove: (() -> Unit)?) { + val context = LocalContext.current + val pal = LocalPalette.current + Box { + if (AgentAttachments.isImage(path)) AsyncImage( + model = AgentAttachments.host(context, path), contentDescription = path.substringAfterLast('/'), contentScale = ContentScale.Crop, + modifier = Modifier.size(72.dp).clip(Shape12).background(pal.surfaceVariant), + ) else Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.heightIn(min = 40.dp).clip(Shape12).background(pal.surfaceVariant).padding(horizontal = 10.dp, vertical = 8.dp), + ) { + Icon(Icons.Outlined.Description, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) + Text(path.substringAfterLast('/'), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurface, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 200.dp).padding(start = 6.dp, end = if (onRemove != null) 18.dp else 0.dp)) + } + if (onRemove != null) Box( + contentAlignment = Alignment.Center, + modifier = Modifier.align(Alignment.TopEnd).padding(3.dp).size(20.dp).clip(Shape12).background(MaterialTheme.colorScheme.surface).clickable(onClick = onRemove), + ) { + Icon(Icons.Outlined.Close, stringResource(R.string.agent_remove_attachment), tint = pal.onSurfaceVariant, modifier = Modifier.size(14.dp)) + } + } +} + +/** The Markdown agents write: headings, lists, fenced code, `code` and **bold**. */ +@Composable +internal fun AgentMarkdown(text: String, modifier: Modifier) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column(modifier, verticalArrangement = Arrangement.spacedBy(6.dp)) { + for (block in markdownBlocks(text)) when (block) { + is MdBlock.Code -> Text(block.text, fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurface, + modifier = Modifier.fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(12.dp)) + is MdBlock.Line -> Text( + inlineMarkdown(block.text, pal.primary2, pal.surfaceVariant), + fontSize = if (block.heading) 17.sp else 15.sp, + fontWeight = if (block.heading) FontWeight.Bold else null, + lineHeight = 22.sp, color = colors.onSurface, + modifier = if (block.bullet) Modifier.padding(start = 12.dp) else Modifier, + ) + } + } +} + +internal sealed interface MdBlock { + data class Line(val text: String, val heading: Boolean = false, val bullet: Boolean = false) : MdBlock + data class Code(val text: String) : MdBlock +} + +private val HEADING = Regex("^#{1,6}\\s+") +private val BULLET = Regex("^\\s*[-*+]\\s+") + +internal fun markdownBlocks(text: String): List { + val out = mutableListOf() + val code = StringBuilder() + var inCode = false + for (raw in text.lines()) { + if (raw.trimStart().startsWith("```")) { + if (inCode) { + out += MdBlock.Code(code.toString().trimEnd('\n')) + code.clear() + } + inCode = !inCode + continue + } + if (inCode) { + code.append(raw).append('\n') + continue + } + val line = raw.trimEnd() + if (line.isBlank()) continue + val heading = HEADING.find(line) + val bullet = BULLET.find(line) + out += when { + heading != null -> MdBlock.Line(line.substring(heading.range.last + 1), heading = true) + bullet != null -> MdBlock.Line("• " + line.substring(bullet.range.last + 1), bullet = true) + else -> MdBlock.Line(line) + } + } + if (inCode && code.isNotEmpty()) out += MdBlock.Code(code.toString().trimEnd('\n')) + return out +} + +internal fun inlineMarkdown(text: String, codeColor: Color, codeBackground: Color): AnnotatedString = buildAnnotatedString { + var i = 0 + while (i < text.length) { + val boldEnd = if (text.startsWith("**", i)) text.indexOf("**", i + 2) else -1 + val tickEnd = if (text[i] == '`') text.indexOf('`', i + 1) else -1 + when { + boldEnd > i + 2 -> { + withStyle(SpanStyle(fontWeight = FontWeight.Bold)) { append(text, i + 2, boldEnd) } + i = boldEnd + 2 + } + tickEnd > i + 1 -> { + withStyle(SpanStyle(fontFamily = FontFamily.Monospace, color = codeColor, background = codeBackground)) { append(text, i + 1, tickEnd) } + i = tickEnd + 1 + } + else -> append(text[i++]) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt new file mode 100644 index 0000000000..9956d0469a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -0,0 +1,393 @@ +package com.droiddeck.launcher.ui + +import androidx.activity.compose.LocalActivityResultRegistryOwner +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.outlined.Send +import androidx.compose.material.icons.outlined.Add +import androidx.compose.material.icons.outlined.AttachFile +import androidx.compose.material.icons.outlined.AutoAwesome +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.ExpandMore +import androidx.compose.material.icons.outlined.History +import androidx.compose.material.icons.outlined.Memory +import androidx.compose.material.icons.outlined.Settings +import androidx.compose.material.icons.outlined.Stop +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentAttachments +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentHost.Entry +import com.droiddeck.launcher.agent.AgentSetup + +internal enum class AgentPanel { NONE, MODEL, HISTORY, PROCESSES } + +/** Slash commands the app handles itself; others go to the CLI, which has its own. */ +private val LOCAL_COMMANDS = listOf("/new", "/model", "/plan", "/history", "/processes", "/stop") +private val CLI_COMMANDS = listOf("/compact", "/cost", "/review", "/init") + +@Composable +internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true) { + val context = LocalContext.current + remember { AgentHost.refresh(context) } + LaunchedEffect(AgentHost.unseen, visible) { if (visible) AgentHost.seen() } + remember { AgentSetup.check(context) } + var setup by rememberSaveable { mutableStateOf(false) } + val draft = rememberSaveable { mutableStateOf("") } + if (setup || AgentHost.state == AgentHost.State.MISSING || !(AgentSetup.ready || AgentSetup.completed(context))) { + AgentSetupView(modifier, onDone = { setup = false }) + return + } + var panel by rememberSaveable { mutableStateOf(AgentPanel.NONE) } + Column(modifier.fillMaxSize()) { + AgentHeader(panel, { panel = if (panel == it) AgentPanel.NONE else it }, onSetup = { setup = true }) + when (panel) { + AgentPanel.HISTORY -> AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } + AgentPanel.PROCESSES -> AgentProcessList(Modifier.weight(1f)) + else -> { + if (panel == AgentPanel.MODEL) AgentModelPicker() + AgentConversation(Modifier.weight(1f)) + AgentStatus() + AgentComposer(draft, inputModifier) { panel = it } + } + } + } +} + +@Composable +private fun AgentHeader(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val working = AgentHost.state == AgentHost.State.WORKING + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp)) { + Column(Modifier.weight(1f)) { + Text(stringResource(R.string.rail_agent), fontSize = 22.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + val model = AgentHost.models(context).firstOrNull { it.id == AgentHost.model }?.label ?: AgentHost.model ?: stringResource(R.string.agent_model_default) + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.clip(Shape12).clickable { onPanel(AgentPanel.MODEL) }.padding(vertical = 2.dp).testTag("agent-model"), + ) { + val parts = listOfNotNull(AgentHost.harness.name, model, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) + Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant) + Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } + } + HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), selected = panel == AgentPanel.HISTORY, tag = "agent-history") { onPanel(AgentPanel.HISTORY) } + HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), selected = panel == AgentPanel.PROCESSES, tag = "agent-processes") { onPanel(AgentPanel.PROCESSES) } + HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), tag = "agent-new") { + AgentHost.forget(context) + if (panel != AgentPanel.NONE) onPanel(panel) + } + HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, tag = "agent-settings", onClick = onSetup) + } +} + +@Composable +internal fun HeaderAction(icon: ImageVector, label: String, enabled: Boolean = true, selected: Boolean = false, tag: String? = null, onClick: () -> Unit) { + val pal = LocalPalette.current + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(start = 8.dp).size(44.dp).clip(Shape12) + .background(if (selected) pal.primary.copy(alpha = 0.2f) else pal.surfaceVariant) + .clickable(enabled = enabled, onClick = onClick) + .then(if (tag != null) Modifier.testTag(tag) else Modifier), + ) { + Icon(icon, label, tint = when { + selected -> pal.primary + enabled -> pal.onBackground + else -> pal.onSurfaceVariant.copy(alpha = 0.5f) + }, modifier = Modifier.size(22.dp)) + } +} + +@Composable +private fun AgentConversation(modifier: Modifier) { + val pal = LocalPalette.current + val list = rememberLazyListState() + val working = AgentHost.state == AgentHost.State.WORKING + val atBottom by remember { derivedStateOf { !list.canScrollForward } } + val items = AgentHost.entries.size + (if (working) 1 else 0) + LaunchedEffect(items) { if (items > 0) list.animateScrollToItem(items - 1) } + LaunchedEffect(AgentHost.live.length / 80, AgentHost.liveThinking.length / 80) { + if (atBottom && items > 0) list.scrollToItem(items - 1, Int.MAX_VALUE / 2) + } + if (AgentHost.entries.isEmpty() && !working) { + Column(modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { + Icon(Icons.Outlined.AutoAwesome, null, tint = pal.primary, modifier = Modifier.size(40.dp)) + Text(stringResource(R.string.agent_empty), fontSize = 15.sp, color = pal.onSurfaceVariant, + textAlign = TextAlign.Center, modifier = Modifier.widthIn(max = 460.dp).padding(top = 12.dp)) + } + return + } + val start = AgentHost.entries.indexOfLast { it is Entry.Asked } + LazyColumn(modifier.fillMaxWidth(), state = list, verticalArrangement = Arrangement.spacedBy(10.dp)) { + items(AgentHost.entries.size) { i -> + val entry = AgentHost.entries[i] + AgentEntry(entry, running = working && i > start && entry is Entry.Used && entry.output == null, last = !working && i == AgentHost.entries.lastIndex) + } + if (working) item { AgentLive() } + } +} + +/** The reply being written, and what the agent is doing right now. */ +@Composable +private fun AgentLive() { + val pal = LocalPalette.current + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + if (AgentHost.liveThinking.isNotBlank()) AgentThought(AgentHost.liveThinking, live = true) + if (AgentHost.live.isNotBlank()) AgentMarkdown(AgentHost.live, Modifier.widthIn(max = 760.dp).padding(horizontal = 4.dp)) + val running = AgentHost.running() + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(4.dp)) { + CircularProgressIndicator(Modifier.size(14.dp), strokeWidth = 2.dp, color = pal.primary) + val elapsed = clock((AgentHost.now - AgentHost.turnStarted) / 1000) + Text( + if (running != null) stringResource(R.string.agent_running, running.tool, elapsed) else stringResource(R.string.agent_thinking_for, elapsed), + fontSize = 13.sp, color = pal.onSurfaceVariant, + ) + } + } +} + +internal fun clock(seconds: Long): String { + val s = seconds.coerceAtLeast(0) + return when { + s < 60 -> "${s}s" + s < 3600 -> "${s / 60}m ${s % 60}s" + else -> "${s / 3600}h ${s % 3600 / 60}m" + } +} + +/** Above the composer: a Lab build's progress, the todo item in progress, and queued messages. */ +@Composable +private fun AgentStatus() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val lab = AgentHost.lab + if (lab != null) { + var armed by remember(lab.pid) { mutableStateOf(false) } + Column( + Modifier.fillMaxWidth().padding(top = 10.dp).clip(Shape14).background(colors.surface).border(1.dp, if (lab.failed) AttentionAmber else pal.line, Shape14) + .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-lab"), + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column(Modifier.weight(1f)) { + Text( + stringResource(if (lab.prepare) R.string.agent_lab_preparing else R.string.agent_lab_building) + " · " + labStage(lab), + fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = if (lab.failed) AttentionAmber else colors.onBackground, + ) + val facts = buildList { + if (lab.running && lab.total > 0) add("${lab.done}/${lab.total}") + add(clock(lab.elapsedSeconds.toLong())) + if (lab.running && lab.etaSeconds >= 0) add(stringResource(R.string.agent_lab_left, clock(lab.etaSeconds.toLong()))) + } + Text(facts.joinToString(" · "), fontSize = 12.5.sp, color = pal.onSurfaceVariant) + } + if (lab.running) SecondaryButton(stringResource(if (armed) R.string.agent_lab_cancel_confirm else R.string.agent_lab_cancel), compact = true) { + if (armed) AgentHost.cancelLabBuild(context) else armed = true + } + } + if (lab.running) { + LinearProgressIndicator( + progress = { lab.permille / 1000f }, color = pal.primary, trackColor = pal.surfaceVariant, + modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(6.dp).clip(CircleShape), + ) + if (lab.task.isNotEmpty()) Text(lab.task, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 4.dp)) + } + } + } + val todos = AgentHost.todos()?.lines()?.filter { it.isNotBlank() } + if (AgentHost.state == AgentHost.State.WORKING && !todos.isNullOrEmpty()) { + val doing = todos.firstOrNull { it.startsWith("[~]") } ?: todos.firstOrNull { it.startsWith("[ ]") } + val done = todos.count { it.startsWith("[x]") } + if (doing != null) Text( + "${doing.drop(4)} · $done/${todos.size}", fontSize = 13.sp, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(top = 8.dp, start = 4.dp), + ) + } + for (queued in AgentHost.queue) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(top = 8.dp).fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(start = 12.dp), + ) { + Text(stringResource(R.string.agent_queued, queued.text), fontSize = 13.sp, color = pal.onSurfaceVariant, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(40.dp).clickable { AgentHost.unqueue(queued) }) { + Icon(Icons.Outlined.Close, stringResource(R.string.agent_unqueue), tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) + } + } + } +} + +@Composable +private fun labStage(lab: com.droiddeck.launcher.agent.LabProgress) = when (lab.stage) { + "building" -> stringResource(R.string.agent_lab_stage_building, lab.permille / 10) + "packaging" -> stringResource(R.string.agent_lab_stage_packaging) + "restarting" -> stringResource(R.string.agent_lab_stage_restarting) + "ready", "prepared" -> stringResource(R.string.agent_lab_stage_ready) + "failed" -> stringResource(R.string.agent_lab_stage_failed, lab.task) + else -> stringResource(R.string.agent_lab_stage_starting) +} + +@Composable +private fun AgentComposer(draftState: MutableState, inputModifier: Modifier, onPanel: (AgentPanel) -> Unit) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var draft by draftState + val working = AgentHost.state == AgentHost.State.WORKING + val send = send@{ + val text = draft.trim() + when (text.substringBefore(' ')) { + "/new" -> AgentHost.forget(context) + "/model" -> onPanel(AgentPanel.MODEL) + "/plan" -> AgentHost.choosePlan(context, !AgentHost.plan) + "/history" -> onPanel(AgentPanel.HISTORY) + "/processes" -> onPanel(AgentPanel.PROCESSES) + "/stop" -> AgentHost.stop(context) + else -> { + if (text.isEmpty() && AgentAttachments.pending.isEmpty()) return@send + AgentHost.send(context, text, AgentAttachments.pending.toList()) + AgentAttachments.pending.clear() + } + } + draft = "" + } + if (draft.startsWith("/") && !draft.contains(' ')) { + val matches = (LOCAL_COMMANDS + CLI_COMMANDS).filter { it.startsWith(draft) && it != draft } + if (matches.isNotEmpty()) Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.padding(top = 10.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + ) { + for (command in matches) Text( + command, fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = pal.primary, + modifier = Modifier.clip(Shape12).background(pal.surfaceVariant).clickable { draft = "$command " }.padding(horizontal = 12.dp, vertical = 8.dp), + ) + } + } + if (AgentAttachments.pending.isNotEmpty()) Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.padding(top = 10.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + ) { + for (path in AgentAttachments.pending.toList()) AttachmentChip(path) { AgentAttachments.pending.remove(path) } + } + var focused by remember { mutableStateOf(false) } + Row( + verticalAlignment = Alignment.Bottom, + modifier = Modifier.fillMaxWidth().padding(top = 10.dp, bottom = 16.dp).clip(Shape16).background(colors.surface) + .border(1.dp, if (focused) pal.primary else pal.line, Shape16).padding(start = 6.dp, end = 6.dp, top = 6.dp, bottom = 6.dp), + ) { + if (LocalActivityResultRegistryOwner.current != null) AttachButton() + Box(Modifier.weight(1f).padding(start = 8.dp, top = 11.dp, bottom = 11.dp)) { + if (draft.isEmpty()) Text( + stringResource(if (working) R.string.agent_hint_working else R.string.agent_hint), fontSize = 16.sp, + color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + BasicTextField( + draft, { draft = it }, + Modifier.fillMaxWidth().onFocusChanged { focused = it.isFocused }.testTag("agent-input").then(inputModifier), + textStyle = TextStyle(fontSize = 16.sp, color = colors.onSurface), + cursorBrush = SolidColor(pal.primary), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), + keyboardActions = KeyboardActions(onSend = { send() }), + maxLines = 6, + ) + } + if (working) RoundButton(Icons.Outlined.Stop, stringResource(R.string.agent_stop), pal.error.copy(alpha = 0.22f), colors.error, "agent-stop") { + AgentHost.stop(context) + } + val canSend = draft.isNotBlank() || AgentAttachments.pending.isNotEmpty() + RoundButton( + Icons.AutoMirrored.Outlined.Send, stringResource(if (working) R.string.agent_queue else R.string.agent_send), + if (canSend) pal.primary else pal.surfaceVariant, if (canSend) pal.onPrimary else pal.onSurfaceVariant, "agent-send", enabled = canSend, + ) { send() } + } +} + +@Composable +private fun AttachButton() { + val context = LocalContext.current + val pal = LocalPalette.current + val picker = rememberLauncherForActivityResult(ActivityResultContracts.OpenMultipleDocuments()) { uris -> + if (uris.isEmpty()) return@rememberLauncherForActivityResult + val chat = AgentHost.chat + Thread({ + val paths = AgentAttachments.copy(context, chat, uris) + android.os.Handler(android.os.Looper.getMainLooper()).post { + if (AgentHost.chat == chat) AgentAttachments.pending.addAll(paths) else AgentAttachments.discard(context, paths) + } + }, "agent-attach").start() + } + RoundButton(Icons.Outlined.AttachFile, stringResource(R.string.agent_attach), pal.surfaceVariant, pal.onBackground, "agent-attach") { + runCatching { picker.launch(arrayOf("*/*")) } + } +} + +@Composable +private fun RoundButton( + icon: ImageVector, label: String, background: androidx.compose.ui.graphics.Color, tint: androidx.compose.ui.graphics.Color, + tag: String, enabled: Boolean = true, onClick: () -> Unit, +) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(start = 6.dp).size(46.dp).clip(CircleShape).background(background) + .clickable(enabled = enabled, onClick = onClick).testTag(tag), + ) { + Icon(icon, label, tint = tint, modifier = Modifier.size(22.dp)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt new file mode 100644 index 0000000000..fd9b9bf8cf --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -0,0 +1,182 @@ +package com.droiddeck.launcher.ui + +import android.text.format.DateUtils +import android.text.format.Formatter +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentChats +import com.droiddeck.launcher.agent.AgentHarness +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentProcesses +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +/** The model and plan mode for the next turns; a conversation keeps going with whatever is chosen. */ +@Composable +internal fun AgentModelPicker() { + val context = LocalContext.current + val pal = LocalPalette.current + val models = remember(AgentHost.harness) { AgentHost.models(context) } + Column(Modifier.fillMaxWidth().padding(bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.horizontalScroll(rememberScrollState())) { + val choices = listOf(AgentHarness.Model("", stringResource(R.string.agent_model_default))) + models + for (choice in choices) { + val id = choice.id.ifEmpty { null } + if (id == AgentHost.model) PrimaryButton(choice.label, compact = true) {} + else SecondaryButton(choice.label, compact = true) { AgentHost.chooseModel(context, id) } + } + } + if (AgentHost.harness.plans) Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(horizontal = 2.dp)) { + Column(Modifier.weight(1f)) { + Text(stringResource(R.string.agent_plan), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) + Text(stringResource(R.string.agent_plan_hint), fontSize = 12.5.sp, color = pal.onSurfaceVariant) + } + ToggleSwitch(AgentHost.plan, label = stringResource(R.string.agent_plan)) { AgentHost.choosePlan(context, it) } + } + } +} + +@Composable +internal fun AgentHistory(modifier: Modifier, onOpened: () -> Unit) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var version by remember { mutableIntStateOf(0) } + val chats by produceState(emptyList(), version, AgentHost.entries.size) { + value = withContext(Dispatchers.IO) { AgentChats.list(context) } + } + if (chats.isEmpty()) { + Box(modifier.fillMaxWidth(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.agent_history_empty), fontSize = 15.sp, color = pal.onSurfaceVariant) + } + return + } + val working = AgentHost.state == AgentHost.State.WORKING + LazyColumn(modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { + items(chats, key = { it.id }) { chat -> + var armed by remember(chat.id) { mutableStateOf(false) } + val current = chat.id == AgentHost.chat + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().heightIn(min = 62.dp) + .clickable(enabled = !working || current) { + AgentHost.open(context, chat.id) + onOpened() + } + .background(if (current) pal.primary.copy(alpha = 0.12f) else colors.surface) + .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-chat"), + ) { + Column(Modifier.weight(1f)) { + Text(chat.title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text( + if (armed) stringResource(R.string.agent_history_delete_warning) + else AgentHarness.byId(chat.harness).name + " · " + when { + System.currentTimeMillis() - chat.updated < 60_000 -> stringResource(R.string.agent_just_now) + else -> DateUtils.getRelativeTimeSpanString(chat.updated, System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS).toString() + }, + fontSize = 12.5.sp, color = if (armed) AttentionAmber else pal.onSurfaceVariant, + ) + } + SecondaryButton( + stringResource(if (armed) R.string.agent_storage_confirm else R.string.agent_history_delete), compact = true, + enabled = !(current && working), + ) { + if (armed) { + AgentHost.delete(context, chat.id) + version++ + } else armed = true + } + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } + } +} + +/** Processes in the Linux userland, the agent's own first, each with a way to end it. */ +@Composable +internal fun AgentProcessList(modifier: Modifier) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var refresh by remember { mutableIntStateOf(0) } + var procs by remember { mutableStateOf?>(null) } + LaunchedEffect(refresh) { + while (true) { + procs = withContext(Dispatchers.IO) { AgentProcesses.snapshot(AgentHost.turnPid) } + delay(2_000) + } + } + val list = procs ?: return + if (list.isEmpty()) { + Box(modifier.fillMaxWidth(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.agent_processes_empty), fontSize = 15.sp, color = pal.onSurfaceVariant) + } + return + } + LazyColumn(modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { + items(list, key = { it.pid }) { proc -> + var open by remember(proc.pid) { mutableStateOf(false) } + Column(Modifier.fillMaxWidth().clickable { open = !open }.padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-process")) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column(Modifier.weight(1f)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(proc.name, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + if (proc.agent) Text(stringResource(R.string.agent_process_agent), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = pal.primary, + modifier = Modifier.clip(Shape12).background(pal.primary.copy(alpha = 0.15f)).padding(horizontal = 6.dp, vertical = 1.dp)) + } + Text( + listOf("pid ${proc.pid}", clock(proc.seconds), Formatter.formatShortFileSize(context, proc.rssKb * 1024), "${proc.cpuPercent}% CPU").joinToString(" · "), + fontSize = 12.5.sp, color = pal.onSurfaceVariant, + ) + } + SecondaryButton(stringResource(R.string.agent_process_stop), compact = true) { + AgentProcesses.killTree(proc.pid) + refresh++ + } + } + SelectionContainer { + Text(proc.args, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, + maxLines = if (open) 40 else 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 4.dp)) + } + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt new file mode 100644 index 0000000000..857e2edce9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt @@ -0,0 +1,215 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.PairingGuideActivity +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentHarness +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentSetup +import com.droiddeck.launcher.agent.AgentStorage +import android.text.format.Formatter +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Alignment +import com.droiddeck.launcher.agent.AgentSetup.Status +import com.droiddeck.launcher.agent.AgentSetup.Step +import com.droiddeck.launcher.core.WirelessAdbPairingService + +@Composable +internal fun AgentSetupView(modifier: Modifier, onDone: () -> Unit = {}) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + LaunchedEffect(AgentHost.harness) { + AgentSetup.check(context) + AgentStorage.measure(context) + } + val lifecycle = LocalLifecycleOwner.current.lifecycle + DisposableEffect(lifecycle) { + var left = false + val observer = LifecycleEventObserver { _, event -> + if (event == Lifecycle.Event.ON_PAUSE) left = true + if (event == Lifecycle.Event.ON_RESUME && left) { + left = false + AgentSetup.check(context) + } + } + lifecycle.addObserver(observer) + onDispose { lifecycle.removeObserver(observer) } + } + Column(modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(14.dp)) { + Text(stringResource(R.string.agent_setup_title), fontSize = 22.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + if (!AgentSetup.runtimeInstalled) { + Note(stringResource(R.string.agent_setup_runtime)) + return@Column + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { + for (harness in AgentHarness.all) { + val chosen = harness == AgentHost.harness + if (chosen) PrimaryButton(harness.name, compact = true) {} else SecondaryButton(harness.name, enabled = !AgentSetup.busy, compact = true) { AgentHost.choose(context, harness) } + } + } + val steps = Step.entries + val done = steps.count { AgentSetup.status[it] == Status.DONE } + val busy = steps.any { AgentSetup.status[it] == Status.WORKING } + var details by rememberSaveable { mutableStateOf(false) } + val summary = if (AgentSetup.ready) buildList { + add(stringResource(R.string.agent_summary_signed_in, AgentHost.harness.name)) + if (AgentSetup.status[Step.GITHUB] == Status.DONE) add(stringResource(R.string.agent_step_github)) + if (AgentSetup.status[Step.BUILD_TOOLS] == Status.DONE) add(stringResource(R.string.agent_summary_lab)) + if (AgentSetup.status[Step.PREPARE] == Status.DONE) add(stringResource(R.string.agent_summary_fast)) + }.joinToString(" · ") else steps.firstOrNull { it.required && AgentSetup.status[it] != Status.DONE }?.let { labels(it, AgentHost.harness.name).first }.orEmpty() + ReadinessCard( + done, steps.size, summary, details || !AgentSetup.ready || busy, { details = !details }, + title = stringResource(if (AgentSetup.ready) R.string.agent_summary_ready else R.string.agent_summary_not_ready), + ready = AgentSetup.ready, + ) { + steps.forEachIndexed { index, step -> + val status = AgentSetup.status[step] ?: Status.UNKNOWN + val (title, hint) = labels(step, AgentHost.harness.name) + val lab = AgentHost.lab?.takeIf { it.prepare && it.running } + val detail = if (step == Step.PREPARE && lab != null) + stringResource(R.string.agent_prepare_progress, lab.permille / 10, clock(lab.etaSeconds.toLong().coerceAtLeast(0))) + else AgentSetup.detail[step] ?: hint + CheckRow( + when (status) { + Status.DONE -> CheckState.OK + Status.WORKING, Status.UNKNOWN -> CheckState.BUSY + Status.TODO, Status.FAILED -> CheckState.WARN + }, + title, detail, divider = index < steps.lastIndex, + ) { + val blocked = (step in setOf(Step.SIGN_IN, Step.GITHUB, Step.BUILD_TOOLS) && AgentSetup.status[Step.INSTALL] != Status.DONE) || + (step == Step.PREPARE && AgentSetup.status[Step.BUILD_TOOLS] != Status.DONE) + if ((status == Status.TODO || status == Status.FAILED) && !blocked) { + val label = stringResource(if (status == Status.FAILED) R.string.agent_setup_retry else action(step)) + val run = { if (step == Step.CONNECTION) pair(context) else AgentSetup.run(context, step) } + if (step.required) PrimaryButton(label, compact = true, onClick = run) else SecondaryButton(label, compact = true, onClick = run) + } + } + } + } + if (AgentSetup.ready || AgentSetup.completed(context)) PrimaryButton(stringResource(R.string.agent_setup_done), main = true, onClick = onDone) + StorageCard() + } +} + +@Composable +private fun StorageCard() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val items = AgentStorage.Item.entries.filter { (AgentStorage.sizes[it] ?: 0L) > 0L } + if (items.isEmpty()) return + val total = items.sumOf { AgentStorage.sizes[it] ?: 0L } + var open by rememberSaveable { mutableStateOf(false) } + Column(Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().heightIn(min = 60.dp).padding(horizontal = 14.dp, vertical = 10.dp)) { + Column(Modifier.weight(1f)) { + Text(stringResource(R.string.agent_storage_title), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Text(Formatter.formatShortFileSize(context, total), fontSize = 13.sp, color = pal.onSurfaceVariant) + } + SecondaryButton(stringResource(if (open) R.string.common_hide else R.string.setup_details), compact = true) { open = !open } + } + if (open) items.forEachIndexed { index, item -> + if (index == 0) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + var armed by remember(item) { mutableStateOf(false) } + val busy = AgentStorage.removing[item] == true + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().heightIn(min = 60.dp).padding(horizontal = 14.dp, vertical = 10.dp), + ) { + Column(Modifier.weight(1f)) { + Text(stringResource(storageTitle(item)), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Text( + if (armed) stringResource(storageWarning(item)) else Formatter.formatShortFileSize(context, AgentStorage.sizes[item] ?: 0L), + fontSize = 13.sp, color = if (armed) AttentionAmber else pal.onSurfaceVariant, + ) + } + SecondaryButton( + stringResource(if (armed) R.string.agent_storage_confirm else R.string.agent_storage_remove), + enabled = !busy && AgentHost.state != AgentHost.State.WORKING, compact = true, + ) { + if (armed) { + armed = false + AgentStorage.remove(context, item) + } else armed = true + } + } + if (index < items.lastIndex) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } + } +} + +private fun storageTitle(item: AgentStorage.Item) = when (item) { + AgentStorage.Item.CLAUDE_CODE -> R.string.agent_storage_claude + AgentStorage.Item.CODEX -> R.string.agent_storage_codex + AgentStorage.Item.BUILD_TOOLS -> R.string.agent_step_build + AgentStorage.Item.SOURCE -> R.string.agent_storage_source + AgentStorage.Item.CACHES -> R.string.agent_storage_caches +} + +private fun storageWarning(item: AgentStorage.Item) = when (item) { + AgentStorage.Item.SOURCE -> R.string.agent_storage_source_warning + AgentStorage.Item.CACHES -> R.string.agent_storage_caches_warning + else -> R.string.agent_storage_reinstall_warning +} + +@Composable +private fun labels(step: Step, harness: String): Pair = when (step) { + Step.CONNECTION -> stringResource(R.string.agent_step_connection) to stringResource(R.string.agent_step_connection_hint) + Step.INSTALL -> stringResource(R.string.agent_step_install, harness) to stringResource(R.string.agent_step_install_hint) + Step.SIGN_IN -> stringResource(R.string.agent_step_sign_in, harness) to stringResource(R.string.agent_step_sign_in_hint) + Step.GITHUB -> stringResource(R.string.agent_step_github) to stringResource(R.string.agent_step_github_hint) + Step.BUILD_TOOLS -> stringResource(R.string.agent_step_build) to stringResource(R.string.agent_step_build_hint) + Step.PREPARE -> stringResource(R.string.agent_step_prepare) to stringResource(R.string.agent_step_prepare_hint) +} + +private fun action(step: Step): Int = when (step) { + Step.CONNECTION -> R.string.agent_action_pair + Step.INSTALL -> R.string.agent_action_install + Step.SIGN_IN, Step.GITHUB -> R.string.agent_action_sign_in + Step.BUILD_TOOLS -> R.string.agent_action_install + Step.PREPARE -> R.string.agent_action_prepare +} + +/** The pairing DroidDeck already uses for the phantom process fix; the agent reuses its key. */ +private fun pair(context: android.content.Context) { + if (!WirelessAdbPairingService.notificationsEnabled(context)) { + context.startActivity(android.content.Intent(android.provider.Settings.ACTION_APP_NOTIFICATION_SETTINGS) + .putExtra(android.provider.Settings.EXTRA_APP_PACKAGE, context.packageName) + .addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)) + return + } + WirelessAdbPairingService.start(context) + PairingGuideActivity.start(context, null, false) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 1c4536fc02..2259a2b34e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -270,6 +270,10 @@ private fun Content( DesktopPage(s, a, modifier, onSelect) return } + if (selected == "agent") { + AgentPage(modifier.padding(horizontal = padH).padding(top = padV)) + return + } if (selected == "android-apps" && s.isHomeApp) { AndroidAppsPage(s, modifier, onAndroidAppClick) return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index ecc597c930..5358b221e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -47,6 +47,7 @@ import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Apps +import androidx.compose.material.icons.outlined.AutoAwesome import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers import androidx.compose.material.icons.outlined.LocalMall @@ -123,7 +124,9 @@ internal fun BottomBar( internal fun navigationKeys(s: FrontEndState) = buildList { add("steam"); add("games") if (s.gameStoresEnabled) add("stores") - add("desktop"); add("components") + add("desktop") + if (com.droiddeck.launcher.agent.AgentHost.available) add("agent") + add("components") if (s.isHomeApp) add("android-apps") add("setup"); add("updates") } @@ -156,7 +159,7 @@ internal fun SideRail( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier.width(if (iconOnly) 64.dp else 92.dp).background(colors.surface).padding(vertical = if (compact) 8.dp else 12.dp), ) { - val count = 6 + (if (s.gameStoresEnabled) 1 else 0) + (if (s.isHomeApp) 1 else 0) + val count = navigationKeys(s).size BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) { val fit = (maxHeight / count - 4.dp).coerceIn(44.dp, if (iconOnly) 48.dp else if (compact) 52.dp else 60.dp) val shown = Hops.railPreview ?: selected @@ -197,6 +200,7 @@ internal fun railLabelIcon(key: String): Pair = when (key) { "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall "desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows "components" -> R.string.rail_components to Icons.Outlined.Layers + "agent" -> R.string.rail_agent to Icons.Outlined.AutoAwesome "android-apps" -> R.string.rail_apps to Icons.Outlined.Apps "setup" -> R.string.rail_setup to Icons.Outlined.Tune else -> R.string.rail_updates to Icons.Outlined.SystemUpdate diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 3532d3e771..79ce769131 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -84,7 +84,7 @@ import com.droiddeck.launcher.stores.download.StoreDownloadTier import com.droiddeck.launcher.R -private enum class CheckState { OK, WARN, BUSY } +internal enum class CheckState { OK, WARN, BUSY } private const val STORAGE_TAB = 3 private const val LAUNCHER_TAB = 2 @@ -97,7 +97,7 @@ private const val GLASSES_TAB = 6 private const val SYNC_TAB = 4 @Composable -private fun CheckRow(state: CheckState, title: String, detail: String?, divider: Boolean = true, action: (@Composable () -> Unit)? = null) { +internal fun CheckRow(state: CheckState, title: String, detail: String?, divider: Boolean = true, action: (@Composable () -> Unit)? = null) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val tint = when (state) { @@ -690,10 +690,12 @@ internal fun SetupPanel( } @Composable -private fun ReadinessCard(passing: Int, total: Int, line: String, open: Boolean, onDetails: () -> Unit, checks: @Composable () -> Unit) { +internal fun ReadinessCard( + passing: Int, total: Int, line: String, open: Boolean, onDetails: () -> Unit, title: String? = null, ready: Boolean = passing == total, + checks: @Composable () -> Unit, +) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val ready = passing == total Column(Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp), @@ -709,7 +711,7 @@ private fun ReadinessCard(passing: Int, total: Int, line: String, open: Boolean, } Column(Modifier.weight(1f)) { Text( - stringResource(if (ready) R.string.setup_ready else R.string.setup_not_ready), + title ?: stringResource(if (ready) R.string.setup_ready else R.string.setup_not_ready), fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, ) if (line.isNotEmpty()) Text(line, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index 07289bdf29..a0d75f027a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -9,12 +9,16 @@ internal enum class SessionDrawerPage(val firstControl: String) { EFFECTS("look"), VR("steamvr"), GAMES("anisotropy"), + AGENT("agent-input"), SESSION("suspend"), } -internal fun sessionDrawerPages(hasSecondScreen: Boolean, hasGlasses: Boolean = false): List = +internal fun sessionDrawerPages( + hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed, +): List = SessionDrawerPage.entries.filter { - (hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) + (hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) && + (hasAgent || it != SessionDrawerPage.AGENT) } internal fun List.step(current: SessionDrawerPage, direction: Int): SessionDrawerPage { 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 7315817c1c..5752578234 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -43,6 +43,7 @@ import androidx.compose.material.icons.outlined.PowerSettingsNew import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers +import androidx.compose.material.icons.outlined.AutoAwesome import androidx.compose.material.icons.outlined.ScreenShare import androidx.compose.material.icons.outlined.Pause import androidx.compose.material.icons.outlined.PictureInPictureAlt @@ -172,6 +173,7 @@ private val SessionDrawerPage.title: Int get() = when (this) { SessionDrawerPage.VR -> R.string.vr_title SessionDrawerPage.EFFECTS -> R.string.drawer_page_effects SessionDrawerPage.GAMES -> R.string.game_settings_title + SessionDrawerPage.AGENT -> R.string.rail_agent SessionDrawerPage.SESSION -> R.string.mode_session } @@ -184,6 +186,7 @@ private val SessionDrawerPage.icon get() = when (this) { SessionDrawerPage.VR -> VrHeadsetIcon SessionDrawerPage.EFFECTS -> Icons.Outlined.AutoFixHigh SessionDrawerPage.GAMES -> Icons.Outlined.Layers + SessionDrawerPage.AGENT -> Icons.Outlined.AutoAwesome SessionDrawerPage.SESSION -> Icons.Outlined.Settings } @@ -550,7 +553,12 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont glassesPages, glassesTab, modifier = Modifier.fillMaxWidth().padding(top = 8.dp), tabModifier = { key -> focus.track(page, "glasses-tab-$key").testTag("glasses-tab-$key") }, ) { selectedGlassesTab = it } - Column( + // The agent's chat scrolls itself and keeps its composer at the bottom, so it takes the height left. + if (page == SessionDrawerPage.AGENT) AgentPage( + Modifier.weight(1f).fillMaxWidth().padding(top = 8.dp, start = 14.dp, end = 14.dp), + inputModifier = focus.track(page, "agent-input"), + visible = open, + ) else Column( modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll.getValue(page)), ) { CompositionLocalProvider(LocalChipMinWidth provides 96.dp, LocalCompactSettings provides true) { when (page) { @@ -762,6 +770,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont track = { key -> focus.track(page, key) }, ) } + SessionDrawerPage.AGENT -> Unit SessionDrawerPage.SESSION -> { if (a.isHomeApp) SettingsGroup(stringResource(R.string.drawer_android_apps)) { SettingsRow(stringResource(R.string.drawer_launch_app), null) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index a1af06a863..990d085f15 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -285,7 +285,15 @@ private fun ChannelPicker(u: UpdatesState, ua: UpdatesActions, sessionRunning: B tests.forEach { t -> TestRow(t, u.follow.pr == t.pr) { ua.onFollow(Follow(Channel.TEST, t.pr)) } } } } - LabBuilds(sessionRunning) + val context = androidx.compose.ui.platform.LocalContext.current + val agentReady = com.droiddeck.launcher.agent.AgentHost.installed && + (com.droiddeck.launcher.agent.AgentSetup.ready || com.droiddeck.launcher.agent.AgentSetup.completed(context)) + LabBuilds(sessionRunning, onRebuild = if (agentReady) { info -> + com.droiddeck.launcher.agent.AgentHost.send(context, context.getString(R.string.agent_rebuild_lab, info.label)) + context.startActivity(android.content.Intent(context, com.droiddeck.launcher.FrontEndActivity::class.java) + .putExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV, "agent") + .addFlags(android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP or android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)) + } else null) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 309d3e4154..fd395216de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1144,6 +1144,101 @@ Lab build turned off It was built for another version of DroidDeck. It is kept in Updates. DroidDeck did not start on it twice + Agent + Agent + Agent is working + Install Claude Code in the Linux userland to use the agent. + Ask about a game, a crash, or a change to DroidDeck + Send + New conversation + Stop + Storage + Remove + Remove now + Claude Code + Codex + DroidDeck source + Download caches + Changes that are not pushed are lost + Builds download these again + Setup can install it again; sign-ins are kept + DroidDeck restarted on your Lab build. Continue where you left off. + Ask it why a game won\'t start, to explain a log, or to change DroidDeck and try the change on this device. + Failed: %1$s + %1$s ended (exit %2$d) + Stopped + Ended without a reply + Retry + Setting up the agent + Rebuild my Lab build %1$s for the installed version of DroidDeck and restart on it. + %1$s in · %2$s out + Thinking + Thought + Thinking · %1$s + %1$s · %2$s + INPUT + OUTPUT + Running… + No result: the turn ended first + No output + Type to queue the next message + Queue + Next: %1$s + Don\'t send + Attach + Remove + Default + Plan first + Plan + Proposes a plan without changing anything + Conversations + No conversations yet + Just now + Delete + Deletes it and its attachments + Processes + Nothing is running in the Linux userland + AGENT + Stop + Lab build + Preparing Lab builds + %1$d%% · about %2$s left + about %1$s left + Cancel + Cancel build + Starting + %1$d%% + Packaging + Restarting DroidDeck on it + Done + Failed: %1$s + Set up the agent + Install the Linux runtime in Setup first. + Retry + Start chatting + Device connection + Wireless debugging, so the agent can see and drive DroidDeck + Install %1$s + Into the Linux userland, with git, gh and adb + Sign in to %1$s + Opens your browser + GitHub + Optional, to open pull requests + Build tools + Optional, for Lab builds on this device · about 5 GB + Agent ready + Finish setting up the agent + Signed in to %1$s + Lab builds + fast builds + Fast Lab builds + Compiles this version ahead, so Lab builds take minutes · about 20 minutes once + Compiling · %1$d%% · about %2$s left + Prepare + Wireless debugging isn\'t reachable; Pair turns it on + Pair + Install + Sign in PR #%1$d Not built for this copy of DroidDeck Updated %1$s diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt new file mode 100644 index 0000000000..23a176c201 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt @@ -0,0 +1,190 @@ +package com.droiddeck.launcher.agent + +import com.droiddeck.launcher.agent.AgentHost.Entry +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.io.File +import java.nio.file.Files + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class AgentHostTest { + @Test fun claudeInitCarriesOnlyTheConversation() { + val event = ClaudeCode.parse("""{"type":"system","subtype":"init","session_id":"abc","tools":[]}""")!! + assertEquals("abc", event.conversation) + assertEquals(emptyList(), event.entries) + } + + @Test fun claudeTextThinkingAndToolUseBecomeEntries() { + val event = ClaudeCode.parse( + """{"type":"assistant","session_id":"abc","message":{"content":[ + {"type":"text","text":" Looking at the log. "}, + {"type":"tool_use","id":"t1","name":"Bash","input":{"command":"droiddeckctl state\nmore"}}, + {"type":"thinking","thinking":"why"}],"usage":{"input_tokens":10,"cache_read_input_tokens":90,"output_tokens":5}}}""", + )!! + assertEquals(listOf(Entry.Said("Looking at the log."), Entry.Used("t1", "Bash", "droiddeckctl state", "droiddeckctl state\nmore"), Entry.Thought("why")), event.entries) + assertEquals(105L, event.context) + } + + @Test fun claudeStreamsTextAsItIsWritten() { + val event = ClaudeCode.parse("""{"type":"stream_event","event":{"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"Hel"}}}""")!! + assertEquals("Hel", event.text) + assertEquals("hm", ClaudeCode.parse("""{"type":"stream_event","event":{"type":"content_block_delta","delta":{"type":"thinking_delta","thinking":"hm"}}}""")!!.thinking) + assertNull(ClaudeCode.parse("""{"type":"stream_event","event":{"type":"message_start"}}""")) + } + + @Test fun claudeToolResultsAnswerTheirCall() { + val event = ClaudeCode.parse( + """{"type":"user","message":{"content":[{"type":"tool_result","tool_use_id":"t1","content":[{"type":"text","text":"ok"}],"is_error":true}]}}""", + )!! + assertEquals(listOf(Entry.Result("t1", "ok", true)), event.entries) + val entries = mutableListOf(Entry.Used("t1", "Bash", "ls", "ls")) + assertTrue(AgentChats.merge(entries, event.entries.single())) + assertEquals(Entry.Used("t1", "Bash", "ls", "ls", "ok", true), entries.single()) + assertFalse(AgentChats.merge(entries, Entry.Result("unknown", "x", false))) + } + + @Test fun aClaudeResultEndsTheTurnWithItsUsage() { + val event = ClaudeCode.parse("""{"type":"result","subtype":"success","is_error":false,"result":"done","duration_ms":4200,"total_cost_usd":0.05,"usage":{"input_tokens":3,"output_tokens":7}}""")!! + assertEquals(listOf(Entry.Finished(null)), event.entries) + assertEquals(AgentHost.Usage(4200, 0.05, 3, 7), event.usage) + assertEquals(listOf(Entry.Finished("Invalid API key")), + ClaudeCode.parse("""{"type":"result","subtype":"success","is_error":true,"result":"Invalid API key"}""")!!.entries) + assertNull(ClaudeCode.parse("not json")) + } + + @Test fun aResultForALeftoverBackgroundTaskDoesNotEndTheTurn() { + val event = ClaudeCode.parse("""{"type":"result","is_error":false,"num_turns":0,"session_id":"s","total_cost_usd":0,"usage":{"input_tokens":0,"output_tokens":0},"origin":{"kind":"task-notification"}}""") + assertTrue(event == null || event.entries.none { it is Entry.Finished }) + } + + @Test fun claudeTurnsBypassPermissionsOrPlanAndTakeAModel() { + val first = ClaudeCode.turn("hi", null, AgentHarness.Options()) + assertTrue("bypassPermissions" in first && "--resume" !in first && "--model" !in first && "--include-partial-messages" in first) + val next = ClaudeCode.turn("hi", "abc", AgentHarness.Options(model = "opus", plan = true)) + assertEquals("abc", next[next.indexOf("--resume") + 1]) + assertEquals("opus", next[next.indexOf("--model") + 1]) + assertEquals("plan", next[next.indexOf("--permission-mode") + 1]) + } + + @Test fun claudeShowsWholeEditsAndTodos() { + assertEquals("a.kt\n\n- old\n\n+ new", ClaudeCode.fullInput("Edit", org.json.JSONObject("""{"file_path":"a.kt","old_string":"old","new_string":"new"}"""))) + assertEquals("[x] read\n[~] fix\n[ ] test", ClaudeCode.fullInput("TodoWrite", org.json.JSONObject( + """{"todos":[{"content":"read","status":"completed"},{"content":"fix","status":"in_progress"},{"content":"test","status":"pending"}]}"""))) + } + + @Test fun codexEventsBecomeEntries() { + assertEquals("t1", Codex.parse("""{"type":"thread.started","thread_id":"t1"}""")!!.conversation) + assertEquals(listOf(Entry.Used("i1", "Shell", "uname -m", "uname -m")), + Codex.parse("""{"type":"item.started","item":{"id":"i1","type":"command_execution","command":"uname -m","status":"in_progress"}}""")!!.entries) + assertEquals(listOf(Entry.Result("i1", "aarch64\n", false)), + Codex.parse("""{"type":"item.completed","item":{"id":"i1","type":"command_execution","command":"uname -m","aggregated_output":"aarch64\n","exit_code":0}}""")!!.entries) + assertEquals(listOf(Entry.Said("It is aarch64.")), + Codex.parse("""{"type":"item.completed","item":{"id":"i2","type":"agent_message","text":"It is aarch64."}}""")!!.entries) + assertEquals(Entry.Used("i3", "Edit", "a.kt, b.kt", "a.kt\nb.kt"), + Codex.parse("""{"type":"item.completed","item":{"id":"i3","type":"file_change","status":"completed","changes":[{"path":"a.kt"},{"path":"b.kt"}]}}""")!!.entries.first()) + assertEquals(listOf(Entry.Finished(null)), Codex.parse("""{"type":"turn.completed","usage":{}}""")!!.entries) + assertEquals(listOf(Entry.Finished("quota")), Codex.parse("""{"type":"turn.failed","error":{"message":"quota"}}""")!!.entries) + assertNull(Codex.parse("""{"type":"error","message":"Reconnecting... 1/5 (stream disconnected before completion)"}""")) + assertEquals(listOf(Entry.Finished("unauthorized")), Codex.parse("""{"type":"error","message":"unauthorized"}""")!!.entries) + assertNull(Codex.parse("""{"type":"item.started","item":{"type":"reasoning"}}""")) + } + + @Test fun codexTurnsSkipItsSandboxResumeAndTakeAModel() { + assertEquals(listOf("/root/.local/bin/codex", "exec", "--json", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check", "hi"), + Codex.turn("hi", null, AgentHarness.Options())) + assertEquals(listOf("/root/.local/bin/codex", "exec", "resume", "t1", "--json", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check", "-m", "gpt", "hi"), + Codex.turn("hi", "t1", AgentHarness.Options(model = "gpt"))) + } + + @Test fun aToolIdUsedAgainInALaterTurnIsANewCall() { + val entries = mutableListOf(Entry.Asked("one"), Entry.Used("item_0", "Shell", "ls", "ls", "a"), Entry.Finished(null), Entry.Asked("two")) + assertFalse(AgentChats.merge(entries, Entry.Result("item_0", "late", false))) + assertTrue(AgentChats.merge(entries, Entry.Used("item_0", "Shell", "pwd", "pwd"))) + assertTrue(AgentChats.merge(entries, Entry.Result("item_0", "/root", false))) + assertEquals(Entry.Used("item_0", "Shell", "ls", "ls", "a"), entries[1]) + assertEquals(Entry.Used("item_0", "Shell", "pwd", "pwd", "/root"), entries.last()) + } + + @Test fun filesAttachedBeforeTheFirstMessageMoveIntoTheChat() { + val context = org.robolectric.RuntimeEnvironment.getApplication() + val dir = AgentAttachments.hostDir(context) + File(dir, "new").mkdirs() + File(dir, "new/a.png").writeText("x") + val moved = AgentAttachments.adopt(context, "42", listOf("/root/.cache/droiddeck/attachments/new/a.png", "/root/.cache/droiddeck/attachments/7/b.txt")) + assertEquals(listOf("/root/.cache/droiddeck/attachments/42/a.png", "/root/.cache/droiddeck/attachments/7/b.txt"), moved) + assertTrue(File(dir, "42/a.png").isFile) + assertFalse(File(dir, "new/a.png").exists()) + AgentChats.delete(context, "42") + assertFalse(File(dir, "42").exists()) + } + + @Test fun codexShellWrappersAreUnwrapped() { + assertEquals("uname -m", shellCommand("/bin/bash -lc 'uname -m'")) + assertEquals("echo 'hi'", shellCommand("/bin/bash -lc 'echo '\''hi'\'''")) + assertEquals("ls", shellCommand("ls")) + } + + @Test fun aTurnWithoutAnEndWasInterrupted() { + assertTrue(AgentHost.interrupted(listOf(Entry.Asked("hi"), Entry.Used("1", "Bash", "dd-lab-build")))) + assertEquals(false, AgentHost.interrupted(listOf(Entry.Asked("hi"), Entry.Finished(null)))) + } + + @Test fun aChatRoundTripsThroughItsFile() { + val file = Files.createTempFile("chat", ".jsonl").toFile() + AgentChats.start(file, "claude") + AgentChats.appendConversation(file, "abc") + val written = listOf( + Entry.Asked("hi", listOf("/root/x.png")), Entry.Said("hello"), Entry.Thought("hm"), Entry.Used("t1", "Read", "/root/x", "{}"), + Entry.Result("t1", "contents", false), Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3)), Entry.Finished("boom", stopped = true), + ) + written.forEach { AgentChats.append(file, it) } + file.appendText("broken line\n") + val loaded = AgentChats.read(file) + assertEquals("claude", loaded.harness) + assertEquals("abc", loaded.conversation) + assertEquals(listOf( + Entry.Asked("hi", listOf("/root/x.png")), Entry.Said("hello"), Entry.Thought("hm"), Entry.Used("t1", "Read", "/root/x", "{}", "contents", false), + Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3)), Entry.Finished("boom", stopped = true), + ), loaded.entries) + assertEquals(emptyList(), AgentChats.read(File(file.path + ".missing")).entries) + } + + @Test fun aTurnThatEndsWithNothingIsAnswerless() { + assertTrue(AgentHost.answerless(listOf(Entry.Said("x"), Entry.Asked("go on"), Entry.Finished(null)))) + assertFalse(AgentHost.answerless(listOf(Entry.Asked("go on"), Entry.Said("ok"), Entry.Finished(null)))) + assertFalse(AgentHost.answerless(listOf(Entry.Asked("go on"), Entry.Finished("boom")))) + assertFalse(AgentHost.answerless(listOf(Entry.Asked("go on"), Entry.Finished(null, stopped = true)))) + } + + @Test fun longOutputKeepsItsEnd() { + val clipped = AgentChats.clip("a".repeat(30_000) + "END") + assertTrue(clipped.endsWith("END") && clipped.length < 30_000) + } + + @Test fun attachmentsAreListedForTheAgent() { + assertEquals("look", AgentAttachments.prompt("look", emptyList())) + assertEquals("look\n\nAttached files (read them with your tools):\n- /root/a.png", AgentAttachments.prompt("look", listOf("/root/a.png"))) + } + + @Test fun procStatFieldsCountFromTheEndOfTheName() { + val stat = AgentProcesses.parseStat("1234 (java (x) y) S 1200 1234 1234 0 -1 4194304 10 0 0 0 150 50 0 0 20 0 30 0 98765 1000000 2048 18446744073709551615") + assertEquals(1200, stat.ppid) + assertEquals(200L, stat.ticks) + assertEquals(98765L, stat.startTicks) + assertEquals(2048L, stat.rssPages) + } + + @Test fun labProgressIsRead() { + val p = LabProgress.parse("""{"stage":"building","mode":"build","permille":420,"task":":app:compileReleaseKotlin","done":120,"total":300,"eta":95,"elapsed":30,"pid":77}""")!! + assertEquals(420, p.permille) + assertTrue(p.running && !p.prepare) + assertEquals(95, p.etaSeconds) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentStorageTest.kt new file mode 100644 index 0000000000..dc12206545 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentStorageTest.kt @@ -0,0 +1,29 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Assume.assumeTrue +import org.junit.Test +import java.nio.file.Files + +class AgentStorageTest { + @Test fun removingAFolderKeepsWhatItsLinksPointAt() { + val base = Files.createTempDirectory("agent-storage") + val outside = Files.createDirectories(base.resolve("sdcard")) + Files.write(outside.resolve("save.dat"), ByteArray(100)) + val item = Files.createDirectories(base.resolve("rootfs/android-sdk")) + Files.write(item.resolve("a.jar"), ByteArray(10)) + val linked = runCatching { Files.createSymbolicLink(item.resolve("saves"), outside) }.isSuccess + assumeTrue("symbolic links need privileges on this OS", linked) + + assertTrue(AgentStorage.size(item) < 100) + AgentStorage.delete(item) + assertFalse(Files.exists(item)) + assertTrue(Files.exists(outside.resolve("save.dat"))) + } + + @Test fun aMissingPathHasNoSize() { + assertEquals(0L, AgentStorage.size(Files.createTempDirectory("agent-storage").resolve("gone"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt new file mode 100644 index 0000000000..c7ad34d894 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.graphics.Color +import org.junit.Assert.assertEquals +import org.junit.Test + +class AgentMarkdownTest { + @Test fun blocksSplitHeadingsBulletsAndCode() { + val blocks = markdownBlocks("## Done\n\n- one\n* two\n```kotlin\nval a = 1\n\nval b = 2\n```\nplain") + assertEquals( + listOf( + MdBlock.Line("Done", heading = true), + MdBlock.Line("• one", bullet = true), + MdBlock.Line("• two", bullet = true), + MdBlock.Code("val a = 1\n\nval b = 2"), + MdBlock.Line("plain"), + ), + blocks, + ) + } + + @Test fun inlineMarkersAreDroppedAndUnclosedOnesKept() { + val text = inlineMarkdown("a **b** `c` d ** e ` f", Color.Red, Color.Black) + assertEquals("a b c d ** e ` f", text.text) + assertEquals(2, text.spanStyles.size) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt index 35561a41d5..15888d289f 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt @@ -26,4 +26,11 @@ class SessionDrawerPageTest { assertEquals(SessionDrawerPage.SESSION, pages.step(SessionDrawerPage.GAMES, 1)) } } + + @Test fun theAgentPageComesBeforeSessionOnlyWhenTheAgentIsInstalled() { + val with = sessionDrawerPages(false, hasAgent = true) + assertEquals(SessionDrawerPage.AGENT, with.step(SessionDrawerPage.GAMES, 1)) + assertEquals(SessionDrawerPage.SESSION, with.step(SessionDrawerPage.AGENT, 1)) + assertFalse(SessionDrawerPage.AGENT in sessionDrawerPages(false, hasAgent = false)) + } } diff --git a/tools/agent/setup b/tools/agent/setup index 49dd82592a..0b1f66f6a0 100755 --- a/tools/agent/setup +++ b/tools/agent/setup @@ -8,6 +8,7 @@ export DEBIAN_FRONTEND=noninteractive tmp=$(mktemp -d) trap 'rm -rf "$tmp"' EXIT +apt-get update apt-get install -y --no-install-recommends git gh adb python3 zip unzip curl openjdk-17-jdk-headless qemu-user zipalign apksigner command -v claude >/dev/null || [ -x "$HOME/.local/bin/claude" ] || From 2426ea793a3d1dee2336fd1bc86c9e317528b428 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 14:11:31 -0500 Subject: [PATCH 016/101] fix(ctl): long agent calls over the broadcast bridge no longer make Android report DroidDeck as not responding (#2363) --- .../launcher/agent/AgentCallReceiver.kt | 22 +++++-- .../launcher/agent/AgentCallReceiverTest.kt | 58 +++++++++++++++++++ 2 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentCallReceiverTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentCallReceiver.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentCallReceiver.kt index 6ef8b2d4ba..b7af5c5b1a 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentCallReceiver.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentCallReceiver.kt @@ -4,6 +4,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.Bundle +import androidx.annotation.VisibleForTesting import java.io.File /** @@ -17,9 +18,17 @@ class AgentCallReceiver : BroadcastReceiver() { val id = intent.getStringExtra("id")?.takeIf { it.matches(Regex("[A-Za-z0-9_-]{1,64}")) } ?: return val arg = intent.getStringExtra("arg") val request = intent.getStringExtra(AgentBridgeProvider.EXTRA_REQUEST) - val pending = goAsync() - Thread({ - val json = try { + val app = context.applicationContext + // The caller waits for the answer file, not for the broadcast. Holding the broadcast open + // with goAsync() for a call that outlasts the broadcast timeout (10 s in the foreground) + // makes Android report the app as not responding. + Thread({ answer(app, method, id, call(app, method, arg, request)) }, "agent-call-$id").start() + } + + companion object { + @VisibleForTesting + internal var call: (Context, String, String?, String?) -> String = { context, method, arg, request -> + try { val extras = Bundle().apply { putString(AgentBridgeProvider.EXTRA_REQUEST, request) } context.contentResolver.call("${context.packageName}.agent", method, arg, extras) ?.getString(AgentBridgeProvider.RESULT_JSON) ?: """{"ok":false,"error":{"code":"NO_RESPONSE","message":"no response"}}""" @@ -27,15 +36,16 @@ class AgentCallReceiver : BroadcastReceiver() { org.json.JSONObject().put("ok", false) .put("error", org.json.JSONObject().put("code", "COMMAND_FAILED").put("message", e.message ?: e.javaClass.simpleName)).toString() } + } + + private fun answer(context: Context, method: String, id: String, json: String) { try { val dir = File(context.getExternalFilesDir(null), "agent-calls").apply { mkdirs() } File(dir, "$id.json.part").writeText(json) File(dir, "$id.json.part").renameTo(File(dir, "$id.json")) } catch (e: Exception) { android.util.Log.w("AgentCallReceiver", "could not write the answer to $method: ${e.message}") - } finally { - pending.finish() } - }, "agent-call-$id").start() + } } } diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentCallReceiverTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentCallReceiverTest.kt new file mode 100644 index 0000000000..5a86993680 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentCallReceiverTest.kt @@ -0,0 +1,58 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import android.content.Intent +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class AgentCallReceiverTest { + private val original = AgentCallReceiver.call + + @After fun restore() { + AgentCallReceiver.call = original + } + + @Test fun aSlowCallIsAnsweredAfterTheBroadcastReturns() { + val context: Context = RuntimeEnvironment.getApplication() + val release = CountDownLatch(1) + val started = CountDownLatch(1) + AgentCallReceiver.call = { _, method, _, _ -> + started.countDown() + release.await(10, TimeUnit.SECONDS) + """{"ok":true,"method":"$method"}""" + } + val answer = File(context.getExternalFilesDir(null), "agent-calls/slow1.json").apply { delete() } + + AgentCallReceiver().onReceive(context, Intent().putExtra("method", "guest").putExtra("id", "slow1")) + + assertTrue(started.await(5, TimeUnit.SECONDS)) + assertFalse(answer.exists()) + release.countDown() + val deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (!answer.exists() && System.nanoTime() < deadline) Thread.sleep(20) + assertEquals("""{"ok":true,"method":"guest"}""", answer.readText()) + } + + @Test fun anUnsafeIdIsIgnored() { + val context: Context = RuntimeEnvironment.getApplication() + var called = false + AgentCallReceiver.call = { _, _, _, _ -> called = true; "{}" } + + AgentCallReceiver().onReceive(context, Intent().putExtra("method", "state").putExtra("id", "../x")) + + Thread.sleep(100) + assertFalse(called) + } +} From 9d99232f9909de53ae1ecc557e67d70144c155e3 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 14:32:29 -0500 Subject: [PATCH 017/101] feat(agent): the agent's commits and pull requests carry no Claude credit by default (#2482) feat(agent): Claude Code commits and pull requests carry no co-author or Claude Code credit by default --- .../droiddeck/launcher/agent/AgentHarness.kt | 24 +++++++++++++++++++ .../com/droiddeck/launcher/agent/AgentHost.kt | 4 +++- .../droiddeck/launcher/agent/AgentSetup.kt | 1 + .../droiddeck/launcher/agent/AgentHostTest.kt | 21 ++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index de45d4b51a..722c6e4029 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -27,6 +27,8 @@ interface AgentHarness { fun turn(message: String, conversation: String?, options: Options): List /** One line of the CLI's output, or null when it carries nothing to show. */ fun parse(line: String): AgentEvent? + /** Sets the CLI's own defaults in the userland before it runs; [rootfs] is the userland's root. */ + fun prepare(rootfs: File) {} data class Model(val id: String, val label: String) @@ -59,6 +61,28 @@ object ClaudeCode : AgentHarness { override val signIn = listOf(binary, "auth", "login", "--claudeai") override val plans = true + /** + * Commits and pull requests the agent makes carry no Claude Code credit or co-author line by + * default. Only keys the user has not set are written, so their own choice stays. + */ + override fun prepare(rootfs: File) { + val file = File(rootfs, "root/.claude/settings.json") + val settings = if (file.exists()) runCatching { JSONObject(file.readText()) }.getOrNull() ?: return else JSONObject() + var changed = false + if (!settings.has("includeCoAuthoredBy")) { + settings.put("includeCoAuthoredBy", false) + changed = true + } + if (!settings.has("attribution")) { + settings.put("attribution", JSONObject().put("commit", "").put("pr", "")) + changed = true + } + if (changed) runCatching { + file.parentFile?.mkdirs() + file.writeText(settings.toString(2) + "\n") + } + } + override fun models(rootfs: File) = listOf( AgentHarness.Model("opus", "Opus"), AgentHarness.Model("sonnet", "Sonnet"), AgentHarness.Model("haiku", "Haiku"), ) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index bbb99b744d..b1e939b088 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -55,7 +55,8 @@ object AgentHost { "process of its own and shows the user its progress and time left; dd-lab-build follows that build's log until it is done. " + "Run it with run_in_background and keep checking its output, so the user can talk to you meanwhile. " + "The restart ends this process, and this conversation continues on the new build. " + - "Files the user attaches are listed at the end of their message, under /root/.cache/droiddeck/attachments." + "Files the user attaches are listed at the end of their message, under /root/.cache/droiddeck/attachments. " + + "Commits and pull requests you make are the user's own: add no co-author line, AI credit or generated-by note." val entries = mutableStateListOf() val queue = mutableStateListOf() @@ -250,6 +251,7 @@ object AgentHost { val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF)) val workdir = workspace(app) Thread({ + runCatching { current.prepare(LinuxRuntime.rootDir(app)) } val child = try { guest(app, command, workdir).start() } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index 47efab507d..b9971ced15 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -93,6 +93,7 @@ object AgentSetup { Thread({ val result = runCatching { installHelpers(app) + runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } val child = AgentHost.guest(app, command).start() child.outputStream.close() child.inputStream.bufferedReader().forEachLine { line -> diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt index 23a176c201..13e88edac4 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt @@ -131,6 +131,27 @@ class AgentHostTest { assertEquals("ls", shellCommand("ls")) } + @Test fun claudeCodeDefaultsToNoAttributionAndKeepsTheUsersChoice() { + val root = Files.createTempDirectory("rootfs").toFile() + val settings = File(root, "root/.claude/settings.json") + ClaudeCode.prepare(root) + val written = org.json.JSONObject(settings.readText()) + assertEquals(false, written.getBoolean("includeCoAuthoredBy")) + assertEquals("", written.getJSONObject("attribution").getString("commit")) + assertEquals("", written.getJSONObject("attribution").getString("pr")) + + settings.writeText("""{"includeCoAuthoredBy":true,"model":"opus"}""") + ClaudeCode.prepare(root) + val kept = org.json.JSONObject(settings.readText()) + assertEquals(true, kept.getBoolean("includeCoAuthoredBy")) + assertEquals("opus", kept.getString("model")) + assertTrue(kept.has("attribution")) + + settings.writeText("not json") + ClaudeCode.prepare(root) + assertEquals("not json", settings.readText()) + } + @Test fun aTurnWithoutAnEndWasInterrupted() { assertTrue(AgentHost.interrupted(listOf(Entry.Asked("hi"), Entry.Used("1", "Bash", "dd-lab-build")))) assertEquals(false, AgentHost.interrupted(listOf(Entry.Asked("hi"), Entry.Finished(null)))) From 263e96469f754ae2b0386bf63b618768b2834a79 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 16:00:11 -0500 Subject: [PATCH 018/101] fix(agent): setup repairs a half-installed userland before installing the CLI (#2490) --- .../com/droiddeck/launcher/agent/AgentSetup.kt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index b9971ced15..bc4ac2c9e9 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -79,7 +79,8 @@ object AgentSetup { Step.CONNECTION -> return Step.INSTALL -> { listOf("sh", "-c", "set -e; export DEBIAN_FRONTEND=noninteractive; " + - "apt-get update; apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") + "dpkg --configure -a; apt-get update; apt-get -f install -y; " + + "apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") } Step.SIGN_IN -> harness.signIn Step.GITHUB -> listOf("dd-gh-login") @@ -96,11 +97,14 @@ object AgentSetup { runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } val child = AgentHost.guest(app, command).start() child.outputStream.close() - child.inputStream.bufferedReader().forEachLine { line -> - val text = line.trim() - if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + logFile(app, step).apply { parentFile?.mkdirs() }.bufferedWriter().use { log -> + child.inputStream.bufferedReader().forEachLine { line -> + log.appendLine(line) + val text = line.trim() + if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + } + child.waitFor().also { log.appendLine("exit $it") } } - child.waitFor() } main.post { AgentHostService.setupEnded(app) @@ -116,6 +120,9 @@ object AgentSetup { }, "agent-setup-${step.name.lowercase()}").start() } + /** The whole output of a step's last run; the card shows only its last line. */ + fun logFile(app: Context, step: Step) = File(app.filesDir, "agent/setup-${step.name.lowercase()}.log") + fun buildToolsInstalled(app: Context) = AgentHost.guestFileExists(app, "/root/aapt2/aapt2") && AgentHost.guestFileExists(app, "$CHECKOUT/.git") /** dd-lab-build compiled this install's commit, so a Lab build compiles only what changed. */ From 7d5aae724ce25290e58bd27cb6fd0d5487dc48a0 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 16:29:53 -0500 Subject: [PATCH 019/101] fix(ci): fetch the Venus component without spending the API quota (#2483) --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 555d8b673c..57a2075145 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -617,12 +617,11 @@ jobs: - name: Check out MaliBridge run: git submodule update --init external/MaliBridge - name: Fetch the Mali (Venus) component (tools/venus/release.env) - env: - GH_TOKEN: ${{ github.token }} run: | set -euo pipefail . tools/venus/release.env - gh release download "${VENUS_TAG}" -R "${VENUS_REPO}" -p venus.tzst -O venus.tzst + curl -fsSL --retry 5 --retry-all-errors --retry-delay 10 -o venus.tzst \ + "https://github.com/${VENUS_REPO}/releases/download/${VENUS_TAG}/venus.tzst" echo "${VENUS_SHA256} venus.tzst" | sha256sum -c - tar --use-compress-program=unzstd -xf venus.tzst -C app/src/main test -f app/src/main/jniLibs/arm64-v8a/libvirgl_test_server.so From 1d247d212bf6e1cd8cb4520b7b7f4ffc1e620510 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 17:39:48 -0500 Subject: [PATCH 020/101] fix(decky): run Decky's unprivileged role as root in the guest (#2481) --- tools/linuxfs/overlay/usr/local/bin/droiddeck-session | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index df301aadaf..37fb2c00ad 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1396,6 +1396,8 @@ case $mode in decky_stop() { [ -z "$decky_child" ] || kill "$decky_child" 2>/dev/null; [ -z "$decky_child" ] || wait "$decky_child" 2>/dev/null; exit 0; } trap decky_stop TERM INT HUP decky_exits=0 + # The guest has no "deck" user, which Decky otherwise requires at startup. + export UNPRIVILEGED_USER=root while :; do if [ "$decky_arch" = x86_64 ]; then /usr/local/bin/droiddeck-fex run --mode on -- "$decky_loader" >>"$HOME/homebrew/services/PluginLoader.log" 2>&1 & else "$decky_loader" >>"$HOME/homebrew/services/PluginLoader.log" 2>&1 & From 3b6d13a8d7830e77bd0cf10373220e341a5df79d Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 19:10:49 -0500 Subject: [PATCH 021/101] fix: games on an SD card install faster and Battle.net can read the card's volume (#2379) A Battle.net library on another volume is reached through its own drive letter, so the Agent's volume query succeeds. The proot fast path keeps folder handles for FUSE-backed libraries. Supersedes #2377. --- .../droiddeck/launcher/runtime/BattleNet.kt | 19 +- .../launcher/runtime/BattleNetTest.kt | 23 ++ .../overlay/usr/local/bin/droiddeck-battlenet | 184 +++++++++++- tools/proot/fastpath/fastpath.c | 264 ++++++++++++++++-- tools/tests/test_battlenet.py | 186 +++++++++++- tools/tests/test_fastpath_fuse_dirs.py | 243 ++++++++++++++++ 6 files changed, 883 insertions(+), 36 deletions(-) create mode 100644 tools/tests/test_fastpath_fuse_dirs.py diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index a98e3d0cfa..e1dd1fff21 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -232,11 +232,24 @@ object BattleNet { } internal fun hostFolder(context: Context, path: String): File? { - val drive = Regex("""^([CcZz]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null + val drive = Regex("""^([A-Za-z]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null val relative = drive.groupValues[2].replace('\\', '/').trim('/') if (relative.isEmpty() || relative.split('/').any { it == ".." }) return null - return if (drive.groupValues[1].equals("c", ignoreCase = true)) File(prefix(context), "pfx/drive_c/$relative") - else com.droiddeck.launcher.frontend.AddedGames.hostPath(context, "/$relative") + val letter = drive.groupValues[1].lowercase() + if (letter == "c") return File(prefix(context), "pfx/drive_c/$relative") + val link = File(prefix(context), "pfx/dosdevices/$letter:").toPath() + val mapped = runCatching { java.nio.file.Files.readSymbolicLink(link).toString() }.getOrNull() + val target = when { + mapped == null -> if (letter == "z") "/" else return null + mapped.startsWith("/") -> mapped + else -> { + val rootfs = LinuxRuntime.rootDir(context).toPath().toAbsolutePath().normalize() + val resolved = link.toAbsolutePath().parent.resolve(mapped).normalize() + if (!resolved.startsWith(rootfs)) return null + "/" + rootfs.relativize(resolved).joinToString("/") + } + }.trimEnd('/') + return com.droiddeck.launcher.frontend.AddedGames.hostPath(context, "$target/$relative") } private val KEY = Regex("""^\[(.+)\](?:\s+\d+)?\s*$""") diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index 1af73baef4..c9a3fcb9e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -259,6 +259,29 @@ class BattleNetTest { BattleNet.hostFolder(context, "Z:/root/Games/Stores/Battle.net/Hearthstone/")) } + @Test fun aMappedWineDriveResolvesThroughItsLink() { + val devices = File(BattleNet.prefix(context), "pfx/dosdevices").apply { mkdirs() } + java.nio.file.Files.createSymbolicLink(File(devices, "d:").toPath(), java.nio.file.Paths.get("/root/Games/Card")) + java.nio.file.Files.createSymbolicLink(File(devices, "e:").toPath(), java.nio.file.Paths.get("../drive_c")) + assertEquals(File(LinuxRuntime.rootDir(context), "root/Games/Card/Battle.net/Hearthstone"), + BattleNet.hostFolder(context, "D:\\Battle.net\\Hearthstone")) + assertEquals(File(BattleNet.prefix(context), "pfx/drive_c/Games/X"), BattleNet.hostFolder(context, "E:\\Games\\X")) + assertNull(BattleNet.hostFolder(context, "F:\\Games\\X")) + assertNull(BattleNet.hostFolder(context, "D:\\..\\etc")) + } + + @Test fun aDriveLinkTheNativeUserlandMadeRelativeStillResolvesInTheGuest() { + val root = LinuxRuntime.rootDir(context) + val devices = File(BattleNet.prefix(context), "pfx/dosdevices").apply { mkdirs() } + java.nio.file.Files.createSymbolicLink(File(devices, "d:").toPath(), java.nio.file.Paths.get("/root/Games/Card")) + java.nio.file.Files.createSymbolicLink(File(devices, "g:").toPath(), java.nio.file.Paths.get("../../../../../../../../../../..")) + NativeGuest.relinkAbsoluteSymlinks(context, root) + assertFalse(java.nio.file.Files.readSymbolicLink(File(devices, "d:").toPath()).isAbsolute) + assertEquals(File(root, "root/Games/Card/Battle.net/Hearthstone"), + BattleNet.hostFolder(context, "D:\\Battle.net\\Hearthstone")) + assertNull(BattleNet.hostFolder(context, "G:\\etc\\passwd")) + } + @Test fun wowForeverIsListedBesideRetailInTheSharedWorldOfWarcraftFolder() { val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 1ea487e873..3473e7dead 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -41,6 +41,9 @@ FEX_WAIT = 120 START_GRACE = 90 POLL = 2 STOP_WAIT = 5 +DRIVES = "defghijklmnopqruvwxy" +PRODUCT_DB = ("ProgramData", "Battle.net", "Agent", "product.db") +INSTALL_FOLDER = (1, 3, 1) CLOSE_GRACE = 15 HANDOFF_WAIT = 120 GAME_SETTLE = 20 @@ -123,7 +126,7 @@ function install() { save(".form", form); if (form.indexOf('"' + lang + '"') < 0) lang = "enUS"; var locale = lang.toLowerCase(); - call("POST", "/install/" + uid, '{"account_country":"' + country + '","finalized":true,"game_dir":"' + dir + '","geo_ip_country":"' + + call("POST", "/install/" + uid, '{"account_country":"' + country + '","finalized":true,"game_dir":"' + dir.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '","geo_ip_country":"' + region + '","language":["' + locale + '"],"selected_asset_locale":"' + locale + '","selected_locale":"' + locale + '","shortcut":"none","tome_torrent":""}'); watch("/install/" + uid); @@ -226,8 +229,72 @@ def installed(root): return os.path.isfile(launcher(root)) -def install_path(library): - return "Z:" + library.rstrip("/") +def dosdevices(root): + return os.path.join(prefix(root), "pfx", "dosdevices") + + +def volume_root(path): + device = os.stat(path).st_dev + while path != "/": + parent = os.path.dirname(path) + if os.stat(parent).st_dev != device: + break + path = parent + return path + + +def inside(path, folder): + return path == folder or path.startswith(folder.rstrip("/") + "/") + + +def mapped_drive(root, path, volume): + folder = dosdevices(root) + try: + names = sorted(os.listdir(folder)) + except OSError: + return None + for name in names: + link = os.path.join(folder, name) + if len(name) == 2 and name[0].lower() in DRIVES and name[1] == ":" and os.path.islink(link): + target = os.path.realpath(link) + if inside(target, volume) and inside(path, target): + return name[0].lower(), target + return None + + +def map_drive(root, volume): + folder = dosdevices(root) + for letter in DRIVES: + link = os.path.join(folder, letter + ":") + if not os.path.lexists(link): + try: + os.makedirs(folder, exist_ok=True) + os.symlink(volume, link) + except OSError as error: + say("%s not mapped to a Wine drive: %s" % (volume, error)) + return None + say("Wine drive %s: is %s" % (letter.upper(), volume)) + return letter, volume + say("%s not mapped to a Wine drive: every letter is taken" % volume) + return None + + +def install_path(root, library): + library = library.rstrip("/") or "/" + try: + path = os.path.realpath(library) + volume = volume_root(path) + except OSError: + return "Z:" + library + if volume == "/": + return "Z:" + library + drive = mapped_drive(root, path, volume) + if drive is None and not wine_processes(os.path.join(prefix(root), "pfx")): + drive = map_drive(root, volume) + if drive is None: + return "Z:" + library + letter, target = drive + return letter.upper() + ":\\" + path[len(target):].strip("/").replace("/", "\\") def write_config(root, library=None): @@ -254,8 +321,8 @@ def write_config(root, library=None): client["HardwareAcceleration"] = "false" changes.append("acceleration") if library and isinstance(client.setdefault("Install", {}), dict) \ - and str(client["Install"].get("DefaultInstallPath", "")).rstrip("/\\") != install_path(library): - client["Install"]["DefaultInstallPath"] = install_path(library) + and str(client["Install"].get("DefaultInstallPath", "")).rstrip("/\\") != install_path(root, library).rstrip("\\"): + client["Install"]["DefaultInstallPath"] = install_path(root, library) changes.append("library") games = config.setdefault("Games", {}) for uid in CLIENT_32_BIT if isinstance(games, dict) else (): @@ -417,13 +484,106 @@ def wallpaper(root): def windows_path(root, path): - found = re.match(r"(?i)^([cz]):[\\/](.*)$", path.strip()) + found = re.match(r"(?i)^([a-z]):[\\/](.*)$", path.strip()) if not found: return None parts = [part for part in re.split(r"[\\/]+", found.group(2)) if part] - if not parts or ".." in parts: + if ".." in parts: return None - return os.path.join(drive_c(root) if found.group(1).lower() == "c" else "/", *parts) + letter = found.group(1).lower() + link = os.path.join(dosdevices(root), letter + ":") + if letter == "c": + target = drive_c(root) + elif os.path.islink(link): + target = os.path.realpath(link) + elif letter == "z": + target = "/" + else: + return None + return os.path.join(target, *parts) + + +def varint(data, at): + value = shift = 0 + while at < len(data) and shift < 64: + byte = data[at] + at += 1 + value |= (byte & 0x7F) << shift + if not byte & 0x80: + return value, at + shift += 7 + raise ValueError("varint") + + +def encode_varint(value): + out = bytearray() + while value > 0x7F: + out.append(value & 0x7F | 0x80) + value >>= 7 + out.append(value) + return bytes(out) + + +def rewrite_field(data, path, change): + out, at = bytearray(), 0 + while at < len(data): + start = at + tag, at = varint(data, at) + kind = tag & 7 + if kind == 0: + at = varint(data, at)[1] + elif kind == 1: + at += 8 + elif kind == 5: + at += 4 + elif kind == 2: + size, body = varint(data, at) + at = body + size + else: + raise ValueError("wire type") + if at > len(data): + raise ValueError("length") + if kind == 2 and tag >> 3 == path[0]: + value = data[body:at] + value = change(value) if len(path) == 1 else rewrite_field(value, path[1:], change) + out += encode_varint(tag) + encode_varint(len(value)) + value + else: + out += data[start:at] + return bytes(out) + + +def drive_folder(root, value): + try: + text = value.decode("utf-8") + except UnicodeDecodeError: + return value + if not re.match(r"(?i)^z:[\\/]", text): + return value + folder = windows_path(root, text) + if not folder or not os.path.isdir(folder): + return value + moved = install_path(root, folder) + return value if moved.startswith("Z:") else moved.replace("\\", "/").encode("utf-8") + + +def move_installs(root): + path = os.path.join(drive_c(root), *PRODUCT_DB) + try: + with open(path, "rb") as f: + data = f.read() + moved = rewrite_field(data, INSTALL_FOLDER, lambda value: drive_folder(root, value)) + if moved == data or wine_processes(os.path.join(prefix(root), "pfx")): + return False + with open(path, "rb") as f: + if f.read() != data: + return False + except (OSError, ValueError): + return False + with open(path + ".tmp", "wb") as f: + f.write(moved) + shutil.copymode(path, path + ".tmp") + os.replace(path + ".tmp", path) + return True def wow_folders(root): @@ -533,6 +693,11 @@ def configure(root, library=None): except OSError as error: say("Battle.net's config not written: %s" % error) return + try: + if move_installs(root): + say("Battle.net's installed games on a mapped volume now use its Wine drive") + except OSError as error: + say("Battle.net's installed games not moved to their Wine drive: %s" % error) try: wallpaper(root) except OSError as error: @@ -1227,7 +1392,6 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" say("%s not made: %s" % (folder, error)) emit("ERROR", "folder") return 2 - windows = "Z:" + folder told = None while True: processes = wine_processes(pfx) @@ -1244,6 +1408,8 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" time.sleep(POLL if poll is None else poll) with lock: stop_leftovers(pfx) + if action == "install": + windows = install_path(root, folder) emit("STATE", "starting") base = os.path.join(CACHE, "agent-%s" % uid) for suffix in (".json", ".game", ".form", ".error"): diff --git a/tools/proot/fastpath/fastpath.c b/tools/proot/fastpath/fastpath.c index 8d645eddd2..7a1e2c79a4 100644 --- a/tools/proot/fastpath/fastpath.c +++ b/tools/proot/fastpath/fastpath.c @@ -41,7 +41,7 @@ typedef long (*stub_fn)(long nr, long a, long b, long c, long d, long e, long f) static stub_fn fp_sys; static int fp_on; -struct bind { char *host; size_t hlen; char *guest; size_t glen; int canon; int dropped; }; +struct bind { char *host; size_t hlen; char *guest; size_t glen; int canon; int dropped; int fuse; }; static struct bind binds[MAX_BINDS]; static int nbinds; static char root[PATH_MAX]; @@ -133,7 +133,8 @@ static long tracer; static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t bind_lock; static pthread_mutex_t long_lock; -static void after_fork(void) { pthread_mutex_init(&cache_lock, NULL); pthread_mutex_init(&bind_lock, NULL); pthread_mutex_init(&long_lock, NULL); } +static pthread_mutex_t dir_lock = PTHREAD_MUTEX_INITIALIZER; +static void after_fork(void) { pthread_mutex_init(&cache_lock, NULL); pthread_mutex_init(&bind_lock, NULL); pthread_mutex_init(&long_lock, NULL); pthread_mutex_init(&dir_lock, NULL); } static int traced_by_match(const char *key) { static char buf[32768]; @@ -414,6 +415,212 @@ static int host_bind(const char *h) { return -1; } +static unsigned hash_of(const char *s); +static long long now_ns(void); +#define DIRS 64 +#define DIR_FD_FLOOR 1000 +struct dirslot { unsigned hash, epoch; int fd, refs; dev_t dev; ino_t ino; long tag; long long stamp; char path[PATH_MAX]; char seen[PATH_MAX]; }; +static struct dirslot dirs[DIRS]; +static unsigned dir_epoch; +struct near { long fd; int slot, own; const char *name; }; + +static int fuse_bind(const char *h) { + int i = host_bind(h); + if (i < 0) return -1; + int f = __atomic_load_n(&binds[i].fuse, __ATOMIC_ACQUIRE); + if (!f) { + struct statfs fs; + f = sc(SYS_statfs, (long)binds[i].host, (long)&fs, 0, 0, 0) == 0 && fs.f_type == 0x65735546 ? 1 : 2; + __atomic_store_n(&binds[i].fuse, f, __ATOMIC_RELEASE); + } + return f == 1 ? i : -1; +} + +static long fd_path(long fd, char *out) { + char link[40]; + snprintf(link, sizeof link, "/proc/self/fd/%ld", fd); + long n = sc(SYS_readlinkat, AT_FDCWD, (long)link, (long)out, PATH_MAX - 1, 0); + if (n <= 0 || n >= PATH_MAX - 1) return -1; + out[n] = 0; + return 0; +} + +static int fd_id(long fd, dev_t *dev, ino_t *ino) { + struct stat st; + if (sc(SYS_newfstatat, fd, (long)"", (long)&st, AT_EMPTY_PATH, 0) != 0) return -1; + *dev = st.st_dev; + *ino = st.st_ino; + return 0; +} + +static long dir_tag(void) { + static uint64_t state; + uint64_t z = __atomic_add_fetch(&state, 0x9e3779b97f4a7c15ULL, __ATOMIC_RELAXED), seed = 0; + const void *random = (const void *)getauxval(AT_RANDOM); + if (random) memcpy(&seed, random, sizeof seed); + z += seed; + z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9ULL; + z = (z ^ (z >> 27)) * 0x94d049bb133111ebULL; + return (long)((z ^ (z >> 31)) & 0xffffffffffULL) + 1; +} + +static int dir_owned(const struct dirslot *e) { + dev_t dev; + ino_t ino; + return e->fd > 0 && sc(SYS_lseek, e->fd, 0, SEEK_CUR, 0, 0) == e->tag + && fd_id(e->fd, &dev, &ino) == 0 && dev == e->dev && ino == e->ino; +} + +static int dir_fresh(struct dirslot *e, const char *dir) { + long long t = now_ns(); + if (t - __atomic_load_n(&e->stamp, __ATOMIC_RELAXED) < ttl_ns) return 1; + struct stat st; + if (sc(SYS_newfstatat, AT_FDCWD, (long)dir, (long)&st, 0, 0) != 0 || st.st_dev != e->dev || st.st_ino != e->ino) { + __atomic_add_fetch(&dir_epoch, 1, __ATOMIC_RELEASE); + return 0; + } + __atomic_store_n(&e->stamp, t, __ATOMIC_RELAXED); + return 1; +} + +static void dirs_drop(const char *host) { + size_t len = strlen(host); + if (pthread_mutex_trylock(&dir_lock) != 0) { + __atomic_add_fetch(&dir_epoch, 1, __ATOMIC_RELEASE); + return; + } + for (int i = 0; i < DIRS; i++) + if (dirs[i].path[0] && under(dirs[i].path, host, len)) dirs[i].path[0] = 0; + pthread_mutex_unlock(&dir_lock); +} + +static void near_put(struct near *n) { + if (n->own) sc(SYS_close, n->fd, 0, 0, 0, 0); + else if (n->slot >= 0) __atomic_sub_fetch(&dirs[n->slot].refs, 1, __ATOMIC_RELEASE); + n->fd = AT_FDCWD; + n->slot = -1; + n->own = 0; +} + +static int dir_cached(const char *dir, struct near *n) { + unsigned h = hash_of(dir); + struct dirslot *e = &dirs[h % DIRS]; + if (pthread_mutex_trylock(&dir_lock) != 0) return 0; + int hit = e->fd >= 0 && e->hash == h && e->path[0] && strcmp(e->path, dir) == 0 + && e->epoch == __atomic_load_n(&dir_epoch, __ATOMIC_ACQUIRE); + if (hit) __atomic_add_fetch(&e->refs, 1, __ATOMIC_ACQUIRE); + pthread_mutex_unlock(&dir_lock); + if (!hit) return 0; + char now[PATH_MAX]; + if (fd_path(e->fd, now) == 0 && strcmp(now, e->seen) == 0 && dir_fresh(e, dir)) { + n->fd = e->fd; + n->slot = (int)(e - dirs); + n->own = 0; + return 1; + } + __atomic_sub_fetch(&e->refs, 1, __ATOMIC_RELEASE); + if (pthread_mutex_trylock(&dir_lock) == 0) { + if (e->hash == h && strcmp(e->path, dir) == 0) e->path[0] = 0; + pthread_mutex_unlock(&dir_lock); + } + return 0; +} + +static int dir_keep(const char *dir, long fd, struct near *n) { + long high = sc(SYS_fcntl, fd, F_DUPFD_CLOEXEC, DIR_FD_FLOOR, 0, 0); + sc(SYS_close, fd, 0, 0, 0, 0); + if (high < 0) return -1; + n->fd = high; + n->slot = -1; + n->own = 1; + char seen[PATH_MAX]; + dev_t dev; + ino_t ino; + long tag = dir_tag(); + struct stat st; + if (fd_id(high, &dev, &ino) < 0 || strlen(dir) >= PATH_MAX + || sc(SYS_newfstatat, AT_FDCWD, (long)dir, (long)&st, 0, 0) != 0 || st.st_dev != dev || st.st_ino != ino) { + near_put(n); + return -1; + } + if (fd_path(high, seen) < 0 || sc(SYS_lseek, high, tag, SEEK_SET, 0, 0) != tag) return 0; + unsigned h = hash_of(dir); + struct dirslot *e = &dirs[h % DIRS]; + if (pthread_mutex_trylock(&dir_lock) != 0) return 0; + if (__atomic_load_n(&e->refs, __ATOMIC_ACQUIRE) == 0) { + if (dir_owned(e)) sc(SYS_close, e->fd, 0, 0, 0, 0); + e->hash = h; + e->epoch = __atomic_load_n(&dir_epoch, __ATOMIC_ACQUIRE); + e->tag = tag; + e->stamp = now_ns(); + e->fd = (int)high; + e->dev = dev; + e->ino = ino; + e->refs = 1; + strcpy(e->path, dir); + strcpy(e->seen, seen); + n->slot = (int)(e - dirs); + n->own = 0; + } + pthread_mutex_unlock(&dir_lock); + return 0; +} + +static int dir_get(char *dir, size_t floor, struct near *n) { + size_t len = strlen(dir), at = len; + while (!dir_cached(dir, n)) { + if (at <= floor) { + long fd = sc(SYS_openat, AT_FDCWD, (long)dir, O_RDONLY | O_DIRECTORY | O_CLOEXEC, 0, 0); + if (fd < 0 || dir_keep(dir, fd, n) < 0) return -1; + break; + } + char *slash = strrchr(dir, '/'); + if (!slash || (size_t)(slash - dir) < floor) return -1; + *slash = 0; + at = slash - dir; + } + while (at < len) { + dir[at] = '/'; + const char *name = dir + at + 1; + size_t next = at + 1 + strlen(name); + long fd = sc(SYS_openat, n->fd, (long)name, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC, 0, 0); + near_put(n); + if (fd < 0 || dir_keep(dir, fd, n) < 0) return -1; + at = next; + } + return 0; +} + +static long near_get(const char *host, struct near *n) { + n->fd = AT_FDCWD; + n->slot = -1; + n->own = 0; + n->name = host; + if (ttl_ns <= 0 || host[0] != '/') return n->fd; + int i = fuse_bind(host); + if (i < 0) return n->fd; + const char *slash = strrchr(host, '/'); + size_t plen = slash - host; + if (plen < binds[i].hlen || !slash[1] || plen >= PATH_MAX) return n->fd; + char dir[PATH_MAX]; + memcpy(dir, host, plen); + dir[plen] = 0; + if (dir_get(dir, binds[i].hlen, n) < 0) { + near_put(n); + return n->fd; + } + n->name = slash + 1; + return n->fd; +} + +static long hsc(long nr, const char *host, long a, long b, long c) { + struct near n; + long fd = near_get(host, &n); + long rs = sc(nr, fd, (long)n.name, a, b, c); + near_put(&n); + return rs; +} + static int guest_text(const char *h, char *g) { if (h[0] == '/' && under(h, root, rootlen)) return to_guest(h, g, PATH_MAX); int i = h[0] == '/' ? host_bind(h) : -1; @@ -556,7 +763,7 @@ static long proc_readlink(const struct res *r, char *text, size_t size, int *cha return name[0] == 'e' ? own_exe(text) : own_cwd(text); } char h[PATH_MAX]; - long t = sc(SYS_readlinkat, AT_FDCWD, (long)r->host, (long)h, sizeof h - 1, 0); + long t = hsc(SYS_readlinkat, r->host, (long)h, sizeof h - 1, 0); if (t < 0) return t; if (t >= (long)sizeof h - 1) return FP_SLOW; if (size && (size_t)t > size) t = size; @@ -579,7 +786,7 @@ static long proc_link(struct res *r, char *text, int final) { if (!under(r->host, "/proc", 5)) return FP_SLOW; r->moving = 1; if (!strcmp(r->guest, "/proc/self") || !strcmp(r->guest, "/proc/thread-self")) { - long t = sc(SYS_readlinkat, AT_FDCWD, (long)r->host, (long)text, PATH_MAX - 1, 0); + long t = hsc(SYS_readlinkat, r->host, (long)text, PATH_MAX - 1, 0); if (t <= 0 || t >= PATH_MAX - 1) return FP_SLOW; text[t] = 0; return t; @@ -628,7 +835,7 @@ static long walk(struct res *r, const char *text, int follow, int last) { if (reserved(r->guest)) return FP_SLOW; struct bind *through; if (to_host(r->guest, r->host, &through) < 0) return FP_SLOW; - long s = sc(SYS_newfstatat, AT_FDCWD, (long)r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0); + long s = hsc(SYS_newfstatat, r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0); if (s < 0) { int glue = glue_above_binding(r->guest, glen + n); if (glue < 0) return FP_SLOW; @@ -648,13 +855,13 @@ static long walk(struct res *r, const char *text, int follow, int last) { t = proc_link(r, target, final && last); if (t == FP_SLOW) return FP_SLOW; if (t == 0) { - if (sc(SYS_newfstatat, AT_FDCWD, (long)r->host, (long)&r->st, 0, 0) < 0) return FP_SLOW; + if (hsc(SYS_newfstatat, r->host, (long)&r->st, 0, 0) < 0) return FP_SLOW; r->magic = 1; r->exists = 1; return 0; } } else { - t = sc(SYS_readlinkat, AT_FDCWD, (long)r->host, (long)target, sizeof target - 1, 0); + t = hsc(SYS_readlinkat, r->host, (long)target, sizeof target - 1, 0); if (t <= 0 || t >= (long)sizeof target - 1) return FP_SLOW; target[t] = 0; if (detranslated(target, r->host) == FP_SLOW) return FP_SLOW; @@ -676,7 +883,7 @@ static long walk(struct res *r, const char *text, int follow, int last) { } if (!stated) { if (to_host(r->guest, r->host, NULL) < 0) return FP_SLOW; - long s = sc(SYS_newfstatat, AT_FDCWD, (long)r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0); + long s = hsc(SYS_newfstatat, r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0); if (s < 0 && strcmp(r->guest, "/") != 0 && glue_above_binding(r->guest, strlen(r->guest))) return FP_SLOW; if (s < 0) return s == -ENOENT ? FP_SLOW : s; } @@ -699,7 +906,7 @@ static long bound_literal(const char *literal, struct res *r) { struct bind *bd; if (reserved(literal) || bind_of(literal, &bd) < 0 || !bd || bd->glen != strlen(literal) || bd->glen < 2) return FP_SLOW; if (snprintf(r->host, PATH_MAX, "%s", bd->host) >= PATH_MAX) return FP_SLOW; - if (sc(SYS_newfstatat, AT_FDCWD, (long)r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0) < 0 || S_ISLNK(r->st.st_mode)) return FP_SLOW; + if (hsc(SYS_newfstatat, r->host, (long)&r->st, AT_SYMLINK_NOFOLLOW, 0) < 0 || S_ISLNK(r->st.st_mode)) return FP_SLOW; snprintf(r->guest, PATH_MAX, "%s", literal); r->exists = 1; r->moving = 0; @@ -822,8 +1029,8 @@ static long fp_open(int dirfd, const char *path, int flags, mode_t mode) { long rs = resolve(dirfd, path, follow | MAY_BE_UNSEEN, &r); if (rs < 0) return rs; if (rs == 1 && !(flags & O_CREAT)) return -ENOENT; - if (rs == UNSEEN) return sc(SYS_openat, AT_FDCWD, (long)r.host, flags, (flags & O_CREAT) ? mode : 0, 0); - return sc(SYS_openat, AT_FDCWD, (long)r.host, flags | (follow && !r.magic ? O_NOFOLLOW : 0), (flags & O_CREAT) ? mode : 0, 0); + if (rs == UNSEEN) return hsc(SYS_openat, r.host, flags, (flags & O_CREAT) ? mode : 0, 0); + return hsc(SYS_openat, r.host, flags | (follow && !r.magic ? O_NOFOLLOW : 0), (flags & O_CREAT) ? mode : 0, 0); } static int do_openat(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, ...)) { @@ -864,7 +1071,7 @@ static long fp_stat(int dirfd, const char *path, int flags, struct stat *st) { long rs = resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); if (rs < 0) return rs; if (rs == 1) return -ENOENT; - if (rs == UNSEEN) return sc(SYS_newfstatat, AT_FDCWD, (long)r.host, (long)st, flags, 0); + if (rs == UNSEEN) return hsc(SYS_newfstatat, r.host, (long)st, flags, 0); *st = r.st; return 0; } @@ -1007,7 +1214,7 @@ static long fp_access(int dirfd, const char *path, int mode, int flags) { ? resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r) : FP_SLOW; if (rs == 1) rs = -ENOENT; if (rs == 0 && S_ISLNK(r.st.st_mode)) rs = FP_SLOW; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_faccessat, AT_FDCWD, (long)r.host, mode, 0, 0); + if (rs == 0 || rs == UNSEEN) rs = hsc(SYS_faccessat, r.host, mode, 0, 0); return rs; } @@ -1030,7 +1237,7 @@ static long link_text(const struct res *r, char *text, size_t size, int *changed *changed = 0; if (in_proc != under(r->host, "/proc", 5)) return FP_SLOW; if (in_proc) return proc_readlink(r, text, size, changed); - long t = sc(SYS_readlinkat, AT_FDCWD, (long)r->host, (long)text, PATH_MAX - 1, 0); + long t = hsc(SYS_readlinkat, r->host, (long)text, PATH_MAX - 1, 0); if (t < 0) return t; if (t >= PATH_MAX - 1) return FP_SLOW; if (size && (size_t)t > size) t = size; @@ -1135,7 +1342,7 @@ char *__getcwd_chk(char *buf, size_t size, size_t room) { static long fp_mkdir(int dirfd, const char *path, mode_t mode) { struct res r; long rs = resolve(dirfd, path, MAY_BE_UNSEEN, &r); - if (rs == 0 || rs == 1 || rs == UNSEEN) rs = sc(SYS_mkdirat, AT_FDCWD, (long)r.host, mode, 0, 0); + if (rs == 0 || rs == 1 || rs == UNSEEN) rs = hsc(SYS_mkdirat, r.host, mode, 0, 0); return rs; } int mkdirat(int dirfd, const char *path, mode_t mode) { @@ -1172,7 +1379,7 @@ static long fp_unlink(int dirfd, const char *path, int flags) { if (rs == 0 && (flags & AT_REMOVEDIR) && strcmp(r.guest, "/") == 0) rs = FP_SLOW; if (rs == 0 || rs == UNSEEN) { int changes_paths = (flags & AT_REMOVEDIR) || rs == UNSEEN || S_ISLNK(r.st.st_mode); - rs = sc(SYS_unlinkat, AT_FDCWD, (long)r.host, flags, 0, 0); + rs = hsc(SYS_unlinkat, r.host, flags, 0, 0); if (rs == 0 && changes_paths) forget(); } return rs; @@ -1196,9 +1403,14 @@ static long fp_rename(int olddirfd, const char *old, int newdirfd, const char *n if (rt < 0) rs = rt; else if (rt == 0 && S_ISDIR(to.st.st_mode)) rs = FP_SLOW; else { - rs = flags ? sc(SYS_renameat2, AT_FDCWD, (long)from.host, AT_FDCWD, (long)to.host, flags) - : sc(SYS_renameat, AT_FDCWD, (long)from.host, AT_FDCWD, (long)to.host, 0); - if (rs == 0) forget(); + struct near a, b; + near_get(from.host, &a); + near_get(to.host, &b); + rs = flags ? sc(SYS_renameat2, a.fd, (long)a.name, b.fd, (long)b.name, flags) + : sc(SYS_renameat, a.fd, (long)a.name, b.fd, (long)b.name, 0); + near_put(&a); + near_put(&b); + if (rs == 0 && (S_ISLNK(from.st.st_mode) || (rt == 0 && S_ISLNK(to.st.st_mode)))) forget(); } } return rs; @@ -1236,7 +1448,10 @@ static long fp_chmod(int dirfd, const char *path, mode_t mode, int flags) { struct res r; long rs = flags ? FP_SLOW : resolve(dirfd, path, 1 | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_fchmodat, AT_FDCWD, (long)r.host, mode, 0, 0); + if (rs == 0 || rs == UNSEEN) { + rs = hsc(SYS_fchmodat, r.host, mode, 0, 0); + if (rs == 0) dirs_drop(r.host); + } return rs; } int fchmodat(int dirfd, const char *path, mode_t mode, int flags) { @@ -1249,7 +1464,10 @@ static long fp_chown(int dirfd, const char *path, uid_t uid, gid_t gid, int flag struct res r; long rs = flags & ~AT_SYMLINK_NOFOLLOW ? FP_SLOW : resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_fchownat, AT_FDCWD, (long)r.host, (long)uid, (long)gid, flags); + if (rs == 0 || rs == UNSEEN) { + rs = hsc(SYS_fchownat, r.host, (long)uid, (long)gid, flags); + if (rs == 0) dirs_drop(r.host); + } return rs; } int fchownat(int dirfd, const char *path, uid_t uid, gid_t gid, int flags) { @@ -1267,7 +1485,7 @@ static long fp_utimens(int dirfd, const char *path, const struct timespec times[ } else { rs = flags & ~AT_SYMLINK_NOFOLLOW ? FP_SLOW : resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; - if (rs == 0 || rs == UNSEEN) rs = sc(SYS_utimensat, AT_FDCWD, (long)r.host, (long)times, flags, 0); + if (rs == 0 || rs == UNSEEN) rs = hsc(SYS_utimensat, r.host, (long)times, flags, 0); } return rs; } @@ -1509,7 +1727,7 @@ static long socket_address(const struct sockaddr *addr, socklen_t len, int follo char *slash = strrchr(r.host, '/'); if (!slash || slash == r.host) return FP_SLOW; *slash = 0; - *dir = sc(SYS_openat, AT_FDCWD, (long)r.host, O_PATH | O_DIRECTORY | O_CLOEXEC, 0, 0); + *dir = hsc(SYS_openat, r.host, O_PATH | O_DIRECTORY | O_CLOEXEC, 0, 0); if (*dir < 0) return FP_SLOW; hlen = snprintf(out->sun_path, room, "/proc/self/fd/%ld/%s", *dir, slash + 1); if (hlen >= room) { sc(SYS_close, *dir, 0, 0, 0, 0); *dir = -1; return FP_SLOW; } diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index 5f3d72c1b6..ec20e81777 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -198,6 +198,155 @@ class ConfigAndMenuTest(Temp): self.assertEqual(path.stat().st_mtime_ns, mtime) +class DriveTest(Temp): + def setUp(self): + super().setUp() + self.root = str(self.tmp / "Steam") + self.devices = Path(BNET["dosdevices"](self.root)) + self.card = self.tmp / "card" + self.library = self.card / "Games/Battle.net" + self.library.mkdir(parents=True) + self.running = [] + patcher = mock.patch.dict(BNET, {"say": lambda message: None, "wine_processes": lambda pfx, proc="/proc": list(self.running), + "volume_root": lambda path: str(self.card) if BNET["inside"](path, str(self.card)) else "/"}) + patcher.start() + self.addCleanup(patcher.stop) + + def test_a_volume_ends_where_the_device_changes(self): + devices = {"/": 1, "/mnt": 1, "/mnt/card": 7, "/mnt/card/Games": 7, "/mnt/card/Games/Battle.net": 7, "/root": 1, "/root/Games": 1} + with mock.patch.object(os, "stat", lambda path: mock.Mock(st_dev=devices[path])): + volume_root = runpy.run_path(str(BIN / "droiddeck-battlenet"))["volume_root"] + self.assertEqual(volume_root("/mnt/card/Games/Battle.net"), "/mnt/card") + self.assertEqual(volume_root("/mnt/card"), "/mnt/card") + self.assertEqual(volume_root("/root/Games"), "/") + self.assertEqual(volume_root("/"), "/") + + def test_a_library_on_the_root_volume_keeps_its_path_and_gets_no_drive(self): + library = self.tmp / "root/Games/Battle.net" + library.mkdir(parents=True) + self.assertEqual(BNET["install_path"](self.root, str(library) + "/"), "Z:" + str(library)) + self.assertFalse(self.devices.exists()) + + def test_a_library_on_another_volume_gets_a_drive_at_the_volume_root(self): + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "D:\\Games\\Battle.net") + self.assertEqual(os.readlink(self.devices / "d:"), str(self.card)) + self.assertEqual(BNET["install_path"](self.root, str(self.library / "World of Warcraft")), "D:\\Games\\Battle.net\\World of Warcraft") + self.assertEqual(BNET["install_path"](self.root, str(self.card)), "D:\\") + self.assertEqual(sorted(os.listdir(self.devices)), ["d:"]) + + def test_drives_in_use_and_the_ones_proton_owns_are_left_alone(self): + self.devices.mkdir(parents=True) + os.symlink("/somewhere/else", self.devices / "d:") + os.symlink(str(self.card), self.devices / "s:") + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "E:\\Games\\Battle.net") + self.assertEqual(os.readlink(self.devices / "d:"), "/somewhere/else") + for letter in BNET["DRIVES"]: + if not os.path.lexists(self.devices / (letter + ":")): + os.symlink("/somewhere/else", self.devices / (letter + ":")) + os.unlink(self.devices / "e:") + os.symlink("/somewhere/else", self.devices / "e:") + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "Z:" + str(self.library)) + self.assertNotIn("s", BNET["DRIVES"]) + self.assertNotIn("t", BNET["DRIVES"]) + + def test_a_running_prefix_gets_no_new_drive_but_uses_the_ones_it_started_with(self): + self.running = [(5, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"])] + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "Z:" + str(self.library)) + self.assertFalse(self.devices.exists()) + self.running = [] + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "D:\\Games\\Battle.net") + self.running = [(5, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"])] + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "D:\\Games\\Battle.net") + + def test_a_drive_mapped_inside_the_volume_is_reused(self): + self.devices.mkdir(parents=True) + os.symlink(str(self.card / "Games"), self.devices / "g:") + self.assertEqual(BNET["install_path"](self.root, str(self.library)), "G:\\Battle.net") + self.assertEqual(sorted(os.listdir(self.devices)), ["g:"]) + + def test_the_config_stores_the_drive_path_once(self): + path = self.tmp / ("Steam/steamapps/compatdata/%s/pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + % BNET["APP_ID"]) + BNET["write_config"](self.root) + self.assertEqual(BNET["write_config"](self.root, str(self.library)), "library") + self.assertEqual(json.loads(path.read_text())["Client"]["Install"]["DefaultInstallPath"], "D:\\Games\\Battle.net") + self.assertIsNone(BNET["write_config"](self.root, str(self.library))) + + def test_registered_paths_resolve_through_their_drive(self): + BNET["install_path"](self.root, str(self.library)) + self.assertEqual(BNET["windows_path"](self.root, "D:/Games/Battle.net/World of Warcraft"), + str(self.library / "World of Warcraft")) + self.assertEqual(BNET["windows_path"](self.root, "Z:\\mnt\\card\\World of Warcraft"), "/mnt/card/World of Warcraft") + self.assertEqual(BNET["windows_path"](self.root, "C:/Program Files (x86)/World of Warcraft"), + os.path.join(BNET["drive_c"](self.root), "Program Files (x86)/World of Warcraft")) + self.assertIsNone(BNET["windows_path"](self.root, "E:/Games/X")) + self.assertIsNone(BNET["windows_path"](self.root, "D:/../etc")) + self.assertEqual(BNET["windows_path"](self.root, "D:\\"), str(self.library.parent.parent)) + + def field(self, number, value): + varint = BNET["encode_varint"] + return varint(number << 3 | 2) + varint(len(value)) + value + + def product(self, uid, folder, filler=b""): + settings = self.field(1, folder.encode()) + self.field(2, b"us") + b"\x18\x02" + filler + return self.field(1, self.field(1, uid.encode()) + self.field(2, uid.encode()) + self.field(3, settings) + + b"\x21" + bytes(8) + b"\x2d" + bytes(4)) + + def database(self, *products): + path = Path(BNET["drive_c"](self.root)) / "ProgramData/Battle.net/Agent/product.db" + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(b"".join(products) + self.field(7, b"tail")) + path.chmod(0o600) + return path + + def test_games_registered_through_the_root_drive_move_to_their_volume_drive(self): + game = self.library / "World of Warcraft" + game.mkdir() + other = self.tmp / "root/Games/Other" + other.mkdir(parents=True) + client = self.product("battle.net", "C:/Program Files (x86)/Battle.net") + local = self.product("other", "Z:" + str(other)) + gone = self.product("gone", "Z:" + str(self.card / "Missing")) + path = self.database(client, self.product("wow", "Z:" + str(game), bytes(200)), local, gone) + self.assertTrue(BNET["move_installs"](self.root)) + self.assertEqual(path.read_bytes(), client + self.product("wow", "D:/Games/Battle.net/World of Warcraft", bytes(200)) + + local + gone + self.field(7, b"tail")) + self.assertEqual(path.stat().st_mode & 0o777, 0o600) + self.assertEqual(os.readlink(self.devices / "d:"), str(self.card)) + self.assertFalse(BNET["move_installs"](self.root)) + + def test_registrations_stay_while_the_prefix_runs_or_the_database_is_unreadable(self): + game = self.library / "World of Warcraft" + game.mkdir() + path = self.database(self.product("wow", "Z:" + str(game))) + before = path.read_bytes() + self.running = [(5, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.exe"])] + self.assertFalse(BNET["move_installs"](self.root)) + self.assertEqual(path.read_bytes(), before) + self.running = [] + for broken in (before[:-3], b"\x0a\xff", b"\x0b\x01"): + path.write_bytes(broken) + self.assertFalse(BNET["move_installs"](self.root)) + self.assertEqual(path.read_bytes(), broken) + os.unlink(path) + self.assertFalse(BNET["move_installs"](self.root)) + + def test_a_database_written_while_it_was_being_read_is_left_as_written(self): + game = self.library / "World of Warcraft" + game.mkdir() + path = self.database(self.product("wow", "Z:" + str(game))) + newer = path.read_bytes() + self.field(7, b"newer") + + def processes(pfx, proc="/proc"): + path.write_bytes(newer) + return [] + + with mock.patch.dict(BNET, {"wine_processes": processes}): + self.assertFalse(BNET["move_installs"](self.root)) + self.assertEqual(path.read_bytes(), newer) + self.assertTrue(BNET["move_installs"](self.root)) + + class GamepadTest(Temp): def registry(self, *entries): rows = ["WINE REGISTRY Version 2"] @@ -772,7 +921,7 @@ class Harness(Temp): "stop": lambda processes, wait=0: self.calls.append(("stop", sorted(pid for pid, _ in processes))), "start": lambda exe, verb=None: self.calls.append(("start", os.path.basename(exe), verb)) or self.Proton(), "spawn": lambda program, verb, args=(): self.calls.append(("spawn", os.path.basename(program), verb, list(args))), - "acquire": lambda folder=None: self.lock, + "acquire": lambda folder=None: self.lock, "volume_root": lambda path: "/", "POLL": 0, "READY_SETTLE": 0, "GAME_GRACE": 0, "CLIENT_WAIT": 0, }) patcher.start() @@ -1170,6 +1319,7 @@ class AgentTest(Temp): script = BNET["AGENT_SCRIPT"] self.assertIn("port = a(0), action = a(1), uid = a(2), product = a(3), dir = a(4)", script) self.assertIn("lang = a(5), country = a(6), region = a(7), out = a(8)", script) + self.assertIn(r'''"game_dir":"' + dir.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '","geo''', script) self.assertIn('"--internalclienttools"', (BIN / "droiddeck-battlenet").read_text()) def test_the_driver_asks_blizzards_chinese_repository_for_chinese_installs(self): @@ -1230,6 +1380,40 @@ class AgentJobTest(Harness): self.assertEqual([kind for kind, _ in self.lines], ["STATE", "PROGRESS", "DONE"]) self.assertEqual(json.loads(self.lines[-1][1]), {"install_dir": "Z:" + folder, "exe": "WarcraftRumble.exe", "version": "16.1.2.119725"}) + def test_an_install_on_another_volume_is_handed_over_by_its_drive_once_the_prefix_is_stopped(self): + self.install() + card = self.tmp / "card" + folder = str(card / "Games/Battle.net/Warcraft Rumble") + self.files = {".json": json.dumps({"progress": 1.0, "download_complete": True, "state": 1004}), + ".game": json.dumps({"installed": True, "install_dir": "D:/Games/Battle.net/Warcraft Rumble", "local_version": "1", + "binaries": {"game": {"relative_path": "WarcraftRumble.exe"}}})} + self.states = [[(7, self.AGENT)]] + events = [] + real_map = BNET["map_drive"] + + def acquire(folder=None): + events.append("lock") + return self.lock + + def stop(pfx): + events.append(("stop", not self.lock.closed)) + self.states = [[]] + return True + + def map_drive(root, volume): + events.append(("map", not self.lock.closed)) + return real_map(root, volume) + + with mock.patch.dict(BNET, {"volume_root": lambda path: str(card), "stop_leftovers": stop, "map_drive": map_drive, + "acquire": acquire}): + code = BNET["agent_job"](self.root, "install", "gryphon", "gryphon", folder, "enUS", "USA", "US", poll=0) + self.assertEqual(code, 0) + self.assertEqual(events, ["lock", ("stop", True), ("map", True)]) + self.assertTrue(self.lock.closed) + cmd = self.started[0] + self.assertEqual(cmd[cmd.index("--") + 6], "D:\\Games\\Battle.net\\Warcraft Rumble") + self.assertEqual(os.readlink(os.path.join(BNET["dosdevices"](self.root), "d:")), str(card)) + def test_an_agent_error_is_reported_with_its_code(self): self.install() self.files = {".json": json.dumps({"error": 2421, "progress": 0.0})} diff --git a/tools/tests/test_fastpath_fuse_dirs.py b/tools/tests/test_fastpath_fuse_dirs.py new file mode 100644 index 0000000000..d8c52e99da --- /dev/null +++ b/tools/tests/test_fastpath_fuse_dirs.py @@ -0,0 +1,243 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +USERNS = shutil.which("unshare") is not None and subprocess.run(["unshare", "-Urm", "true"], capture_output=True).returncode == 0 + +FASTPATH = Path(__file__).resolve().parents[1] / "proot/fastpath/fastpath.c" + +PROGRAM = r""" +#include "FASTPATH" +#include + +static long host_sys(long nr, long a, long b, long c, long d, long e, long f) { + long r = syscall(nr, a, b, c, d, e, f); + return r < 0 ? -errno : r; +} + +static void show(long r) { + if (r == FP_SLOW) puts("SLOW"); + else if (r < 0) printf("E%ld\n", -r); + else puts("ok"); +} + +static int high_fds(void) { + int n = 0; + for (int fd = DIR_FD_FLOOR; fd < DIR_FD_FLOOR + 4 * DIRS; fd++) + if (fcntl(fd, F_GETFD) >= 0) n++; + return n; +} + +int main(int argc, char **argv) { + static char hosts[MAX_BINDS][PATH_MAX], guests[MAX_BINDS][512]; + static int taken[DIRS]; + int ntaken = 0; + fp_sys = host_sys; + snprintf(root, sizeof root, "%s", argv[1]); + rootlen = strlen(root); + int i = 2; + for (; i + 1 < argc && strcmp(argv[i], "--"); i += 2) { + struct bind *bd = &binds[nbinds]; + bd->host = hosts[nbinds]; + bd->guest = guests[nbinds]; + snprintf(bd->host, PATH_MAX, "%s", argv[i]); + snprintf(bd->guest, sizeof guests[0], "%s", argv[i + 1]); + bd->hlen = strlen(bd->host); + bd->glen = strlen(bd->guest); + nbinds++; + } + pthread_once(&init_once, fp_init); + fp_on = 1; + for (i++; i < argc; i++) { + const char *op = argv[i]; + if (!strcmp(op, "fuse")) { + for (int b = 0; b < nbinds; b++) binds[b].fuse = 1; + } else if (!strcmp(op, "touch")) { + long fd = fp_open(AT_FDCWD, argv[++i], O_CREAT | O_WRONLY | O_CLOEXEC, 0644); + if (fd >= 0) close((int)fd); + show(fd); + } else if (!strcmp(op, "stat")) { + struct stat st; + show(fp_stat(AT_FDCWD, argv[++i], AT_SYMLINK_NOFOLLOW, &st)); + } else if (!strcmp(op, "mkdir")) { + show(fp_mkdir(AT_FDCWD, argv[++i], 0755)); + } else if (!strcmp(op, "mv")) { + show(fp_rename(AT_FDCWD, argv[i + 1], AT_FDCWD, argv[i + 2], 0)); + i += 2; + } else if (!strcmp(op, "rm")) { + show(fp_unlink(AT_FDCWD, argv[++i], 0)); + } else if (!strcmp(op, "host-mv")) { + show(host_sys(SYS_renameat, AT_FDCWD, (long)argv[i + 1], AT_FDCWD, (long)argv[i + 2], 0, 0)); + i += 2; + } else if (!strcmp(op, "host-rmdir")) { + show(host_sys(SYS_unlinkat, AT_FDCWD, (long)argv[++i], AT_REMOVEDIR, 0, 0, 0)); + } else if (!strcmp(op, "host-mkdir")) { + show(host_sys(SYS_mkdirat, AT_FDCWD, (long)argv[++i], 0755, 0, 0, 0)); + } else if (!strcmp(op, "clobber")) { + long null = host_sys(SYS_openat, AT_FDCWD, (long)"/dev/null", O_RDONLY, 0, 0, 0); + for (int fd = DIR_FD_FLOOR; fd < DIR_FD_FLOOR + DIRS; fd++) host_sys(SYS_dup3, null, fd, 0, 0, 0, 0); + host_sys(SYS_close, null, 0, 0, 0, 0, 0); + puts("ok"); + } else if (!strcmp(op, "first-fd")) { + char link[40], out[PATH_MAX]; + snprintf(link, sizeof link, "/proc/self/fd/%d", DIR_FD_FLOOR); + long n = host_sys(SYS_readlinkat, AT_FDCWD, (long)link, (long)out, sizeof out - 1, 0, 0); + out[n > 0 ? n : 0] = 0; + puts(out); + } else if (!strcmp(op, "fds")) { + printf("%d\n", high_fds()); + } else if (!strcmp(op, "ttl")) { + ttl_ns = atoll(argv[++i]) * 1000000LL; + } else if (!strcmp(op, "sleep")) { + usleep(atoi(argv[++i]) * 1000); + } else if (!strcmp(op, "chmod")) { + show(fp_chmod(AT_FDCWD, argv[i + 1], strtol(argv[i + 2], NULL, 8), 0)); + i += 2; + } else if (!strcmp(op, "host-mount")) { + show(mount("tmpfs", argv[++i], "tmpfs", 0, NULL) == 0 ? 0 : -errno); + } else if (!strcmp(op, "take-over")) { + for (int fd = DIR_FD_FLOOR; fd < DIR_FD_FLOOR + DIRS; fd++) { + char link[40], out[PATH_MAX]; + snprintf(link, sizeof link, "/proc/self/fd/%d", fd); + long n = host_sys(SYS_readlinkat, AT_FDCWD, (long)link, (long)out, sizeof out - 1, 0, 0); + if (n <= 0) continue; + out[n] = 0; + long mine = host_sys(SYS_openat, AT_FDCWD, (long)out, O_RDONLY | O_DIRECTORY, 0, 0, 0); + host_sys(SYS_dup3, mine, fd, 0, 0, 0, 0); + host_sys(SYS_close, mine, 0, 0, 0, 0, 0); + taken[ntaken++] = fd; + } + puts("ok"); + } else if (!strcmp(op, "taken")) { + int open_fds = 0; + for (int t = 0; t < ntaken; t++) + if (lseek(taken[t], 0, SEEK_CUR) == 0) open_fds++; + printf("%d/%d\n", open_fds, ntaken); + } + } + return 0; +} +""" + + +class FastPathFuseDirsTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + if shutil.which("gcc") is None: + raise unittest.SkipTest("gcc is not available") + cls.build = tempfile.TemporaryDirectory() + source = Path(cls.build.name) / "fuse_dirs.c" + source.write_text(PROGRAM.replace("FASTPATH", str(FASTPATH))) + cls.program = Path(cls.build.name) / "fuse_dirs" + subprocess.run(["gcc", "-O1", "-Wall", "-Wextra", "-Werror", "-Wno-format-truncation", "-pthread", "-o", str(cls.program), str(source), "-ldl"], check=True) + + @classmethod + def tearDownClass(cls): + cls.build.cleanup() + + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + base = Path(self.temp.name) + self.root = base / "root" + (self.root / "mnt").mkdir(parents=True) + self.card = base / "card" + (self.card / "Games/steamapps/common/Game/Data").mkdir(parents=True) + + def ask(self, *ops, wrap=()): + argv = [*wrap, str(self.program), str(self.root), str(self.card), "/mnt/card", "--", *ops] + return subprocess.run(argv, capture_output=True, text=True, timeout=20, check=True).stdout.split() + + def test_files_deep_in_a_fuse_library_are_created_renamed_and_removed(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "touch", f"{data}/a.tmp", "mv", f"{data}/a.tmp", f"{data}/a.idx", + "stat", f"{data}/a.idx", "stat", f"{data}/a.tmp", "rm", f"{data}/a.idx", + "stat", f"{data}/a.idx", "fds") + self.assertEqual(["ok", "ok", "ok", "E2", "ok", "E2"], out[:-1]) + self.assertGreater(int(out[-1]), 0) + self.assertEqual([], list((self.card / "Games/steamapps/common/Game/Data").iterdir())) + + def test_a_folder_renamed_behind_the_cache_is_not_reused(self): + game = self.card / "Games/steamapps/common/Game" + (game / "Data/keep").write_text("x") + out = self.ask("fuse", "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "host-mv", str(game), str(game.parent / "Moved"), + "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "stat", "/mnt/card/Games/steamapps/common/Moved/Data/keep") + self.assertEqual(["ok", "ok", "E2", "ok"], out) + + def test_a_folder_deleted_and_made_again_is_looked_up_fresh(self): + data = self.card / "Games/steamapps/common/Game/Data" + out = self.ask("fuse", "touch", "/mnt/card/Games/steamapps/common/Game/Data/old", + "rm", "/mnt/card/Games/steamapps/common/Game/Data/old", + "host-rmdir", str(data), "host-mkdir", str(data), + "touch", "/mnt/card/Games/steamapps/common/Game/Data/new") + self.assertEqual(["ok"] * 5, out) + self.assertEqual(["new"], [p.name for p in data.iterdir()]) + + def test_folders_deleted_and_made_again_many_times_keep_descriptors_bounded(self): + data = self.card / "Games/steamapps/common/Game/Data" + ops = ["fuse"] + for _ in range(200): + ops += ["touch", "/mnt/card/Games/steamapps/common/Game/Data/x", + "rm", "/mnt/card/Games/steamapps/common/Game/Data/x", + "host-rmdir", str(data), "host-mkdir", str(data)] + out = self.ask(*ops, "fds") + self.assertEqual(["ok"] * 800, out[:-1]) + self.assertLessEqual(int(out[-1]), 64) + + def test_descriptors_the_program_takes_over_are_left_alone(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "touch", f"{data}/a", "clobber", "touch", f"{data}/b", + "stat", f"{data}/a", "first-fd") + self.assertEqual(["ok", "ok", "ok", "ok", "/dev/null"], out) + self.assertEqual({"a", "b"}, {p.name for p in (self.card / "Games/steamapps/common/Game/Data").iterdir()}) + + def test_a_folder_the_program_opened_itself_stays_open_when_the_cache_moves_on(self): + data = self.card / "Games/steamapps/common/Game/Data" + ops = ["fuse", "touch", "/mnt/card/Games/steamapps/common/Game/Data/a", "take-over"] + for n in range(200): + (data / f"d{n}").mkdir() + ops += ["touch", f"/mnt/card/Games/steamapps/common/Game/Data/d{n}/x"] + out = self.ask(*ops, "taken") + self.assertEqual(["ok"] * 202, out[:-1]) + opened, total = map(int, out[-1].split("/")) + self.assertGreater(total, 0) + self.assertEqual(total, opened) + self.assertEqual(200, len(list(data.glob("d*/x")))) + + @unittest.skipIf(os.geteuid() == 0, "root passes folder permissions") + def test_a_parent_folder_closed_by_the_program_stops_cached_access_at_once(self): + game = self.card / "Games/steamapps/common/Game" + (game / "Data/keep").write_text("x") + self.addCleanup(os.chmod, game, 0o755) + out = self.ask("fuse", "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "chmod", "/mnt/card/Games/steamapps/common/Game", "000", + "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "touch", "/mnt/card/Games/steamapps/common/Game/Data/new") + self.assertEqual(["ok", "ok"], out[:2]) + self.assertNotIn("ok", out[2:]) + os.chmod(game, 0o755) + self.assertEqual(["keep"], [p.name for p in (game / "Data").iterdir()]) + + @unittest.skipUnless(USERNS, "mount namespaces are not available") + def test_a_mount_placed_over_a_cached_folder_receives_later_writes(self): + data = self.card / "Games/steamapps/common/Game/Data" + out = self.ask("fuse", "ttl", "1", "touch", "/mnt/card/Games/steamapps/common/Game/Data/under", + "host-mount", str(data), "sleep", "20", + "touch", "/mnt/card/Games/steamapps/common/Game/Data/over", + "stat", "/mnt/card/Games/steamapps/common/Game/Data/under", wrap=("unshare", "-Urm")) + self.assertEqual(["ok", "ok", "ok", "E2"], out) + self.assertEqual(["under"], [p.name for p in data.iterdir()]) + + def test_other_filesystems_keep_absolute_paths_and_open_no_folders(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("touch", f"{data}/a", "mv", f"{data}/a", f"{data}/b", "rm", f"{data}/b", "fds") + self.assertEqual(["ok", "ok", "ok", "0"], out) + + +if __name__ == "__main__": + unittest.main() From b3c61cf0bfad2fc87cbe957308caa5ff741f8682 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:45:23 -0500 Subject: [PATCH 022/101] fix: permissions set by Windows programs are kept on SD cards (#2504) * fix: keep file permissions set by Windows programs on volumes without extended attributes Wine's server stores a file's security descriptor in an extended attribute. Volumes that cannot hold one dropped every descriptor, so a program that checks and repairs its install folder's permissions repeated the repair on every start. The descriptor is now kept inside the prefix when the volume refuses it, and follows the file when the server renames or deletes it. * fix: a path deleted with remove() drops its kept descriptor too --- tools/linuxfs/preload/descriptor.c | 291 +++++++++++++++++++++++++ tools/linuxfs/preload/dircache.c | 16 +- tools/linuxfs/preload/owner.c | 7 +- tools/tests/test_descriptor_preload.py | 245 +++++++++++++++++++++ tools/tests/test_fastpath_fuse_dirs.py | 28 +++ 5 files changed, 580 insertions(+), 7 deletions(-) create mode 100644 tools/linuxfs/preload/descriptor.c create mode 100644 tools/tests/test_descriptor_preload.py diff --git a/tools/linuxfs/preload/descriptor.c b/tools/linuxfs/preload/descriptor.c new file mode 100644 index 0000000000..681dce999e --- /dev/null +++ b/tools/linuxfs/preload/descriptor.c @@ -0,0 +1,291 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define DESCRIPTOR "user.wine.sd" +#define STORE "/.droiddeck-descriptors" +#define ENTRY_MAX (PATH_MAX * 2) + +int bl_is_wineserver(void) __attribute__((visibility("hidden"))); + +static int store_seen; + +static int kept(const char *name) { + return name != NULL && strcmp(name, DESCRIPTOR) == 0 && bl_is_wineserver(); +} + +static int store_root(char *out, size_t size) { + const char *prefix = getenv("WINEPREFIX"); + int n; + + if (prefix == NULL || prefix[0] != '/') return -1; + n = snprintf(out, size, "%s" STORE, prefix); + return n > 0 && (size_t)n < size ? n : -1; +} + +static int store_exists(void) { + char root[PATH_MAX]; + + if (store_seen) return 1; + if (store_root(root, sizeof(root)) < 0) return 0; + store_seen = access(root, F_OK) == 0; + return store_seen; +} + +static int entry_for(const char *path, char *out, size_t size, const char *suffix, int create) { + int used = store_root(out, size); + const char *part = path, *end; + + if (used < 0 || path[0] != '/') return -1; + if (create && mkdir(out, 0700) != 0 && errno != EEXIST) return -1; + while (*part == '/') part++; + if (*part == '\0') return -1; + for (;;) { + size_t length; + const char *tail; + + end = strchr(part, '/'); + length = end ? (size_t)(end - part) : strlen(part); + tail = end ? ".d" : suffix; + if (length + strlen(tail) > NAME_MAX || used + length + strlen(tail) + 2 > size) return -1; + out[used++] = '/'; + memcpy(out + used, part, length); + used += (int)length; + strcpy(out + used, tail); + used += (int)strlen(tail); + if (!end) break; + if (create && mkdir(out, 0700) != 0 && errno != EEXIST) return -1; + part = end + 1; + } + if (create) store_seen = 1; + return 0; +} + +static int path_of(int fd, char *out, size_t size) { + char link[40]; + ssize_t n; + + snprintf(link, sizeof(link), "/proc/self/fd/%d", fd); + n = readlink(link, out, size - 1); + if (n <= 0 || out[0] != '/') return -1; + out[n] = '\0'; + return 0; +} + +static int resolved(const char *path, char *out, size_t size) { + int fd, result; + + if (path == NULL) return -1; + fd = open(path, O_PATH | O_NOFOLLOW | O_CLOEXEC); + if (fd < 0) return -1; + result = path_of(fd, out, size); + close(fd); + return result; +} + +static int entry_of(int fd, char *out, size_t size, int create) { + char path[PATH_MAX]; + + if (path_of(fd, path, sizeof(path)) != 0) return -1; + return entry_for(path, out, size, ".sd", create); +} + +static ssize_t stored_read(int fd, void *value, size_t size) { + char entry[ENTRY_MAX]; + struct stat st; + ssize_t got = 0; + int file; + + if (entry_of(fd, entry, sizeof(entry), 0) != 0) return -2; + file = open(entry, O_RDONLY | O_NOFOLLOW | O_CLOEXEC); + if (file < 0) { + if (errno != ENOENT) return -2; + errno = ENODATA; + return -1; + } + if (fstat(file, &st) != 0) { + close(file); + return -2; + } + if (size == 0) { + close(file); + return (ssize_t)st.st_size; + } + if ((size_t)st.st_size > size) { + close(file); + errno = ERANGE; + return -1; + } + while (got < st.st_size) { + ssize_t n = read(file, (char *)value + got, (size_t)(st.st_size - got)); + if (n <= 0) { + close(file); + return -2; + } + got += n; + } + close(file); + return got; +} + +static int stored_write(int fd, const void *value, size_t size) { + char entry[ENTRY_MAX], fresh[ENTRY_MAX + 8]; + size_t put = 0; + int file; + + if (entry_of(fd, entry, sizeof(entry), 1) != 0) return -1; + snprintf(fresh, sizeof(fresh), "%s.new", entry); + file = open(fresh, O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW | O_CLOEXEC, 0600); + if (file < 0) return -1; + while (put < size) { + ssize_t n = write(file, (const char *)value + put, size - put); + if (n <= 0) { + close(file); + unlinkat(AT_FDCWD, fresh, 0); + return -1; + } + put += (size_t)n; + } + if (close(file) != 0 || renameat(AT_FDCWD, fresh, AT_FDCWD, entry) != 0) { + unlinkat(AT_FDCWD, fresh, 0); + return -1; + } + return 0; +} + +ssize_t fgetxattr(int fd, const char *name, void *value, size_t size) { + static ssize_t (*next)(int, const char *, void *, size_t); + ssize_t result; + + if (next == NULL) next = dlsym(RTLD_NEXT, "fgetxattr"); + if (next == NULL) { + errno = ENOSYS; + return -1; + } + result = next(fd, name, value, size); + if (result >= 0 || errno != ENOTSUP || !kept(name)) return result; + result = stored_read(fd, value, size); + if (result == -2) { + errno = ENOTSUP; + return -1; + } + return result; +} + +int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags) { + static int (*next)(int, const char *, const void *, size_t, int); + int saved = errno, result; + + if (next == NULL) next = dlsym(RTLD_NEXT, "fsetxattr"); + if (next == NULL) { + errno = ENOSYS; + return -1; + } + result = next(fd, name, value, size, flags); + if (result == 0 || errno != ENOTSUP || !kept(name)) return result; + if (stored_write(fd, value, size) != 0) { + errno = ENOTSUP; + return -1; + } + errno = saved; + return 0; +} + +int fremovexattr(int fd, const char *name) { + static int (*next)(int, const char *); + char entry[ENTRY_MAX]; + int saved = errno, result; + + if (next == NULL) next = dlsym(RTLD_NEXT, "fremovexattr"); + if (next == NULL) { + errno = ENOSYS; + return -1; + } + result = next(fd, name); + if (result == 0 || errno != ENOTSUP || !kept(name)) return result; + if (entry_of(fd, entry, sizeof(entry), 0) != 0) { + errno = ENOTSUP; + return -1; + } + if (unlinkat(AT_FDCWD, entry, 0) != 0) { + errno = errno == ENOENT ? ENODATA : ENOTSUP; + return -1; + } + errno = saved; + return 0; +} + +static int tracked(const char *path, char *out, size_t size) { + int saved = errno, found; + + found = bl_is_wineserver() && store_exists() && resolved(path, out, size) == 0; + errno = saved; + return found; +} + +static void forget(const char *path, int folder) { + char entry[ENTRY_MAX]; + int saved = errno; + + if (entry_for(path, entry, sizeof(entry), ".sd", 0) == 0) unlinkat(AT_FDCWD, entry, 0); + if (folder && entry_for(path, entry, sizeof(entry), ".d", 0) == 0) unlinkat(AT_FDCWD, entry, AT_REMOVEDIR); + errno = saved; +} + +static void follow(const char *from, const char *to) { + static const char *const kinds[] = {".sd", ".d"}; + char old[ENTRY_MAX], new[ENTRY_MAX]; + int saved = errno; + + for (size_t i = 0; i < 2; i++) { + if (entry_for(from, old, sizeof(old), kinds[i], 0) != 0) continue; + if (access(old, F_OK) != 0) { + if (i == 0 && entry_for(to, new, sizeof(new), kinds[i], 0) == 0) unlinkat(AT_FDCWD, new, 0); + continue; + } + if (entry_for(to, new, sizeof(new), kinds[i], 1) != 0 || renameat(AT_FDCWD, old, AT_FDCWD, new) != 0) { + if (i == 0) unlinkat(AT_FDCWD, old, 0); + } + } + errno = saved; +} + +__attribute__((visibility("hidden"))) +int bl_descriptor_unlink(const char *path, int (*real)(const char *)) { + char target[PATH_MAX]; + int known = tracked(path, target, sizeof(target)), result = real(path); + + if (result == 0 && known) forget(target, 0); + return result; +} + +__attribute__((visibility("hidden"))) +int bl_descriptor_rmdir(const char *path, int (*real)(const char *)) { + char target[PATH_MAX]; + int known = tracked(path, target, sizeof(target)), result = real(path); + + if (result == 0 && known) forget(target, 1); + return result; +} + +__attribute__((visibility("hidden"))) +int bl_descriptor_remove(const char *path, int (*real)(const char *)) { + return bl_descriptor_rmdir(path, real); +} + +__attribute__((visibility("hidden"))) +int bl_descriptor_rename(const char *from, const char *to, int (*real)(const char *, const char *)) { + char old[PATH_MAX], new[PATH_MAX]; + int known = tracked(from, old, sizeof(old)), result = real(from, to); + + if (result == 0 && known && tracked(to, new, sizeof(new))) follow(old, new); + return result; +} diff --git a/tools/linuxfs/preload/dircache.c b/tools/linuxfs/preload/dircache.c index 296faa616b..f6951497f0 100644 --- a/tools/linuxfs/preload/dircache.c +++ b/tools/linuxfs/preload/dircache.c @@ -846,9 +846,17 @@ int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, } ONE_PATH(mkdir, ADDED, IN_CREATE, next_mkdir(path, mode), mode_t mode) -ONE_PATH(rmdir, REMOVED, IN_DELETE, next_rmdir(path)) -ONE_PATH(unlink, REMOVED, IN_DELETE, next_unlink(path)) -ONE_PATH(remove, REMOVED, IN_DELETE, next_remove(path)) +int bl_descriptor_unlink(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int bl_descriptor_rmdir(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int bl_descriptor_remove(const char *path, int (*real)(const char *)) __attribute__((visibility("hidden"))); +int bl_descriptor_rename(const char *from, const char *to, int (*real)(const char *, const char *)) + __attribute__((visibility("hidden"))); + +static int moved(const char *from, const char *to) { return bl_descriptor_rename(from, to, next_rename); } + +ONE_PATH(rmdir, REMOVED, IN_DELETE, bl_descriptor_rmdir(path, next_rmdir)) +ONE_PATH(unlink, REMOVED, IN_DELETE, bl_descriptor_unlink(path, next_unlink)) +ONE_PATH(remove, REMOVED, IN_DELETE, bl_descriptor_remove(path, next_remove)) #define TWO_PATHS(name, gone, event, call) \ int name(const char *from, const char *to) { \ @@ -881,7 +889,7 @@ ONE_PATH(remove, REMOVED, IN_DELETE, next_remove(path)) int bl_link_lock(const char *oldpath, const char *newpath, int result) __attribute__((visibility("hidden"))); static int link_or_lock(const char *from, const char *to) { return bl_link_lock(from, to, next_link(from, to)); } -TWO_PATHS(rename, 1, IN_MOVED_TO, next_rename) +TWO_PATHS(rename, 1, IN_MOVED_TO, moved) TWO_PATHS(link, 0, IN_CREATE, link_or_lock) TWO_PATHS(symlink, 0, IN_CREATE, next_symlink) diff --git a/tools/linuxfs/preload/owner.c b/tools/linuxfs/preload/owner.c index 78ada3bf00..1e493f8a80 100644 --- a/tools/linuxfs/preload/owner.c +++ b/tools/linuxfs/preload/owner.c @@ -12,7 +12,8 @@ #define FAT_MAGIC 0x4d44 #define EXFAT_MAGIC 0x2011bab0 -static int is_wineserver(void) { +__attribute__((visibility("hidden"))) +int bl_is_wineserver(void) { static int cached = -1; char exe[PATH_MAX]; const char *base; @@ -43,7 +44,7 @@ void bl_storage_owner(int fd, struct stat *st) { int saved = errno; uid_t uid; - if (st != NULL && is_wineserver()) { + if (st != NULL && bl_is_wineserver()) { uid = getuid(); if (st->st_uid != uid && has_no_unix_owner(fd)) st->st_uid = uid; } @@ -60,7 +61,7 @@ int fchmod(int fd, mode_t mode) { return -1; } result = next_fchmod(fd, mode); - if (result != 0 && errno == EPERM && is_wineserver()) { + if (result != 0 && errno == EPERM && bl_is_wineserver()) { if (has_no_unix_owner(fd)) { errno = saved; return 0; diff --git a/tools/tests/test_descriptor_preload.py b/tools/tests/test_descriptor_preload.py new file mode 100644 index 0000000000..f83df2e9b2 --- /dev/null +++ b/tools/tests/test_descriptor_preload.py @@ -0,0 +1,245 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +FAKE = r""" +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include + +static int answer(int fd) { + char link[32], path[4096]; + snprintf(link, sizeof(link), "/proc/self/fd/%d", fd); + long n = syscall(SYS_readlinkat, AT_FDCWD, link, path, sizeof(path) - 1); + path[n > 0 ? n : 0] = '\0'; + if (strstr(path, "/card/")) return ENOTSUP; + if (strstr(path, "/denied/")) return EACCES; + return ENODATA; +} + +ssize_t fgetxattr(int fd, const char *name, void *value, size_t size) { + (void)name; (void)value; (void)size; + errno = answer(fd); + return -1; +} + +int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags) { + (void)name; (void)value; (void)size; (void)flags; + int error = answer(fd); + if (error == ENODATA) return 0; + errno = error; + return -1; +} + +int fremovexattr(int fd, const char *name) { + (void)name; + errno = answer(fd); + return -1; +} +""" + +PROGRAM = r""" +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include + +static const char *error(void) { + return errno == ENOTSUP ? "unsupported" : errno == ENODATA ? "none" : errno == ERANGE ? "range" : + errno == EACCES ? "denied" : "other"; +} + +int main(int argc, char **argv) { + for (int i = 1; i < argc; i++) { + const char *op = argv[i]; + if (!strcmp(op, "unlink") || !strcmp(op, "rmdir")) { + const char *path = argv[++i]; + printf("%s\n", (op[0] == 'u' ? unlink(path) : rmdir(path)) == 0 ? "ok" : "failed"); + continue; + } + if (!strcmp(op, "remove-path")) { + printf("%s\n", remove(argv[++i]) == 0 ? "ok" : "failed"); + continue; + } + if (!strcmp(op, "rename")) { + const char *from = argv[++i], *to = argv[++i]; + printf("%s\n", rename(from, to) == 0 ? "ok" : "failed"); + continue; + } + int fd = open(argv[++i], O_RDONLY); + char value[64]; + if (!strcmp(op, "set")) { + const char *text = argv[++i]; + errno = 1234; + int result = fsetxattr(fd, "user.wine.sd", text, strlen(text), 0); + printf("%s\n", result == 0 ? errno == 1234 ? "ok" : "errno" : error()); + } else if (!strcmp(op, "get")) { + ssize_t n = fgetxattr(fd, "user.wine.sd", value, sizeof(value)); + if (n < 0) printf("%s\n", error()); + else printf("=%.*s\n", (int)n, value); + } else if (!strcmp(op, "size")) { + ssize_t n = fgetxattr(fd, "user.wine.sd", NULL, 0); + if (n < 0) printf("%s\n", error()); + else printf("%d\n", (int)n); + } else if (!strcmp(op, "short")) { + ssize_t n = fgetxattr(fd, "user.wine.sd", value, 2); + printf("%s\n", n < 0 ? error() : "read"); + } else if (!strcmp(op, "remove")) { + errno = 1234; + int result = fremovexattr(fd, "user.wine.sd"); + printf("%s\n", result == 0 ? errno == 1234 ? "ok" : "errno" : error()); + } else if (!strcmp(op, "other")) { + ssize_t n = fgetxattr(fd, "user.other", value, sizeof(value)); + printf("%s\n", n < 0 ? error() : "read"); + } + close(fd); + } + return 0; +} +""" + + +@unittest.skipUnless(shutil.which("cc"), "needs a C compiler") +class DescriptorPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.build_dir = tempfile.TemporaryDirectory() + build = Path(cls.build_dir.name) + (build / "fake.c").write_text(FAKE) + (build / "program.c").write_text(PROGRAM) + cls.preload = build / "libblsession.so" + cls.fake = build / "fake.so" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.preload), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(cls.fake), str(build / "fake.c")], check=True) + cls.wineserver = build / "wineserver" + subprocess.run(["cc", "-O2", "-o", str(cls.wineserver), str(build / "program.c")], check=True) + cls.other = build / "wine64-preloader" + shutil.copy(cls.wineserver, cls.other) + + @classmethod + def tearDownClass(cls): + cls.build_dir.cleanup() + + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.dir = Path(os.path.realpath(self.temp.name)) + self.prefix = self.dir / "prefix" + self.prefix.mkdir() + self.store = self.prefix / ".droiddeck-descriptors" + for kind in ("card", "disk", "denied"): + (self.dir / kind / "game").mkdir(parents=True) + (self.dir / kind / "game" / "file").write_text("x") + + def tearDown(self): + self.temp.cleanup() + + def path(self, *parts): + return str(self.dir.joinpath(*parts)) + + def run_as(self, program, *args, prefix=True): + env = dict(os.environ, LD_PRELOAD="%s:%s" % (self.preload, self.fake)) + env.pop("WINEPREFIX", None) + if prefix: + env["WINEPREFIX"] = str(self.prefix) + result = subprocess.run([str(program), *args], env=env, capture_output=True, text=True, check=True) + return result.stdout.split() + + def server(self, *args, **kwargs): + return self.run_as(self.wineserver, *args, **kwargs) + + def test_a_descriptor_is_kept_where_the_volume_cannot_store_it(self): + file, folder = self.path("card", "game", "file"), self.path("card", "game") + self.assertEqual(["none", "ok", "ok"], self.server("get", file, "set", file, "one", "set", folder, "two")) + self.assertEqual(["=one", "3", "=two"], self.server("get", file, "size", file, "get", folder)) + + def test_a_descriptor_is_replaced_and_removed(self): + file = self.path("card", "game", "file") + self.assertEqual(["ok", "ok", "=longer"], self.server("set", file, "one", "set", file, "longer", "get", file)) + self.assertEqual(["range", "ok", "none", "none"], self.server("short", file, "remove", file, "get", file, "remove", file)) + + def test_a_volume_that_stores_descriptors_is_left_alone(self): + file = self.path("disk", "game", "file") + self.assertEqual(["ok", "none", "none"], self.server("set", file, "one", "get", file, "remove", file)) + self.assertFalse(self.store.exists()) + + def test_other_failures_keep_their_error(self): + file = self.path("denied", "game", "file") + self.assertEqual(["denied", "denied", "denied"], self.server("set", file, "one", "get", file, "remove", file)) + self.assertFalse(self.store.exists()) + + def test_other_programs_and_other_attributes_are_unchanged(self): + file = self.path("card", "game", "file") + self.assertEqual(["unsupported", "unsupported", "unsupported"], + self.run_as(self.other, "set", file, "one", "get", file, "remove", file)) + self.assertEqual(["ok", "unsupported"], self.server("set", file, "one", "other", file)) + self.assertEqual(["unsupported"], self.run_as(self.other, "get", file)) + + def test_nothing_is_kept_without_a_prefix(self): + file = self.path("card", "game", "file") + self.assertEqual(["unsupported", "unsupported", "unsupported"], + self.server("set", file, "one", "get", file, "remove", file, prefix=False)) + + def test_a_deleted_file_loses_its_descriptor(self): + file, folder = self.path("card", "game", "file"), self.path("card", "game") + self.assertEqual(["ok", "ok", "ok"], self.server("set", file, "one", "set", folder, "two", "unlink", file)) + Path(file).write_text("x") + self.assertEqual(["none", "ok", "ok"], self.server("get", file, "unlink", file, "rmdir", folder)) + Path(folder).mkdir() + self.assertEqual(["none"], self.server("get", folder)) + + def test_a_removed_file_or_folder_loses_its_descriptor(self): + file, folder = self.path("card", "game", "file"), self.path("card", "game") + self.assertEqual(["ok", "ok", "ok", "ok"], + self.server("set", file, "one", "set", folder, "two", "remove-path", file, "remove-path", folder)) + Path(folder).mkdir() + Path(file).write_text("x") + self.assertEqual(["none", "none"], self.server("get", folder, "get", file)) + + def test_a_file_deleted_through_a_link_loses_its_descriptor(self): + file = self.path("card", "game", "file") + os.symlink(self.path("card"), self.path("drive")) + self.assertEqual(["ok", "ok"], self.server("set", file, "one", "unlink", self.path("drive", "game", "file"))) + Path(file).write_text("x") + self.assertEqual(["none"], self.server("get", file)) + + def test_a_descriptor_follows_a_rename(self): + file, moved = self.path("card", "game", "file"), self.path("card", "game", "moved") + self.assertEqual(["ok", "ok", "=one"], self.server("set", file, "one", "rename", file, moved, "get", moved)) + Path(file).write_text("x") + self.assertEqual(["none", "ok", "none"], self.server("get", file, "rename", file, moved, "get", moved)) + + def test_descriptors_follow_a_renamed_folder(self): + file, folder, moved = self.path("card", "game", "file"), self.path("card", "game"), self.path("card", "moved") + self.assertEqual(["ok", "ok", "ok"], self.server("set", file, "one", "set", folder, "two", "rename", folder, moved)) + self.assertEqual(["=two", "=one"], self.server("get", moved, "get", self.path("card", "moved", "file"))) + Path(folder).mkdir() + (Path(folder) / "file").write_text("x") + self.assertEqual(["none", "none"], self.server("get", folder, "get", file)) + + def test_deletes_outside_the_store_cost_nothing_before_it_exists(self): + file = self.path("disk", "game", "file") + self.assertEqual(["ok"], self.server("unlink", file)) + self.assertFalse(self.store.exists()) + + def test_a_name_too_long_to_keep_reports_no_support(self): + long_file = self.path("card", "game", "n" * 254) + Path(long_file).write_text("x") + self.assertEqual(["unsupported", "unsupported"], self.server("set", long_file, "one", "get", long_file)) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_fastpath_fuse_dirs.py b/tools/tests/test_fastpath_fuse_dirs.py index d8c52e99da..4347e0aedf 100644 --- a/tools/tests/test_fastpath_fuse_dirs.py +++ b/tools/tests/test_fastpath_fuse_dirs.py @@ -13,8 +13,18 @@ PROGRAM = r""" #include "FASTPATH" #include +static const char *race_from, *race_to; +static dev_t race_dev; +static ino_t race_ino; + static long host_sys(long nr, long a, long b, long c, long d, long e, long f) { long r = syscall(nr, a, b, c, d, e, f); + struct stat fs; + if (r >= 0 && nr == SYS_fcntl && b == F_DUPFD_CLOEXEC && c == DIR_FD_FLOOR && race_from + && syscall(SYS_fstat, a, &fs) == 0 && fs.st_dev == race_dev && fs.st_ino == race_ino) { + syscall(SYS_renameat, AT_FDCWD, race_from, AT_FDCWD, race_to); + race_from = NULL; + } return r < 0 ? -errno : r; } @@ -72,6 +82,14 @@ int main(int argc, char **argv) { } else if (!strcmp(op, "host-mv")) { show(host_sys(SYS_renameat, AT_FDCWD, (long)argv[i + 1], AT_FDCWD, (long)argv[i + 2], 0, 0)); i += 2; + } else if (!strcmp(op, "race-mv")) { + struct stat rs; + race_from = argv[i + 1]; + race_to = argv[i + 2]; + i += 2; + show(host_sys(SYS_newfstatat, AT_FDCWD, (long)race_from, (long)&rs, 0, 0, 0)); + race_dev = rs.st_dev; + race_ino = rs.st_ino; } else if (!strcmp(op, "host-rmdir")) { show(host_sys(SYS_unlinkat, AT_FDCWD, (long)argv[++i], AT_REMOVEDIR, 0, 0, 0)); } else if (!strcmp(op, "host-mkdir")) { @@ -169,6 +187,16 @@ class FastPathFuseDirsTest(unittest.TestCase): "stat", "/mnt/card/Games/steamapps/common/Moved/Data/keep") self.assertEqual(["ok", "ok", "E2", "ok"], out) + def test_a_folder_renamed_while_it_is_opened_is_not_used_under_its_old_name(self): + game = self.card / "Games/steamapps/common/Game" + (game / "Data/keep").write_text("x") + out = self.ask("fuse", "race-mv", str(game / "Data"), str(game / "Moved"), + "stat", "/mnt/card/Games/steamapps/common/Game/Data/keep", + "touch", "/mnt/card/Games/steamapps/common/Game/Data/new", "fds") + self.assertEqual(["ok", "E2", "E2"], out[:3]) + self.assertEqual(["keep"], [p.name for p in (game / "Moved").iterdir()]) + self.assertLessEqual(int(out[-1]), 64) + def test_a_folder_deleted_and_made_again_is_looked_up_fresh(self): data = self.card / "Games/steamapps/common/Game/Data" out = self.ask("fuse", "touch", "/mnt/card/Games/steamapps/common/Game/Data/old", From ea48036811633afc81fc6ac47f619fcc8870c379 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:55:30 -0500 Subject: [PATCH 023/101] fix(game-env): the VRAM cap also applies to D3D9 games (#2372) * fix(game-env): the VRAM cap also applies to D3D9 games DXVK's D3D9 frontend ignores dxgi.maxDeviceMemory, so set d3d9.maxAvailableMemory to the same cap. * fix(vram): leave DXVK's lower per-game D3D9 limits in place above the 4096 MiB default --- docs/development/vram-budget.md | 2 +- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 5 ++++- tools/tests/test_game_environment.py | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/development/vram-budget.md b/docs/development/vram-budget.md index c9e6820efe..50e3becf70 100644 --- a/docs/development/vram-budget.md +++ b/docs/development/vram-budget.md @@ -1,6 +1,6 @@ # Reported video memory budget -The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives its existing `dxgi.maxDeviceMemory` setting, which separately reduces the adapter's advertised dedicated video memory. A lower driver budget remains lower; the layer never increases it. +The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives its existing `dxgi.maxDeviceMemory` setting, which separately reduces the adapter's advertised dedicated video memory, and, for caps below DXVK's 4096 MiB D3D9 default, `d3d9.maxAvailableMemory`, which caps the texture memory DXVK's D3D9 frontend reports, since D3D9 games do not read the DXGI setting. Higher caps leave the D3D9 setting alone so DXVK's lower per-game limits still apply. OpenGL games are not covered. A lower driver budget remains lower; the layer never increases it. This does not make vkd3d-proton automatically enforce the selected budget. In the [upstream allocator inspected during this investigation](https://github.com/HansKristian-Work/vkd3d-proton/blob/865b12ba0cc20796b3709397ce5d6d3b8a205b04/libs/vkd3d/memory.c), `heapBudget` is used for diagnostic reporting, while the [DXVK adapter](https://github.com/doitsujin/dxvk/blob/cf0a0d90f8965147741ad17dcd0b263817572ab3/src/dxgi/dxgi_adapter.cpp) returns the Vulkan budget to applications. Seeing a smaller budget in a VKD3D log verifies reporting, not reduced allocation or eviction. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 175b8d8d1c..a4d8387353 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -12,6 +12,7 @@ from pathlib import Path GAME_TU_DEBUG = "DROIDDECK_GAME_TU_DEBUG" CHROMIUM_FILES = {"chrome-sandbox", "chrome_100_percent.pak", "v8_context_snapshot.bin"} +D3D9_DEFAULT_MEMORY_MB = 4096 SYNC_KEYS = ("BL_SYNC", "BL_SYNC_FALLBACK", "BL_FSYNC_FIRST", "BL_SYNC_MIN_NOFILE", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") SEED_REDISTS = "/usr/local/bin/droiddeck-seed-redists" PACK_KEYS = ("WINESERVER", "BL_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC") @@ -396,7 +397,9 @@ def vram_cap(env): if not re.fullmatch(r"[1-9][0-9]{0,6}", value): return env result = env.copy() - cap = "dxgi.maxDeviceMemory = %d" % int(value) + cap = "dxgi.maxDeviceMemory = {0}".format(int(value)) + if int(value) < D3D9_DEFAULT_MEMORY_MB: + cap += "; d3d9.maxAvailableMemory = {0}".format(int(value)) own = result.get("DXVK_CONFIG", "").strip().strip(";").strip() result["DXVK_CONFIG"] = cap + "; " + own if own else cap result["DROIDDECK_VRAM_CAP"] = "1" diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index d6cb49582e..18ec5135ec 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -993,8 +993,10 @@ class GameEnvironmentTest(unittest.TestCase): def test_the_vram_cap_comes_before_the_games_own_dxvk_settings(self): cap = MODULE["vram_cap"] self.assertEqual(cap({"BL_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096") + self.assertEqual(cap({"BL_VRAM_MB": "8192"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 8192") + self.assertEqual(cap({"BL_VRAM_MB": "4095"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4095; d3d9.maxAvailableMemory = 4095") self.assertEqual(cap({"BL_VRAM_MB": "2048", "DXVK_CONFIG": "dxvk.maxFrameRate = 60;"})["DXVK_CONFIG"], - "dxgi.maxDeviceMemory = 2048; dxvk.maxFrameRate = 60") + "dxgi.maxDeviceMemory = 2048; d3d9.maxAvailableMemory = 2048; dxvk.maxFrameRate = 60") for off in ({}, {"BL_VRAM_MB": "0"}, {"BL_VRAM_MB": "lots"}, {"BL_VRAM_MB": "²"}, {"BL_VRAM_MB": "-1"}): self.assertNotIn("DXVK_CONFIG", cap(off)) self.assertNotIn("DROIDDECK_VRAM_CAP", cap(off)) From 2953739f1e4afea09c8e81c0cf30dc7b47a6bd80 Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 01:55:33 +0000 Subject: [PATCH 024/101] fix(lab): target the active app package and repair build setup (#2494) * fix(lab): handle SDK licenses and cache Gradle planning * fix(lab): target the package owning the agent session * fix(lab): preserve package overrides across build handoff --- docs/lab-builds.md | 5 +++ tools/agent/dd-lab-build | 31 +++++++++++--- tools/agent/setup | 2 +- tools/tests/test_dd_lab_build.py | 69 ++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 7 deletions(-) create mode 100644 tools/tests/test_dd_lab_build.py diff --git a/docs/lab-builds.md b/docs/lab-builds.md index 4f2ddfb5f0..177133e14d 100644 --- a/docs/lab-builds.md +++ b/docs/lab-builds.md @@ -25,6 +25,11 @@ change. Updates lists them under Lab builds: the one in use can be turned off, one built for this install can be used again, and any can be deleted. +The build targets the package owning `DD_AGENT_INBOX` when run from the Agent tab. +For a manual build of another package, set `DROIDDECK_PACKAGE`, for example +`DROIDDECK_PACKAGE=com.tencent.ig dd-lab-build`. This also selects the control provider, +Lab storage, and package to restart. + ## What a Lab build cannot change The manifest, native code (`cpp`, `jniLibs`, Rust), Gradle files, `App`, `AppLanguage`, and `LabOverlay` itself: diff --git a/tools/agent/dd-lab-build b/tools/agent/dd-lab-build index 44b62bd6b8..b29c6bc5a6 100755 --- a/tools/agent/dd-lab-build +++ b/tools/agent/dd-lab-build @@ -5,12 +5,17 @@ # compile what changed. Setup runs it once; it takes the longest. # --explain logs why each task ran and Kotlin's build report, to find out what makes a build slow. set -euo pipefail -pkg=com.droiddeck.launcher +pkg=${DROIDDECK_PACKAGE:-} +if [ -z "$pkg" ] && [[ ${DD_AGENT_INBOX:-} =~ ^/data/(user/[0-9]+|data)/([^/]+)/files/agent$ ]]; then + pkg=${BASH_REMATCH[2]} +fi +pkg=${pkg:-com.droiddeck.launcher} serial=${ADB_SERIAL:-127.0.0.1:5555} mode=build explain=() for arg in "$@"; do case $arg in + --package=*) pkg=${arg#--package=} ;; --no-restart) mode=no-restart ;; --prepare) mode=prepare ;; --explain) explain=(--info -Pkotlin.build.report.output=file) ;; @@ -31,16 +36,18 @@ progress() { # stage [permille task done total eta] fail() { progress failed 0 "$*"; echo "dd-lab-build: $*" >&2; exit 1; } trap 'progress failed 0 stopped; exit 143' INT TERM trap 'progress failed 0 "a command failed on line $LINENO"' ERR +[[ $pkg =~ ^[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)+$ ]] || fail "invalid Android package: $pkg" +export DROIDDECK_PACKAGE=$pkg device() { adb -s "$serial" shell "$@" | tr -d '\r'; } # The app's agent loses every process it started when its turn ends, a build included, so it asks # the app to run the build in a process of its own and follows that build here. -agent=/data/user/0/$pkg/files/agent +agent=${DD_AGENT_INBOX:-/data/user/0/$pkg/files/agent} if [ -n "${DD_AGENT:-}" ] && [ -z "${DD_LAB_DETACHED:-}" ] && [ -d "$agent" ]; then trap - ERR log=$cache/dd-lab-build.log rm -f "$progress_file" - python3 -c 'import json,os,sys; print(json.dumps({"cwd": os.getcwd(), "args": sys.argv[1:]}))' "$@" > "$agent/lab-request.part" + python3 -c 'import json,os,sys; print(json.dumps({"cwd": os.getcwd(), "args": [*sys.argv[1:], "--package=" + os.environ["DROIDDECK_PACKAGE"]]}))' "$@" > "$agent/lab-request.part" mv "$agent/lab-request.part" "$agent/lab-request" echo "DroidDeck runs this build itself, so it keeps going if this turn ends. Its log follows." for _ in $(seq 1 30); do [ -f "$progress_file" ] && break; sleep 1; done @@ -102,7 +109,7 @@ export DROIDDECK_SOURCE_COMMIT=$base DROIDDECK_BUILD_LABEL="lab on $installed_la printf 'sdk.dir=%s\n' "$ANDROID_HOME" > local.properties if [ ! -d "$ANDROID_HOME/platforms/android-34" ]; then progress sdk - yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null + (set +o pipefail; yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null) "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null fi @@ -125,7 +132,19 @@ gradle=(./gradlew :app:processReleaseResources :app:mergeDexRelease --max-worker -Pandroid.aapt2FromMavenOverride=$HOME/aapt2/aapt2 -Pkotlin.compiler.execution.strategy=daemon -Pkotlin.daemon.jvmargs=-Xmx${kotlin_heap}m -Dorg.gradle.jvmargs=-Xmx${gradle_heap}m --console=plain) progress planning -mapfile -t plan < <("${gradle[@]}" --dry-run -q 2>/dev/null | awk '/^:/ {print $1}' || true) +plan_file=$cache/dd-lab-build-plan +plan_key=$( + { + printf '%s\n' "$repo" "${gradle[@]}" + git ls-files -z -- '*gradle*' | xargs -0 -r sha256sum + } | sha256sum | cut -d ' ' -f1 +) +if [ "$(head -n 1 "$plan_file" 2>/dev/null)" != "$plan_key" ]; then + plan_output=$("${gradle[@]}" --dry-run) || fail "Gradle planning failed: $plan_output" + { printf '%s\n' "$plan_key"; awk '/^:/ {print $1}' <<<"$plan_output"; } > "$plan_file.part" + mv "$plan_file.part" "$plan_file" +fi +mapfile -t plan < <(tail -n +2 "$plan_file") total=${#plan[@]} # Each task's estimate is how long it took last time; a full compile of the app takes about 15 minutes. @@ -221,6 +240,6 @@ device cmd package compile -m verify -f $pkg >/dev/null progress restarting 1000 "$name" echo "Restarting DroidDeck on the Lab build; it shows a notification when it is back" # The app's own agent ends with the app, so it is told to carry on once the app is back. -if [ -n "${DD_AGENT:-}" ]; then mkdir -p "/data/user/0/$pkg/files/agent" && : > "/data/user/0/$pkg/files/agent/resume"; fi +if [ -n "${DD_AGENT:-}" ]; then mkdir -p "$agent" && : > "$agent/resume"; fi device "nohup sh -c 'sleep 3; monkey -p $pkg -c android.intent.category.LAUNCHER 1' >/dev/null 2>&1 &" for pid in $(device pidof $pkg); do kill "$pid" 2>/dev/null || true; done diff --git a/tools/agent/setup b/tools/agent/setup index 0b1f66f6a0..5c2405d8d6 100755 --- a/tools/agent/setup +++ b/tools/agent/setup @@ -61,7 +61,7 @@ if [ ! -x "$sdk/cmdline-tools/latest/bin/sdkmanager" ]; then mv "$sdk/cmdline-tools/cmdline-tools" "$sdk/cmdline-tools/latest" fi export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-arm64 -yes | "$sdk/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null +(set +o pipefail; yes | "$sdk/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null) "$sdk/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null adb connect 127.0.0.1:5555 || true diff --git a/tools/tests/test_dd_lab_build.py b/tools/tests/test_dd_lab_build.py new file mode 100644 index 0000000000..9cf6d2a2c8 --- /dev/null +++ b/tools/tests/test_dd_lab_build.py @@ -0,0 +1,69 @@ +import json +import os +from pathlib import Path +import subprocess +import tempfile +import time +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / 'agent/dd-lab-build' + + +class LabBuildPackageTest(unittest.TestCase): + def test_package_override_survives_app_handoff_without_its_environment(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + inbox = root / 'agent' + inbox.mkdir() + cache = root / '.cache' + env = {**os.environ, 'HOME': tmp, 'DD_AGENT': '1', + 'DD_AGENT_INBOX': str(inbox), 'DROIDDECK_PACKAGE': 'com.example.target'} + env.pop('DD_LAB_DETACHED', None) + child = subprocess.Popen(['bash', str(SCRIPT), '--prepare'], env=env, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) + try: + request = inbox / 'lab-request' + deadline = time.monotonic() + 10 + while not request.exists() and child.poll() is None and time.monotonic() < deadline: + time.sleep(0.01) + self.assertTrue(request.exists()) + payload = json.loads(request.read_text()) + self.assertEqual(['--prepare', '--package=com.example.target'], payload['args']) + progress = cache / 'dd-lab-build.json' + progress.write_text('{"stage":"prepared"}') + stdout, stderr = child.communicate(timeout=10) + self.assertEqual(0, child.returncode, stdout + stderr) + finally: + if child.poll() is None: + child.kill() + child.communicate() + + bin_dir = root / 'bin' + bin_dir.mkdir() + (bin_dir / 'adb').write_text('#!/bin/sh\nexit 0\n') + (bin_dir / 'python3').write_text( + '#!/bin/sh\nprintf "%s" "$DROIDDECK_PACKAGE" > "$HOME/selected-package"\nexit 1\n') + for tool in bin_dir.iterdir(): + tool.chmod(0o755) + env.pop('DROIDDECK_PACKAGE') + env['DD_LAB_DETACHED'] = '1' + env['PATH'] = str(bin_dir) + os.pathsep + env['PATH'] + result = subprocess.run(['bash', str(SCRIPT), *payload['args']], env=env, + capture_output=True, text=True, timeout=10, cwd=SCRIPT.parents[2]) + self.assertNotEqual(0, result.returncode) + self.assertIn('could not read DroidDeck', result.stderr) + self.assertEqual('com.example.target', (root / 'selected-package').read_text()) + + def test_invalid_packages_are_rejected_before_handoff(self): + with tempfile.TemporaryDirectory() as tmp: + inbox = Path(tmp) / 'agent' + inbox.mkdir() + for package in ('bad;touch injected', '../other', '', 'com.example/other'): + with self.subTest(package=package): + env = {**os.environ, 'HOME': tmp, 'DD_AGENT': '1', 'DD_AGENT_INBOX': str(inbox)} + result = subprocess.run(['bash', str(SCRIPT), '--package=' + package], env=env, + capture_output=True, text=True, timeout=10) + self.assertNotEqual(0, result.returncode) + self.assertIn('invalid Android package', result.stderr) + self.assertFalse((inbox / 'lab-request').exists()) From 8961d088f258e22c39cc9a772eed0b3b0ae18b0e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:55:37 -0500 Subject: [PATCH 025/101] fix(desktop): run a store game's exe through its launcher so the EA environment and Origin process are set up (#2486) * fix(desktop): run a store game's exe through its launcher so the EA environment and Origin process are set up * fix(desktop): keep a store game's prefix and resolve its launcher through symlinks and deep folders * fix(desktop): keep the exe's resolved compatdata folder when running its launcher and find the sidecar beside a symlinked exe --- .../overlay/usr/local/bin/droiddeck-open | 23 +++++++++- .../usr/local/bin/droiddeck-proton-run | 11 +++-- .../usr/local/bin/droiddeck-store-launch | 19 +++++++- tools/tests/test_desktop_open.py | 38 +++++++++++++++ tools/tests/test_store_launch_ea.py | 46 +++++++++++++++++++ 5 files changed, 130 insertions(+), 7 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open index bf0aaff7c1..d39942a2cc 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open @@ -17,6 +17,7 @@ PROTON_RUN = os.path.join(BIN, "droiddeck-proton-run") APPIMAGE_RUN = os.path.join(BIN, "droiddeck-appimage-run") SCRIPT_RUN = os.path.join(BIN, "droiddeck-script-run") STEAM_LAUNCH = os.path.join(BIN, "droiddeck-steam-launch") +STORE_LAUNCH = os.path.join(BIN, "droiddeck-store-launch") PROGRAMS = os.path.join(BIN, "droiddeck-desktop-programs") CACHE = os.path.join(HOME, ".cache", "droiddeck") IMPORTS = {"appimage": ("/opt/appimages/user", "app"), "folder": ("/opt/droiddeck-apps", "entry")} @@ -272,12 +273,32 @@ def steam_title(path): return None +def exe_prefix(path): + try: + run = runpy.run_path(PROTON_RUN) + root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or run["STEAM_ROOT"] + target = run["locate"](path, root) + return ["--prefix", target.appid, "--compatdata", target.compatdata] + except (OSError, ValueError, KeyError, IndexError): + return None + + +def store_launcher(path): + try: + return runpy.run_path(STORE_LAUNCH)["store_launcher"](path) + except (OSError, ValueError, KeyError): + return None + + def command(path, args, what, window=False, appid=None): folder = os.path.dirname(path) if what == "steam": return [STEAM_LAUNCH, "desktop", appid], folder if what == "windows": - return [PROTON_RUN] + (["--window"] if window else []) + [path] + args, folder + launcher = None if args else store_launcher(path) + prefix = exe_prefix(path) if launcher else None + keep = prefix or [] + return [PROTON_RUN] + (["--window"] if window else []) + keep + [launcher or path] + args, folder if what == "x86 script": return [FEX, "run", "--mode", "on", "--for", folder, "--"] + interpreter(path) + [path] + args, folder if what == "script": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 164dbd0288..6dfcbadb25 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -315,8 +315,8 @@ def locate(program, root): os.path.dirname(program), root, "own") -def fixed(program, root, appid): - return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), +def fixed(program, root, appid, compatdata=None): + return Target(appid, compatdata or os.path.join(root, "steamapps", "compatdata", str(appid)), os.path.dirname(program), root, "fixed") @@ -451,6 +451,7 @@ def arguments(program, args, desktop=None, compatdata=None): def main(argv): window = False prefix = None + compatdata = None verb = VERB game_id = None desktop = None @@ -461,6 +462,8 @@ def main(argv): window = True elif option == "--prefix" and argv and prefix_id(argv[0]): prefix = argv.pop(0) + elif option == "--compatdata" and argv and os.path.isabs(argv[0]): + compatdata = argv.pop(0) elif option == "--verb" and argv and argv[0] in VERBS: verb = argv.pop(0) elif option == "--game-id" and argv and argv[0].isdigit() and argv[0] != "0": @@ -484,7 +487,7 @@ def main(argv): say("%s is not an app id" % app) return 2 if not argv and app is None: - say("usage: droiddeck-proton-run [--window] [--prefix ID] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...]") + say("usage: droiddeck-proton-run [--window] [--prefix ID [--compatdata DIR]] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...]") return 2 root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or STEAM_ROOT if options is None: @@ -509,7 +512,7 @@ def main(argv): if app is not None and int(app) >= STEAM_APP_LIMIT: target = shortcut_target(app, program, start, root) elif prefix: - target = fixed(program, root, prefix) + target = fixed(program, root, prefix, compatdata) else: target = locate(program, root) available = tools(root) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index ca6ddebc84..939504835c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -48,14 +48,14 @@ def sidecar_at(folder): return sidecar -def find_store_game(argv): +def find_store_game(argv, depth=MAX_DEPTH): for raw in argv: arg = raw.strip().strip('"').strip("'").replace("\\", "/") low = arg.lower() if not (low.endswith(LAUNCHER) or low.endswith(".exe") or low.endswith(".bat")) or "/" not in arg: continue folder = Path(arg).parent - for _ in range(MAX_DEPTH): + for _ in range(depth): sidecar = sidecar_at(folder) if sidecar is not None: return folder, sidecar @@ -65,6 +65,21 @@ def find_store_game(argv): return None +def store_launcher(path): + real = os.path.realpath(path) + for start in dict.fromkeys([os.path.abspath(path), real]): + found = find_store_game([start], depth=len(Path(start).parts)) + if found is None: + continue + folder, sidecar = found + launcher, exe = str(sidecar.get("launcher") or ""), str(sidecar.get("exe") or "") + if not launcher or not exe or (folder / launcher).is_symlink() or not (folder / launcher).is_file(): + continue + if os.path.realpath(folder / exe).lower() == real.lower(): + return str(folder / launcher) + return None + + def drop_stale(folder, now=None): code = folder / EPIC_CODE try: diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index c32baf71a6..a7840cfa53 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -136,6 +136,30 @@ class CommandTest(Temp): self.assertEqual(OPEN["command"](script, [], "x86 script")[0], [OPEN["FEX"], "run", "--mode", "on", "--for", str(self.tmp), "--", "/bin/sh", script]) + def test_a_store_games_exe_runs_through_its_launcher(self): + exe, launcher = str(self.tmp / "game.exe"), str(self.tmp / "launch.bat") + with mock.patch.dict(OPEN, {"store_launcher": lambda path: launcher if path == exe else None, + "exe_prefix": lambda path: ["--prefix", "4242", "--compatdata", "/c/4242"]}): + keep = ["--prefix", "4242", "--compatdata", "/c/4242"] + self.assertEqual(OPEN["command"](exe, [], "windows")[0], [OPEN["PROTON_RUN"]] + keep + [launcher]) + self.assertEqual(OPEN["command"](exe, [], "windows", True)[0], + [OPEN["PROTON_RUN"], "--window"] + keep + [launcher]) + self.assertEqual(OPEN["command"](exe, ["-x"], "windows")[0], [OPEN["PROTON_RUN"], exe, "-x"]) + other = str(self.tmp / "other.exe") + self.assertEqual(OPEN["command"](other, [], "windows")[0], [OPEN["PROTON_RUN"], other]) + + def test_a_store_games_launcher_keeps_the_exes_prefix(self): + exe = self.tmp / "game.exe" + exe.write_text("x") + root = str(self.tmp / "steam") + with mock.patch.dict(os.environ, {"STEAM_COMPAT_CLIENT_INSTALL_PATH": root}), \ + mock.patch.dict(OPEN, {"PROTON_RUN": str(BIN / "droiddeck-proton-run"), + "store_launcher": lambda path: str(self.tmp / "launch.bat")}): + command = OPEN["command"](str(exe), [], "windows")[0] + located = RUN["locate"](str(exe), root) + self.assertEqual(command[1:5], ["--prefix", located.appid, "--compatdata", located.compatdata]) + self.assertEqual(str(RUN["own_id"](str(exe))), str(RUN["locate"](str(exe), root).appid)) + def test_a_native_program_on_noexec_storage_runs_from_a_copy(self): program = self.write("storage/tool", elf(183)) x86 = self.write("storage/game.x86_64", elf(62)) @@ -737,6 +761,20 @@ class ProtonRunTest(Temp): self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(signed)) self.assertFalse((self.root / "steamapps/compatdata/2733369024").exists()) + def test_a_launcher_run_keeps_the_resolved_compatdata_folder(self): + bat = self.write("Games/Epic/Game/.droiddeck-launch.bat", b"@echo off") + signed = self.root / "steamapps/compatdata/-1561598272" + signed.mkdir(parents=True) + other = self.tmp / "Library2/steamapps/compatdata/555" + other.mkdir(parents=True) + for compatdata, appid in ((signed, "2733369024"), (other, "555")): + with self.subTest(compatdata=str(compatdata)): + code, calls, dirs = self.run_main(["--prefix", appid, "--compatdata", str(compatdata), str(bat)]) + self.assertIsNone(code) + self.assertEqual(calls[0][2]["STEAM_COMPAT_DATA_PATH"], str(compatdata)) + code, calls, dirs = self.run_main(["--prefix", "555", str(bat)]) + self.assertEqual(calls[0][2]["STEAM_COMPAT_DATA_PATH"], str(self.root / "steamapps/compatdata/555")) + def test_prefix_folder_prefers_initialized_unsigned_over_empty_signed(self): signed = self.root / "steamapps/compatdata/-1561598272" signed.mkdir(parents=True) diff --git a/tools/tests/test_store_launch_ea.py b/tools/tests/test_store_launch_ea.py index 2dd72b324b..9096d2d3c8 100644 --- a/tools/tests/test_store_launch_ea.py +++ b/tools/tests/test_store_launch_ea.py @@ -35,6 +35,52 @@ class EaHook(unittest.TestCase): self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\EA Games\Game', 'DisplayName', 'Mass Effect 3'), entries) self.assertIn((r'HKEY_LOCAL_MACHINE\SOFTWARE\Respawn\Titanfall2', 'DisplayName', 'Mass Effect 3'), entries) + def test_the_games_exe_maps_to_its_launcher_only(self): + with tempfile.TemporaryDirectory() as tmp: + folder = Path(tmp) / 'Game' + (folder / 'bin').mkdir(parents=True) + for name in ('bin/Game.exe', 'bin/Other.exe', store.LAUNCHER): + (folder / name).write_text('x') + sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'bin/Game.exe', 'launcher': store.LAUNCHER} + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + self.assertEqual(store.store_launcher(str(folder / 'bin/Game.exe')), str(folder / store.LAUNCHER)) + self.assertEqual(store.store_launcher(str(folder / 'bin/game.exe')), str(folder / store.LAUNCHER)) + self.assertIsNone(store.store_launcher(str(folder / 'bin/Other.exe'))) + self.assertIsNone(store.store_launcher(str(Path(tmp) / 'Elsewhere.exe'))) + (folder / store.SIDECAR).write_text(json.dumps(dict(sidecar, launcher=''))) + self.assertIsNone(store.store_launcher(str(folder / 'bin/Game.exe'))) + + def test_a_symlinked_or_deep_exe_still_finds_its_launcher(self): + with tempfile.TemporaryDirectory() as tmp: + folder = Path(tmp) / 'Game' + deep = folder / 'a/b/c/d/e/f' + deep.mkdir(parents=True) + (deep / 'Game.exe').write_text('x') + (folder / store.LAUNCHER).write_text('x') + sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'a/b/c/d/e/f/Game.exe', 'launcher': store.LAUNCHER} + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + link = Path(tmp) / 'x/y/z/Link.exe' + link.parent.mkdir(parents=True) + link.symlink_to(deep / 'Game.exe') + expected = str(folder.resolve() / store.LAUNCHER) + self.assertEqual(store.store_launcher(str(deep / 'Game.exe')), expected) + self.assertEqual(store.store_launcher(str(link)), expected) + self.assertIsNone(store.find_store_game([str(deep / 'Game.exe')])) + + def test_a_symlinked_exe_finds_the_sidecar_beside_the_link(self): + with tempfile.TemporaryDirectory() as tmp: + outside = Path(tmp) / 'Real/Game.exe' + outside.parent.mkdir() + outside.write_text('x') + folder = Path(tmp) / 'Game' + folder.mkdir() + (folder / store.LAUNCHER).write_text('x') + (folder / 'Game.exe').symlink_to(outside) + sidecar = {'store': 'ea', 'id': 'Origin.OFR.50.1', 'exe': 'Game.exe', 'launcher': store.LAUNCHER} + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + self.assertEqual(store.store_launcher(str(folder / 'Game.exe')), str(folder / store.LAUNCHER)) + self.assertIsNone(store.store_launcher(str(outside))) + def test_legacy_games_are_registered_by_content_id(self): sidecar = {'id': 'Origin.OFR.50.0005237', 'title': 'Mass Effect 3 (2012)', 'extra': {'contentIds': '71073,71183, bad id', 'displayName': 'Mass Effect 3', 'locale': 'fr_FR'}} From a7bd6ed299ed5d1e3b03105aa749eaf94f3bd0a7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:55:41 -0500 Subject: [PATCH 026/101] fix(venus): drop LIBGL_KOPPER_DISABLE without calling the guarded unsetenv (#2441) --- tools/linuxfs/preload/venus.c | 9 ++++- tools/tests/test_venus_preload.py | 66 +++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 tools/tests/test_venus_preload.py diff --git a/tools/linuxfs/preload/venus.c b/tools/linuxfs/preload/venus.c index 4feb9ee03a..aae9ebbec2 100644 --- a/tools/linuxfs/preload/venus.c +++ b/tools/linuxfs/preload/venus.c @@ -12,7 +12,14 @@ #include #include +extern char **environ; + __attribute__((constructor)) static void bl_venus_keep_kopper(void) { + static const char name[] = "LIBGL_KOPPER_DISABLE="; const char *debug = getenv("VN_DEBUG"); - if (debug && strstr(debug, "vtest")) unsetenv("LIBGL_KOPPER_DISABLE"); + if (!debug || !strstr(debug, "vtest") || !environ) return; + char **out = environ; + for (char **in = environ; *in; in++) + if (strncmp(*in, name, sizeof name - 1)) *out++ = *in; + *out = NULL; } diff --git a/tools/tests/test_venus_preload.py b/tools/tests/test_venus_preload.py new file mode 100644 index 0000000000..9f90a78f6b --- /dev/null +++ b/tools/tests/test_venus_preload.py @@ -0,0 +1,66 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +PROGRAM = r""" +#include +#include +int unsetenv(const char *name) { return -1; } +int setenv(const char *name, const char *value, int overwrite) { return -1; } +int putenv(char *string) { return -1; } +int main(void) { + const char *names[] = {"LIBGL_KOPPER_DISABLE", "LIBGL_KOPPER_DISABLE_X", "ZINK_DEBUG", "VN_DEBUG"}; + for (int i = 0; i < 4; i++) { + const char *value = getenv(names[i]); + printf("%s=%s\n", names[i], value ? value : "(unset)"); + } + return 0; +} +""" + + +@unittest.skipUnless(shutil.which("cc"), "needs cc") +class VenusPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.tmp = Path(tempfile.mkdtemp()) + source = cls.tmp / "program.c" + source.write_text(PROGRAM) + cls.program = cls.tmp / "program" + cls.library = cls.tmp / "libvenus.so" + subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.program), str(source)], check=True) + subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-shared", "-fPIC", "-o", str(cls.library), + str(PRELOAD / "venus.c")], check=True) + + @classmethod + def tearDownClass(cls): + shutil.rmtree(cls.tmp, ignore_errors=True) + + def values(self, **extra): + env = {"PATH": os.environ.get("PATH", ""), "LD_PRELOAD": str(self.library), **extra} + result = subprocess.run([str(self.program)], env=env, capture_output=True, text=True, check=True) + return dict(line.split("=", 1) for line in result.stdout.splitlines()) + + def test_kopper_is_kept_when_environment_changes_are_refused(self): + values = self.values(VN_DEBUG="vtest", LIBGL_KOPPER_DISABLE="true", LIBGL_KOPPER_DISABLE_X="1", + ZINK_DEBUG="mem") + self.assertEqual(values["LIBGL_KOPPER_DISABLE"], "(unset)") + self.assertEqual(values["LIBGL_KOPPER_DISABLE_X"], "1") + self.assertEqual(values["ZINK_DEBUG"], "mem") + self.assertEqual(values["VN_DEBUG"], "vtest") + + def test_other_sessions_keep_kopper_disabled(self): + self.assertEqual(self.values(LIBGL_KOPPER_DISABLE="true")["LIBGL_KOPPER_DISABLE"], "true") + self.assertEqual(self.values(VN_DEBUG="init", LIBGL_KOPPER_DISABLE="true")["LIBGL_KOPPER_DISABLE"], "true") + + def test_absent_variable_is_harmless(self): + self.assertEqual(self.values(VN_DEBUG="vtest")["LIBGL_KOPPER_DISABLE"], "(unset)") + + +if __name__ == "__main__": + unittest.main() From 8e02be244023dbeed9bdd716b6e1f286ac664602 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:55:45 -0500 Subject: [PATCH 027/101] fix(steam-x64): skip empty runtime library folders when linking (#2334) --- .../overlay/usr/local/bin/droiddeck-steam-x64 | 7 +- tools/tests/test_steam_x64_runtime_libs.py | 67 +++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 tools/tests/test_steam_x64_runtime_libs.py diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index 481d25d194..0aeb0e594c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -449,7 +449,11 @@ mkdir -p "$srt_libs" for d in "$STEAM_X64"/steamrt64/pv-runtime/steam-runtime-steamrt/steamrt3c_platform_*/files/lib/x86_64-linux-gnu \ "$STEAM_X64"/steamrt64/pv-runtime/steam-runtime-steamrt/steamrt3c_platform_*/files/usr/lib/x86_64-linux-gnu; do [ -d "$d" ] || continue - for f in "$d"/*.so*; do [ -e "$srt_libs/$(basename "$f")" ] || ln -s "$f" "$srt_libs/"; done + for f in "$d"/*.so*; do + [ -e "$f" ] || [ -L "$f" ] || continue + s="$srt_libs/$(basename "$f")" + { [ -e "$s" ] || [ -L "$s" ]; } || ln -s "$f" "$srt_libs/" + done done FEX_ROOTFS=$ROOTFS /usr/local/bin/FEX "$ROOTFS/usr/sbin/ldconfig.real" -n "$srt_libs" >>"$LOG" 2>&1 || step "ldconfig on $srt_libs failed" sniper_compat=$X64_HOME/sniper-compat @@ -458,6 +462,7 @@ mkdir -p "$sniper_compat" hb=$(ls "$srt_libs"/libharfbuzz.so.0.* 2>/dev/null | head -n 1) if [ -n "$hb" ]; then ln -s "$hb" "$sniper_compat/libharfbuzz.so.0"; else step "warning: no HarfBuzz in Valve's runtime for the newer-runtime titles"; fi for f in "$srt_libs"/*; do + [ -e "$f" ] || [ -L "$f" ] || continue n=$(basename "$f") if [ -e "$ROOTFS/usr/lib/x86_64-linux-gnu/$n" ] || [ -e "$ROOTFS/lib/x86_64-linux-gnu/$n" ]; then rm -f "$f"; fi done diff --git a/tools/tests/test_steam_x64_runtime_libs.py b/tools/tests/test_steam_x64_runtime_libs.py new file mode 100644 index 0000000000..6f3f71c3f4 --- /dev/null +++ b/tools/tests/test_steam_x64_runtime_libs.py @@ -0,0 +1,67 @@ +import os +from pathlib import Path +import re +import subprocess +import tempfile +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-steam-x64' +SOURCE = SCRIPT.read_text() +LIBRARY_LOOP = re.search(r'^for d in "\$STEAM_X64"/steamrt64/.*?^done\nFEX_ROOTFS=', SOURCE, re.M | re.S).group() +LIBRARY_LOOP = LIBRARY_LOOP[:LIBRARY_LOOP.rfind('\nFEX_ROOTFS=')] + + +class SteamX64RuntimeLibsTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.steam = self.root / 'Steam' + self.runtime = self.steam / 'steamrt64/pv-runtime/steam-runtime-steamrt' + self.lib = self.runtime / 'steamrt3c_platform_a/files/lib/x86_64-linux-gnu' + self.usr_lib = self.runtime / 'steamrt3c_platform_a/files/usr/lib/x86_64-linux-gnu' + self.lib.mkdir(parents=True) + self.usr_lib.mkdir(parents=True) + self.dest = self.root / 'steamrt-libs' + self.dest.mkdir() + + def run_loop(self): + shell = 'srt_libs="$DEST"\n' + LIBRARY_LOOP + env = dict(os.environ, STEAM_X64=str(self.steam), DEST=str(self.dest)) + return subprocess.run(['bash', '-eu', '-c', shell], env=env, capture_output=True, text=True, timeout=10) + + def test_empty_library_directory_is_skipped(self): + (self.usr_lib / 'libexample.so.1').touch() + result = self.run_loop() + self.assertEqual(0, result.returncode, result.stderr) + self.assertTrue((self.dest / 'libexample.so.1').is_symlink()) + + def test_two_platform_versions_with_empty_lib_dirs_use_usr_lib(self): + platform_b = self.runtime / 'steamrt3c_platform_b' + (platform_b / 'files/lib/x86_64-linux-gnu').mkdir(parents=True) + usr_lib_b = platform_b / 'files/usr/lib/x86_64-linux-gnu' + usr_lib_b.mkdir(parents=True) + (self.usr_lib / 'libexample.so.1').touch() + (usr_lib_b / 'libother.so.1').touch() + result = self.run_loop() + self.assertEqual(0, result.returncode, result.stderr) + self.assertTrue((self.dest / 'libexample.so.1').is_symlink()) + self.assertTrue((self.dest / 'libother.so.1').is_symlink()) + + def test_stale_literal_glob_link_does_not_abort(self): + (self.dest / '*.so*').symlink_to('/missing/*.so*') + result = self.run_loop() + self.assertEqual(0, result.returncode, result.stderr) + self.assertTrue((self.dest / '*.so*').is_symlink()) + + def test_existing_dangling_library_link_is_not_recreated(self): + (self.lib / 'libexample.so.1').touch() + (self.dest / 'libexample.so.1').symlink_to('/missing/libexample.so.1') + result = self.run_loop() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('/missing/libexample.so.1', os.readlink(self.dest / 'libexample.so.1')) + + +if __name__ == '__main__': + unittest.main() From c177b1eed1d08a106f32723049c871a4994825ec Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:55:48 -0500 Subject: [PATCH 028/101] fix(gog): installs no longer hang on Finishing for large games (#2367) * fix(gog): list each folder once when checking install paths The case-clash check listed a file's parent folder again for every file, so installing a game with thousands of files stayed on Finishing for a very long time after the download. * fix(gog): check each install path prefix once instead of resolving every file --- .../launcher/stores/gog/GogInstallRecord.kt | 29 ++++++++++++++----- .../launcher/stores/gog/GogMaintenanceTest.kt | 7 +++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt index df07991023..686ebd3c8f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogInstallRecord.kt @@ -65,13 +65,19 @@ internal object GogFiles { fun dir(folder: File): File = inside(folder, ".droiddeck-gog").apply { mkdirs() } fun journal(folder: File): File = File(dir(folder), "operation.json") - fun inside(root: File, raw: String): File { + private fun parts(raw: String): List { val path = raw.replace('\\', '/') + val parts = path.split('/') require(path.isNotBlank() && !path.startsWith('/') && ':' !in path && '\u0000' !in path && - path.split('/').none { it.isEmpty() || it == "." || it == ".." }) { "Invalid GOG path: $raw" } + parts.none { it.isEmpty() || it == "." || it == ".." }) { "Invalid GOG path: $raw" } + return parts + } + + fun inside(root: File, raw: String): File { + val parts = parts(raw) val base = root.canonicalFile var out = base - for (part in path.split('/')) { + for (part in parts) { out = File(out, part) require(!Files.isSymbolicLink(out.toPath())) { "GOG path is a symbolic link: $raw" } } @@ -122,21 +128,28 @@ internal object GogFiles { } fun validate(files: JSONArray, folder: File) { + val base = folder.canonicalFile val paths = HashSet() val components = HashMap() + val listings = HashMap>>() for (file in files.objects()) { val path = file.getString("path").replace('\\', '/') - inside(folder, path) + val parts = parts(path) require(!path.startsWith(".droiddeck-", true) && path != StoreGameSidecar.FILE_NAME) { "GOG content overlaps launcher metadata" } require(paths.add(path.lowercase(Locale.ROOT))) { "GOG paths differ only by case: $path" } - var parent = folder + var parent = base var relative = "" - for (part in path.split('/')) { + for (part in parts) { relative = if (relative.isEmpty()) part else "$relative/$part" + val child = File(parent, part) val previous = components.putIfAbsent(relative.lowercase(Locale.ROOT), relative) require(previous == null || previous == relative) { "GOG directory paths differ only by case: $path" } - require(parent.list()?.none { it != part && it.equals(part, true) } != false) { "An existing path differs only by case: $path" } - parent = File(parent, part) + if (previous == null) { + require(!Files.isSymbolicLink(child.toPath())) { "GOG path is a symbolic link: $path" } + val existing = listings.getOrPut(parent) { parent.list().orEmpty().groupBy { it.lowercase(Locale.ROOT) } } + require(existing[part.lowercase(Locale.ROOT)].orEmpty().all { it == part }) { "An existing path differs only by case: $path" } + } + parent = child } } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt index 06c88bfd11..c98c1da30e 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogMaintenanceTest.kt @@ -302,10 +302,17 @@ class GogMaintenanceTest { File(folder, "Game.bin").writeText("original") assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"game.bin"}]"""), folder) } assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":".droiddeck-store.json"}]"""), folder) } + val data = File(folder, "Data").apply { mkdirs() } + val installed = JSONArray() + for (i in 0 until 2000) { File(data, "Part$i.bin").writeText(""); installed.put(JSONObject().put("path", "Data/Part$i.bin")) } + GogFiles.validate(installed, folder) + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"Data/Part0.bin"},{"path":"Data/part1.bin"}]"""), folder) } val outside = temporary.newFolder() try { Files.createSymbolicLink(File(folder, "link").toPath(), outside.toPath()) } catch (_: java.nio.file.FileSystemException) { return } assertThrows(IllegalArgumentException::class.java) { GogFiles.inside(folder, "link/game.exe") } + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"Data/Part0.bin"},{"path":"link/game.exe"}]"""), folder) } + assertThrows(IllegalArgumentException::class.java) { GogFiles.validate(JSONArray("""[{"path":"a/./file"}]"""), folder) } } @Test fun resumedInstallSpaceCountsOnlyFilesStillMissing() { From 3230ccdc73c64629f947c01d0356d0e4922b68e6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:55:52 -0500 Subject: [PATCH 029/101] fix(steam): offer a Games folder as a Steam library when it is not already one (#2432) * fix(steam): offer a Games folder as a Steam library when it is not already one * test(steam): cover discovery with chosen storage * fix(steam): compare Games folders and Steam libraries by the same storage path The Games-folder overlap check used the raw canonical path, so a library saved under the raw card mount and the same folder under /storage were treated as different. Reuse the library canonicalisation. --- .../droiddeck/launcher/session/GameStorage.kt | 8 ++---- .../launcher/session/SteamLibraries.kt | 10 +++++-- .../launcher/session/SteamLibrariesTest.kt | 28 +++++++++++++++++++ 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt index 5bf25103b0..e9ecb7443c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -90,11 +90,11 @@ object GameStorage { fun gamesFolderLibraries(context: Context): List { if (SessionPrefs.gameStorage(context).isNotEmpty()) return emptyList() - val card = effective(context)?.let { canonical(File(it.path)) } - val added = SteamLibraries.list(context).map { canonical(it.host) } + val card = effective(context)?.let { SteamLibraries.canonical(File(it.path)) } + val added = SteamLibraries.list(context).map { SteamLibraries.canonical(it.host) } val sm = context.getSystemService(StorageManager::class.java) return AddedGames.roots(context).mapNotNull { root -> - val host = canonical(root.host) + val host = SteamLibraries.canonical(root.host) if (!hasInstalledGames(root.host)) return@mapNotNull null if ('"' in root.guest || '\\' in root.guest || !root.host.isDirectory || !root.host.canWrite()) return@mapNotNull null if (card != null && (host == card || host.startsWith("$card/") || card.startsWith("$host/"))) return@mapNotNull null @@ -109,8 +109,6 @@ object GameStorage { internal fun hasInstalledGames(root: File): Boolean = File(root, "steamapps").listFiles { f -> f.isFile && f.name.startsWith("appmanifest_") && f.name.endsWith(".acf") }?.isNotEmpty() == true - private fun canonical(file: File): String = runCatching { file.canonicalPath }.getOrDefault(file.absolutePath) - fun labelFor(context: Context, path: String): String = options(context).firstOrNull { it.path == path }?.name ?: File(path).name.ifEmpty { context.getString(R.string.gstore_folder) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt index 0846763599..8b219470c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -82,13 +82,14 @@ object SteamLibraries { /** Reads storage; call off the main thread. */ fun found(context: Context): List { val entries = list(context) - val taken = taken(context, entries) + AddedGames.roots(context).map { canonical(it.host) } + val taken = taken(context, entries) + GameStorage.gamesFolderLibraries(context).map { canonical(it.host) } + val gamesFolders = AddedGames.roots(context).map { canonical(it.host) } val hits = ArrayList>() for (root in StorageRoots.list(context)) { if (!root.readable) continue for (dir in candidates(rawView(root.dir), SCAN_DEPTH)) { val games = gameCount(dir) - if (games > 0 && File(dir, "steamapps").canWrite() && taken.none { overlaps(it, canonical(dir)) }) hits += dir to games + if (games > 0 && File(dir, "steamapps").canWrite() && offered(taken, gamesFolders, canonical(dir))) hits += dir to games } } val picked = ArrayList>() @@ -101,6 +102,9 @@ object SteamLibraries { } } + internal fun offered(taken: List, gamesFolders: List, dir: String): Boolean = + taken.none { overlaps(it, dir) } && gamesFolders.none { it != dir && overlaps(it, dir) } + /** The FUSE view under /storage hides files other apps wrote unless DroidDeck has all files access; the raw card mount does not. */ private fun rawView(dir: File): File { if (!dir.path.startsWith("/storage/") || dir.path.startsWith("/storage/emulated")) return dir @@ -171,7 +175,7 @@ object SteamLibraries { internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") - private fun canonical(file: File): String = UsbLink.storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) + internal fun canonical(file: File): String = UsbLink.storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) private const val SCAN_DEPTH = 2 private const val SCAN_LIMIT = 4000 diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt index 5a3fdb26c8..5317e5ca33 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -65,6 +65,26 @@ class SteamLibrariesTest { assertTrue(SteamLibraries.add(app, nested.path) is SteamLibraries.AddResult.Refused) } + @Test fun aGamesFolderIsOfferedWholeUnlessItIsAlreadyALibrary() { + val games = "/storage/card/GameNative" + assertTrue(SteamLibraries.offered(emptyList(), listOf(games), games)) + assertFalse(SteamLibraries.offered(emptyList(), listOf(games), "$games/Steam")) + assertFalse(SteamLibraries.offered(emptyList(), listOf(games), "/storage/card")) + assertFalse(SteamLibraries.offered(listOf(games), listOf(games), games)) + assertTrue(SteamLibraries.offered(listOf("/storage/card/Other"), listOf(games), "/storage/card/New")) + } + + @Test fun aGamesFolderRemainsDiscoverableBesideChosenGameStorage() { + val card = tmp.newFolder("card") + val games = File(card, "GameNative").path + val selected = File(card, "Selected").apply { mkdirs() } + SessionPrefs.setGameStorage(app, selected.path, "Selected") + val effective = GameStorage.effective(app)!! + assertTrue(SteamLibraries.offered(listOf(effective.path), listOf(games), games)) + SessionPrefs.setGameStorage(app, card.path, "Card") + assertFalse(SteamLibraries.offered(listOf(GameStorage.effective(app)!!.path), listOf(games), games)) + } + private fun library(dir: File): File = dir.apply { File(this, "steamapps").mkdirs(); File(this, "steamapps/appmanifest_220.acf").writeText("x") } @Test fun pickingTheFolderAboveALibraryAddsTheLibraryInside() { @@ -124,6 +144,14 @@ class SteamLibrariesTest { assertEquals("${lib.guest}/steamapps/common/Game", AddedGames.guestPath(app, scanned.folder)) } + @Test fun rawAndStorageMountViewsOverlapButDistinctFoldersDoNot() { + val raw = SteamLibraries.canonical(File("/mnt/media_rw/ABCD-1234/Games")) + val storage = SteamLibraries.canonical(File("/storage/ABCD-1234/Games")) + assertEquals(storage, raw) + assertTrue(SteamLibraries.overlaps(raw, SteamLibraries.canonical(File("/storage/ABCD-1234/Games/Steam")))) + assertFalse(SteamLibraries.overlaps(raw, SteamLibraries.canonical(File("/storage/ABCD-1234/Other")))) + } + @Test fun unreadableOrInvalidEntriesAreDropped() { assertTrue(SteamLibraries.parse("{oops").isEmpty()) assertEquals(listOf("2"), SteamLibraries.parse("""[{"id":"../x","path":"/a"},{"id":"2","path":"/b","label":""}]""").map { it.id }) From afd2d91662a42a66fbcb5a1cf83cf5b0ceaa37d9 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Wed, 11 Nov 2026 19:55:56 -0600 Subject: [PATCH 030/101] fix(input): B on a controller hides the on-screen keyboard before going back (#2498) * fix(input): B on a controller hides the on-screen keyboard before going back * fix(input): B sees the on-screen keyboard on Android 8 to 10 too --- .../com/droiddeck/launcher/ui/WirelessAdbFixPage.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt index 8ebfb5ad69..a685e414f3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -454,6 +454,18 @@ internal fun AdbTextField( } } showSoftInputOnFocus = !bottomTyping + // B on a controller puts the keyboard away first; with no keyboard up it goes back as usual. + var hidingKeyboard = false + setOnKeyListener { view, keyCode, event -> + if (keyCode != android.view.KeyEvent.KEYCODE_BUTTON_B) return@setOnKeyListener false + if (event.action == android.view.KeyEvent.ACTION_DOWN && event.repeatCount == 0) { + hidingKeyboard = androidx.core.view.ViewCompat.getRootWindowInsets(view) + ?.isVisible(androidx.core.view.WindowInsetsCompat.Type.ime()) == true + if (hidingKeyboard) (view.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) + ?.hideSoftInputFromWindow(view.windowToken, 0) + } + hidingKeyboard + } setOnClickListener { if (hasFocus() && !typeOnBottom(this) && bottomTypingLatest.value) showKeyboardHere(this) } setOnFocusChangeListener { _, hasFocus -> focused = hasFocus From 8ee50e5b384eea210c80f3fce1dc4e849718a5e3 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:56:10 -0500 Subject: [PATCH 031/101] fix(ea): retry rejected EA licence token requests (#2440) * fix(ea): retry licence requests EA rejects for a transient token failure * test(ea): cover bounded licence retries * fix(ea): retry only token field rejections --- .../com/droiddeck/launcher/stores/ea/EaOoa.kt | 18 ++++++++- .../droiddeck/launcher/stores/ea/EaTest.kt | 37 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt index 9590ce4a0b..5be0d03931 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaOoa.kt @@ -175,13 +175,29 @@ object EaOoa { return head + EaCrypto.licenseEncrypt(licenseXml(l).toByteArray()) } + private const val AUTH_ATTEMPTS = 4 + + internal fun tokenRejected(body: String) = + body.contains("cause=\"AUTHENTICATION_FAILED\"") && body.contains("field=\"ea_eadmtoken\"") + + internal fun retryTokenRejected(request: () -> EaReply): EaReply { + var reply = request() + var attempt = 1 + while (!reply.ok && attempt < AUTH_ATTEMPTS && tokenRejected(reply.text)) { + attempt++ + reply = request() + } + return reply + } + fun request(token: String, contentId: String, machineHash: String, requestToken: String? = null, requestType: String? = null): License { val nonce = EaCrypto.hex(ByteArray(4).also(SecureRandom()::nextBytes)) val params = mutableListOf("contentId" to contentId, "machineHash" to machineHash, "nonce" to nonce, "ea_eadmtoken" to token) if (requestToken != null) params += "requestToken" to requestToken if (requestType != null) params += "requestType" to requestType val url = LICENSES + "?" + params.joinToString("&") { (k, v) -> k + "=" + URLEncoder.encode(v, "UTF-8") } - val reply = EaHttp.request(url, headers = mapOf("X-Requester-Id" to "Origin Online Activation", "User-Agent" to "EACTransaction")) + val headers = mapOf("X-Requester-Id" to "Origin Online Activation", "User-Agent" to "EACTransaction") + val reply = retryTokenRejected { EaHttp.request(url, headers = headers) } if (!reply.ok) throw IllegalStateException("EA refused the licence (${reply.status}): ${reply.text.replace(Regex("(eadmToken value=\")[^\"]*"), "$1\"").take(600)}") val signature = reply.header("x-signature") ?: throw IllegalStateException("EA's licence had no signature") return parseLicense(String(EaCrypto.licenseDecrypt(reply.body), Charsets.UTF_8), signature) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt index a52485035e..bb8aa159a6 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -40,6 +40,43 @@ class EaTest { assertNull(EaCrypto.challengeSeed("9", answer)) } + @Test fun onlyTokenRejectionsAreRetried() { + val rejected = EaReply(409, "".toByteArray(), emptyMap()) + val notEntitled = EaReply(409, "".toByteArray(), emptyMap()) + var authCalls = 0 + val success = EaReply(200, ByteArray(0), emptyMap()) + val result = EaOoa.retryTokenRejected { + authCalls++ + if (authCalls == 1) rejected else success + } + assertEquals(2, authCalls) + assertEquals(200, result.status) + + var entitlementCalls = 0 + val refused = EaOoa.retryTokenRejected { + entitlementCalls++ + notEntitled + } + assertEquals(1, entitlementCalls) + assertEquals(409, refused.status) + + val otherAuthFailure = EaReply(409, "".toByteArray(), emptyMap()) + var otherAuthCalls = 0 + val otherRefused = EaOoa.retryTokenRejected { + otherAuthCalls++ + otherAuthFailure + } + assertEquals(1, otherAuthCalls) + assertEquals(409, otherRefused.status) + + var failedCalls = 0 + EaOoa.retryTokenRejected { + failedCalls++ + rejected + } + assertEquals(4, failedCalls) + } + @Test fun licenceRoundTripsThroughTheFileFormat() { val xml = "kh" + "12349tokgsn" From f4503c2eda999b6609638369ce8d675f39bb525f Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:56:15 -0500 Subject: [PATCH 032/101] fix(steam-x64): new store shortcuts get a compatibility tool (#2336) fix: map new Steam shortcuts to x64 Proton --- .../overlay/usr/local/bin/steam-compatibility | 2 +- tools/tests/test_steam_compat_x64.py | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 426b6c173b..cf616c86fc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1540,7 +1540,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non auto = followers(state, current) known = {app for app in state.get("owned", ()) if isinstance(app, str)} if isinstance(state.get("owned"), list) else set() pinned = {app: current[app] for app in set(owned) - known - if current.get(app) in {TOOL, previous} | gone and app not in auto} + if app in current and current.get(app) in {TOOL, previous} | gone and app not in auto} if pinned and isinstance(auto, dict): state["auto"] = dict(auto, **pinned) state["owned"] = sorted(set(owned), key=app_order) diff --git a/tools/tests/test_steam_compat_x64.py b/tools/tests/test_steam_compat_x64.py index 9f9abc478a..9d9bf109e0 100644 --- a/tools/tests/test_steam_compat_x64.py +++ b/tools/tests/test_steam_compat_x64.py @@ -99,6 +99,31 @@ class X64RepointTest(unittest.TestCase): self.assertEqual(COMPAT["x64_repoint"](str(self.root), None), []) self.assertEqual((self.root / "config" / "config.vdf").read_text(), before) + def test_new_owned_shortcut_gets_the_x64_default_and_explicit_choice_stays(self): + app = "2350879490" + chosen = "proton-cachyos-a64" + config = self.root / "config" / "config.vdf" + state = self.root / "droiddeck-compat" + self.assertEqual(COMPAT["register_default"]( + str(config), apps=[app], protect={chosen: "proton-cachyos-a64"}, + default="GE-Proton11-7-a64", directory=str(state), + linux_tool="droiddeck-direct", owned=[app]), "GE-Proton11-7-a64") + self.assertEqual(self.mapping()[app], "GE-Proton11-7-a64") + self.assertEqual(COMPAT["register_default"]( + str(config), apps=[app], protect={chosen: "proton-cachyos-a64"}, + default="GE-Proton11-7-a64", directory=str(state), + linux_tool="droiddeck-direct", owned=[app]), "GE-Proton11-7-a64") + self.assertEqual(self.mapping()[app], "GE-Proton11-7-a64") + tokens = COMPAT["tokenize"](config.read_text()) + mapping = COMPAT["mapping_block"](tokens) + COMPAT["set_mapping"](tokens, mapping, app, chosen) + config.write_text(COMPAT["serialize"](tokens)) + COMPAT["register_default"]( + str(config), apps=[app], protect={chosen: "proton-cachyos-a64"}, + default="GE-Proton11-7-a64", directory=str(state), + linux_tool="droiddeck-direct", owned=[app]) + self.assertEqual(self.mapping()[app], chosen) + if __name__ == "__main__": unittest.main() From 65554a544cb9154a177a3e05b47bd5a727bf7fd0 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 20:56:19 -0500 Subject: [PATCH 033/101] fix(input): digital trigger keys work again on pads that also list analog axes (#2291) Since #2205 a pad that lists an analog trigger axis had its L2/R2 keys ignored. Handhelds whose triggers can be switched to digital keep listing the axis but only send the keys in that mode, so the triggers stopped responding. A trigger key now presses its trigger when the axis is idle at that moment and holds it until the key is released; motion events with an idle axis keep it held. As soon as the axis reports a value it takes over again, so pads that send both (the #2205 case) still follow their analog axis and key repeats never change the value. --- .../droiddeck/launcher/input/PadBridge.java | 34 ++++++++++--- .../launcher/input/PadPartialAxesTest.kt | 49 ++++++++++++++++--- 2 files changed, 69 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index c7dd27a271..71744bf866 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -56,6 +56,7 @@ public final class PadBridge { private final FakeInputWriter[] playerWriters = new FakeInputWriter[SLOTS]; private final PadState[] playerStates = new PadState[SLOTS]; private final float[][] rawSticks = new float[SLOTS][4]; + private final boolean[][] keyTriggers = new boolean[SLOTS][2]; private final int[] retainedSticks = new int[SLOTS]; private final PadState effectiveState = new PadState(); private final PadState homeGuideReport = new PadState(); @@ -407,11 +408,11 @@ public final class PadBridge { break; case KeyEvent.KEYCODE_BUTTON_L2: pad.leftTrigger = keyTrigger(pad.leftTrigger, pressed, event.getRepeatCount(), - analogTrigger(event.getDevice(), MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE)); + analogTrigger(event.getDevice(), MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE), keyTriggers[slot], 0); break; case KeyEvent.KEYCODE_BUTTON_R2: pad.rightTrigger = keyTrigger(pad.rightTrigger, pressed, event.getRepeatCount(), - analogTrigger(event.getDevice(), MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS)); + analogTrigger(event.getDevice(), MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS), keyTriggers[slot], 1); break; case KeyEvent.KEYCODE_DPAD_UP: pad.up = pressed; break; case KeyEvent.KEYCODE_DPAD_RIGHT: pad.right = pressed; break; @@ -471,6 +472,7 @@ public final class PadBridge { stateFor(slot).clear(); retainedSticks[slot] = 0; Arrays.fill(rawSticks[slot], 0f); + Arrays.fill(keyTriggers[slot], false); } private void mutateState(java.util.function.Consumer mutation) { @@ -525,11 +527,11 @@ public final class PadBridge { float lt = 0f; float rt = 0f; if (wired || hasAxis(device, source, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE)) { - lt = leftTrigger(event, wired); + lt = axisTrigger(leftTrigger(event, wired), keyTriggers[slot], 0); pad.leftTrigger = lt; } if (wired || hasAxis(device, source, MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS)) { - rt = rightTrigger(event, wired); + rt = axisTrigger(rightTrigger(event, wired), keyTriggers[slot], 1); pad.rightTrigger = rt; } if (hasAxis(device, source, MotionEvent.AXIS_HAT_X)) { @@ -553,9 +555,27 @@ public final class PadBridge { return true; } - static float keyTrigger(float current, boolean pressed, int repeatCount, boolean analog) { - if (analog || repeatCount > 0) return current; - return pressed ? 1f : 0f; + static float keyTrigger(float current, boolean pressed, int repeatCount, boolean analog, boolean[] held, int side) { + if (repeatCount > 0) return current; + if (!analog) { + held[side] = pressed; + return pressed ? 1f : 0f; + } + if (pressed) { + if (current != 0f) return current; + held[side] = true; + return 1f; + } + if (!held[side]) return current; + held[side] = false; + return 0f; + } + + static float axisTrigger(float value, boolean[] held, int side) { + if (!held[side]) return value; + if (value == 0f) return 1f; + held[side] = false; + return value; } static boolean analogTrigger(InputDevice device, int... axes) { diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt index 2a2bade1c4..ae46c9d5e3 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt @@ -126,11 +126,11 @@ class PadPartialAxesTest { @Test fun wiredXboxTriggerKeysDoNotOverrideTheirAxes() { val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ, wired = true) - motion(device, MotionEvent.AXIS_Z to 0f, MotionEvent.AXIS_RZ to -1f) + motion(device, MotionEvent.AXIS_Z to 0f, MotionEvent.AXIS_RZ to -0.6f) key(device, KeyEvent.KEYCODE_BUTTON_L2) key(device, KeyEvent.KEYCODE_BUTTON_R2) assertEquals(0.5f, pad().leftTrigger) - assertEquals(0f, pad().rightTrigger) + assertEquals(0.2f, pad().rightTrigger, 0.0001f) } @Test fun digitalTriggerKeysStillPressAndRelease() { @@ -148,11 +148,46 @@ class PadPartialAxesTest { } @Test fun keyTriggerDecision() { - assertEquals(1f, PadBridge.keyTrigger(0f, true, 0, false)) - assertEquals(0f, PadBridge.keyTrigger(1f, false, 0, false)) - assertEquals(0.25f, PadBridge.keyTrigger(0.25f, true, 1, false)) - assertEquals(0.25f, PadBridge.keyTrigger(0.25f, true, 0, true)) - assertEquals(0.25f, PadBridge.keyTrigger(0.25f, false, 0, true)) + val held = BooleanArray(2) + assertEquals(1f, PadBridge.keyTrigger(0f, true, 0, false, held, 0)) + assertEquals(0f, PadBridge.keyTrigger(1f, false, 0, false, held, 0)) + assertEquals(0.25f, PadBridge.keyTrigger(0.25f, true, 1, false, held, 0)) + assertEquals(0.25f, PadBridge.keyTrigger(0.25f, true, 0, true, held, 0)) + assertEquals(0.25f, PadBridge.keyTrigger(0.25f, false, 0, true, held, 0)) + assertEquals(1f, PadBridge.keyTrigger(0f, true, 0, true, held, 1)) + assertEquals(1f, PadBridge.axisTrigger(0f, held, 1)) + assertEquals(0f, PadBridge.keyTrigger(1f, false, 0, true, held, 1)) + assertEquals(0f, PadBridge.axisTrigger(0f, held, 1)) + } + + @Test fun silentTriggerAxesLetTheirKeysPress() { + val device = device(MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_RTRIGGER) + motion(device) + key(device, KeyEvent.KEYCODE_BUTTON_L2) + key(device, KeyEvent.KEYCODE_BUTTON_R2) + assertEquals(1f, pad().leftTrigger) + assertEquals(1f, pad().rightTrigger) + motion(device, MotionEvent.AXIS_X to 0.8f) + key(device, KeyEvent.KEYCODE_BUTTON_L2, repeat = 1) + assertEquals(1f, pad().leftTrigger) + assertEquals(1f, pad().rightTrigger) + key(device, KeyEvent.KEYCODE_BUTTON_L2, KeyEvent.ACTION_UP) + assertEquals(0f, pad().leftTrigger) + assertEquals(1f, pad().rightTrigger) + key(device, KeyEvent.KEYCODE_BUTTON_R2, KeyEvent.ACTION_UP) + assertEquals(0f, pad().rightTrigger) + } + + @Test fun aLiveAxisTakesOverFromItsKey() { + val device = device(MotionEvent.AXIS_LTRIGGER) + key(device, KeyEvent.KEYCODE_BUTTON_L2) + assertEquals(1f, pad().leftTrigger) + motion(device, MotionEvent.AXIS_LTRIGGER to 0.4f) + assertEquals(0.4f, pad().leftTrigger) + motion(device, MotionEvent.AXIS_LTRIGGER to 0f) + assertEquals(0f, pad().leftTrigger) + key(device, KeyEvent.KEYCODE_BUTTON_L2, KeyEvent.ACTION_UP) + assertEquals(0f, pad().leftTrigger) } private fun pad(): PadState = requireNotNull(JoyConPadTest.RecordingWriter.pads[0]) From 92d4959970986fe0cb6315f4c9b7ab34c58af7bc Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:56:26 -0500 Subject: [PATCH 034/101] fix: run Final Fantasy VII Rebirth at D3D12 feature level 12_2 (#2289) * fix: run Final Fantasy VII Rebirth at D3D12 feature level 12_2 * fix: match FF7 Rebirth by its real executables --- .../overlay/usr/local/bin/droiddeck-game-env | 6 ++++++ tools/tests/test_game_environment.py | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index a4d8387353..459e8a6fac 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -145,6 +145,12 @@ def deep_rock_gdk_raytracing(game): return {}, ["-noraytracing", "-ini:Engine:[/Script/Engine.RendererSettings]:r.RayTracing=False"], "Deep Rock Galactic GDK: ray tracing off (D3D12 pipeline creation fails on Thor)" +@fix +def ff7_rebirth_feature_level(game): + if game.stem in ("ff7rebirth", "ff7rebirth_"): + return {"VKD3D_FEATURE_LEVEL": "12_2"}, [], "Final Fantasy VII Rebirth: D3D12 feature level 12_2 (the device-reported level fails its DX12 check)" + + @fix def arkham_city_x87(game): if "batmanac.exe" in game.files: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 18ec5135ec..5f7b4af087 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1522,6 +1522,19 @@ class GameEnvironmentTest(unittest.TestCase): config = {"version": 1, "shared": {}, "games": {"42": values}} self.assertEqual(MODULE["apply_config"]({}, config, "42", env), values, name) + def test_ff7_rebirth_runs_at_feature_level_12_2_unless_the_game_overrides_it(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) / "FINAL FANTASY VII REBIRTH" + game = root / "End/Binaries/Win64/ff7rebirth_.exe" + game.parent.mkdir(parents=True) + for exe in (root / "ff7rebirth.exe", game): + exe.touch() + env, extra, notes = MODULE["engine_fixes"](str(exe), []) + self.assertEqual(env, {"VKD3D_FEATURE_LEVEL": "12_2"}, exe.name) + self.assertTrue(notes) + config = {"version": 1, "shared": {}, "games": {"42": {"VKD3D_FEATURE_LEVEL": "12_1"}}} + self.assertEqual(MODULE["apply_config"]({}, config, "42", env), {"VKD3D_FEATURE_LEVEL": "12_1"}) + def test_unity_players_keep_tso_over_the_preset(self): with tempfile.TemporaryDirectory() as tmp: def game(*names): From 956f17239b2ad6ea1a37ee6c0edbda9f8c84d27e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 20:56:30 -0500 Subject: [PATCH 035/101] fix(storage): Clean up keeps Proton EasyAntiCheat and BattlEye runtimes (#2254) --- .../main/java/com/droiddeck/launcher/storage/SteamStorage.kt | 5 ++++- .../main/java/com/droiddeck/launcher/storage/StorageScan.kt | 3 ++- app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt | 1 + app/src/main/res/values/strings.xml | 1 + .../java/com/droiddeck/launcher/storage/SteamStorageTest.kt | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt index de3648e83c..2111bfdee1 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -11,6 +11,8 @@ object SteamStorage { const val PROTON_11_ARM = 4628740 const val REDISTRIBUTABLES = 228980 const val FEX = 3127680 + const val EAC_RUNTIME = 1826330 + const val BATTLEYE_RUNTIME = 1161040 const val ARM_TOOL = "droiddeck-proton-arm64" const val ARM_11_TOOL = "droiddeck-proton-11-arm64" @@ -18,7 +20,7 @@ object SteamStorage { private val VALVE_TOOLS = setOf( 858280, 961940, 1054830, 1113280, 1245040, 1420170, 1493710, 1580130, 1887720, 2180100, 2348590, 2805730, 3029110, 3658110, 4183110, 4628710, 4690330, - SCOUT, SOLDIER, SNIPER, ARM_RUNTIME, PROTON_ARM, PROTON_11_ARM, REDISTRIBUTABLES, FEX, + SCOUT, SOLDIER, SNIPER, ARM_RUNTIME, PROTON_ARM, PROTON_11_ARM, REDISTRIBUTABLES, FEX, EAC_RUNTIME, BATTLEYE_RUNTIME, ) private val APP_ID = Regex("^\\s*\"appid\"\\s*\"(\\d+)\"", RegexOption.MULTILINE) @@ -93,6 +95,7 @@ object SteamStorage { val dir = m.installDir.orEmpty() return when { m.appId == SCOUT || m.appId == SOLDIER || dir == "SteamLinuxRuntime" || dir == "SteamLinuxRuntime_soldier" -> Kind.OLD_RUNTIME + m.appId == EAC_RUNTIME || m.appId == BATTLEYE_RUNTIME -> Kind.REQUIRED dir.startsWith("Proton") && "ARM64" in dir -> Kind.ARM_PROTON m.appId == PROTON_ARM || m.appId == PROTON_11_ARM -> Kind.ARM_PROTON dir.startsWith("Proton ") -> Kind.X86_PROTON diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt index 9c5fff91a9..3a7c52db38 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -26,7 +26,7 @@ class GameUsage( } enum class ToolState { IN_USE, REQUIRED, UNUSED } -enum class ToolReason { DEFAULT_PROTON, PROTON, FEX_RUNTIME, ARM_RUNTIME, REDISTRIBUTABLES, FEX, STEAM_TOOL, OLD_RUNTIME, X86_PROTON, CUSTOM, CUSTOM_UNKNOWN, X64_CLIENT } +enum class ToolReason { DEFAULT_PROTON, PROTON, FEX_RUNTIME, ARM_RUNTIME, REDISTRIBUTABLES, FEX, ANTICHEAT_RUNTIME, STEAM_TOOL, OLD_RUNTIME, X86_PROTON, CUSTOM, CUSTOM_UNKNOWN, X64_CLIENT } class ToolUsage( val key: String, val name: String, val bytes: Long, val state: ToolState, val reason: ToolReason, @@ -153,6 +153,7 @@ object StorageScan { SteamStorage.ARM_RUNTIME -> ToolReason.ARM_RUNTIME SteamStorage.REDISTRIBUTABLES -> ToolReason.REDISTRIBUTABLES SteamStorage.FEX -> ToolReason.FEX + SteamStorage.EAC_RUNTIME, SteamStorage.BATTLEYE_RUNTIME -> ToolReason.ANTICHEAT_RUNTIME else -> ToolReason.STEAM_TOOL } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index 04ff93efc9..68bcb8d27d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -714,6 +714,7 @@ private fun toolDetail(t: ToolUsage): String = when (t.reason) { ToolReason.ARM_RUNTIME -> stringResource(R.string.storage_tool_arm_runtime) ToolReason.REDISTRIBUTABLES -> stringResource(R.string.storage_tool_redist) ToolReason.FEX -> stringResource(R.string.storage_tool_fex) + ToolReason.ANTICHEAT_RUNTIME -> stringResource(R.string.storage_tool_anticheat) ToolReason.STEAM_TOOL -> stringResource(R.string.storage_tool_steam) ToolReason.OLD_RUNTIME -> stringResource(R.string.storage_tool_old_runtime) ToolReason.X86_PROTON -> stringResource(R.string.storage_tool_x86_proton) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd395216de..3f6d489aea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3337,6 +3337,7 @@ VC++ and DirectX installers games ask for Runs Linux x86 games Steam tool + Steam downloads this for games that ship anti-cheat, even when it is off. Removing it stalls their install at 0% DroidDeck runs games without this runtime x86 Proton, which DroidDeck cannot run Default for every game diff --git a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt index 0cfbf2e054..a3b6a8fa24 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt @@ -50,6 +50,8 @@ class SteamStorageTest { assertEquals(SteamStorage.Kind.X86_PROTON, SteamStorage.kind(manifest(1493710, "Proton - Experimental"))) assertEquals(SteamStorage.Kind.X86_PROTON, SteamStorage.kind(manifest(2805730, "Proton 9.0"))) assertEquals(SteamStorage.Kind.REQUIRED, SteamStorage.kind(manifest(228980, "Steamworks Shared"))) + assertEquals(SteamStorage.Kind.REQUIRED, SteamStorage.kind(manifest(1826330, "Proton EasyAntiCheat Runtime"))) + assertEquals(SteamStorage.Kind.REQUIRED, SteamStorage.kind(manifest(1161040, "Proton BattlEye Runtime"))) assertTrue(SteamStorage.isTool(manifest(2805730, "Proton 9.0"))) assertFalse(SteamStorage.isTool(manifest(204360, "CastleCrashers"))) } From 02a5be62da4dc1af8f5e18f49dc14c0185126f04 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 11 Nov 2026 21:57:56 -0500 Subject: [PATCH 036/101] fix(input): a controller that disconnects mid-event no longer closes the app (#2369) * fix(input): a controller that disconnects mid-event no longer closes the app KeyEvent.getDevice() looks the device up on every call, so a controller removed while its event was handled made a later lookup return null and crashed in noteDevice. Look the device up once per event and ignore events whose device is gone. * fix(input): retain controller layout during disconnect * fix(input): look up the controller once per key and motion event --- .../droiddeck/launcher/input/PadBridge.java | 39 ++++++----- .../droiddeck/launcher/input/JoyConPadTest.kt | 69 +++++++++++++++++++ .../launcher/input/PadBridgeRoutingTest.kt | 16 ++++- 3 files changed, 106 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 71744bf866..c75602585c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -290,7 +290,10 @@ public final class PadBridge { } public static boolean isControllerKeyEvent(KeyEvent event) { - InputDevice device = event.getDevice(); + return isControllerKeyEvent(event, event.getDevice()); + } + + static boolean isControllerKeyEvent(KeyEvent event, InputDevice device) { if (device == null || device.isVirtual() || isSystemVirtualInputName(device.getName())) return false; if (KeyEvent.isGamepadButton(event.getKeyCode())) { return device.supportsSource(InputDevice.SOURCE_GAMEPAD) @@ -315,7 +318,10 @@ public final class PadBridge { } public static boolean isControllerMotionEvent(MotionEvent event) { - InputDevice device = event.getDevice(); + return isControllerMotionEvent(event, event.getDevice()); + } + + static boolean isControllerMotionEvent(MotionEvent event, InputDevice device) { return event.isFromSource(InputDevice.SOURCE_JOYSTICK) && device != null && !device.isVirtual() && !isSystemVirtualInputName(device.getName()) && (device.supportsSource(InputDevice.SOURCE_GAMEPAD) @@ -376,10 +382,11 @@ public final class PadBridge { } public synchronized boolean onKeyEvent(KeyEvent event) { - if (!isControllerKeyEvent(event) || excluded.test(event.getDeviceId())) return false; - int slot = slotFor(event.getDevice()); + InputDevice device = event.getDevice(); + if (!isControllerKeyEvent(event, device) || excluded.test(event.getDeviceId())) return false; + int slot = slotFor(device); if (slot < 0) return false; - int side = JoyCon.side(event.getDevice()); + int side = JoyCon.side(device); if (side >= 0 && partners[slot] != NO_CONTROLLER && JoyCon.isRail(side, event.getScanCode())) return true; long timing = InputTiming.begin(); PadState pad = stateFor(slot); @@ -401,18 +408,18 @@ public final class PadBridge { case KeyEvent.KEYCODE_HOME: case KeyEvent.KEYCODE_MOVE_HOME: pad.press(PadState.GUIDE, pressed); break; case KeyEvent.KEYCODE_BUTTON_Z: - if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.R4 : DeckControls.L4, pressed); + if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(device) ? DeckControls.R4 : DeckControls.L4, pressed); break; case KeyEvent.KEYCODE_BUTTON_C: - if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.L4 : DeckControls.R4, pressed); + if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(device) ? DeckControls.L4 : DeckControls.R4, pressed); break; case KeyEvent.KEYCODE_BUTTON_L2: pad.leftTrigger = keyTrigger(pad.leftTrigger, pressed, event.getRepeatCount(), - analogTrigger(event.getDevice(), MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE), keyTriggers[slot], 0); + analogTrigger(device, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE), keyTriggers[slot], 0); break; case KeyEvent.KEYCODE_BUTTON_R2: pad.rightTrigger = keyTrigger(pad.rightTrigger, pressed, event.getRepeatCount(), - analogTrigger(event.getDevice(), MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS), keyTriggers[slot], 1); + analogTrigger(device, MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS), keyTriggers[slot], 1); break; case KeyEvent.KEYCODE_DPAD_UP: pad.up = pressed; break; case KeyEvent.KEYCODE_DPAD_RIGHT: pad.right = pressed; break; @@ -420,7 +427,7 @@ public final class PadBridge { case KeyEvent.KEYCODE_DPAD_LEFT: pad.left = pressed; break; default: return false; } - noteDevice(event.getDevice(), slot); + noteDevice(device, slot); if (pressed && event.getRepeatCount() == 0 && !event.isCanceled()) noteChordInput(slot); if (pressed) notePlayerInput(); statButtons++; @@ -491,16 +498,16 @@ public final class PadBridge { } public synchronized boolean onMotionEvent(MotionEvent event) { - if (!isControllerMotionEvent(event) || excluded.test(event.getDeviceId())) return false; + InputDevice device = event.getDevice(); + if (!isControllerMotionEvent(event, device) || excluded.test(event.getDeviceId())) return false; if (event.getAction() != MotionEvent.ACTION_MOVE) return false; - int slot = slotFor(event.getDevice()); + int slot = slotFor(device); if (slot < 0) return false; long timing = InputTiming.begin(); PadState pad = stateFor(slot); - noteDevice(event.getDevice(), slot); + noteDevice(device, slot); statAxes++; scheduleStats(); - InputDevice device = event.getDevice(); int side = JoyCon.side(device); if (side >= 0) { int[] stick = JoyCon.stickAxes(side, device, event.getSource()); @@ -517,7 +524,7 @@ public final class PadBridge { } float lx = event.getAxisValue(MotionEvent.AXIS_X); float ly = event.getAxisValue(MotionEvent.AXIS_Y); - boolean wired = wiredXboxLayout(event); + boolean wired = wiredXboxLayout(device, event.getSource()); float rx = event.getAxisValue(wired ? MotionEvent.AXIS_RX : MotionEvent.AXIS_Z); float ry = event.getAxisValue(wired ? MotionEvent.AXIS_RY : MotionEvent.AXIS_RZ); retainStick(slot, JoyCon.LEFT, lx, ly); @@ -1007,7 +1014,7 @@ public final class PadBridge { } private boolean isPrimary(KeyEvent event) { - int id = event.getDevice().getId(); + int id = event.getDeviceId(); int first = firstPlayerSlot(); return owners[first] == id || partners[first] == id; } diff --git a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt index 0b8c930ed0..cff58d665e 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt @@ -147,6 +147,75 @@ class JoyConPadTest { assertNull(RecordingWriter.pads[2]) } + @Test fun aControllerThatDisconnectsWhileItsKeyIsHandledIsIgnored() { + for (lookups in 0..4) { + val event = key(right, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH) + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = lookups + try { + val handled = bridge.onKeyEvent(event) + if (lookups == 0) assertFalse(handled) + if (lookups >= 2) assertTrue(handled) + } finally { PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = -1 } + } + assertTrue(press(right, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH)) + } + + @Test fun aControllerThatDisconnectsAfterTheFirstLookupStillDeliversItsEvents() { + val device = controller(0x045e, 0x0b13, MotionEvent.AXIS_X, MotionEvent.AXIS_Y) + val down = key(device, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH) + val up = key(device, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH, KeyEvent.ACTION_UP) + val move = motion(device, MotionEvent.AXIS_X to 0.5f, MotionEvent.AXIS_Y to -0.25f) + try { + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = 1 + assertTrue(bridge.onKeyEvent(down)) + assertEquals(0, PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft) + assertTrue(pad(0).isDown(PadState.A)) + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = 1 + assertTrue(bridge.onKeyEvent(up)) + assertFalse(pad(0).isDown(PadState.A)) + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = 1 + assertTrue(bridge.onMotionEvent(move)) + assertEquals(0, PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft) + assertEquals(0.5f, pad(0).leftX) + assertEquals(-0.25f, pad(0).leftY) + } finally { + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = -1 + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = -1 + } + } + + @Test fun nonControllerInputStaysUnhandledWithOneLookup() { + val keyboard = InputDeviceBuilder.newBuilder().setId(nextId++).setName("Keyboard").setDescriptor("keyboard") + .setExternal(true).setSources(InputDevice.SOURCE_KEYBOARD) + .setKeyboardType(InputDevice.KEYBOARD_TYPE_ALPHABETIC) + .setKeyCharacterMap(KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD)).build().also(::register) + val typed = KeyEvent(0L, 0L, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A, 0, 0, keyboard.id, 30, 0, InputDevice.SOURCE_KEYBOARD) + val touch = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_MOVE, 1, arrayOf(MotionEvent.PointerProperties().apply { id = 0 }), + arrayOf(MotionEvent.PointerCoords().apply { x = 10f; y = 20f }), 0, 0, 1f, 1f, keyboard.id, 0, InputDevice.SOURCE_TOUCHSCREEN, 0) + try { + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = 1 + assertFalse(bridge.onKeyEvent(typed)) + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = 1 + assertFalse(bridge.onMotionEvent(touch)) + } finally { + PadBridgeRoutingTest.RegisteredKeyEvent.lookupsLeft = -1 + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = -1 + } + assertNull(RecordingWriter.pads[0]) + } + + @Test fun wiredMotionKeepsItsAxesWhenDeviceDisappears() { + val device = controller(0x20d6, 0x2063, MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ) + val event = motion(device, MotionEvent.AXIS_RX to 0.75f, MotionEvent.AXIS_RY to -0.5f, + MotionEvent.AXIS_Z to -1f, MotionEvent.AXIS_RZ to 1f) + PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = 2 + try { assertTrue(bridge.onMotionEvent(event)) } finally { PadBridgeRoutingTest.RegisteredMotionEvent.lookupsLeft = -1 } + assertEquals(0.75f, pad(0).rightX) + assertEquals(-0.5f, pad(0).rightY) + assertEquals(0f, pad(0).leftTrigger) + assertEquals(1f, pad(0).rightTrigger) + } + @Test fun joyConsHeldForVrAreLeftAlone() { bridge.setExcluded { it == left.id } assertFalse(bridge.onKeyEvent(key(left, KeyEvent.KEYCODE_BUTTON_L1, BTN_TL))) diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt index a76da590a3..ea66f32136 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt @@ -191,12 +191,24 @@ class PadBridgeRoutingTest { @Implements(KeyEvent::class) class RegisteredKeyEvent : ShadowKeyEvent() { @RealObject private lateinit var event: KeyEvent - @Implementation override fun getDevice(): InputDevice? = Shadow.directlyOn(event as InputEvent, InputEvent::class.java, "getDevice") + @Implementation override fun getDevice(): InputDevice? { + if (lookupsLeft == 0) return null + if (lookupsLeft > 0) lookupsLeft-- + return Shadow.directlyOn(event as InputEvent, InputEvent::class.java, "getDevice") + } + + companion object { @JvmField var lookupsLeft = -1 } } @Implements(MotionEvent::class) class RegisteredMotionEvent : ShadowMotionEvent() { @RealObject private lateinit var event: MotionEvent - @Implementation override fun getDevice(): InputDevice? = Shadow.directlyOn(event as InputEvent, InputEvent::class.java, "getDevice") + @Implementation override fun getDevice(): InputDevice? { + if (lookupsLeft == 0) return null + if (lookupsLeft > 0) lookupsLeft-- + return Shadow.directlyOn(event as InputEvent, InputEvent::class.java, "getDevice") + } + + companion object { @JvmField var lookupsLeft = -1 } } } From 7da27d4ff4a5d9b006ae9febcd565b45a9eca617 Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 03:28:59 +0000 Subject: [PATCH 037/101] feat: add build watermark toggle for Lab, test, and local builds (#2488) --- .../droiddeck/launcher/FrontEndActivity.kt | 8 ++ .../launcher/session/BuildWatermarkSetting.kt | 44 +++++++++ .../launcher/session/SessionPrefs.kt | 7 ++ .../launcher/session/SettingsReset.kt | 3 +- .../droiddeck/launcher/ui/BuildWatermark.kt | 61 +++++++++--- .../droiddeck/launcher/ui/FrontEndScreen.kt | 2 + .../com/droiddeck/launcher/ui/UpdatesPage.kt | 7 ++ 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/BuildWatermarkSettingTest.kt | 99 +++++++++++++++++++ 41 files changed, 281 insertions(+), 16 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/BuildWatermarkSetting.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/BuildWatermarkSettingTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 55fdf3f1f3..a8d0a5bde2 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -593,6 +593,7 @@ class FrontEndActivity : ComponentActivity() { private var vacDiagnostics by mutableStateOf(false) private var agentCommands by mutableStateOf(false) private var graphicsLogs by mutableStateOf(false) + private var buildWatermark by mutableStateOf(true) private var steamGpuDrawing by mutableStateOf(false) private var bridgeFellBack by mutableStateOf(false) private var bridgeFellBackMemory by mutableStateOf(false) @@ -1178,6 +1179,7 @@ class FrontEndActivity : ComponentActivity() { gameDebugLogsEnabled = gameDebugLogsEnabled, gameDebugLogsNeedsRestart = gameDebugLogsNeedsRestart, vacDiagnostics = vacDiagnostics, agentCommands = agentCommands, graphicsLogs = graphicsLogs, steamGpuDrawing = steamGpuDrawing, bridgeFellBack = bridgeFellBack, bridgeFellBackMemory = bridgeFellBackMemory, + buildWatermark = buildWatermark, clearCachedApps = clearCachedApps, adbPaired = adbPaired, memoryHud = memoryHud, backgroundAppLimit = backgroundAppLimit, tpUbwcMode = drivers.tpUbwcModeForDevice(), tpUbwcRestartRequired = drivers.tpUbwcRestartRequired(), canRestartApp = !runtimeChangesBlocked(), steamGames = steamGames, steamGamesX64 = steamGamesX64, emulators = emulatorList, running = runningLabel, @@ -1416,6 +1418,11 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setDetailedGraphicsLogs(this, !SessionPrefs.detailedGraphicsLogs(this)) graphicsLogs = SessionPrefs.detailedGraphicsLogs(this) }, + onBuildWatermark = { + SessionPrefs.setBuildWatermarkEnabled(this, !SessionPrefs.buildWatermarkEnabled(this)) + buildWatermark = SessionPrefs.buildWatermarkEnabled(this) + com.droiddeck.launcher.ui.BuildWatermark.refresh(this) + }, onVacDiagnostics = { SessionPrefs.setVacDiagnostics(this, !SessionPrefs.vacDiagnostics(this)) vacDiagnostics = SessionPrefs.vacDiagnostics(this) @@ -2867,6 +2874,7 @@ class FrontEndActivity : ComponentActivity() { vacDiagnostics = SessionPrefs.vacDiagnostics(this) agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this) graphicsLogs = SessionPrefs.detailedGraphicsLogs(this) + buildWatermark = SessionPrefs.buildWatermarkEnabled(this) steamGpuDrawing = SessionPrefs.steamGpuCompositing(this) bridgeFellBack = SessionPrefs.bridgeFellBack(this) bridgeFellBackMemory = SessionPrefs.bridgeFellBackForMemory(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/BuildWatermarkSetting.kt b/app/src/main/java/com/droiddeck/launcher/session/BuildWatermarkSetting.kt new file mode 100644 index 0000000000..98239f8eb0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BuildWatermarkSetting.kt @@ -0,0 +1,44 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.content.Intent +import android.util.AtomicFile +import java.io.File + +internal object BuildWatermarkSetting { + const val CHANGED = "com.droiddeck.launcher.BUILD_WATERMARK_CHANGED" + + private fun file(context: Context) = AtomicFile(File(context.filesDir, "build-watermark")) + + private val processLock = Any() + + private fun locked(context: Context, action: () -> T): T = synchronized(processLock) { + File(context.filesDir, "build-watermark.lock").outputStream().channel.use { channel -> + channel.lock().use { action() } + } + } + + fun enabled(context: Context): Boolean = try { + locked(context) { + // SharedPreferences caches are process-local; read the shared file on every refresh. + file(context).readFully().decodeToString() != "off" + } + } catch (_: java.io.IOException) { + context.getSharedPreferences("session", Context.MODE_PRIVATE).getBoolean("buildWatermark", true) + } + + fun setEnabled(context: Context, on: Boolean) { + locked(context) { + val target = file(context) + val stream = target.startWrite() + try { + stream.write((if (on) "on" else "off").toByteArray()) + target.finishWrite(stream) + } catch (error: Throwable) { + target.failWrite(stream) + throw error + } + } + context.sendBroadcast(Intent(CHANGED).setPackage(context.packageName)) + } +} 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 4b0a94f7b6..b682a82953 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1048,6 +1048,13 @@ object SessionPrefs { prefs(context).edit().putBoolean("vac_diagnostics", on).apply() } + fun buildWatermarkEnabled(context: Context): Boolean = + BuildWatermarkSetting.enabled(context) + + fun setBuildWatermarkEnabled(context: Context, on: Boolean) { + BuildWatermarkSetting.setEnabled(context, on) + } + private fun resolutionCap(context: Context, mode: String): Int = prefs(context).getInt("resolutionCap.$mode", 720) fun resolutionChosen(context: Context, mode: String): Boolean = 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 67f013b78f..321af09802 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -23,7 +23,7 @@ object SettingsReset { "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite", - "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", + "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark", "upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias", "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", "bootMovieApplyNext", "bootMovieSteamSeen", @@ -43,6 +43,7 @@ object SettingsReset { var ok = true val session = context.getSharedPreferences("session", Context.MODE_PRIVATE) session.edit().apply { session.all.keys.filter { isSessionSetting(it) }.forEach { remove(it) } }.commit() + BuildWatermarkSetting.setEnabled(context, true) ControllerPrefs.resetAll(context) InputProfiles.resetAll(context) context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().clear().commit() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt index a9d0c3d1a2..446420806c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt @@ -2,7 +2,12 @@ package com.droiddeck.launcher.ui import android.app.Activity import android.app.Application +import android.content.BroadcastReceiver +import android.content.Intent +import android.content.IntentFilter import android.content.Context +import androidx.core.content.ContextCompat +import com.droiddeck.launcher.session.BuildWatermarkSetting import android.graphics.Canvas import android.graphics.Paint import android.graphics.Typeface @@ -14,11 +19,14 @@ import android.view.Gravity import android.view.View import android.view.ViewGroup import android.widget.FrameLayout +import java.util.WeakHashMap import com.droiddeck.launcher.BuildConfig import com.droiddeck.launcher.QuestXrActivity object BuildWatermark { private const val TITLE_LIMIT = 80 + private val activities = WeakHashMap() + internal var lineProvider: () -> List? = { lines() } fun lines( pr: Int = BuildConfig.PR_NUMBER, @@ -38,33 +46,56 @@ object BuildWatermark { if (text.length <= TITLE_LIMIT) text else text.take(TITLE_LIMIT - 1).trimEnd() + "…" fun install(app: Application) { - val lab = com.droiddeck.launcher.lab.LabOverlay.active?.let { "LAB | ${truncate(it.label)}" } - val lines = (listOfNotNull(lab) + lines().orEmpty()).ifEmpty { return } + ContextCompat.registerReceiver( + app, + object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { refresh(context) } + }, + IntentFilter(BuildWatermarkSetting.CHANGED), + "${app.packageName}.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION", + null, + ContextCompat.RECEIVER_NOT_EXPORTED, + ) app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { if (activity is QuestXrActivity) return - val decor = activity.window.decorView as? ViewGroup ?: return - if (decor.findViewWithTag(TAG) != null) return - val margin = (8 * activity.resources.displayMetrics.density).toInt() - decor.addView( - MarkView(activity, lines).apply { tag = TAG }, - FrameLayout.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT, - Gravity.BOTTOM or Gravity.END, - ).apply { setMargins(margin, margin, margin, margin) }, - ) + synchronized(activities) { activities[activity] = Unit } + update(activity) } override fun onActivityStarted(activity: Activity) = Unit - override fun onActivityResumed(activity: Activity) = Unit + override fun onActivityResumed(activity: Activity) { update(activity) } override fun onActivityPaused(activity: Activity) = Unit override fun onActivityStopped(activity: Activity) = Unit override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit - override fun onActivityDestroyed(activity: Activity) = Unit + override fun onActivityDestroyed(activity: Activity) { synchronized(activities) { activities.remove(activity) } } }) } + fun refresh(context: Context) { + val current = synchronized(activities) { activities.keys.toList() } + current.forEach(::update) + } + + private fun update(activity: Activity) { + if (activity is QuestXrActivity) return + val decor = activity.window.decorView as? ViewGroup ?: return + decor.findViewWithTag(TAG)?.let(decor::removeView) + if (!com.droiddeck.launcher.session.SessionPrefs.buildWatermarkEnabled(activity)) return + val lab = com.droiddeck.launcher.lab.LabOverlay.active?.let { "LAB | ${truncate(it.label)}" } + val build = lineProvider().orEmpty() + val content = (listOfNotNull(lab) + build).ifEmpty { return } + val margin = (8 * activity.resources.displayMetrics.density).toInt() + decor.addView( + MarkView(activity, content).apply { tag = TAG }, + FrameLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + Gravity.BOTTOM or Gravity.END, + ).apply { setMargins(margin, margin, margin, margin) }, + ) + } + private const val TAG = "build-watermark" private class MarkView(context: Context, private val lines: List) : View(context) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 31a8fb28c8..7638e8f042 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -108,6 +108,7 @@ class FrontEndState( val vacDiagnostics: Boolean = false, val agentCommands: Boolean = false, val graphicsLogs: Boolean = false, + val buildWatermark: Boolean = true, val steamGpuDrawing: Boolean = false, val bridgeFellBack: Boolean = false, val bridgeFellBackMemory: Boolean = false, @@ -247,6 +248,7 @@ class FrontEndActions( val onVacDiagnostics: () -> Unit = {}, val onAgentCommands: () -> Unit = {}, val onGraphicsLogs: () -> Unit = {}, + val onBuildWatermark: () -> Unit = {}, val onSteamGpuDrawing: () -> Unit = {}, val onClearCachedApps: (Boolean) -> Unit = {}, val onMemoryHud: (String) -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index 990d085f15..e0622acf5e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -92,6 +92,7 @@ class UpdatesActions( @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { + val host = rememberMenuHost() val u = s.updates val ua = a.updates val me = remember { AppUpdates.installed() } @@ -128,6 +129,12 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie Box(Modifier.weight(1.15f)) { StatusPanel(s, u, ua, me) } } } + Box(Modifier.padding(top = 18.dp)) { + ToggleRow( + host, "build-watermark", stringResource(R.string.setup_build_watermark), + stringResource(R.string.setup_build_watermark_hint), s.buildWatermark, + ) { a.onBuildWatermark() } + } } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 573c669b9d..5dbf1a47eb 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2674,6 +2674,8 @@ هذا الجهاز إزالة %1$s؟ التشخيص + علامة مائية لاسم الإصدار + عرض اسم إصدار الاختبار أو Lab على الشاشة. مفعّل افتراضيًا. جاهز للّعب غير جاهز للّعب بعد بيئة التشغيل %1$s 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 f38bdcee46..a14f49e9a1 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2611,6 +2611,8 @@ Este dispositivo ¿Quitar %1$s? Diagnóstico + Marca de agua de compilación + Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. Listo para jugar Aún no está listo para jugar runtime %1$s diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 36751e5311..09c26b8075 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2566,6 +2566,8 @@ Това устройство Премахване на %1$s? Диагностика + Воден знак с етикет на компилацията + Показва етикета на тестовата или Lab компилация на екрана. Включено по подразбиране. Готово за игра Още не е готово за игра среда %1$s diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 010374a13e..43169adfb0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2620,6 +2620,8 @@ Toto zařízení Odstranit %1$s? Diagnostika + Vodoznak s označením sestavení + Zobrazit na obrazovce označení testovacího sestavení nebo sestavení Lab. Ve výchozím nastavení zapnuté. Připraveno ke hraní Ještě není připraveno ke hraní runtime %1$s diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f0c0527365..3a41c0928b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2566,6 +2566,8 @@ Denne enhed Fjern %1$s? Diagnostik + Vandmærke med buildmærkat + Vis mærkatet for test- eller Lab-builden på skærmen. Aktiveret som standard. Klar til at spille Ikke klar til at spille endnu runtime %1$s diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ad656b8bb8..53a0591334 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2555,6 +2555,8 @@ Dieses Gerät %1$s entfernen? Diagnose + Build-Kennzeichnung als Wasserzeichen + Kennzeichnung des Test- oder Lab-Builds auf dem Bildschirm anzeigen. Standardmäßig aktiviert. Bereit zum Spielen Noch nicht bereit zum Spielen Laufzeit %1$s diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0d7d8e1c91..1f2a7f6fa5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2566,6 +2566,8 @@ Αυτή η συσκευή Κατάργηση %1$s; Διαγνωστικά + Υδατογράφημα ετικέτας έκδοσης + Εμφάνιση της ετικέτας δοκιμαστικής έκδοσης ή έκδοσης Lab στην οθόνη. Ενεργό από προεπιλογή. Έτοιμο για παιχνίδι Δεν είναι ακόμα έτοιμο για παιχνίδι runtime %1$s diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1e7fb4865a..bc362f264d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2590,6 +2590,8 @@ Este dispositivo ¿Quitar %1$s? Diagnóstico + Marca de agua de compilación + Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. Listo para jugar Aún no está listo para jugar runtime %1$s diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ba86de4422..70e0c2e8ee 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2566,6 +2566,8 @@ Tämä laite Poistetaanko %1$s? Diagnostiikka + Koontiversion vesileima + Näytä testi- tai Lab-version tunniste näytöllä. Käytössä oletusarvoisesti. Valmis pelattavaksi Ei vielä valmis pelattavaksi ajoympäristö %1$s diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 02c4953bfb..8a8bd2cb69 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2590,6 +2590,8 @@ Cet appareil Supprimer %1$s ? Diagnostic + Filigrane de version + Afficher le libellé de la version de test ou Lab à l’écran. Activé par défaut. Prêt à jouer Pas encore prêt à jouer environnement d\'exécution %1$s diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index cdacc2c56d..62f8a6d867 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2566,6 +2566,8 @@ यह डिवाइस %1$s हटाएं? डायग्नोस्टिक्स + बिल्ड लेबल वॉटरमार्क + स्क्रीन पर टेस्ट या Lab बिल्ड लेबल दिखाएँ। डिफ़ॉल्ट रूप से चालू। खेलने के लिए तैयार अभी खेलने के लिए तैयार नहीं रनटाइम %1$s diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3743a26364..854208f327 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2566,6 +2566,8 @@ Ez a készülék Eltávolítja a %1$s-t? Diagnosztika + Buildcímke vízjelként + A tesztbuild vagy Lab-build címkéjének megjelenítése a képernyőn. Alapértelmezés szerint bekapcsolva. Készen áll a játékra Még nem áll készen a játékra futtatókörnyezet: %1$s diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 395b199251..d18a42fe96 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2539,6 +2539,8 @@ Perangkat ini Hapus %1$s? Diagnostik + Tanda air label build + Tampilkan label build pengujian atau Lab di layar. Aktif secara default. Siap bermain Belum siap bermain runtime %1$s diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9d7e3392bf..655d1bb9e5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2582,6 +2582,8 @@ Questo dispositivo Rimuovere %1$s? Diagnostica + Filigrana con etichetta build + Mostra sullo schermo l’etichetta della build di test o Lab. Attiva per impostazione predefinita. Pronto per giocare Non ancora pronto per giocare runtime %1$s diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2be588f1c8..0b16c04969 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2539,6 +2539,8 @@ このデバイス %1$sを削除しますか? 診断 + ビルドラベルの透かし + テストビルドまたはLabビルドのラベルを画面に表示します。デフォルトで有効です。 プレイの準備完了 まだプレイの準備ができていません 実行環境 %1$s diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 457511bbde..ec2fc2dc3c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2539,6 +2539,8 @@ 이 기기 %1$s을(를) 제거하시겠습니까? 진단 + 빌드 라벨 워터마크 + 테스트 또는 Lab 빌드 라벨을 화면에 표시합니다. 기본적으로 켜져 있습니다. 플레이 준비 완료 아직 플레이할 준비가 되지 않음 런타임 %1$s diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 10524febe1..ff08492061 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2539,6 +2539,8 @@ Peranti ini Alih keluar %1$s? Diagnostik + Tera air label binaan + Paparkan label binaan ujian atau Lab pada skrin. Dihidupkan secara lalai. Sedia untuk bermain Belum sedia untuk bermain masa jalan %1$s diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 8ac2561bab..0be006b622 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2566,6 +2566,8 @@ Denne enheten Fjerne %1$s? Diagnostikk + Vannmerke for byggetikett + Vis etiketten for test- eller Lab-bygget på skjermen. På som standard. Klar til å spille Ikke klar til å spille ennå kjøretid %1$s diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a7bd52c016..6097f32580 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2566,6 +2566,8 @@ Dit apparaat %1$s verwijderen? Diagnostiek + Buildlabel als watermerk + Toon het label van de testbuild of Lab-build op het scherm. Standaard ingeschakeld. Klaar om te spelen Nog niet klaar om te spelen runtime %1$s diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4d00ba2ee8..bfe36b08d9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2620,6 +2620,8 @@ To urządzenie Usunąć %1$s? Diagnostyka + Znak wodny z etykietą kompilacji + Pokazuj na ekranie etykietę kompilacji testowej lub Lab. Domyślnie włączone. Gotowe do gry Jeszcze nie gotowe do gry środowisko %1$s diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 17ff8cbac3..e278e59f25 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2582,6 +2582,8 @@ Este dispositivo Remover %1$s? Diagnóstico + Marca de água da compilação + Mostrar no ecrã a etiqueta da compilação de teste ou Lab. Ativada por predefinição. Pronto para jogar Ainda não está pronto para jogar ambiente de execução %1$s diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 73d1a4c4c9..9d2305b2b6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2582,6 +2582,8 @@ Este aparelho Remover %1$s? Diagnóstico + Marca de água da compilação + Mostrar na tela a etiqueta da compilação de teste ou Lab. Ativada por padrão. Pronto para jogar Ainda não está pronto para jogar runtime %1$s diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d3b8b9269b..cbd0b85423 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2593,6 +2593,8 @@ Acest dispozitiv Elimini %1$s? Diagnosticare + Filigrană cu eticheta versiunii + Afișează pe ecran eticheta versiunii de testare sau Lab. Activată implicit. Pregătit de joc Încă nepregătit de joc mediu de execuție %1$s diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 89dc1b2d78..0bfb8f26ae 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2700,6 +2700,8 @@ Это устройство Удалить %1$s? Диагностика + Водяной знак с меткой сборки + Показывать на экране метку тестовой сборки или сборки Lab. Включено по умолчанию. Готово к игре Пока не готово к игре среда выполнения %1$s diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index c8a3088a00..674f7ca9ff 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2566,6 +2566,8 @@ Den här enheten Ta bort %1$s? Diagnostik + Vattenstämpel med byggetikett + Visa testbyggets eller Lab-byggets etikett på skärmen. Aktiverad som standard. Redo att spela Inte redo att spela än runtime %1$s diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 4bbe6cf467..31e38b728f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2539,6 +2539,8 @@ อุปกรณ์นี้ ลบ %1$s? การวินิจฉัย + ลายน้ำป้ายชื่อบิลด์ + แสดงป้ายชื่อบิลด์ทดสอบหรือบิลด์ Lab บนหน้าจอ เปิดไว้โดยค่าเริ่มต้น พร้อมเล่นแล้ว ยังไม่พร้อมเล่น รันไทม์ %1$s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1d53a2d478..f66424d69d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2555,6 +2555,8 @@ Bu cihaz %1$s kaldırılsın mı? Tanılama + Derleme etiketi filigranı + Test veya Lab derlemesinin etiketini ekranda gösterir. Varsayılan olarak açıktır. Oynamaya hazır Henüz oynamaya hazır değil çalışma ortamı %1$s diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 79eb4138e0..8aebdeebdd 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2620,6 +2620,8 @@ Цей пристрій Видалити %1$s? Діагностика + Водяний знак із міткою збірки + Показувати на екрані мітку тестової збірки або збірки Lab. Увімкнено за замовчуванням. Готово до гри Ще не готово до гри середовище %1$s diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 537168797a..a6a392b8f0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2539,6 +2539,8 @@ Thiết bị này Xóa %1$s? Chẩn đoán + Hình mờ nhãn bản dựng + Hiển thị nhãn bản dựng thử nghiệm hoặc Lab trên màn hình. Được bật theo mặc định. Sẵn sàng để chơi Chưa sẵn sàng để chơi runtime %1$s diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8f0ab9c57b..45aebc4133 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2552,6 +2552,8 @@ 使用 %1$s? 移除 %1$s? 诊断 + 构建标签水印 + 在屏幕上显示测试版或 Lab 构建标签。默认启用。 可以游玩了 暂时还不能游玩 运行时 %1$s diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b8d2bf0846..65b40bad57 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2539,6 +2539,8 @@ 此裝置 移除 %1$s? 診斷 + 建置標籤浮水印 + 在畫面上顯示測試版或 Lab 建置標籤。預設啟用。 可以開始遊戲 尚未可以開始遊戲 運行環境 %1$s diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8b883d4a89..c05aeafcd3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2539,6 +2539,8 @@ 此裝置 要移除 %1$s 嗎? 診斷 + 組建標籤浮水印 + 在畫面上顯示測試版或 Lab 組建標籤。預設啟用。 已可開始遊戲 尚未準備好開始遊戲 執行環境 %1$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f6d489aea..9942a419fe 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -919,6 +919,8 @@ Saved after each session Enhanced diagnostics for next session Captures detailed logs for one session. May reduce performance and use more storage. Turns itself off when the session starts; review logs before sharing. + Build label watermark + Show the test or Lab build label on screen. On by default. Share diagnostic bundles Session and device Graphics diff --git a/app/src/test/java/com/droiddeck/launcher/session/BuildWatermarkSettingTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BuildWatermarkSettingTest.kt new file mode 100644 index 0000000000..f495d9e0bb --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BuildWatermarkSettingTest.kt @@ -0,0 +1,99 @@ +package com.droiddeck.launcher.session + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.content.Intent +import android.os.Looper +import android.view.View +import com.droiddeck.launcher.ui.BuildWatermark +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.ConscryptMode +import org.robolectric.annotation.GraphicsMode +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@ConscryptMode(ConscryptMode.Mode.OFF) +@GraphicsMode(GraphicsMode.Mode.LEGACY) +@Config(sdk = [34], manifest = Config.NONE, application = Application::class) +class BuildWatermarkSettingTest { + private val context get() = RuntimeEnvironment.getApplication() + private val originalLineProvider = BuildWatermark.lineProvider + + @Before fun clear() { + BuildWatermark.lineProvider = { + BuildWatermark.lines(pr = 1234, ci = true, commit = "abcdef0123", title = "Test build", branch = "") + } + listOf("build-watermark", "build-watermark.new", "build-watermark.bak", "build-watermark.lock").forEach { + File(context.filesDir, it).delete() + } + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @After fun cleanUp() { + try { + clear() + } finally { + BuildWatermark.lineProvider = originalLineProvider + } + } + + @Test fun defaultsOnAndPreservesLegacyChoice() { + assertTrue(SessionPrefs.buildWatermarkEnabled(context)) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("buildWatermark", false).commit() + assertFalse(SessionPrefs.buildWatermarkEnabled(context)) + } + + @Test fun sharedFileOverridesCachedPreferencesAndNotifiesOtherProcesses() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("buildWatermark", false).commit() + SessionPrefs.setBuildWatermarkEnabled(context, true) + assertTrue(SessionPrefs.buildWatermarkEnabled(context)) + val change = shadowOf(context).broadcastIntents.last { it.action == BuildWatermarkSetting.CHANGED } + assertEquals(context.packageName, change.`package`) + File(context.filesDir, "build-watermark").writeText("off") + assertFalse(SessionPrefs.buildWatermarkEnabled(context)) + } + + @Test fun lockOpenFailureFallsBackToPreferences() { + val lock = File(context.filesDir, "build-watermark.lock") + assertTrue(lock.mkdir()) + assertTrue(SessionPrefs.buildWatermarkEnabled(context)) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("buildWatermark", false).commit() + assertFalse(SessionPrefs.buildWatermarkEnabled(context)) + assertThrows(java.io.IOException::class.java) { SessionPrefs.setBuildWatermarkEnabled(context, true) } + } + + @Test fun settingReadFailureFallsBackToPreferences() { + assertTrue(File(context.filesDir, "build-watermark").mkdir()) + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("buildWatermark", false).commit() + assertFalse(SessionPrefs.buildWatermarkEnabled(context)) + } + + @Test fun remoteChangeRefreshesExistingAndRecreatedActivities() { + BuildWatermark.install(context) + val activity = Robolectric.buildActivity(Activity::class.java).setup() + try { + assertNotNull(activity.get().window.decorView.findViewWithTag("build-watermark")) + File(context.filesDir, "build-watermark").writeText("off") + context.sendBroadcast(Intent(BuildWatermarkSetting.CHANGED).setPackage(context.packageName)) + shadowOf(Looper.getMainLooper()).idle() + assertNull(activity.get().window.decorView.findViewWithTag("build-watermark")) + activity.recreate() + assertNull(activity.get().window.decorView.findViewWithTag("build-watermark")) + SessionPrefs.setBuildWatermarkEnabled(context, true) + shadowOf(Looper.getMainLooper()).idle() + assertNotNull(activity.get().window.decorView.findViewWithTag("build-watermark")) + } finally { + activity.pause().stop().destroy() + } + } +} From 1882520cac2f8c6d862959334ed4b1f7a12def0e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 11 Nov 2026 23:46:48 -0500 Subject: [PATCH 038/101] fix(agent): the agent survives Steam session starts, stops and restarts (#2503) * fix(agent): session starts and stops leave the agent's own processes running * feat(agent): droiddeckctl ships with the app and the brief explains the Steam session --- app/build.gradle | 2 + app/src/main/assets/agent/droiddeckctl | 2 + .../com/droiddeck/launcher/agent/AgentHost.kt | 23 ++++++++-- .../droiddeck/launcher/agent/AgentSetup.kt | 42 ++++++++++++------- .../launcher/session/OrphanReaper.kt | 5 ++- .../launcher/session/SessionService.kt | 6 ++- 6 files changed, 58 insertions(+), 22 deletions(-) create mode 100755 app/src/main/assets/agent/droiddeckctl diff --git a/app/build.gradle b/app/build.gradle index 28bf184e32..35201d85c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -277,6 +277,8 @@ def stageRuntimeAssets = tasks.register('stageRuntimeAssets', Sync) { dependsOn(stageSessionScripts) from(layout.projectDirectory.dir('src/main/assets')) { exclude 'pulseaudio.tzst' } from(rootProject.file('tools/linuxfs/innoextract')) + from(rootProject.file('tools')) { include 'droiddeckctl', 'adb_device.py', 'proot_profile.py'; into('agent/ctl') } + from(rootProject.file('docs/agent-control.md')) { into('agent/ctl') } from(layout.buildDirectory.dir('prepared-assets')) into(runtimeAssetsDir) } diff --git a/app/src/main/assets/agent/droiddeckctl b/app/src/main/assets/agent/droiddeckctl new file mode 100755 index 0000000000..a72cb2587c --- /dev/null +++ b/app/src/main/assets/agent/droiddeckctl @@ -0,0 +1,2 @@ +#!/bin/sh +exec python3 /root/.local/share/droiddeck/ctl/droiddeckctl "$@" diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index b1e939b088..d82ea8f127 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -14,6 +14,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.OrphanReaper import com.droiddeck.launcher.session.SessionPrefs import java.io.File import java.nio.file.Files @@ -50,7 +51,12 @@ object AgentHost { @VisibleForTesting internal const val BRIEF = "You run inside DroidDeck on the user's handheld, in its Linux userland (Ubuntu under proot, aarch64), " + "and the user talks to you from DroidDeck's Agent tab, often on a small screen, so keep replies short. " + - "droiddeckctl (in the /root/DroidDeck checkout, tools/droiddeckctl) inspects and drives the app over loopback adb (\$ADB_SERIAL). " + + "droiddeckctl inspects and drives the app over loopback adb (\$ADB_SERIAL); its guide is ${AgentSetup.CTL}/agent-control.md. " + + "Steam, the desktop and games run in DroidDeck's session, a separate guest from yours: a program you start here is not in it and has no screen. " + + "Reach the session through droiddeckctl: state, start steam, stop, launch, quit, focus, screenshot, logs, and guest to run a command inside it. " + + "Starting, stopping or restarting a session leaves you running. " + + "Never kill by a command-line pattern (pkill -f, pgrep -f piped to kill): your own command line holds the user's message, so the pattern matches you. " + + "End a game with droiddeckctl quit, the session with droiddeckctl stop, anything else by its pid. " + "dd-lab-build builds the checkout as a Lab build and restarts DroidDeck on it (docs/lab-builds.md). DroidDeck runs the build in a " + "process of its own and shows the user its progress and time left; dd-lab-build follows that build's log until it is done. " + "Run it with run_in_background and keep checking its output, so the user can talk to you meanwhile. " + @@ -252,6 +258,7 @@ object AgentHost { val workdir = workspace(app) Thread({ runCatching { current.prepare(LinuxRuntime.rootDir(app)) } + runCatching { AgentSetup.installHelpers(app) } val child = try { guest(app, command, workdir).start() } catch (e: Exception) { @@ -260,6 +267,7 @@ object AgentHost { return@Thread } val started = Turn(child, AgentProcesses.pidOf(child)) + OrphanReaper.keep(started.pid) main.post { if (generation == gen && state == State.WORKING && turn == null) turn = started else AgentProcesses.killTree(started.pid) } child.outputStream.close() var ended = false @@ -278,6 +286,7 @@ object AgentHost { } runCatching { raw?.close() } val status = runCatching { child.waitFor() }.getOrDefault(-1) + OrphanReaper.release(started.pid) main.post { if (turn === started) { turn = null @@ -500,9 +509,15 @@ object AgentHost { val child = guest(app, listOf("sh", "-c", "mkdir -p /root/.cache; DD_LAB_DETACHED=1 exec dd-lab-build \"\$@\" > /root/.cache/dd-lab-build.log 2>&1", "dd-lab-build") + args, cwd).start() main.post { labProcess = child } - child.outputStream.close() - child.inputStream.readBytes() - child.waitFor() + val pid = AgentProcesses.pidOf(child) + OrphanReaper.keep(pid) + try { + child.outputStream.close() + child.inputStream.readBytes() + child.waitFor() + } finally { + OrphanReaper.release(pid) + } }.onFailure { Log.w(TAG, "could not run a Lab build", it) } main.post { labProcess = null diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index bc4ac2c9e9..f5c080a060 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.OrphanReaper import java.io.File import java.util.concurrent.TimeUnit @@ -39,7 +40,8 @@ object AgentSetup { private val main = Handler(Looper.getMainLooper()) private const val REPO = "https://github.com/Droid-Deck/DroidDeck.git" private const val CHECKOUT = "/root/DroidDeck" - private val HELPERS = listOf("android-open", "dd-gh-login") + private val HELPERS = listOf("android-open", "dd-gh-login", "droiddeckctl") + internal const val CTL = "/root/.local/share/droiddeck/ctl" private const val PROBE_TIMEOUT_S = 60L fun check(context: Context) { @@ -96,14 +98,20 @@ object AgentSetup { installHelpers(app) runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } val child = AgentHost.guest(app, command).start() - child.outputStream.close() - logFile(app, step).apply { parentFile?.mkdirs() }.bufferedWriter().use { log -> - child.inputStream.bufferedReader().forEachLine { line -> - log.appendLine(line) - val text = line.trim() - if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + val pid = AgentProcesses.pidOf(child) + OrphanReaper.keep(pid) + try { + child.outputStream.close() + logFile(app, step).apply { parentFile?.mkdirs() }.bufferedWriter().use { log -> + child.inputStream.bufferedReader().forEachLine { line -> + log.appendLine(line) + val text = line.trim() + if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + } + child.waitFor().also { log.appendLine("exit $it") } } - child.waitFor().also { log.appendLine("exit $it") } + } finally { + OrphanReaper.release(pid) } } main.post { @@ -172,12 +180,16 @@ object AgentSetup { } /** Written before every step, so the helpers a step relies on are there and match this DroidDeck version. */ - private fun installHelpers(app: Context) { - val bin = File(LinuxRuntime.rootDir(app), "root/.local/bin").apply { mkdirs() } - for (name in HELPERS) { - val target = File(bin, name) - app.assets.open("agent/$name").use { input -> target.outputStream().use { input.copyTo(it) } } - target.setExecutable(true, false) - } + internal fun installHelpers(app: Context) { + val root = LinuxRuntime.rootDir(app) + val bin = File(root, "root/.local/bin").apply { mkdirs() } + for (name in HELPERS) copyAsset(app, "agent/$name", File(bin, name)) + val ctl = File(root, CTL.removePrefix("/")).apply { mkdirs() } + for (name in app.assets.list("agent/ctl").orEmpty()) copyAsset(app, "agent/ctl/$name", File(ctl, name)) + } + + private fun copyAsset(app: Context, asset: String, target: File) { + app.assets.open(asset).use { input -> target.outputStream().use { input.copyTo(it) } } + target.setExecutable(true, false) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt b/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt index cbcd904bc1..a6c5117665 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt @@ -11,6 +11,9 @@ object OrphanReaper { fun release(pid: Int) { kept.remove(pid) } + /** Kept processes and everything they started, which session cleanups must leave running. */ + fun spared(): Set = descendants(kept) + fun hasOtherProcesses(): Boolean = hasOtherProcesses( File("/proc").list()?.mapNotNull { it.toIntOrNull() }, android.os.Process.myPid(), ) { pid -> @@ -30,7 +33,7 @@ object OrphanReaper { fun reap(reason: String, matching: (String) -> Boolean = { true }): Int { val me = android.os.Process.myPid() val uid = android.os.Process.myUid() - val spared = descendants(kept) + val spared = spared() var killed = 0 File("/proc").listFiles()?.forEach { entry -> val pid = entry.name.toIntOrNull() ?: return@forEach 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 4faa870866..2af6510093 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1606,10 +1606,11 @@ class SessionService : Service() { val me = android.os.Process.myPid() val rootfs = try { File(filesDir, "linuxfs").canonicalPath } catch (e: Exception) { return } + "/" val procs = File("/proc").listFiles { f -> f.name.all { it.isDigit() } } ?: return + val spared = OrphanReaper.spared() var killed = 0 for (proc in procs) { val pid = proc.name.toIntOrNull() ?: continue - if (pid == me) continue + if (pid == me || pid in spared) continue val exe = try { File(proc, "exe").canonicalPath } catch (e: Exception) { continue } if (!exe.startsWith(rootfs)) continue android.os.Process.killProcess(pid) @@ -1621,10 +1622,11 @@ class SessionService : Service() { private fun killStragglers() { val me = android.os.Process.myPid() val procs = File("/proc").listFiles { f -> f.name.all { it.isDigit() } } ?: return + val spared = OrphanReaper.spared() var killed = 0 for (proc in procs) { val pid = proc.name.toIntOrNull() ?: continue - if (pid == me) continue + if (pid == me || pid in spared) continue val cmdline = try { File(proc, "cmdline").readBytes().toString(Charsets.UTF_8).replace('\u0000', ' ') } catch (e: Exception) { From b303423001ec49f9894f97cd4763e5536e5a494b Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 05:02:26 +0000 Subject: [PATCH 039/101] fix(lab): reuse installed add-on packs so the Agent can restart (#2512) --- .../com/droiddeck/launcher/core/AddonPack.kt | 5 ++++- .../com/droiddeck/launcher/core/AddonPackTest.kt | 16 ++++++++++++++++ docs/lab-builds.md | 4 ++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt index d3d5cf2c74..9e0452771d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.core import android.content.Context import android.util.Log import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.lab.LabOverlay import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -16,6 +17,7 @@ import java.io.FileInputStream internal class AddonPack( val name: String, private val sha256: String, val size: Long, private val required: List, private val reuseDeviceCopy: Boolean = sha256.isEmpty() && !BuildConfig.CI_BUILD, + private val labBuild: Boolean = LabOverlay.active != null, private val bundle: (Context) -> java.io.InputStream = { it.assets.open("packs/$name.tar.zst") }, ) { sealed interface State { @@ -42,7 +44,8 @@ internal class AddonPack( fun installed(context: Context): Boolean = version(context).isNotEmpty() && File(dir(context), COMPLETE).isFile - private fun version(context: Context): String = if (!reuseDeviceCopy) sha256 else deviceCopy(context).orEmpty() + private fun version(context: Context): String = + if (reuseDeviceCopy || labBuild) deviceCopy(context) ?: sha256 else sha256 private fun deviceCopy(context: Context): String? = root(context).listFiles().orEmpty() .filter { dir -> diff --git a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt index 80c6ebd328..c367c63ecc 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt @@ -58,6 +58,22 @@ class AddonPackTest { assertFalse(AddonPack("sample", "", 0L, listOf("tool"), reuseDeviceCopy = false).installed(context)) } + @Test fun labBuildReusesInstalledPackDespiteDifferentSourcePin() { + installed("b".repeat(64)) + val pack = AddonPack("sample", "a".repeat(64), 1L, listOf("tool"), labBuild = true) + + assertTrue(pack.installed(context)) + assertEquals("b".repeat(64), pack.dir(context).name) + } + + @Test fun labBuildWithoutCompleteInstalledPackKeepsSourcePin() { + installed("b".repeat(64), complete = false) + val pack = AddonPack("sample", "a".repeat(64), 1L, listOf("tool"), labBuild = true) + + assertFalse(pack.installed(context)) + assertEquals("a".repeat(64), pack.dir(context).name) + } + @Test fun localBuildInstallsTheBundledPackWithoutDownloading() { val archive = tarZst("tool" to "x") val pack = AddonPack("sample", Hashes.sha256(archive), archive.length(), listOf("tool"), bundle = { archive.inputStream() }) diff --git a/docs/lab-builds.md b/docs/lab-builds.md index 177133e14d..2e01e3b9d8 100644 --- a/docs/lab-builds.md +++ b/docs/lab-builds.md @@ -5,6 +5,10 @@ or by hand, and loaded over the installed APK at the next start. Nothing is rein re-signed, so a tester on a release build keeps their games, sign-ins and settings while trying a change. +While a Lab build is active, add-on packs reuse the newest complete copy already installed on the +device, even when the checkout pins another version. This keeps helpers such as proot available +after restarting. If no complete copy exists, the pack uses the checkout's pin. + ## How it works - `tools/agent/dd-lab-build` builds the checkout with Gradle on the device (`processReleaseResources` From cd05c96d103210820f0c6891c9b690f50611d94b Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 00:13:00 -0500 Subject: [PATCH 040/101] fix(proot): a call the filesystem does not implement no longer switches the fast path off (#2509) Android's FUSE daemon has no symlink or link, so those calls on a storage card return ENOSYS. The fast path read any ENOSYS from its trampoline as a seccomp trap and stopped for the whole process. It now asks again with the same call number and invalid arguments: a trap answers ENOSYS again, anything else means the call reached the kernel and only that call is repeated. Folders opened for a refused call are still closed. --- tools/proot/PATCHES.md | 5 +++ tools/proot/fastpath/fastpath.c | 4 +-- tools/tests/test_fastpath_fuse_dirs.py | 45 +++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index c4173a48c7..3099009c57 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -162,6 +162,11 @@ Prototype (inert unless `PROOT_FASTPATH` is set; see `docs/development/proot-per `ENOSYS`, because its arguments are host paths; the fast path then stops for that process and repeats the call through a plain `svc`, which the guest's filter traps with the guest path. `bench/guest-trap.c` installs a tagged `openat` trap and checks its handler answers the call. + The kernel and filesystems also return `ENOSYS` themselves: Android's FUSE daemon has no + `symlink`, so `symlinkat` on a storage card fails with it. The fast path therefore asks again + with the same call number and invalid arguments. A trap answers `ENOSYS` again and the fast path + stops for the process; any other error means the call reached the kernel, so only that one call + is repeated through a plain `svc` and the fast path stays on. Old kernel fixes: diff --git a/tools/proot/fastpath/fastpath.c b/tools/proot/fastpath/fastpath.c index 7a1e2c79a4..bcc745852a 100644 --- a/tools/proot/fastpath/fastpath.c +++ b/tools/proot/fastpath/fastpath.c @@ -59,10 +59,10 @@ static int optional_syscall(long nr) { nr == SYS_openat2 || nr == SYS_renameat2; } static long sc(long nr, long a, long b, long c, long d, long e) { - if (fp_refused) return -ENOSYS; + if (fp_refused && nr != SYS_close) return -ENOSYS; long r = fp_sys(nr, a, b, c, d, e, 0); if (r == -ENOSYS && !optional_syscall(nr)) { - __atomic_store_n(&fp_on, 0, __ATOMIC_RELAXED); + if (fp_sys(nr, -1, -1, -1, -1, -1, 0) == -ENOSYS) __atomic_store_n(&fp_on, 0, __ATOMIC_RELAXED); fp_refused = 1; } return r; diff --git a/tools/tests/test_fastpath_fuse_dirs.py b/tools/tests/test_fastpath_fuse_dirs.py index 4347e0aedf..b8b45f851a 100644 --- a/tools/tests/test_fastpath_fuse_dirs.py +++ b/tools/tests/test_fastpath_fuse_dirs.py @@ -17,7 +17,10 @@ static const char *race_from, *race_to; static dev_t race_dev; static ino_t race_ino; +static long trapped_nr = -1, unsupported_nr = -1; + static long host_sys(long nr, long a, long b, long c, long d, long e, long f) { + if (nr == trapped_nr || (nr == unsupported_nr && a != -1)) return -ENOSYS; long r = syscall(nr, a, b, c, d, e, f); struct stat fs; if (r >= 0 && nr == SYS_fcntl && b == F_DUPFD_CLOEXEC && c == DIR_FD_FLOOR && race_from @@ -72,8 +75,24 @@ int main(int argc, char **argv) { } else if (!strcmp(op, "stat")) { struct stat st; show(fp_stat(AT_FDCWD, argv[++i], AT_SYMLINK_NOFOLLOW, &st)); + } else if (!strcmp(op, "symlink")) { + long r = fp_symlink("target", AT_FDCWD, argv[++i]); + if (refused()) puts("REFUSED"); + else show(r); + } else if (!strcmp(op, "trap-symlink")) { + trapped_nr = SYS_symlinkat; + } else if (!strcmp(op, "no-symlinks")) { + unsupported_nr = SYS_symlinkat; + } else if (!strcmp(op, "on")) { + printf("%d\n", fp_ready()); + } else if (!strcmp(op, "no-folders")) { + unsupported_nr = SYS_mkdirat; + } else if (!strcmp(op, "busy-cache")) { + pthread_mutex_lock(&dir_lock); } else if (!strcmp(op, "mkdir")) { - show(fp_mkdir(AT_FDCWD, argv[++i], 0755)); + long r = fp_mkdir(AT_FDCWD, argv[++i], 0755); + if (refused()) puts("REFUSED"); + else show(r); } else if (!strcmp(op, "mv")) { show(fp_rename(AT_FDCWD, argv[i + 1], AT_FDCWD, argv[i + 2], 0)); i += 2; @@ -261,6 +280,30 @@ class FastPathFuseDirsTest(unittest.TestCase): self.assertEqual(["ok", "ok", "ok", "E2"], out) self.assertEqual(["under"], [p.name for p in data.iterdir()]) + def test_a_call_the_filesystem_does_not_implement_leaves_the_fast_path_on(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "no-symlinks", "touch", f"{data}/a", "symlink", f"{data}/link", "on", + "stat", f"{data}/a", "symlink", f"{data}/link", "on", "touch", f"{data}/b") + self.assertEqual(["ok", "REFUSED", "1", "ok", "REFUSED", "1", "ok"], out) + self.assertEqual(["a", "b"], sorted(p.name for p in (self.card / "Games/steamapps/common/Game/Data").iterdir())) + + def test_repeated_unsupported_calls_close_the_folders_they_opened(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + ops = [op for n in range(40) for op in ("mkdir", f"{data}/new{n}")] + out = self.ask("fuse", "no-folders", "busy-cache", *ops, "on", "fds") + self.assertEqual(["REFUSED"] * 40 + ["1", "0"], out) + + def test_a_trapped_call_still_stops_the_fast_path_for_the_process(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "trap-symlink", "symlink", f"{data}/link", "on") + self.assertEqual(["REFUSED", "0"], out) + + def test_a_symlink_is_made_where_the_filesystem_allows_it(self): + data = "/mnt/card/Games/steamapps/common/Game/Data" + out = self.ask("fuse", "symlink", f"{data}/link", "on") + self.assertEqual(["ok", "1"], out) + self.assertEqual("target", os.readlink(self.card / "Games/steamapps/common/Game/Data/link")) + def test_other_filesystems_keep_absolute_paths_and_open_no_folders(self): data = "/mnt/card/Games/steamapps/common/Game/Data" out = self.ask("touch", f"{data}/a", "mv", f"{data}/a", f"{data}/b", "rm", f"{data}/b", "fds") From 01bfe8519ef75eed6fc5b988424604a01cb23650 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 01:25:21 -0500 Subject: [PATCH 041/101] fix(session): preserve guest monotonic time after long pauses (#2393) --- app/src/main/cpp/waylandcomp/CMakeLists.txt | 1 + .../main/cpp/waylandcomp/src/clock_domain.c | 72 +++++ .../main/cpp/waylandcomp/src/clock_domain.h | 11 + app/src/main/cpp/waylandcomp/src/compositor.c | 13 +- .../cpp/waylandcomp/src/waylandcomp_jni.c | 8 + .../launcher/session/SessionService.kt | 1 + .../session/SessionSuspendController.kt | 2 + .../launcher/wayland/CompositorHost.kt | 3 + .../launcher/wayland/WaylandCompositor.java | 2 + .../session/SessionSuspendControllerTest.kt | 5 + .../overlay/usr/local/bin/droiddeck-session | 3 +- tools/linuxfs/preload/clockpause.c | 1 - tools/tests/test_clock_pause_preload.py | 143 +++++++++- tools/tests/test_wayland_clock_domain.py | 267 ++++++++++++++++++ 14 files changed, 519 insertions(+), 13 deletions(-) create mode 100644 app/src/main/cpp/waylandcomp/src/clock_domain.c create mode 100644 app/src/main/cpp/waylandcomp/src/clock_domain.h create mode 100644 tools/tests/test_wayland_clock_domain.py diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index 61baf0d379..c7aa1b0eb4 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -1,5 +1,6 @@ add_library(droiddeckwayland SHARED src/compositor.c + src/clock_domain.c src/vk_present.c src/effects_chain.c src/cardboard.c diff --git a/app/src/main/cpp/waylandcomp/src/clock_domain.c b/app/src/main/cpp/waylandcomp/src/clock_domain.c new file mode 100644 index 0000000000..30fd73a4eb --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/clock_domain.c @@ -0,0 +1,72 @@ +#define _GNU_SOURCE +#include "clock_domain.h" + +#include +#include +#include +#include +#include +#include +#include + +static const int64_t *g_shift; +static pthread_mutex_t g_control_lock = PTHREAD_MUTEX_INITIALIZER; +static dev_t g_device; +static ino_t g_inode; + +void droiddeck_clock_domain_set_control(const char *path) { + int fd; + struct stat st; + pthread_mutex_lock(&g_control_lock); + if (!path || !*path) { + const int64_t *previous = g_shift; + g_shift = NULL; + if (previous) munmap((void *)previous, sizeof(*previous)); + pthread_mutex_unlock(&g_control_lock); + return; + } + fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0 || fstat(fd, &st) != 0 || st.st_size < (off_t)sizeof(int64_t)) { + if (fd >= 0) close(fd); + pthread_mutex_unlock(&g_control_lock); + return; + } + if (g_shift && st.st_dev == g_device && st.st_ino == g_inode) { + close(fd); + pthread_mutex_unlock(&g_control_lock); + return; + } + const int64_t *shift = mmap(NULL, sizeof(*shift), PROT_READ, MAP_SHARED, fd, 0); + close(fd); + if (shift != MAP_FAILED) { + g_device = st.st_dev; + g_inode = st.st_ino; + const int64_t *previous = g_shift; + g_shift = shift; + if (previous) munmap((void *)previous, sizeof(*previous)); + } + pthread_mutex_unlock(&g_control_lock); +} + +static int64_t shift_ns(void) { + pthread_mutex_lock(&g_control_lock); + const int64_t *mapping = g_shift; + int64_t shift = mapping ? __atomic_load_n(mapping, __ATOMIC_RELAXED) : 0; + pthread_mutex_unlock(&g_control_lock); + return shift > 0 ? shift : 0; +} + +int64_t droiddeck_clock_domain_adjust_ns(int64_t value) { + int64_t shift = shift_ns(); + return value > shift ? value - shift : 0; +} + +int64_t droiddeck_clock_domain_now_ns(void) { + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return droiddeck_clock_domain_adjust_ns((int64_t)ts.tv_sec * 1000000000LL + ts.tv_nsec); +} + +uint32_t droiddeck_clock_domain_now_ms(void) { + return (uint32_t)(droiddeck_clock_domain_now_ns() / 1000000LL); +} diff --git a/app/src/main/cpp/waylandcomp/src/clock_domain.h b/app/src/main/cpp/waylandcomp/src/clock_domain.h new file mode 100644 index 0000000000..acb7e0e174 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/clock_domain.h @@ -0,0 +1,11 @@ +#ifndef DROIDDECK_CLOCK_DOMAIN_H +#define DROIDDECK_CLOCK_DOMAIN_H + +#include + +void droiddeck_clock_domain_set_control(const char *path); +int64_t droiddeck_clock_domain_now_ns(void); +uint32_t droiddeck_clock_domain_now_ms(void); +int64_t droiddeck_clock_domain_adjust_ns(int64_t value); + +#endif diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 21ef1d23f9..3510ea29a3 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -36,6 +36,7 @@ #include "droiddeck_ext.h" #include "droiddeck_color.h" #include "compositor_internal.h" +#include "clock_domain.h" #define WLOGI(...) __android_log_print(ANDROID_LOG_INFO, "DroidDeckWayland", __VA_ARGS__) #define WLOGE(...) __android_log_print(ANDROID_LOG_ERROR, "DroidDeckWayland", __VA_ARGS__) @@ -727,9 +728,7 @@ static void on_pending_buffer_destroyed(struct wl_listener *l, void *data) { static void fire_frames(struct wl_list *frames) { struct wl_resource *cb, *tmp; uint32_t t; - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - t = (uint32_t)(ts.tv_sec * 1000 + ts.tv_nsec / 1000000); + t = droiddeck_clock_domain_now_ms(); wl_resource_for_each_safe(cb, tmp, frames) { wl_callback_send_done(cb, t); wl_resource_destroy(cb); @@ -1061,6 +1060,7 @@ static int64_t presented_ns(int64_t render_ns) { static void feedback_present_all(struct wl_list *list, int64_t t) { struct wl_resource *fb, *tmp; + t = droiddeck_clock_domain_adjust_ns(t); uint64_t sec = (uint64_t)(t / 1000000000LL); uint32_t nsec = (uint32_t)(t % 1000000000LL); wl_resource_for_each_safe(fb, tmp, list) { @@ -2493,8 +2493,7 @@ static void on_vsync(int64_t frame_time_ns) { static uint32_t now_ms(void) { - struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); - return (uint32_t)(ts.tv_sec * 1000 + ts.tv_nsec / 1000000); + return droiddeck_clock_domain_now_ms(); } static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint32_t serial, @@ -3114,12 +3113,10 @@ static void relative_pointers_pointer_gone(struct wl_resource *pointer) { static int send_relative_motion(struct wl_client *client, double dx, double dy) { struct relative_pointer *rp; - struct timespec ts; uint64_t ut; int sent = 0; if (dx == 0 && dy == 0) return 0; - clock_gettime(CLOCK_MONOTONIC, &ts); - ut = (uint64_t)ts.tv_sec * 1000000ULL + (uint64_t)ts.tv_nsec / 1000; + ut = (uint64_t)(droiddeck_clock_domain_now_ns() / 1000); wl_list_for_each(rp, &g_relative_pointers, link) { if (!rp->pointer || wl_resource_get_client(rp->pointer) != client) continue; zwp_relative_pointer_v1_send_relative_motion(rp->resource, (uint32_t)(ut >> 32), (uint32_t)ut, diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index ffbfdfd935..25b97ae0f8 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -18,6 +18,7 @@ #include "cardboard.h" #include "droiddeck_color.h" #include "gpu_clock_pin.h" +#include "clock_domain.h" extern int droiddeck_wayland_run(void); extern void droiddeck_wayland_set_scale_mode(int mode, int alignment); @@ -354,6 +355,13 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeVsync(JNIEnv *env, j droiddeck_wayland_vsync((int64_t)frameTimeNanos); } +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetClockControl(JNIEnv *env, jclass clazz, jstring path) { + const char *value = path ? (*env)->GetStringUTFChars(env, path, NULL) : NULL; + droiddeck_clock_domain_set_control(value); + if (value) (*env)->ReleaseStringUTFChars(env, path, value); +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetHideShell(JNIEnv *env, jclass clazz, jboolean hide) { g_hide_shell = hide ? 1 : 0; 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 2af6510093..232eaf0c6d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -822,6 +822,7 @@ class SessionService : Service() { }, zramControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-zram"), clockControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-clock"), + mapClockControl = { WaylandCompositor.nativeSetClockControl(it.path) }, pagedOut = { processes, unacknowledged, residentKb, swapKb, swapBeforeKb, millis -> Log.i(TAG, "paged out $processes processes ($unacknowledged unacknowledged) in $millis ms: " + "resident ${residentKb / 1024} MB, zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt index b0a6852144..ad7360d8ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -23,6 +23,7 @@ internal class SessionSuspendController( private val executor: ExecutorService = Executors.newSingleThreadExecutor(), private val zramControl: File? = null, private val clockControl: File? = null, + private val mapClockControl: (File) -> Unit = {}, private val nowNanos: () -> Long = System::nanoTime, private val pagedOut: (processes: Int, unacknowledged: Int, residentKb: Long, swapKb: Long, swapBeforeKb: Long, millis: Long) -> Unit = { _, _, _, _, _, _ -> }, @@ -154,6 +155,7 @@ internal class SessionSuspendController( frozenSince = null val control = clockControl?.takeIf { it.isFile && it.length() >= Long.SIZE_BYTES } ?: return try { + mapClockControl(control) RandomAccessFile(control, "rw").use { file -> val bytes = ByteArray(Long.SIZE_BYTES) file.readFully(bytes) diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index 7166440029..7fcdc09620 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -50,6 +50,7 @@ object CompositorHost { refreshHz: Float, fpsLimit: Int, ): Boolean { + WaylandCompositor.nativeSetClockControl(java.io.File(context.filesDir, "${com.droiddeck.launcher.runtime.LinuxRuntime.DIR}/tmp/.bl-clock").path) ownVsyncThread = SessionPrefs.vsyncThread(context) WaylandCompositor.nativeSetRenderOnCommit(SessionPrefs.renderOnCommit(context)) pace(refreshHz, fpsLimit) @@ -135,7 +136,9 @@ object CompositorHost { vsyncRunning = false } + @Synchronized fun newSession() { + WaylandCompositor.nativeSetClockControl(null) if (started) WaylandCompositor.nativeResetFirstFrame() } diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index a2ac2171df..995f512471 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -178,6 +178,8 @@ public final class WaylandCompositor { public static native void nativeVsync(long frameTimeNanos); + public static native void nativeSetClockControl(String path); + public static native int nativeCompositorTid(); private static native String nativeCompositorFault(); diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt index 230eb1f12e..44aa6c73cd 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -273,9 +273,12 @@ class SessionSuspendControllerTest { val fixture = fixture(17) fixture.clock.writeBytes(shift(5_000_000L)) fixture.controller.freeze { assertTrue(it) } + fixture.clock.delete() + fixture.clock.writeBytes(shift(5_000_000L)) fixture.now += 90_000L fixture.controller.resume { assertTrue(it) } val expected = 5_000_000L + 90_000L * 1_000_000L + assertEquals(5_000_000L, fixture.clockAtMapping) assertEquals(expected, fixture.clockAtContinue) assertEquals(expected, shift(fixture.clock)) fixture.controller.resume { assertTrue(it) } @@ -478,6 +481,7 @@ class SessionSuspendControllerTest { val control = File(tmp, ".bl-zram") val clock = File(tmp, ".bl-clock") var clockAtContinue: Long? = null + var clockAtMapping: Long? = null val pagedOut = mutableListOf>() val pagedIn = mutableListOf>() var availableKb = 8_000_000L @@ -496,6 +500,7 @@ class SessionSuspendControllerTest { proc, ::signal, ::threadSignal, ::sleep, { now }, executor, zramControl = control, clockControl = clock, + mapClockControl = { clockAtMapping = ByteBuffer.wrap(it.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long }, nowNanos = { now * 1_000_000L }, pagedOut = { processes, unacknowledged, resident, swap, _, _ -> pagedOut += Triple(processes, resident, swap) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 37fb2c00ad..df27767405 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -132,8 +132,7 @@ clear_stale_tmp() { [ -z "${BL_INSIDE:-}" ] && clear_stale_tmp if [ -z "${BL_INSIDE:-}" ]; then if [ "${BL_ZRAM:-0}" = 1 ]; then printf 0 > /tmp/.bl-zram; else rm -f /tmp/.bl-zram; fi - rm -f /tmp/.bl-clock - head -c 8 /dev/zero > /tmp/.bl-clock + dd if=/dev/zero of=/tmp/.bl-clock bs=8 count=1 conv=notrunc status=none fi steam_devtools() { diff --git a/tools/linuxfs/preload/clockpause.c b/tools/linuxfs/preload/clockpause.c index 19a1d728ab..eed7a401d7 100644 --- a/tools/linuxfs/preload/clockpause.c +++ b/tools/linuxfs/preload/clockpause.c @@ -81,7 +81,6 @@ static void cp_init(void) { struct stat st; void *map; int fd; - if (strcmp(program_invocation_short_name, "plasmashell") != 0) return; if (!cp_find_cond_bit()) return; fd = open(CP_CTL, O_RDONLY | O_CLOEXEC); if (fd < 0) return; diff --git a/tools/tests/test_clock_pause_preload.py b/tools/tests/test_clock_pause_preload.py index 6523811125..06ddd65a49 100644 --- a/tools/tests/test_clock_pause_preload.py +++ b/tools/tests/test_clock_pause_preload.py @@ -1,19 +1,34 @@ import os from pathlib import Path +import queue +import re +import shlex import shutil import struct import subprocess import tempfile +import threading import unittest PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +def clock_reset_command(control): + script = (PRELOAD.parent / "overlay/usr/local/bin/droiddeck-session").read_text() + start = script.index('if [ -z "${BL_INSIDE:-}" ]; then\n if [ "${BL_ZRAM:-0}"') + end = script.index("\nfi", start) + len("\nfi") + paths = {"/tmp/.bl-clock": shlex.quote(str(control)), + "/tmp/.bl-zram": shlex.quote(str(control.parent / "zram"))} + pattern = "|".join(re.escape(token) for token in paths) + return 'BL_INSIDE=; BL_ZRAM=0; ' + re.sub(pattern, lambda match: paths[match.group(0)], script[start:end]) + PROGRAM = r""" #define _GNU_SOURCE #include #include #include #include +#include #include #include #include @@ -36,12 +51,26 @@ static int64_t start; static void begin(void) { start = ns(CLOCK_BOOTTIME); } static void end(const char *name) { printf("%s %lld\n", name, (long long)((ns(CLOCK_BOOTTIME) - start) / 1000000LL)); } +static unsigned long long memory_probe(void) { + static volatile unsigned char memory[4 * 1024 * 1024]; + unsigned long long checksum = 0; + for (size_t i = 0; i < sizeof(memory); i += 4096) memory[i] = (unsigned char)(i / 4096 + 1); + for (size_t i = 0; i < sizeof(memory); i += 4096) checksum += memory[i]; + return checksum; +} + int main(void) { const int64_t wait = 60000000LL; printf("gap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ns(CLOCK_MONOTONIC)) / 1000000LL)); struct timespec raw; syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &raw); printf("rawgap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ((int64_t)raw.tv_sec * 1000000000LL + raw.tv_nsec)) / 1000000LL)); + printf("memory %llu\n", memory_probe()); + if (getenv("CLOCK_PAUSE_WAIT")) { puts("ready"); fflush(stdout); getchar(); } + if (getenv("CLOCK_PAUSE_WAIT")) { + printf("livegap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ns(CLOCK_MONOTONIC)) / 1000000LL)); + printf("livememory %llu\n", memory_probe()); + } pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; pthread_condattr_t attr; @@ -124,14 +153,124 @@ class ClockPausePreloadTest(unittest.TestCase): self.assertGreaterEqual(paused[name], 50, name) self.assertLess(paused[name], 1000, name) - def test_other_programs_keep_the_real_clock(self): + def test_program_without_preload_keeps_the_real_clock(self): plain = self.run_program(self.other, 0, preload=False) - paused = self.run_program(self.other, SHIFT_MS) + paused = self.run_program(self.other, SHIFT_MS, preload=False) self.assertAlmostEqual(paused["gap"], plain["gap"], delta=50) for name in ("cond_mono", "clockwait", "sem", "nanosleep", "timerfd", "futex"): self.assertGreaterEqual(paused[name], 50, name) self.assertLess(paused[name], 1000, name) + def test_every_session_program_stops_monotonic_clock_and_keeps_memory_access(self): + plain = self.run_program(self.other, 0) + paused = self.run_program(self.other, SHIFT_MS) + self.assertAlmostEqual(paused["gap"] - plain["gap"], SHIFT_MS, delta=50) + self.assertAlmostEqual(paused["rawgap"] - plain["rawgap"], SHIFT_MS, delta=50) + self.assertEqual(plain["memory"], 130560) + self.assertEqual(paused["memory"], 130560) + + def test_running_session_program_observes_pause_offset_update(self): + self.check_running_offset_update(False) + + def test_session_reset_preserves_live_guest_mapping(self): + self.check_running_offset_update(True) + + def check_running_offset_update(self, reset): + self.control.write_bytes(struct.pack("\n' + '#include "clock_domain.h"\n' + 'int main(int argc, char **argv) { (void)argc;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld %u %lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL), ' + ' droiddeck_clock_domain_now_ms(), (long long)droiddeck_clock_domain_adjust_ns(5LL * 1000000000LL));\n' + ' return 0;\n' + '}\n' + ) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), "-o", str(binary), str(program), str(SOURCE)], + check=True) + result = subprocess.run([str(binary), str(control)], capture_output=True, text=True, check=True) + adjusted, now_ms, clamped = map(int, result.stdout.split()) + self.assertEqual(adjusted, 20_000_000_000) + self.assertGreaterEqual(now_ms, 0) + self.assertLessEqual(now_ms, 0xFFFFFFFF) + self.assertEqual(clamped, 0) + + def test_paced_release_uses_kernel_time_across_pause_offsets(self): + compositor = SOURCE.with_name("compositor.c").read_text() + functions = extract_function(compositor, "now_ns") + "\n" + extract_void_function(compositor, "arm_release_timer") + harness = r''' +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include "clock_domain.h" + +struct pending_release { void *buffer; int64_t at_ns; struct pending_release *next; }; +static struct pending_release *g_pending_releases; +static int g_release_timer_fd; +#define wl_list_for_each(pr, list, link) for (pr = *(list); pr; pr = pr->next) +static int buffer_release_blocked(void *buffer) { return buffer != NULL; } + +@FUNCTIONS@ + +int main(int argc, char **argv) { + (void)argc; + droiddeck_clock_domain_set_control(argv[1]); + int control = open(argv[1], O_WRONLY); + assert(control >= 0); + g_release_timer_fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC); + assert(g_release_timer_fd >= 0); + const int64_t offsets[] = {0, 10000000000LL, 300000000000LL}; + for (unsigned i = 0; i < sizeof(offsets) / sizeof(offsets[0]); i++) { + assert(pwrite(control, &offsets[i], sizeof(offsets[i]), 0) == sizeof(offsets[i])); + struct timespec started, ended; + clock_gettime(CLOCK_MONOTONIC, &started); + int64_t start = now_ns(); + struct pending_release blocked = {(void *)1, start + 1000000LL, NULL}; + struct pending_release release = {NULL, start + 60000000LL, &blocked}; + g_pending_releases = &release; + arm_release_timer(); + int64_t next_offset = offsets[i] + 10000000000LL; + assert(pwrite(control, &next_offset, sizeof(next_offset), 0) == sizeof(next_offset)); + struct pollfd pollfd = {g_release_timer_fd, POLLIN, 0}; + assert(poll(&pollfd, 1, 1000) == 1); + clock_gettime(CLOCK_MONOTONIC, &ended); + int64_t elapsed = (ended.tv_sec - started.tv_sec) * 1000000000LL + ended.tv_nsec - started.tv_nsec; + assert(elapsed >= 50000000LL && elapsed < 1000000000LL); + uint64_t expirations; + assert(read(g_release_timer_fd, &expirations, sizeof(expirations)) == sizeof(expirations)); + assert(expirations == 1); + g_pending_releases = &blocked; + arm_release_timer(); + struct itimerspec remaining; + assert(timerfd_gettime(g_release_timer_fd, &remaining) == 0); + assert(remaining.it_value.tv_sec == 0 && remaining.it_value.tv_nsec == 0); + } + close(g_release_timer_fd); + close(control); + return 0; +} +''' + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + control = root / "clock" + control.write_bytes(struct.pack("\n' + '#include "clock_domain.h"\n' + 'int main(int argc, char **argv) { (void)argc;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' droiddeck_clock_domain_set_control(argv[2]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' return 0;\n' + '}\n' + ) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), "-o", str(binary), str(program), str(SOURCE)], + check=True) + result = subprocess.run([str(binary), str(control), str(root / "missing")], capture_output=True, text=True, check=True) + self.assertEqual(result.stdout.split(), ["30000000000", "30000000000"]) + + def test_replaced_control_file_updates_offset_without_invalidating_readers(self): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + control = root / "clock" + replacement = root / "replacement" + control.write_bytes(struct.pack("\n' + '#include "clock_domain.h"\n' + 'int main(int argc, char **argv) { (void)argc;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' if (rename(argv[2], argv[1]) != 0) return 1;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' return 0;\n' + '}\n' + ) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), "-o", str(binary), str(program), str(SOURCE)], + check=True) + result = subprocess.run([str(binary), str(control), str(replacement)], capture_output=True, text=True, check=True) + self.assertEqual(result.stdout.split(), ["20000000000", "10000000000"]) + + def test_session_transition_clears_stale_offset_but_live_failures_preserve_it(self): + harness = r''' +#include +#include +#include +#include +#include "clock_domain.h" + +int main(int argc, char **argv) { + (void)argc; + int64_t shift = 10000000000LL; + int fd = open(argv[1], O_CREAT | O_RDWR, 0600); + assert(fd >= 0); + assert(write(fd, &shift, sizeof(shift)) == sizeof(shift)); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 20000000000LL); + assert(unlink(argv[1]) == 0); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 20000000000LL); + int replacement = open(argv[1], O_CREAT | O_RDWR, 0600); + assert(replacement >= 0); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 20000000000LL); + droiddeck_clock_domain_set_control(NULL); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 30000000000LL); + shift = 20000000000LL; + assert(write(replacement, &shift, sizeof(shift)) == sizeof(shift)); + droiddeck_clock_domain_set_control(argv[1]); + assert(droiddeck_clock_domain_adjust_ns(30000000000LL) == 10000000000LL); + close(replacement); + close(fd); + return 0; +} +''' + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + program = root / "program.c" + program.write_text(harness) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), + "-o", str(binary), str(program), str(SOURCE)], check=True) + subprocess.run([str(binary), str(root / "clock")], check=True, timeout=5) + host = SOURCE.parents[3] / "java/com/droiddeck/launcher/wayland/CompositorHost.kt" + self.assertIn("nativeSetClockControl(null)", host.read_text().split("fun newSession() {", 1)[1].split("}", 1)[0]) + + def test_startup_reset_keeps_host_and_guest_on_the_same_inode(self): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + control = root / "clock" + control.write_bytes(struct.pack("\n' + '#include "clock_domain.h"\n' + 'int main(int argc, char **argv) { (void)argc;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' if (rename(argv[2], argv[1]) != 0) return 1;\n' + ' droiddeck_clock_domain_set_control(argv[1]);\n' + ' printf("%lld\\n", (long long)droiddeck_clock_domain_adjust_ns(30LL * 1000000000LL));\n' + ' return 0;\n' + '}\n' + ) + binary = root / "program" + subprocess.run(["cc", "-Wall", "-Wextra", "-Werror", "-O2", "-I", str(SOURCE.parent), + "-o", str(binary), str(program), str(SOURCE)], check=True) + result = subprocess.run([str(binary), str(control), str(replacement)], capture_output=True, text=True, check=True) + self.assertEqual(result.stdout.split(), ["30000000000", "10000000000"]) + + +if __name__ == "__main__": + unittest.main() From da5a36151b7f82a394049409a75efc4888077f43 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 02:10:34 -0500 Subject: [PATCH 042/101] feat(ui): option to hide the Agent tab (#2515) --- .../main/java/com/droiddeck/launcher/App.kt | 3 ++- .../droiddeck/launcher/FrontEndActivity.kt | 3 ++- .../com/droiddeck/launcher/agent/AgentTab.kt | 23 +++++++++++++++++++ .../launcher/session/SessionPrefs.kt | 6 +++++ .../launcher/session/SettingsReset.kt | 2 +- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 2 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 5 ++++ .../launcher/ui/SessionDrawerPage.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 9 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 79f42d118a..ac9995412b 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -43,7 +43,8 @@ class App : Application() { process == "$packageName:shortcuts_sync" || process == "$packageName:bottom_desktop") return CrashHandler.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) - if (com.droiddeck.launcher.agent.AgentHost.available) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" + com.droiddeck.launcher.agent.AgentTab.load(this) + if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a8d0a5bde2..699dd9643b 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1107,7 +1107,7 @@ class FrontEndActivity : ComponentActivity() { if (savedInstanceState == null) readIntegrationIntent(intent) readGameIntent(intent) // A Lab build is usually the agent's work, so the app comes back where the agent is. - if (savedInstanceState == null && navRequest == null && com.droiddeck.launcher.lab.LabOverlay.promoted && com.droiddeck.launcher.agent.AgentHost.available) navRequest = "agent" + if (savedInstanceState == null && navRequest == null && com.droiddeck.launcher.lab.LabOverlay.promoted && com.droiddeck.launcher.agent.AgentTab.visible) navRequest = "agent" gameSyncFolder = GameFileSync.folder(this) displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager refreshPhantomStatus() @@ -3054,6 +3054,7 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.core.AppLanguage.setChosen(this, com.droiddeck.launcher.core.AppLanguage.SYSTEM) if (!ok) android.widget.Toast.makeText(this, R.string.setup_reset_settings_partial, android.widget.Toast.LENGTH_LONG).show() com.droiddeck.launcher.ui.Motion.refresh(this) + com.droiddeck.launcher.agent.AgentTab.load(this) if (!switchLauncherIcon(LauncherIcon.DARK)) recreate() } }, "reset-settings").start() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt new file mode 100644 index 0000000000..7392473c72 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -0,0 +1,23 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.SessionPrefs + +object AgentTab { + var shown by mutableStateOf(true) + private set + + val visible: Boolean get() = shown && AgentHost.available + + fun load(context: Context) { + shown = SessionPrefs.agentTab(context) + } + + fun set(context: Context, show: Boolean) { + shown = show + SessionPrefs.setAgentTab(context, show) + } +} 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 b682a82953..a14490bb8d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -253,6 +253,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } + fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", true) + + fun setAgentTab(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("agentTab", show).apply() + } + fun libraryShowUninstalled(context: Context): Boolean = prefs(context).getBoolean("libraryShowUninstalled", false) fun setLibraryShowUninstalled(context: Context, show: Boolean) { 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 321af09802..756b05f45f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "railLabels", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "railLabels", "agentTab", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 5358b221e1..351eded54c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -125,7 +125,7 @@ internal fun navigationKeys(s: FrontEndState) = buildList { add("steam"); add("games") if (s.gameStoresEnabled) add("stores") add("desktop") - if (com.droiddeck.launcher.agent.AgentHost.available) add("agent") + if (com.droiddeck.launcher.agent.AgentTab.visible) add("agent") add("components") if (s.isHomeApp) add("android-apps") add("setup"); add("updates") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 79ce769131..f90cf1b26b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -455,6 +455,11 @@ internal fun SetupPanel( val railContext = androidx.compose.ui.platform.LocalContext.current remember { RailLabels.load(railContext) } ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } + if (com.droiddeck.launcher.agent.AgentHost.available) { + ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { + com.droiddeck.launcher.agent.AgentTab.set(railContext, it) + } + } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index a0d75f027a..cb438903b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -14,7 +14,7 @@ internal enum class SessionDrawerPage(val firstControl: String) { } internal fun sessionDrawerPages( - hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed, + hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed && com.droiddeck.launcher.agent.AgentTab.shown, ): List = SessionDrawerPage.entries.filter { (hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) && diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9942a419fe..b658b8d8b7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2641,6 +2641,7 @@ Sort Sidebar labels Show names under the sidebar icons. Turn off for a slimmer sidebar. + Agent tab Display Larger cards Smaller cards From a8237e89277706b3b9256a0bbe338e5f0acc18d0 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 07:38:28 -0500 Subject: [PATCH 043/101] fix(memory): reclaim idle session memory under pressure (#2382) --- .../droiddeck/launcher/core/HostProcess.kt | 7 + .../launcher/core/SessionLogCapture.kt | 52 +++++ .../launcher/session/SessionArtifacts.kt | 5 + docs/development/low-memory.md | 46 ++-- .../overlay/usr/local/bin/droiddeck-session | 147 +++++++++---- tools/tests/test_client_zram_focus.py | 1 + tools/tests/test_memory_pressure.py | 203 +++++++++++++++--- 7 files changed, 379 insertions(+), 82 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt index 0757192461..114e337892 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt @@ -13,6 +13,11 @@ object HostProcess { @JvmStatic fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?, outputFile: File?): Int { + return start(command, env, dir, onExit, onLine, outputFile, null) + } + + @JvmStatic + fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?, outputFile: File?, onOutputComplete: Runnable?): Int { val argv = split(command) if (argv.isEmpty()) return -1 return try { @@ -35,6 +40,8 @@ object HostProcess { try { process.inputStream.bufferedReader().useLines { lines -> lines.forEach { onLine.accept(it) } } } catch (e: Exception) { + } finally { + onOutputComplete?.run() } }, "proc-out-$pid").apply { priority = Thread.NORM_PRIORITY - 1; isDaemon = true; start() } } diff --git a/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt b/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt index b9c0256dbf..c7b4a78c7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt @@ -5,6 +5,9 @@ import android.util.Log import java.io.BufferedWriter import java.io.File import java.io.FileOutputStream +import java.nio.file.Files +import java.nio.file.StandardCopyOption +import java.util.concurrent.atomic.AtomicInteger object SessionLogCapture { private const val TAG = "SessionLogCapture" @@ -104,4 +107,53 @@ object SessionLogCapture { Log.w(TAG, "could not dump the crash buffer", e) } } + + fun dumpMemoryPressure(target: File) { + var temporary: File? = null + try { + val staged = File.createTempFile(target.name, ".part", target.parentFile).also { temporary = it } + val lines = StringBuilder() + val done = java.util.concurrent.CountDownLatch(1) + val outputDone = java.util.concurrent.CountDownLatch(1) + val exitStatus = AtomicInteger(Int.MIN_VALUE) + val pid = HostProcess.start( + "/system/bin/logcat -b events -d -v threadtime -t 800", null, target.parentFile, + { status -> exitStatus.set(status); done.countDown() }, + { line -> synchronized(lines) { lines.append(line).append('\n') } }, + null, + outputDone::countDown, + ) + val deadline = System.nanoTime() + java.util.concurrent.TimeUnit.SECONDS.toNanos(10) + val finished = if (pid == -1) false else { + val exitTime = deadline - System.nanoTime() + exitTime > 0 && done.await(exitTime, java.util.concurrent.TimeUnit.NANOSECONDS) && + (deadline - System.nanoTime()).let { it > 0 && outputDone.await(it, java.util.concurrent.TimeUnit.NANOSECONDS) } + } + val body = synchronized(lines) { lines.toString() } + val status = exitStatus.get() + val pressure = runCatching { File("/proc/pressure/memory").readText() }.getOrDefault("unavailable\n") + val meminfo = runCatching { File("/proc/meminfo").readText() }.getOrDefault("unavailable\n") + val gpu = runCatching { File("/sys/class/kgsl/kgsl/page_alloc").readText() }.getOrDefault("unavailable\n") + staged.writeText( + "Android memory events:\n" + + when { + pid == -1 -> "(logcat could not be started at all)\n" + status != Int.MIN_VALUE && status != 0 -> "(logcat failed with exit status $status; no Android memory events were captured)\n" + + if (body.isEmpty()) "" else "\nlogcat command output:\n$body" + !finished -> if (body.isEmpty()) "(logcat did not finish within 10 s; nothing captured)\n" + else body + "(logcat did not finish within 10 s; later events may be missing)\n" + body.isNotEmpty() -> body + else -> "(no readable events were returned)\n" + } + + "\n/proc/pressure/memory:\n$pressure\n/proc/meminfo:\n$meminfo\n/sys/class/kgsl/kgsl/page_alloc:\n$gpu" + ) + Files.move( + staged.toPath(), target.toPath(), + StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE, + ) + } catch (e: Exception) { + temporary?.delete() + Log.w(TAG, "could not dump memory pressure diagnostics", e) + } + } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt index cb766a2de3..3ac0ef8ab6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -77,6 +77,7 @@ object SessionArtifacts { copySteamLogs(context, dir, record, steamArch) VacDiagnostics.collect(context, dir) SessionLogCapture.dumpCrashBuffer(File(dir, "crash.log")) + SessionLogCapture.dumpMemoryPressure(File(dir, "memory-pressure.log")) val scrubbed = markScrubbed(scrubTree(record)) SessionEvents.record("session.artifacts_collected", mapOf("reason" to reason), dir) if (scrubbed) File(dir, COMPLETE_MARKER).writeText("collected: $reason at ${now()}\n") @@ -594,6 +595,10 @@ object SessionArtifacts { if (!crashLog.exists()) { SessionLogCapture.dumpCrashBuffer(crashLog) } + val memoryLog = File(dir, "memory-pressure.log") + if (newest && !memoryLog.exists()) { + SessionLogCapture.dumpMemoryPressure(memoryLog) + } if (stopWhenSessionStarts && SessionState.running) { record.failed = true record.deferred = true diff --git a/docs/development/low-memory.md b/docs/development/low-memory.md index 4b8e9b459e..81055ff0b1 100644 --- a/docs/development/low-memory.md +++ b/docs/development/low-memory.md @@ -9,8 +9,10 @@ Every five seconds the monitor reads `MemAvailable`, swap headroom and memory PS headroom means less than one fifth of total RAM (bounded to 512–1536 MiB), or at least 1% `some avg10` memory stall with less than one third of RAM available. Pressure requests target only the launcher processes already recognized by the monitor, never the game. They require -at least 128 MiB launcher RSS and enough free swap to cover its entire RSS while leaving -one fifth of swap (at least 256 MiB) free. The regular automatic client request uses the +at least 128 MiB launcher RSS and enough free swap to cover its anonymous RSS while leaving +one fifth of swap (at least 256 MiB) free. File-backed resident pages do not consume this +budget: the page-out helper targets private anonymous mappings. If `RssAnon` is absent from a +process's status, its full RSS is used instead. The regular automatic client request uses the same swap guard. An explicit session RAM cap retains its existing behavior. Pressure requests are at least 30 seconds apart. Reclaiming less than 16 MiB doubles the @@ -41,27 +43,32 @@ reduced aggregate launcher RSS only from 263 to 255 MiB and backed off. Thus lau does not resolve this load failure, and this run did not exhaust swap. The unevictable/shmem growth needs allocation attribution before treating it as a driver or GPU-memory diagnosis. -## Low-RAM devices: compressing idle game memory +## Pressure reclaim: compressing idle game memory -On devices with at most 13 GiB `MemTotal` (every 12 GB phone and handheld and below), the -monitor also compresses the game session itself when memory runs out. The trigger is absolute -headroom, not a percentage: Android's `lmkd` killed a session on a 7.5 GiB device with +The monitor also compresses the game session itself when observed pressure approaches the +system kill boundary. There is no RAM-size gate. The trigger is absolute real headroom, not a +percentage: Android's `lmkd` killed a session on a 7.5 GiB device with 490 MiB still available, so a 95% used threshold (about 400 MiB left on 8 GB) is already past the kill. A world load added 1 GiB of GPU memory in about ten seconds, and compressing 1.4 GiB took 2.6 seconds, so the request has to leave room for both. -The session request runs when available memory falls below a quarter of RAM (bounded to -768–2560 MiB, 1.85 GiB on an 8 GB device), or below one and a half times that with at least 1% -`some avg10` memory stall. One request pages out every session process that loaded -`libblsession.so`: the game, Wine and its services, plus the launcher processes unless their -compression is turned off, under a single wait. It runs before the launcher-only check, which -can wait up to 12 seconds for acknowledgements. While a game runs and available memory is under -twice that level, memory is read every second instead of every five. Requests are at least 30 seconds apart and need the same swap reserve as launcher -requests. When the session has read back more than half of what the previous request compressed, -that memory is in use: the request is skipped and the wait doubles, up to five minutes. A -request whose memory stayed compressed resets it to 30 seconds. Below half the headroom the -wait is ignored and only the 30-second spacing applies. The state resets when the game exits. Devices above 13 GiB keep the -launcher-only behaviour. +The session request runs when real headroom falls below a quarter of RAM (bounded to +768–2560 MiB), or below one and a half times that with at least 1% `some` or `full avg10` +memory stall. Real headroom subtracts positive growth in KGSL allocation, `Unevictable`, and +`Shmem` from `MemAvailable`; a rapid fall also qualifies near twice the headroom. The monitor +may first request page-out of idle Steam and hidden launchers, subject to the Performance +setting and client reclaim limits. When both qualify, both requests are sent before waiting +for either to complete, so a slow launcher acknowledgement does not delay the game request. Until the client +request finishes, its anonymous RSS remains reserved from the session's swap budget. Completion +and backoff are measured against the processes that received each request, even if a later scan +finds different processes. The session request targets processes that loaded +`libblsession.so`: the game, Wine and its services, and excludes Steam and hidden launchers. +Requests are at least 30 seconds apart and need the same +swap reserve as launcher requests. When the session has read back more than half of what the +previous request compressed, that memory is in use: the request is skipped and the wait doubles, +up to five minutes. A request whose memory stayed compressed resets it to 30 seconds. Below half +the headroom the wait is ignored and only the 30-second spacing applies. The state resets when +the game exits. Measured on a Retroid Pocket Duo (7.5 GiB, kernel 6.6, 6 GiB lzo-rle zram plus a 4 GiB swap file) entering the world in World of Warcraft: Forever, one run each: @@ -91,7 +98,8 @@ A second run on that build showed the trigger arriving too late: character selec there. During the load, available memory crossed the headroom 9 seconds after Enter World, but the launcher check ran first and waited 12 seconds for acknowledgements; the game request started at 21 seconds, moved about 200 MiB, and `lmkd` ended the session at 30 seconds. The quarter-of-RAM -level and the game-first single request address both. +level starts reclaim earlier. Sending both requests before waiting removes the launcher +acknowledgement delay; it does not guarantee that reclaim can keep up with every loading peak. Without root an app cannot write its memory cgroup's `memory.reclaim` (owned by `system`), `process_madvise` on another process returns `EPERM`, `PAGEMAP_SCAN` is absent before Linux 6.7, diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index df27767405..9ec12398f4 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -811,19 +811,30 @@ case $mode in fi } bl_zram_usage() { - local _p _k _v _u _rss=0 _swap=0 + local _p _k _v _u _resident _anonymous _rss=0 _anon=0 _swap=0 for _p in "$@"; do + _resident=0 _anonymous=-1 while read -r _k _v _u; do - case $_k in VmRSS:) _rss=$((_rss + _v)) ;; VmSwap:) _swap=$((_swap + _v)) ;; esac + case $_v in ''|*[!0-9]*) continue ;; esac + case $_k in + VmRSS:) _resident=$_v ;; + RssAnon:) _anonymous=$_v ;; + VmSwap:) _swap=$((_swap + _v)) ;; + esac done 2>/dev/null < "/proc/$_p/status" + [ "$_anonymous" -ge 0 ] || _anonymous=$_resident + _rss=$((_rss + _resident)) _anon=$((_anon + _anonymous)) done - _bl_rss=$_rss + _bl_rss=$_rss _bl_anon=$_anon _bl_swap=$_swap echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" } bl_memory_read() { - local _k _v _u _kind _fields _avg - _bl_mem_total=0 _bl_available=-1 _bl_swap_total=0 _bl_swap_free=-1 _bl_psi=0 + local _k _v _u _kind _fields _avg _whole _frac _gpu_bytes _growth _saved_growth _saved_fall + _saved_growth=${_bl_preserved_growth:-0} _saved_fall=${_bl_preserved_fall:-0} + _bl_preserved_growth=0 _bl_preserved_fall=0 + _bl_mem_total=0 _bl_available=-1 _bl_swap_total=0 _bl_swap_free=-1 + _bl_psi_some=0 _bl_psi_full=0 _bl_gpu=0 _bl_unevictable=0 _bl_shmem=0 while read -r _k _v _u; do case $_v in ''|*[!0-9]*) continue ;; esac case $_k in @@ -831,15 +842,50 @@ case $mode in MemAvailable:) _bl_available=$_v ;; SwapTotal:) _bl_swap_total=$_v ;; SwapFree:) _bl_swap_free=$_v ;; + Unevictable:) _bl_unevictable=$_v ;; + Shmem:) _bl_shmem=$_v ;; esac done 2>/dev/null < /proc/meminfo if [ -r /proc/pressure/memory ]; then while read -r _kind _fields; do - [ "$_kind" = some ] || continue - _avg=${_fields#avg10=} _avg=${_avg%% *} _avg=${_avg%%.*} - case $_avg in ''|*[!0-9]*) ;; *) _bl_psi=$((10#$_avg)) ;; esac + [ "$_kind" = some ] || [ "$_kind" = full ] || continue + _avg=${_fields#avg10=} _avg=${_avg%% *} + _whole=${_avg%%.*} _frac=${_avg#*.} + [ "$_frac" = "$_avg" ] && _frac=00 + _frac=${_frac}00 + _frac=${_frac:0:2} + case $_whole$_frac in ''|*[!0-9]*) continue ;; esac + if [ "$_kind" = some ]; then + _bl_psi_some=$((10#$_whole * 100 + 10#$_frac)) + else + _bl_psi_full=$((10#$_whole * 100 + 10#$_frac)) + fi done 2>/dev/null < /proc/pressure/memory fi + if [ -r /sys/class/kgsl/kgsl/page_alloc ]; then + read -r _gpu_bytes _u < /sys/class/kgsl/kgsl/page_alloc + case $_gpu_bytes in ''|*[!0-9]*) _gpu_bytes=0 ;; esac + _bl_gpu=$((_gpu_bytes / 1024)) + fi + _bl_psi=$_bl_psi_some + [ "$_bl_psi_full" -gt "$_bl_psi" ] && _bl_psi=$_bl_psi_full + if [ "${_bl_sample_at:-}" = "" ]; then + _bl_growth=0 _bl_fall=0 + _bl_sample_at=$SECONDS _bl_sample_available=$_bl_available _bl_sample_gpu=$_bl_gpu + _bl_sample_unevictable=$_bl_unevictable _bl_sample_shmem=$_bl_shmem + elif [ "$SECONDS" -gt "$_bl_sample_at" ]; then + _bl_growth=0 _bl_fall=0 + _growth=$((_bl_gpu - _bl_sample_gpu)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) + _growth=$((_bl_unevictable - _bl_sample_unevictable)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) + _growth=$((_bl_shmem - _bl_sample_shmem)); [ "$_growth" -gt 0 ] && _bl_growth=$((_bl_growth + _growth)) + _bl_fall=$((_bl_sample_available - _bl_available)) + [ "$_saved_growth" -gt "$_bl_growth" ] && _bl_growth=$_saved_growth + [ "$_saved_fall" -gt "$_bl_fall" ] && _bl_fall=$_saved_fall + _bl_sample_at=$SECONDS _bl_sample_available=$_bl_available _bl_sample_gpu=$_bl_gpu + _bl_sample_unevictable=$_bl_unevictable _bl_sample_shmem=$_bl_shmem + fi + _bl_real_available=$_bl_available + [ "$_bl_real_available" -ge 0 ] && _bl_real_available=$((_bl_real_available - _bl_growth)) _bl_headroom=$((_bl_mem_total / 5)) [ "$_bl_headroom" -ge $((512 * 1024)) ] || _bl_headroom=$((512 * 1024)) [ "$_bl_headroom" -le $((1536 * 1024)) ] || _bl_headroom=$((1536 * 1024)) @@ -851,25 +897,29 @@ case $mode in } bl_memory_tight() { [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_available" -ge 0 ] && - { [ "$_bl_available" -lt "$_bl_headroom" ] || - { [ "$_bl_psi" -ge 1 ] && [ "$_bl_available" -lt $((_bl_mem_total / 3)) ]; }; } + { [ "$_bl_real_available" -lt "$_bl_headroom" ] || + { [ "$_bl_psi" -ge 100 ] && [ "$_bl_real_available" -lt $((_bl_mem_total / 3)) ]; } || + { [ "$_bl_fall" -ge $((256 * 1024)) ] && [ "$_bl_real_available" -lt $((_bl_headroom * 2)) ]; }; } } bl_client_can_pageout() { bl_memory_read bl_zram_usage "${_bl_pids[@]}" > /dev/null - [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_swap_total" -gt 0 ] && - [ $((_bl_swap_free - _bl_rss)) -ge "$_bl_swap_reserve" ] + [ "$_bl_mem_total" -gt 0 ] && bl_zram_has_room + } + bl_zram_has_room() { + [ "$_bl_swap_total" -gt 0 ] && + [ $((_bl_swap_free - _bl_anon - ${_bl_client_reserve:-0})) -ge "$_bl_swap_reserve" ] } bl_client_can_readback() { bl_memory_read bl_zram_usage "${_bl_pids[@]}" > /dev/null - [ "$_bl_mem_total" -gt 0 ] && ! bl_memory_tight && - [ "$_bl_available" -ge $((_bl_swap * 2)) ] && - [ $((_bl_available - _bl_swap)) -ge "$_bl_headroom" ] + [ "$_bl_mem_total" -gt 0 ] && ! bl_memory_tight && ! bl_memory_critical && + [ "$_bl_real_available" -ge $((_bl_swap * 2)) ] && + [ $((_bl_real_available - _bl_swap)) -ge "$_bl_headroom" ] } bl_client_pressure() { [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ "$_bl_game" = 1 ] && - [ "${#_bl_pids[@]}" -gt 0 ] && bl_memory_tight || return 0 + [ "${#_bl_pids[@]}" -gt 0 ] && { bl_memory_tight || bl_memory_critical; } || return 0 [ "$_bl_pressure_at" -lt 0 ] || [ $((SECONDS - _bl_pressure_at)) -ge "$_bl_pressure_backoff" ] || return 0 [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 30 ] || return 0 @@ -879,12 +929,29 @@ case $mode in return 0 fi [ "$_bl_rss" -ge $((128 * 1024)) ] || return 0 - local _before=$_bl_rss - bl_zram_send 1 "memory pressure, compressing the client (available $((_bl_available / 1024)) MB, swap free $((_bl_swap_free / 1024)) MB)" client + _bl_pressure_before=$_bl_rss + if [ "${1:-}" = defer ]; then + _bl_client_reserve=$_bl_anon + _bl_client_pending=1 + fi + bl_zram_send 1 "memory pressure, compressing the client (available $((_bl_available / 1024)) MB, swap free $((_bl_swap_free / 1024)) MB)" client "${1:-}" _bl_packed=$SECONDS + if [ "${1:-}" = defer ]; then + _bl_client_targets=("${_bl_zram_targets[@]}") + else + bl_client_pressure_result + fi + } + bl_client_pressure_finish() { + [ "${_bl_client_pending:-0}" = 1 ] || return 0 + bl_zram_finish 1 "${_bl_client_targets[@]}" + bl_client_pressure_result "${_bl_client_targets[@]}" + _bl_client_pending=0 _bl_client_reserve=0 _bl_client_targets=() + } + bl_client_pressure_result() { [ "${_bl_pageout_complete:-0}" = 1 ] || return 0 - bl_zram_usage "${_bl_pids[@]}" > /dev/null - if [ $((_before - _bl_rss)) -lt $((16 * 1024)) ]; then + if [ "$#" -gt 0 ]; then bl_zram_usage "$@" > /dev/null; else bl_zram_usage "${_bl_pids[@]}" > /dev/null; fi + if [ $((_bl_pressure_before - _bl_rss)) -lt $((16 * 1024)) ]; then _bl_pressure_backoff=$((_bl_pressure_backoff * 2 > 300 ? 300 : _bl_pressure_backoff * 2)) else _bl_pressure_backoff=30 @@ -892,15 +959,13 @@ case $mode in } bl_memory_critical() { [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_available" -ge 0 ] && - { [ "$_bl_available" -lt "$_bl_tier_headroom" ] || - { [ "$_bl_psi" -ge 1 ] && [ "$_bl_available" -lt $((_bl_tier_headroom * 3 / 2)) ]; }; } - } - bl_low_ram() { - [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_mem_total" -le $((13 * 1024 * 1024)) ] + { [ "$_bl_real_available" -lt "$_bl_tier_headroom" ] || + { [ "$_bl_psi" -ge 100 ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 3 / 2)) ]; } || + { [ "$_bl_fall" -ge $((256 * 1024)) ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 2)) ]; }; } } bl_session_pressure() { bl_memory_read - [ "$_bl_game" = 1 ] && bl_low_ram && bl_memory_critical || return 0 + [ "$_bl_game" = 1 ] && bl_memory_critical || return 0 local _wait=$_bl_tier_backoff _before _pids _targets [ "$_bl_available" -ge $((_bl_headroom / 2)) ] || [ "$_bl_tier_pushed" -lt 0 ] || _wait=30 [ "$_bl_tier_at" -lt 0 ] || [ $((SECONDS - _bl_tier_at)) -ge "$_wait" ] || return 0 @@ -916,21 +981,18 @@ case $mode in fi fi _bl_tier_at=$SECONDS _bl_tier_pushed=0 - bl_zram_pick game + bl_zram_pick session bl_zram_usage "${_pids[@]}" > /dev/null [ "$_bl_rss" -ge $((256 * 1024)) ] || return 0 - if [ "$_bl_swap_total" -le 0 ] || [ $((_bl_swap_free - _bl_rss)) -lt "$_bl_swap_reserve" ]; then + if ! bl_zram_has_room; then step "zRAM: low-memory page-out skipped, swap headroom too small ($((_bl_swap_free / 1024)) MB free)" return 0 fi _targets=("${_pids[@]}") _before=$_bl_swap - bl_zram_send 1 "low memory (available $((_bl_available / 1024)) MB), compressing idle game memory" game + bl_zram_send 1 "low memory (available $((_bl_real_available / 1024)) MB), compressing idle game memory" session bl_zram_usage "${_targets[@]}" > /dev/null _bl_tier_pushed=$((_bl_swap - _before)) bl_tier_note "${_targets[@]}" - if [ "${_bl_pageout_complete:-0}" = 1 ] && [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ "${#_bl_pids[@]}" -gt 0 ]; then - _bl_pressure_at=$SECONDS _bl_packed=$SECONDS - fi } bl_proc_start() { local _s= @@ -961,7 +1023,7 @@ case $mode in } bl_watch_nap() { local _i - if [ "$_bl_game" = 1 ] && bl_low_ram && [ "$_bl_available" -ge 0 ] && [ "$_bl_available" -lt $((_bl_tier_headroom * 2)) ]; then + if [ "$_bl_game" = 1 ] && [ "$_bl_available" -ge 0 ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 2)) ]; then for _i in 1 2 3 4 5; do nap 1 bl_memory_read @@ -1017,10 +1079,16 @@ case $mode in for _p in "${_pids[@]}"; do rm -f "/tmp/.bl-zram.ack.$_p"; done printf '%s' "$_mode" > /tmp/.bl-zram [ "${#_pids[@]}" = 0 ] || kill -URG "${_pids[@]}" 2>/dev/null - if [ "$_mode" = 1 ]; then bl_zram_wait "${_pids[@]}"; else nap 5; fi + _bl_zram_targets=("${_pids[@]}") + [ "${4:-}" != defer ] || return 0 + bl_zram_finish "$_mode" "${_pids[@]}" + } + bl_zram_finish() { + local _mode=$1 + shift + if [ "$_mode" = 1 ]; then bl_zram_wait "$@"; else nap 5; fi bl_zram_scan - bl_zram_pick "$_which" - step "zRAM: done ($(bl_zram_usage "${_pids[@]}"))" + step "zRAM: done ($(bl_zram_usage "$@"))" } bl_game_focused() { if [ "${BL_DESKTOP:-}" = 1 ] || [ -z "${BL_LAUNCH_DIR:-}" ]; then @@ -1047,6 +1115,8 @@ case $mode in } _bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 _bl_pressure_at=-1 _bl_pressure_backoff=30 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 _bl_tier_back=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() + _bl_client_pending=0 _bl_client_reserve=0 _bl_client_targets=() + _bl_sample_at= _bl_sample_available=0 _bl_sample_gpu=0 _bl_sample_unevictable=0 _bl_sample_shmem=0 while kill -0 $$ 2>/dev/null; do bl_zram_scan bl_memory_read @@ -1073,8 +1143,11 @@ case $mode in _bl_backoff=30 fi fi + _bl_preserved_growth=$_bl_growth _bl_preserved_fall=$_bl_fall + bl_client_pressure defer + _bl_preserved_growth=$_bl_growth _bl_preserved_fall=$_bl_fall bl_session_pressure - bl_client_pressure + bl_client_pressure_finish if [ "$_bl_game" = 1 ] && bl_game_focused; then if [ "$_bl_since" -lt 0 ] || [ "$_bl_since_apps" != "$_bl_apps" ]; then _bl_since=$SECONDS _bl_since_apps=$_bl_apps diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index 5cd7d3cd4a..db2d3f80e1 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -121,6 +121,7 @@ step() { :; } bl_zram_scan() { :; } bl_memory_read() { :; } bl_client_pressure() { :; } +bl_client_pressure_finish() { :; } bl_session_pressure() { :; } bl_client_can_pageout() { return 0; } bl_client_can_readback() { [ "${readback:-1}" = 1 ]; } diff --git a/tools/tests/test_memory_pressure.py b/tools/tests/test_memory_pressure.py index 13f9e2f8d3..01c32c3f82 100644 --- a/tools/tests/test_memory_pressure.py +++ b/tools/tests/test_memory_pressure.py @@ -2,7 +2,7 @@ from pathlib import Path import tempfile import unittest -from tools.tests.test_client_zram_focus import function_source, run_bash +from tools.tests.test_client_zram_focus import SCRIPT, function_source, run_bash class MemoryPressureTest(unittest.TestCase): @@ -20,8 +20,8 @@ class MemoryPressureTest(unittest.TestCase): def run_policy(self, body): functions = '\n'.join(function_source(name) for name in ( - 'bl_memory_read', 'bl_memory_tight', 'bl_client_can_pageout', - 'bl_client_can_readback', 'bl_client_pressure')) + 'bl_memory_read', 'bl_memory_tight', 'bl_memory_critical', 'bl_client_can_pageout', + 'bl_client_can_readback', 'bl_client_pressure', 'bl_client_pressure_result', 'bl_zram_has_room')) functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) harness = ''' @@ -29,7 +29,7 @@ set -u _bl_pids=(123) _bl_game=1 _bl_packed=-1 _bl_pressure_at=-1 _bl_pressure_backoff=30 rss=$((384 * 1024)) client_swap=$((512 * 1024)) reclaimed=$((128 * 1024)) step() { :; } -bl_zram_usage() { _bl_rss=$rss _bl_swap=$client_swap; } +bl_zram_usage() { _bl_rss=$rss _bl_anon=${anon:-$rss} _bl_swap=$client_swap; } bl_zram_send() { echo "send:$1:$3"; rss=$((rss - reclaimed)); _bl_pageout_complete=${pageout_complete:-1}; } ''' + functions + '\nbl_memory_read\n' + body result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) @@ -80,6 +80,13 @@ if bl_client_can_readback; then echo yes; else echo no; fi self.assertEqual(['no'], self.run_policy(''' bl_client_pressure if bl_client_can_pageout; then echo yes; else echo no; fi +''')) + + def test_client_swap_budget_excludes_file_backed_memory(self): + self.memory(swap_free=1536) + self.assertEqual(['send:1:client'], self.run_policy(''' +rss=$((2048 * 1024)) anon=$((256 * 1024)) +bl_client_pressure ''')) def test_without_swap_automatic_pageout_is_disabled(self): @@ -152,20 +159,20 @@ class SessionPressureTest(unittest.TestCase): def run_policy(self, body): functions = '\n'.join(function_source(name) for name in ( - 'bl_memory_read', 'bl_memory_tight', 'bl_memory_critical', 'bl_low_ram', - 'bl_session_pressure', 'bl_watch_nap', 'bl_zram_pick', 'bl_tier_note', 'bl_tier_readback')) + 'bl_memory_read', 'bl_memory_tight', 'bl_memory_critical', + 'bl_session_pressure', 'bl_zram_has_room', 'bl_watch_nap', 'bl_zram_pick', 'bl_tier_note', 'bl_tier_readback')) functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) harness = ''' set -u _bl_game=1 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 _bl_tier_back=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() _bl_pids=(999) _bl_pressure_at=-1 _bl_packed=-1 -rss=$((1536 * 1024)) swap=0 pushed=$((1024 * 1024)) alive=999 started=100 complete=1 +rss=$((1536 * 1024)) swap=0 pushed=$((1024 * 1024)) alive="999 321 654" started=100 complete=1 step() { :; } bl_proc_start() { _bl_start=; case " $alive " in *" $1 "*) _bl_start=$started; return 0 ;; esac; return 1; } nap() { echo "nap:$1"; } bl_session_others() { _bl_session=(321 654); } -bl_zram_usage() { _bl_rss=$rss _bl_swap=$swap; } +bl_zram_usage() { _bl_rss=$rss _bl_anon=${anon:-$rss} _bl_swap=$swap; } bl_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed)); _bl_pageout_complete=$complete; } ''' + functions + '\nbl_memory_read\n' + body result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) @@ -174,19 +181,27 @@ bl_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed return result.stdout.splitlines() def test_low_headroom_compresses_the_game_session_at_most_every_30_seconds(self): - self.assertEqual(['send:1:game', 'send:1:game'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' SECONDS=0; bl_session_pressure SECONDS=10; bl_session_pressure SECONDS=29; bl_session_pressure SECONDS=30; bl_session_pressure ''')) - def test_twelve_gigabyte_devices_are_included_and_larger_ones_are_not(self): - for total, expected in ((11264, ['send:1:game']), (12288, ['send:1:game']), (15360, [])): + def test_pressure_policy_is_independent_of_ram_size(self): + for total, expected in ((11264, ['send:1:session']), (12288, ['send:1:session']), (16384, ['send:1:session'])): with self.subTest(total=total): self.memory(total=total) self.assertEqual(expected, self.run_policy('bl_session_pressure')) + def test_large_device_with_real_headroom_does_not_reclaim(self): + self.memory(total=16384, available=5120, psi='12.34') + self.assertEqual([], self.run_policy('bl_session_pressure')) + + def test_large_device_with_psi_and_moderate_headroom_reclaims(self): + self.memory(total=16384, available=3072, psi='1.23') + self.assertEqual(['send:1:session'], self.run_policy('bl_session_pressure')) + def test_no_game_does_not_compress_the_session(self): self.assertEqual([], self.run_policy('_bl_game=0; bl_session_pressure')) @@ -196,15 +211,26 @@ SECONDS=30; bl_session_pressure def test_stalls_with_moderate_headroom_compress_before_the_hard_limit(self): self.memory(available=2048, psi='1.50') - self.assertEqual(['send:1:game'], self.run_policy('bl_session_pressure')) + self.assertEqual(['send:1:session'], self.run_policy('bl_session_pressure')) def test_moderate_headroom_without_stalls_waits(self): self.memory(available=2048) self.assertEqual([], self.run_policy('bl_session_pressure')) + def test_same_second_memory_read_preserves_the_pressure_baseline(self): + self.memory(available=2048) + meminfo = self.root / 'meminfo' + self.assertEqual(['1048576:524288:2097152'], self.run_policy(f''' +SECONDS=100 +_bl_sample_at=100 _bl_sample_available=2097152 _bl_growth=0 _bl_fall=524288 +sed -i 's/MemAvailable: 2097152 kB/MemAvailable: 1048576 kB/' {meminfo} +bl_memory_read +echo "$_bl_available:$_bl_fall:$_bl_sample_available" +''')) + def test_game_reading_back_most_of_a_pageout_skips_and_doubles_the_wait(self): - self.assertEqual(['send:1:game', 'backoff:60', 'send:1:game', 'backoff:60', - 'send:1:game', 'backoff:30'], self.run_policy(''' + self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:60', + 'send:1:session', 'backoff:30'], self.run_policy(''' pushed=$((512 * 1024)) SECONDS=0; bl_session_pressure swap=$((swap / 4)) @@ -226,7 +252,7 @@ echo "backoff:$_bl_tier_backoff" def test_nearly_out_of_memory_ignores_the_backoff_but_keeps_30_seconds(self): self.memory(available=512) - self.assertEqual(['send:1:game', 'send:1:game'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' _bl_tier_backoff=300 SECONDS=0; bl_session_pressure SECONDS=20; bl_session_pressure @@ -235,7 +261,7 @@ SECONDS=30; bl_session_pressure def test_nearly_out_of_memory_still_backs_off_when_the_game_reads_its_pageout_back(self): self.memory(available=512) - self.assertEqual(['send:1:game', 'backoff:60', 'send:1:game'], self.run_policy(''' + self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session'], self.run_policy(''' SECONDS=0; bl_session_pressure swap=0 SECONDS=30; bl_session_pressure @@ -247,7 +273,7 @@ SECONDS=90; bl_session_pressure def test_nearly_out_of_memory_retries_a_skipped_pageout_after_30_seconds(self): self.memory(available=512) - self.assertEqual(['send:1:game', 'send:1:game'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' SECONDS=0; bl_session_pressure swap=0 SECONDS=30; bl_session_pressure @@ -263,6 +289,24 @@ SECONDS=360; bl_session_pressure self.memory(swap_free=1536, swap_total=2048) self.assertEqual([], self.run_policy('bl_session_pressure')) + def test_file_backed_resident_memory_does_not_consume_the_swap_budget(self): + self.memory(swap_free=3088, swap_total=6144) + self.assertEqual(['send:1:session'], self.run_policy(''' +rss=$((4096 * 1024)) anon=$((1024 * 1024)) +bl_session_pressure +''')) + + def test_anonymous_memory_and_pending_client_still_need_the_full_swap_reserve(self): + self.memory(swap_free=3088, swap_total=6144) + self.assertEqual([], self.run_policy(''' +rss=$((4096 * 1024)) anon=$((2048 * 1024)) +bl_session_pressure +''')) + self.assertEqual([], self.run_policy(''' +rss=$((4096 * 1024)) anon=$((1536 * 1024)) _bl_client_reserve=$((512 * 1024)) +bl_session_pressure +''')) + def test_small_session_is_left_alone(self): self.assertEqual([], self.run_policy('rss=$((128 * 1024)); bl_session_pressure')) @@ -275,10 +319,10 @@ SECONDS=360; bl_session_pressure self.assertEqual(['nap:5'], self.run_policy('bl_watch_nap')) self.assertEqual(['nap:5'], self.run_policy('_bl_game=0; bl_watch_nap')) - def test_one_push_compresses_the_game_and_the_launcher_and_restarts_the_launcher_wait(self): - self.assertEqual(['send:1:game', 'pids:321 654 999', 'client:0:0'], self.run_policy(''' + def test_session_push_preserves_client_timestamps(self): + self.assertEqual(['send:1:session', 'pids:321 654', 'client:-1:-1'], self.run_policy(''' SECONDS=0; bl_session_pressure -bl_zram_pick game; echo "pids:${_pids[*]}" +bl_zram_pick session; echo "pids:${_pids[*]}" echo "client:$_bl_pressure_at:$_bl_packed" ''')) @@ -286,19 +330,19 @@ echo "client:$_bl_pressure_at:$_bl_packed" self.assertEqual(['pids:321 654', 'client:-1:-1'], self.run_policy(''' BL_ZRAM_CLIENT=0 SECONDS=0; bl_session_pressure -bl_zram_pick game; echo "pids:${_pids[*]}" +bl_zram_pick session; echo "pids:${_pids[*]}" echo "client:$_bl_pressure_at:$_bl_packed" ''')[1:]) def test_low_ram_devices_compress_with_a_quarter_of_memory_left(self): self.memory(available=1700) - self.assertEqual(['send:1:game'], self.run_policy('bl_session_pressure')) + self.assertEqual(['send:1:session'], self.run_policy('bl_session_pressure')) self.memory(available=1900) self.assertEqual([], self.run_policy('bl_session_pressure')) def test_a_compressed_process_that_exits_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:game', 'send:1:game', 'backoff:30'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' SECONDS=0; bl_session_pressure alive=""; swap=0 SECONDS=30; bl_session_pressure @@ -306,7 +350,7 @@ echo "backoff:$_bl_tier_backoff" ''')) def test_a_process_that_starts_after_a_pageout_is_not_in_its_read_back(self): - self.assertEqual(['send:1:game', 'targets:999', 'send:1:game', 'backoff:30'], self.run_policy(''' + self.assertEqual(['send:1:session', 'targets:321 654', 'send:1:session', 'backoff:30'], self.run_policy(''' SECONDS=0; bl_session_pressure echo "targets:${_bl_tier_targets[*]}" alive="999 1234" @@ -315,7 +359,7 @@ echo "backoff:$_bl_tier_backoff" ''')) def test_an_incomplete_pageout_does_not_restart_the_launcher_wait(self): - self.assertEqual(['send:1:game', 'client:-1:-1'], self.run_policy(''' + self.assertEqual(['send:1:session', 'client:-1:-1'], self.run_policy(''' complete=0 SECONDS=0; bl_session_pressure echo "client:$_bl_pressure_at:$_bl_packed" @@ -323,7 +367,7 @@ echo "client:$_bl_pressure_at:$_bl_packed" def test_a_reused_process_id_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:game', 'send:1:game', 'backoff:30'], self.run_policy(''' + self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' SECONDS=0; bl_session_pressure started=200; swap=0 SECONDS=30; bl_session_pressure @@ -344,5 +388,112 @@ echo "backoff:$_bl_tier_backoff" self.assertEqual(['gone'], result.stdout.split()) +class ReclaimDispatchTest(unittest.TestCase): + def run_cycle(self, client=1, game=1, anonymous=384, complete=1, reclaimed=128, body=None, available=1024, fall=0, tick=0): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + (root / 'meminfo').write_text( + f'MemTotal: 7340032 kB\nMemAvailable: {available * 1024} kB\n' + 'SwapTotal: 6291456 kB\nSwapFree: 4194304 kB\n') + (root / 'pressure').write_text('some avg10=0.00 avg60=0.00 avg300=0.00 total=0\n') + names = ('bl_memory_read', 'bl_memory_tight', 'bl_memory_critical', + 'bl_zram_has_room', 'bl_client_can_pageout', 'bl_client_pressure', + 'bl_client_pressure_result', 'bl_client_pressure_finish', + 'bl_session_pressure', 'bl_zram_send', 'bl_zram_finish', 'bl_zram_pick') + source = '\n'.join(function_source(name) for name in names) + source = source.replace('/proc/meminfo', str(root / 'meminfo')) + source = source.replace('/proc/pressure/memory', str(root / 'pressure')) + source = source.replace('/tmp/.bl-zram', str(root / 'ctl')) + monitor = SCRIPT.read_text() + start = monitor.index(' _bl_preserved_growth=$_bl_growth', monitor.index('while kill -0 $$')) + stop = monitor.index(' if [ "$_bl_game" = 1 ] && bl_game_focused', start) + cycle = monitor[start:stop] if body is None else body + script = f''' +set -u +BL_ZRAM_CLIENT={client} _bl_game={game} _bl_pids=(123) _bl_others=(321) +_bl_pressure_at=-1 _bl_pressure_backoff=30 _bl_packed=-1 +_bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 +_bl_client_reserve=0 client_rss=393216 client_anon={anonymous * 1024} +step() {{ :; }} +bl_session_others() {{ _bl_session=(321); }} +bl_zram_scan() {{ _bl_pids=(456); }} +nap() {{ echo "nap:$*:at:$NOW"; }} +bl_zram_usage() {{ + if [ "$1" = 123 ]; then + _bl_rss=$client_rss _bl_anon=$client_anon _bl_swap=0 + else + _bl_rss=3145728 _bl_anon=1572864 _bl_swap=0 + fi +}} +kill() {{ echo "signal:$*:at:$NOW"; NOW=$((NOW + {tick})); }} +bl_zram_wait() {{ + echo "wait:$*:at:$NOW" + NOW=$((NOW + 12)) + _bl_pageout_complete={complete} + [ "$1" != 123 ] || client_rss=$((client_rss - {reclaimed * 1024})) +}} +bl_tier_note() {{ :; }} +''' + source + f''' +bl_memory_read +_bl_fall={fall * 1024} +''' + cycle + ''' +echo "client:$_bl_pressure_backoff:${_bl_client_reserve:-0}:${_bl_client_pending:-0}" +''' + result = run_bash('NOW=0\n' + script.replace('SECONDS', 'NOW')) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + return result.stdout.splitlines() + + def test_both_requests_are_sent_before_either_wait(self): + self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', + 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], self.run_cycle()) + + def test_disabled_client_is_never_signalled_or_waited_for(self): + self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], + self.run_cycle(client=0)) + + def test_no_game_requests_nothing(self): + self.assertEqual(['client:30:0:0'], self.run_cycle(game=0)) + + def test_a_client_with_no_anonymous_pages_still_finishes_its_request(self): + self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', + 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], + self.run_cycle(anonymous=0)) + + def test_falling_headroom_survives_a_tick_between_requests(self): + self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:1', + 'wait:321:at:2', 'wait:123:at:14', 'client:30:0:0'], + self.run_cycle(available=2304, fall=512, tick=1)) + + def test_deferred_ineffective_reclaim_still_doubles_the_backoff(self): + self.assertEqual('client:60:0:0', self.run_cycle(reclaimed=0)[-1]) + + def test_deferred_incomplete_reclaim_does_not_double_the_backoff(self): + self.assertEqual('client:30:0:0', self.run_cycle(reclaimed=0, complete=0)[-1]) + + def test_explicit_combined_send_keeps_its_synchronous_wait(self): + self.assertEqual(['signal:-URG 321 123:at:0', 'wait:321 123:at:0', 'client:30:0:0'], + self.run_cycle(body='bl_zram_send 1 cap game\n')) + self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], + self.run_cycle(client=0, body='bl_zram_send 1 cap game\n')) + + def test_readback_keeps_its_synchronous_delay(self): + self.assertEqual(['signal:-URG 123:at:0', 'nap:5:at:0', 'client:30:0:0'], + self.run_cycle(body='bl_zram_send 0 readback client\n')) + + def test_usage_sums_anonymous_rss_and_falls_back_per_process(self): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + for pid, contents in ((123, 'VmRSS: 2000 kB\nRssAnon: 300 kB\nVmSwap: 100 kB\n'), + (321, 'VmRSS: 4000 kB\nVmSwap: 200 kB\n'), + (654, 'VmRSS: 1000 kB\nRssAnon: 0 kB\n')): + (root / str(pid)).mkdir() + (root / str(pid) / 'status').write_text(contents) + source = function_source('bl_zram_usage').replace('/proc/', str(root) + '/') + result = run_bash(source + '\nbl_zram_usage 123 321 654 > /dev/null; echo "$_bl_rss:$_bl_anon:$_bl_swap"') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('7000:4300:300', result.stdout.strip()) + + if __name__ == '__main__': unittest.main() From c8dec0a8bc4285d9cf9da59ad7a663f0e28e9400 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 10:02:46 -0500 Subject: [PATCH 044/101] fix(stores): EA and Ubisoft libraries list only games the account can download (#2521) * fix(stores): EA and Ubisoft libraries list only games the account can download * fix(stores): keep owned games through entitlement and manifest lookup failures --- .../droiddeck/launcher/stores/ea/EaLibrary.kt | 33 ++++++- .../launcher/stores/ubisoft/UbisoftBackend.kt | 92 +++++++++---------- .../droiddeck/launcher/stores/ea/EaTest.kt | 14 +++ .../launcher/stores/ubisoft/UbisoftTest.kt | 31 +++++-- 4 files changed, 106 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt index 2a90b2550c..37fd6269f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt @@ -69,8 +69,8 @@ data class EaGame( } object EaLibrary { - private const val KEY_CACHE = "library_cache" - private const val KEY_SYNCED_AT = "library_synced_at" + private const val KEY_CACHE = "library_cache_v2" + private const val KEY_SYNCED_AT = "library_synced_at_v2" private const val THROTTLE_MS = 6 * 60 * 60 * 1000L private const val ART_TTL_MS = 7 * 24 * 60 * 60 * 1000L private const val ART_THREADS = 4 @@ -137,6 +137,16 @@ object EaLibrary { }.sortedBy { it.first.name.lowercase() } } + /** + * Offers EA lists as owned whose entitlements grant no active game download: an online pass or product-key + * link such as Burnout Paradise's VALIDATED_ONLINE_ACCESS, or a Game Pass title disabled once the + * subscription lapsed. EA refuses their licence. Offers with no entitlement rows at all are left alone. + */ + internal fun withoutGameDownload(rows: List): Map> = + rows.groupBy { it.optString("productId") }.filterKeys { it.isNotEmpty() }.filterValues { offer -> + offer.none { it.optString("entitlementType").equals("ORIGIN_DOWNLOAD", true) && it.optString("status").equals("ACTIVE", true) } + } + private fun art(app: Context, token: String, slugs: Collection, gen: Int): Map { val prefs = EaPrefs.get(app) val now = System.currentTimeMillis() @@ -229,13 +239,28 @@ object EaLibrary { status(R.string.stores_sync_sign_in) val token = EaAuth.accessToken(app) ?: return problem(StoresState.notSignedInLine(store)) status(R.string.stores_sync_game_list) - val owned = withToken(app, token) { EaApi.owned(it) } + val listed = withToken(app, token) { EaApi.owned(it) } + val rows = try { + withToken(app, token) { EaApi.legacyEntitlements(it) } + } catch (e: Exception) { + if (e is EaApiException && e.status == 401) throw e + if (e !is EaApiException && e !is java.io.IOException) throw e + StoresState.logLine("ea: entitlements unavailable, keeping every owned product: ${e.message}") + emptyList() + } + val unplayable = withoutGameDownload(rows) + for ((id, held) in unplayable) if (listed.any { it.offerId == id }) StoresState.logLine( + "ea: left out $id, no game download: " + held.joinToString(",") { it.optString("entitlementTag") + "/" + it.optString("status") + "/" + it.optString("statusReasonCode") + "/" + it.optString("externalType") }) + val owned = listed.filterNot { it.offerId in unplayable } val offers = withToken(app, token) { EaApi.offers(it, owned.map { o -> o.offerId }) }.associateBy { it.offerId } val picked = pick(owned, offers) StoresState.logLine("ea: ${owned.size} owned products, ${picked.size} games") for ((o, offer) in picked) StoresState.logLine( "ea: owned ${o.offerId} content=${offer.contentId} master=${offer.masterTitleId} mp=${offer.multiplayerId} via=${o.ownership.joinToString("+")} type=${o.gameType}") - if (picked.isEmpty()) return problem(if (cache.isEmpty()) app.getString(R.string.stores_sync_no_games, store.label) else null) + if (picked.isEmpty()) { + if (owned.size < listed.size && storeCache(app, emptyList(), gen)) publish(app, emptyList(), gen) + return problem(app.getString(R.string.stores_sync_no_games, store.label).takeIf { cache.isEmpty() || owned.size < listed.size }) + } if (gen != generation.get()) return status(R.string.stores_sync_cover_art) val images = art(app, token, picked.map { it.first.slug }, gen) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt index 09008e1927..8a4b253135 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt @@ -48,11 +48,6 @@ object UbisoftBackend : StoreBackend { override fun install(context: Context, item: CatalogItem, root: java.io.File) { val app = context.applicationContext - item.extra[STEAM_APP]?.takeIf { item.extra["productId"] == null }?.let { steam -> - StoresState.logLine("Ubisoft: ${item.title} is owned on Steam; installing Steam app $steam") - installInSteam(app, steam) - return - } if (!UbisoftNative.ready()) { StoresState.logLine(UbisoftNative.ENGINE_MISSING) StoresState.post { StoresState.problems[store] = UbisoftNative.ENGINE_MISSING } @@ -65,19 +60,6 @@ object UbisoftBackend : StoreBackend { } override fun uninstall(context: Context, game: InstalledStoreGame) {} - - const val STEAM_APP = "steamAppId" - - /** Steam asks to install a game it does not have when told to run it. */ - private fun installInSteam(app: Context, steamAppId: String) { - if (com.droiddeck.launcher.session.SessionState.running) { - if (!com.droiddeck.launcher.session.SessionService.launchGame(app, steamAppId)) StoresState.logLine("Ubisoft: Steam is busy; install Steam app $steamAppId there") - return - } - app.startActivity(Intent(app, com.droiddeck.launcher.SessionActivity::class.java) - .putExtra(com.droiddeck.launcher.session.SessionService.EXTRA_STEAM_URL, com.droiddeck.launcher.frontend.GameLaunchLink.steamUrl(steamAppId)) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) - } } internal class UbisoftLogin(override val userAgent: String) : StoreLoginActivity.Flow { @@ -134,11 +116,20 @@ object UbisoftLibrary { return items to games.optInt("totalCount", items.size) } - /** Base games with a manifest, by UbiServices space; add-ons and bundles share spaces with their game. */ + private val THIRD_PARTY = Regex("""^\s*third_party_platform:\s*\r?\n\s+name:\s*['"]?([^'"\r\n]+?)['"]?\s*$""", RegexOption.MULTILINE) + + /** The store a product's configuration says delivers it, such as Steam, when not Ubisoft itself. */ + internal fun thirdParty(configuration: String): String? = THIRD_PARTY.find(configuration)?.groupValues?.get(1)?.trim()?.takeIf { it.isNotEmpty() } + + /** + * Owned base games Ubisoft delivers itself, by UbiServices space; add-ons and bundles share spaces with their + * game. A game whose manifest Ubisoft did not send stays: the manifest only names the build to download. + */ internal fun ownedBySpace(owned: JSONObject?): Map { val list = owned?.optJSONArray("games") ?: return emptyMap() val games = (0 until list.length()).mapNotNull { list.optJSONObject(it) } - .filter { it.optString("manifest").isNotEmpty() && it.optInt("productType") == 0 && it.optBoolean("owned", true) } + .filter { it.optInt("productType") == 0 && it.optBoolean("owned", true) && thirdParty(it.optString("configuration")) == null } + .sortedByDescending { it.optString("manifest").isNotEmpty() } val out = LinkedHashMap() for (key in listOf("spaceId")) for (g in games) { val space = g.optString(key).takeIf { it.isNotEmpty() } ?: continue @@ -147,19 +138,30 @@ object UbisoftLibrary { return out } - private val STEAM_ID = Regex("""^\s*steam_app_id:\s*['"]?(\d+)""", RegexOption.MULTILINE) - private val THIRD_PARTY = Regex("""^\s*third_party_platform:\s*\r?\n\s+name:\s*['"]?Steam\b""", setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE)) + private fun download(o: JSONObject) = listOfNotNull( + "productId" to o.optLong("productId").toString(), + o.optString("manifest").takeIf { it.isNotEmpty() }?.let { "manifest" to it }, + o.optString("appId").takeIf { it.isNotEmpty() }?.let { "appId" to it }, + executable(o.optString("configuration"))?.let { "exe" to it }, + ) - /** The Steam app of a product Ubisoft says is owned and installed through Steam. */ - internal fun steamApp(configuration: String): String? = - if (THIRD_PARTY.containsMatchIn(configuration)) STEAM_ID.find(configuration)?.groupValues?.get(1) else null - - /** Owned games Ubisoft delivers through Steam, by UbiServices space. */ - internal fun steamBySpace(owned: JSONObject?): Map { - val list = owned?.optJSONArray("games") ?: return emptyMap() - return (0 until list.length()).mapNotNull { list.optJSONObject(it) } - .filter { it.optInt("productType") == 0 && it.optBoolean("owned", true) && it.optString("spaceId").isNotEmpty() } - .mapNotNull { o -> steamApp(o.optString("configuration"))?.let { o.optString("spaceId") to it } }.toMap() + /** + * Games Connect owns and delivers itself. The profile's game list also names games only played through + * Ubisoft+, free weekends or another store; without an ownership answer that list is all there is. + */ + internal fun assemble(listed: List, owned: JSONObject?): List { + val known = owned?.optJSONArray("games") != null && owned.optString("error").isEmpty() + val bySpace = ownedBySpace(owned) + val matched = listed.map { g -> bySpace[g.id]?.let { g.copy(extra = g.extra + download(it)) } ?: g } + .filter { !known || it.extra["productId"] != null } + .let { games -> games.filter { g -> g.extra["productId"] == null || games.first { it.extra["productId"] == g.extra["productId"] } === g } } + .let { games -> games.filter { g -> g.extra["productId"] != null || games.none { it !== g && it.title == g.title && it.extra["productId"] != null } } } + val products = matched.mapNotNull { it.extra["productId"] }.toSet() + val unlisted = bySpace.filterKeys { space -> listed.none { it.id == space } }.filterValues { it.optLong("productId").toString() !in products }.mapNotNull { (space, o) -> + val title = title(o.optString("configuration")) ?: return@mapNotNull null + CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)) + } + return (matched + unlisted).sortedBy { it.title.lowercase() } } private val RELATIVE = Regex("""relative:\s*['"]?([^'"\r\n]+?)['"]?\s*$""", RegexOption.MULTILINE) @@ -205,29 +207,19 @@ object UbisoftLibrary { } val owned = UbisoftNative.call("owned", JSONObject().put("ticket", s.ticket).put("sessionId", s.sessionId)) owned?.optString("error")?.takeIf { it.isNotEmpty() }?.let { StoresState.logLine("Ubisoft: ownership: $it") } - val bySpace = ownedBySpace(owned) owned?.takeIf { it.optInt("manifestsAsked") > 0 }?.let { StoresState.logLine("Ubisoft: latest manifests: ${it.optInt("manifestsFound")} of ${it.optInt("manifestsAsked")} ${it.optString("manifestError")}".trim()) } - fun download(o: JSONObject) = listOfNotNull( - "productId" to o.optLong("productId").toString(), - o.optString("manifest").takeIf { it.isNotEmpty() }?.let { "manifest" to it }, - o.optString("appId").takeIf { it.isNotEmpty() }?.let { "appId" to it }, - executable(o.optString("configuration"))?.let { "exe" to it }, - ) val listed = all.distinctBy { it.id } - val onSteam = steamBySpace(owned) - val matched = listed.map { g -> bySpace[g.id]?.let { g.copy(extra = g.extra + download(it)) } ?: onSteam[g.id]?.let { g.copy(extra = g.extra + (UbisoftBackend.STEAM_APP to it)) } ?: g } - .let { games -> games.filter { g -> g.extra["productId"] == null || games.first { it.extra["productId"] == g.extra["productId"] } === g } } - .let { games -> games.filter { g -> g.extra["productId"] != null || games.none { it !== g && it.title == g.title && it.extra["productId"] != null } } } - val products = matched.mapNotNull { it.extra["productId"] }.toSet() - val unlisted = bySpace.filterKeys { space -> listed.none { it.id == space } }.filterValues { it.optLong("productId").toString() !in products }.mapNotNull { (space, o) -> - val title = title(o.optString("configuration")) ?: return@mapNotNull null - CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)) + val games = assemble(listed, owned) + ownedBySpace(owned).values.filter { it.optString("manifest").isEmpty() }.takeIf { it.isNotEmpty() }?.let { bare -> + StoresState.logLine("Ubisoft: owned without a manifest: " + bare.joinToString(", ") { (title(it.optString("configuration")) ?: "?") + "=" + it.optLong("productId") }) } - val games = (matched + unlisted).sortedBy { it.title.lowercase() } - StoresState.logLine("Ubisoft: ${bySpace.size} downloadable products; " + + StoresState.logLine("Ubisoft: ${ownedBySpace(owned).size} owned products; " + games.filter { it.extra.containsKey("productId") }.joinToString(", ") { "${it.title}=${it.extra["productId"]}" }) + listed.filter { g -> games.none { it.id == g.id } }.takeIf { it.isNotEmpty() }?.let { left -> + StoresState.logLine("Ubisoft: left out ${left.size} games Connect does not deliver to this account: " + left.joinToString(", ") { it.title }) + } post(gen) { StoresState.status.remove(Store.UBISOFT) StoresState.problems.remove(Store.UBISOFT) @@ -235,7 +227,7 @@ object UbisoftLibrary { StoresState.shelves[Store.UBISOFT] = com.droiddeck.launcher.stores.StoreShelves( trending = games.sortedByDescending { it.extra.containsKey("productId") }, art = games.mapNotNull { it.imageUrl }) } - StoresState.logLine("Ubisoft: ${games.size} owned games; on Steam: " + games.filter { it.extra.containsKey(UbisoftBackend.STEAM_APP) }.joinToString(", ") { "${it.title}=${it.extra[UbisoftBackend.STEAM_APP]}" }) + StoresState.logLine("Ubisoft: ${games.size} owned games") } catch (e: Exception) { StoresState.logLine("Ubisoft: library sync failed: ${e.javaClass.simpleName} ${e.message.orEmpty().take(200)}") post(gen) { StoresState.status.remove(Store.UBISOFT); StoresState.problems[Store.UBISOFT] = app.getString(R.string.stores_sync_failed) } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt index bb8aa159a6..83c03495ae 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -225,6 +225,20 @@ class EaTest { assertEquals(listOf("1", "3"), picked.map { it.first.offerId }) } + @Test fun anOwnedProductWithoutAnActiveGameDownloadIsLeftOut() { + fun row(id: String, type: String, tag: String = type, status: String = "ACTIVE") = + JSONObject().put("productId", id).put("entitlementType", type).put("entitlementTag", tag).put("status", status) + val rows = listOf( + row("DR:106479900", "DEFAULT", "VALIDATED_ONLINE_ACCESS"), + row("DR:231813200", "ORIGIN_DOWNLOAD", status = "DISABLED"), + row("Origin.OFR.50.0003426", "ONLINE_ACCESS"), + row("Origin.OFR.50.0003426", "ORIGIN_DOWNLOAD"), + row("Origin.OFR.50.0005237", "ORIGIN_DOWNLOAD"), + ) + assertEquals(setOf("DR:106479900", "DR:231813200"), EaLibrary.withoutGameDownload(rows).keys) + assertTrue(EaLibrary.withoutGameDownload(emptyList()).isEmpty()) + } + @Test fun ownedPageParses() { val page = JSONObject( """{"me":{"ownedGameProducts":{"next":"100","items":[{"originOfferId":"Origin.OFR.50.0001","product":{"id":"x","name":"N","downloadable":true,"gameSlug":"titanfall-2", diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt index 58e361db81..7f163ce351 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.stores.ubisoft +import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreLaunch @@ -20,18 +21,28 @@ class UbisoftTest { private val steamConfig = "version: 2.0\r\nroot:\r\n name: Assassin's Creed Syndicate\r\n start_game:\r\n steam:\r\n steam_app_id: 368500\r\n" + " third_party_platform:\r\n name: Steam\r\n override_uplayid: 1875\r\n" - @Test fun aProductUbisoftDeliversThroughSteamNamesItsSteamApp() { - assertEquals("368500", UbisoftLibrary.steamApp(steamConfig)) - assertNull(UbisoftLibrary.steamApp("root:\n start_game:\n online:\n executables:\n - path:\n relative: bin/game.exe\n")) + private fun listed(space: String, name: String) = CatalogItem(Store.UBISOFT, space, name, null, owned = true, extra = mapOf("spaceId" to space)) + + private val owned = JSONObject().put("games", JSONArray() + .put(JSONObject().put("productId", 1957).put("spaceId", "space-s").put("productType", 0).put("owned", true).put("configuration", steamConfig)) + .put(JSONObject().put("productId", 109).put("spaceId", "space-sc").put("productType", 0).put("owned", true).put("manifest", "AB").put("configuration", "root: {}")) + .put(JSONObject().put("productId", 1961).put("spaceId", "space-addon").put("productType", 1).put("owned", true).put("manifest", "CD").put("configuration", steamConfig)) + .put(JSONObject().put("productId", 720).put("spaceId", "space-plus").put("productType", 0).put("owned", false).put("manifest", "EF").put("configuration", "root: {}")) + .put(JSONObject().put("productId", 3539).put("spaceId", "space-o").put("productType", 0).put("owned", true).put("configuration", "root: {}"))) + + @Test fun onlyGamesConnectDeliversAreInTheLibrary() { + val profile = listOf(listed("space-sc", "Splinter Cell"), listed("space-s", "Syndicate"), listed("space-plus", "Ubisoft+ Game"), listed("space-gone", "Free Weekend"), listed("space-o", "Origins")) + val games = UbisoftLibrary.assemble(profile, owned) + assertEquals(listOf("space-o", "space-sc"), games.map { it.id }) + assertEquals(listOf("3539", "109"), games.map { it.extra["productId"] }) + assertEquals(null, games.first().extra["manifest"]) + assertEquals("Steam", UbisoftLibrary.thirdParty(steamConfig)) } - @Test fun steamOwnedGamesAreKeyedByTheirSpace() { - val owned = JSONObject().put("games", JSONArray() - .put(JSONObject().put("productId", 1957).put("spaceId", "space-s").put("productType", 0).put("owned", true).put("configuration", steamConfig)) - .put(JSONObject().put("productId", 109).put("spaceId", "space-sc").put("productType", 0).put("owned", true).put("manifest", "AB").put("configuration", "root: {}")) - .put(JSONObject().put("productId", 1961).put("spaceId", "space-addon").put("productType", 1).put("owned", true).put("configuration", steamConfig))) - assertEquals(mapOf("space-s" to "368500"), UbisoftLibrary.steamBySpace(owned)) - assertEquals(setOf("space-sc"), UbisoftLibrary.ownedBySpace(owned).keys) + @Test fun withoutAnOwnershipAnswerTheProfileListStays() { + val profile = listOf(listed("space-sc", "Splinter Cell"), listed("space-gone", "Free Weekend")) + assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, JSONObject().put("error", "demux closed")).map { it.id }) + assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, null).map { it.id }) } @Test fun theEntitlementNamesTheGamesApplication() { From 3b1366f85c1d432c7bcfc5c627668eb7d77876fb Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 10:23:38 -0500 Subject: [PATCH 045/101] feat(agent): choose the reasoning effort in the Agent tab (#2507) * feat(agent): choose the reasoning effort in the Agent tab; agent processes survive Steam session cleanup; sdkmanager license step tolerates SIGPIPE * docs(agent): on-device build and commit pitfalls for the agent --- AGENTS.md | 10 ++++++++++ .../com/droiddeck/launcher/agent/AgentHarness.kt | 8 +++++++- .../java/com/droiddeck/launcher/agent/AgentHost.kt | 12 +++++++++++- .../main/java/com/droiddeck/launcher/ui/AgentPage.kt | 2 +- .../java/com/droiddeck/launcher/ui/AgentPanels.kt | 12 +++++++++++- app/src/main/res/values/strings.xml | 1 + 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index c22c5647c0..447807615b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,3 +1,13 @@ # Rules - Comments should be rare, factual, and explain only non-obvious external constraints or business invariants. + +# Working on the device + +- `dd-lab-build` builds only committed work. Check `git status` and `gh api user` for the identity before committing; if `git config user.name` is empty, use the `gh` login's name and noreply email for this repo, never a guess. +- Do not commit or start a build in the same step: a build started next to a failed commit fails too. Commit first, check it, then build. +- Uncommitted changes in the tree may not be yours. Read `git diff` before committing them and tell the user what they do. +- If `dd-lab-build` says "could not read DroidDeck's state", loopback adb is down and `$ADB_SERIAL` is stale. Run `adb devices`; the port changes whenever wireless debugging is toggled. Ask the user to turn it on rather than retrying. +- A build that "did not start" can be adb, not the app. Read `~/.cache/dd-lab-build.json` and `.log` for the real reason; they can be stale from an earlier build, so compare their times with `date`. +- Run `dd-lab-build` with `run_in_background` and read its output file. A foreground `sleep` is blocked; wait with Monitor and an until-loop. +- The build restarts DroidDeck and ends your process. A turn that ends this way is not a failure. diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index 722c6e4029..78dbbd1900 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -21,6 +21,8 @@ interface AgentHarness { val signIn: List /** Whether [Options.plan] means anything to this CLI. */ val plans: Boolean + /** Reasoning effort levels the CLI accepts, lowest first; empty when it has none. */ + val efforts: List /** Models to offer besides the CLI's default; [rootfs] is where the CLI's own files can be read. */ fun models(rootfs: File): List /** The guest command for one turn; [conversation] is null for the first one. */ @@ -32,7 +34,7 @@ interface AgentHarness { data class Model(val id: String, val label: String) - data class Options(val model: String? = null, val plan: Boolean = false, val brief: String? = null) + data class Options(val model: String? = null, val plan: Boolean = false, val brief: String? = null, val effort: String? = null) companion object { val all: List = listOf(ClaudeCode, Codex) @@ -60,6 +62,7 @@ object ClaudeCode : AgentHarness { override val signedIn = listOf("sh", "-c", "$binary auth status | grep -q '\"loggedIn\": true'") override val signIn = listOf(binary, "auth", "login", "--claudeai") override val plans = true + override val efforts = listOf("low", "medium", "high", "xhigh", "max") /** * Commits and pull requests the agent makes carry no Claude Code credit or co-author line by @@ -92,6 +95,7 @@ object ClaudeCode : AgentHarness { addAll(listOf(binary, "-p", message, "--output-format", "stream-json", "--verbose", "--include-partial-messages")) addAll(listOf("--permission-mode", if (options.plan) "plan" else "bypassPermissions")) options.model?.let { addAll(listOf("--model", it)) } + options.effort?.let { addAll(listOf("--effort", it)) } options.brief?.let { addAll(listOf("--append-system-prompt", it)) } if (conversation != null) addAll(listOf("--resume", conversation)) } @@ -212,6 +216,7 @@ object Codex : AgentHarness { override val signedIn = listOf(binary, "login", "status") override val signIn = listOf(binary, "login") override val plans = false + override val efforts = listOf("low", "medium", "high") /** Codex keeps the models its account can use in `~/.codex/models_cache.json` once it has run. */ override fun models(rootfs: File): List = runCatching { @@ -231,6 +236,7 @@ object Codex : AgentHarness { if (conversation != null) addAll(listOf("resume", conversation)) addAll(listOf("--json", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check")) options.model?.let { addAll(listOf("-m", it)) } + options.effort?.let { addAll(listOf("-c", "model_reasoning_effort=\"$it\"")) } // codex exec has no system prompt option, so a new conversation starts with the brief. add(if (conversation == null && options.brief != null) "${options.brief}\n\n$message" else message) } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index d82ea8f127..ac47bd5235 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -78,6 +78,9 @@ object AgentHost { /** The chosen model for [harness]; null is the CLI's default. */ var model by mutableStateOf(null) private set + /** The chosen reasoning effort for [harness]; null is the CLI's default. */ + var effort by mutableStateOf(null) + private set var plan by mutableStateOf(false) private set var chat by mutableStateOf(null) @@ -131,6 +134,7 @@ object AgentHost { File(app.filesDir, "agent").mkdirs() harness = AgentHarness.byId(prefs(app).getString(HARNESS_KEY, null)) model = prefs(app).getString(modelKey(harness), null) + effort = prefs(app).getString(effortKey(harness), null)?.takeIf { it in harness.efforts } plan = prefs(app).getBoolean(PLAN_KEY, false) available = LinuxRuntime.hasRootfs(app) installed = harness.files.all { guestFileExists(app, it) } @@ -220,6 +224,11 @@ object AgentHost { prefs(context).edit().putString(modelKey(harness), id).apply() } + fun chooseEffort(context: Context, level: String?) { + effort = level + prefs(context).edit().putString(effortKey(harness), level).apply() + } + fun choosePlan(context: Context, on: Boolean) { plan = on prefs(context).edit().putBoolean(PLAN_KEY, on).apply() @@ -254,7 +263,7 @@ object AgentHost { AgentHostService.start(app) val current = harness val prompt = AgentAttachments.prompt(message, attached) - val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF)) + val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF, effort)) val workdir = workspace(app) Thread({ runCatching { current.prepare(LinuxRuntime.rootDir(app)) } @@ -546,6 +555,7 @@ object AgentHost { private const val RETRY_MS = 3_000L private fun modelKey(harness: AgentHarness) = "model_${harness.id}" + private fun effortKey(harness: AgentHarness) = "effort_${harness.id}" internal fun prefs(context: Context) = context.getSharedPreferences("agent", Context.MODE_PRIVATE) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 9956d0469a..3886f2bca6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -121,7 +121,7 @@ private fun AgentHeader(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetu verticalAlignment = Alignment.CenterVertically, modifier = Modifier.clip(Shape12).clickable { onPanel(AgentPanel.MODEL) }.padding(vertical = 2.dp).testTag("agent-model"), ) { - val parts = listOfNotNull(AgentHost.harness.name, model, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) + val parts = listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant) Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt index fd9b9bf8cf..8d247f8de6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -48,7 +48,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.withContext -/** The model and plan mode for the next turns; a conversation keeps going with whatever is chosen. */ +/** The model, reasoning effort and plan mode for the next turns; a conversation keeps going with whatever is chosen. */ @Composable internal fun AgentModelPicker() { val context = LocalContext.current @@ -63,6 +63,16 @@ internal fun AgentModelPicker() { else SecondaryButton(choice.label, compact = true) { AgentHost.chooseModel(context, id) } } } + if (AgentHost.harness.efforts.isNotEmpty()) Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + Text(stringResource(R.string.agent_effort), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.padding(horizontal = 2.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.horizontalScroll(rememberScrollState())) { + for (level in listOf(null) + AgentHost.harness.efforts) { + val label = level ?: stringResource(R.string.agent_model_default) + if (level == AgentHost.effort) PrimaryButton(label, compact = true) {} + else SecondaryButton(label, compact = true) { AgentHost.chooseEffort(context, level) } + } + } + } if (AgentHost.harness.plans) Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(horizontal = 2.dp)) { Column(Modifier.weight(1f)) { Text(stringResource(R.string.agent_plan), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b658b8d8b7..114ec48d94 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1190,6 +1190,7 @@ Attach Remove Default + Reasoning effort Plan first Plan Proposes a plan without changing anything From 514f7964286dedb48082baf65dfff2f84da638ee Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 16:07:39 +0000 Subject: [PATCH 046/101] Fix Agent composer keyboard spacing and scrolling (#2529) * fix(agent): keep composer above the software keyboard * fix(agent): place growing composer directly above keyboard --- .../java/com/droiddeck/launcher/FrontEndActivity.kt | 1 + .../main/java/com/droiddeck/launcher/ui/AgentPage.kt | 12 +++++++++--- .../java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 6 +++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 699dd9643b..3b6b6378f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1099,6 +1099,7 @@ class FrontEndActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) drivers.restartBlocked = ::runtimeChangesBlocked drivers.loadTpUbwcMode() pendingSessionLogExport = savedInstanceState?.getString(KEY_PENDING_SESSION_LOG_EXPORT)?.let(::File) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 3886f2bca6..01a684abec 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -11,9 +11,12 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.ime import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn @@ -57,6 +60,7 @@ import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -92,7 +96,7 @@ internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, v return } var panel by rememberSaveable { mutableStateOf(AgentPanel.NONE) } - Column(modifier.fillMaxSize()) { + Column(modifier.fillMaxSize().imePadding()) { AgentHeader(panel, { panel = if (panel == it) AgentPanel.NONE else it }, onSetup = { setup = true }) when (panel) { AgentPanel.HISTORY -> AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } @@ -327,9 +331,10 @@ private fun AgentComposer(draftState: MutableState, inputModifier: Modif for (path in AgentAttachments.pending.toList()) AttachmentChip(path) { AgentAttachments.pending.remove(path) } } var focused by remember { mutableStateOf(false) } + val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 Row( verticalAlignment = Alignment.Bottom, - modifier = Modifier.fillMaxWidth().padding(top = 10.dp, bottom = 16.dp).clip(Shape16).background(colors.surface) + modifier = Modifier.fillMaxWidth().padding(top = 10.dp, bottom = if (keyboardOpen) 4.dp else 16.dp).clip(Shape16).background(colors.surface) .border(1.dp, if (focused) pal.primary else pal.line, Shape16).padding(start = 6.dp, end = 6.dp, top = 6.dp, bottom = 6.dp), ) { if (LocalActivityResultRegistryOwner.current != null) AttachButton() @@ -345,7 +350,8 @@ private fun AgentComposer(draftState: MutableState, inputModifier: Modif cursorBrush = SolidColor(pal.primary), keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), keyboardActions = KeyboardActions(onSend = { send() }), - maxLines = 6, + minLines = 1, + maxLines = 8, ) } if (working) RoundButton(Icons.Outlined.Stop, stringResource(R.string.agent_stop), pal.error.copy(alpha = 0.22f), colors.error, "agent-stop") { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 7638e8f042..1e4aaa88b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -40,6 +40,8 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.ime +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.width @@ -689,9 +691,11 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com onRailSelect(key) }, a) CompositionLocalProvider(LocalShowSection provides { key -> selected = key }) { + val agentKeyboardOpen = railSelection == "agent" && WindowInsets.ime.getBottom(androidx.compose.ui.platform.LocalDensity.current) > 0 LauncherLayout( bottomNavigation && !s.dualScreen, pal.line, Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() } + .then(if (railSelection == "agent") Modifier.imePadding() else Modifier) .then(if (s.dualScreen) Modifier.onKeyEvent { event -> val step = dualPageStep(event.nativeKeyEvent) ?: return@onKeyEvent false if (event.type == KeyEventType.KeyDown && !processSettingsPageVisible) { @@ -705,7 +709,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com true } else Modifier), navigation = { - if (s.dualScreen) Unit + if (s.dualScreen || (bottomNavigation && agentKeyboardOpen)) Unit else if (bottomNavigation) BottomBar(s, railSelection, onRailSelect, onRailFocus, a, railFocus) else SideRail(s, railSelection, onRailSelect, onRailFocus, a, railFocus.fillMaxHeight()) }, From 08a8de9bc4e2c94578cef0aa5bdf14073360cef3 Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 16:38:31 +0000 Subject: [PATCH 047/101] Fix Agent keyboard panning and collapsed landscape input (#2530) * fix(agent): prevent Android panning the IME-aware chat * fix(agent): reserve composer space before chat status panels --- .../droiddeck/launcher/FrontEndActivity.kt | 1 - .../com/droiddeck/launcher/ui/AgentPage.kt | 26 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 3b6b6378f6..699dd9643b 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1099,7 +1099,6 @@ class FrontEndActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) drivers.restartBlocked = ::runtimeChangesBlocked drivers.loadTpUbwcMode() pendingSessionLogExport = savedInstanceState?.getString(KEY_PENDING_SESSION_LOG_EXPORT)?.let(::File) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 01a684abec..645ce77f1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -1,5 +1,8 @@ package com.droiddeck.launcher.ui +import android.app.Activity +import android.content.ContextWrapper +import android.view.WindowManager import androidx.activity.compose.LocalActivityResultRegistryOwner import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -45,6 +48,7 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.derivedStateOf @@ -56,11 +60,14 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.window.DialogWindowProvider import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -86,6 +93,17 @@ private val CLI_COMMANDS = listOf("/compact", "/cost", "/review", "/init") @Composable internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true) { val context = LocalContext.current + val view = LocalView.current + DisposableEffect(view, visible) { + val window = (view.parent as? DialogWindowProvider)?.window + ?: generateSequence(view.context) { (it as? ContextWrapper)?.baseContext } + .filterIsInstance().firstOrNull()?.window + val previousMode = window?.attributes?.softInputMode + if (visible) window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING) + onDispose { + if (visible && previousMode != null) window?.setSoftInputMode(previousMode) + } + } remember { AgentHost.refresh(context) } LaunchedEffect(AgentHost.unseen, visible) { if (visible) AgentHost.seen() } remember { AgentSetup.check(context) } @@ -102,9 +120,11 @@ internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, v AgentPanel.HISTORY -> AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } AgentPanel.PROCESSES -> AgentProcessList(Modifier.weight(1f)) else -> { - if (panel == AgentPanel.MODEL) AgentModelPicker() - AgentConversation(Modifier.weight(1f)) - AgentStatus() + Column(Modifier.weight(1f).clipToBounds()) { + if (panel == AgentPanel.MODEL) AgentModelPicker() + AgentConversation(Modifier.weight(1f)) + AgentStatus() + } AgentComposer(draft, inputModifier) { panel = it } } } From a5712c0d20d292f0d5b97d65cbca699828863c60 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:08:33 -0500 Subject: [PATCH 048/101] feat(stores): EA and Ubisoft stores browse their catalogs, and EA's Get for free works in the app (#2527) * feat(stores): EA and Ubisoft stores browse their catalogs with prices, deals and search * feat(stores): Get for free adds EA's free games to the account in the app * fix(stores): an owned EA game matches its store card by its full product name --- .../droiddeck/launcher/stores/StoreCatalog.kt | 1 + .../droiddeck/launcher/stores/StoreFront.kt | 119 ++++++++++++++++ .../droiddeck/launcher/stores/StoresState.kt | 27 ++++ .../com/droiddeck/launcher/stores/ea/EaApi.kt | 14 ++ .../droiddeck/launcher/stores/ea/EaBackend.kt | 30 +++- .../droiddeck/launcher/stores/ea/EaLibrary.kt | 16 ++- .../droiddeck/launcher/stores/ea/EaStore.kt | 120 ++++++++++++++++ .../launcher/stores/ubisoft/UbisoftBackend.kt | 20 ++- .../launcher/stores/ubisoft/UbisoftStore.kt | 129 ++++++++++++++++++ .../com/droiddeck/launcher/ui/GameDetail.kt | 7 +- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../ea/graphql/GetGameProductOfferIds.gql | 15 ++ .../resources/ea/graphql/grantEntitlement.gql | 23 ++++ .../droiddeck/launcher/stores/ea/EaTest.kt | 42 ++++++ .../launcher/stores/ubisoft/UbisoftTest.kt | 30 ++++ 47 files changed, 614 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/StoreFront.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaStore.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftStore.kt create mode 100644 app/src/main/resources/ea/graphql/GetGameProductOfferIds.gql create mode 100644 app/src/main/resources/ea/graphql/grantEntitlement.gql diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt index cb46d23601..e87266df65 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt @@ -106,6 +106,7 @@ fun detailCatalogItem( library.firstOrNull { it.store == store && it.id == id } ?: found.firstOrNull { it.store == store && it.id == id } ?: shelves?.all?.firstOrNull { it.store == store && it.id == id } + ?: shelves?.all?.firstOrNull { it.store == store && it.extra[StoreFront.STORE_CARD] == id } fun mergeItems(old: List?, new: List): List { if (old.isNullOrEmpty()) return new diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreFront.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreFront.kt new file mode 100644 index 0000000000..5791656111 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreFront.kt @@ -0,0 +1,119 @@ +package com.droiddeck.launcher.stores + +import android.content.SharedPreferences +import org.json.JSONArray +import org.json.JSONObject +import java.text.Normalizer +import java.util.Locale + +/** Store shelves fetched from a public catalog, kept in memory and on disk between refreshes. */ +internal class StoreFront( + private val store: Store, + private val prefs: () -> SharedPreferences, + private val fetch: () -> Catalog, + private val key: String = "store_front", + private val ttlMs: Long = 3 * 60 * 60 * 1000L, +) { + /** One refresh: the shelves and every game the store lists, for search. */ + class Catalog(val shelves: StoreShelves, val all: List = shelves.all) + + @Volatile private var memory: Catalog? = null + @Volatile private var memoryAt = 0L + + fun cached(): StoreShelves? = cachedCatalog()?.shelves + + fun everything(): List = cachedCatalog()?.all.orEmpty() + + private fun cachedCatalog(): Catalog? = memory ?: decode(prefs().getString(key, null))?.also { memory = it } + + /** The shelves, refreshed when stale; a refresh that fails keeps the last good set. */ + fun shelves(force: Boolean): StoreShelves? { + val now = System.currentTimeMillis() + if (!force) { + memory?.takeIf { now - memoryAt in 0 until ttlMs }?.let { return it.shelves } + val at = prefs().getLong("${key}_at", 0L) + if (now - at in 0 until ttlMs) decode(prefs().getString(key, null))?.let { memory = it; memoryAt = at; return it.shelves } + } + val fresh = runCatching(fetch).onFailure { StoresState.logLine("${store.label}: store shelves failed: ${it.javaClass.simpleName} ${it.message.orEmpty().take(160)}") } + .getOrNull()?.takeUnless { it.shelves.isEmpty } + ?: return cached() + prefs().edit().putString(key, encode(fresh)).putLong("${key}_at", now).apply() + memory = fresh + memoryAt = now + return fresh.shelves + } + + private fun encode(c: Catalog): String = JSONObject().apply { + val s = c.shelves + listOf(s.whatsNew, s.deals, s.free, s.trending).zip(SHELVES).forEach { (items, k) -> put(k, JSONArray(items.map { it.id })) } + put("art", JSONArray(s.art)) + put("items", JSONArray().apply { (c.all + s.all).distinctBy { it.id }.forEach { put(itemJson(it)) } }) + }.toString() + + private fun decode(text: String?): Catalog? { + val o = text?.let { runCatching { JSONObject(it) }.getOrNull() } ?: return null + val items = o.optJSONArray("items")?.let { a -> (0 until a.length()).mapNotNull { a.optJSONObject(it)?.let(::itemFrom) } }.orEmpty() + val byId = items.associateBy { it.id } + fun shelf(k: String) = o.optJSONArray(k)?.let { a -> (0 until a.length()).mapNotNull { byId[a.optString(it)] } }.orEmpty() + val art = o.optJSONArray("art")?.let { a -> List(a.length()) { a.optString(it) }.filter { it.isNotEmpty() } }.orEmpty() + val shelves = StoreShelves(shelf("new"), shelf("deals"), shelf("free"), shelf("trending"), art).takeUnless { it.isEmpty } ?: return null + return Catalog(shelves, items) + } + + private fun itemJson(i: CatalogItem) = JSONObject() + .put("id", i.id).put("title", i.title).put("image", i.imageUrl.orEmpty()).put("tall", i.tallImageUrl.orEmpty()).put("tags", i.tags) + .put("free", i.isFree).put("hasPrice", i.hasPrice).put("final", i.finalPrice).put("orig", i.originalPrice).put("disc", i.discountPercent) + .put("url", i.storeUrl).put("dev", i.developer).put("pub", i.publisher).put("rel", i.releaseDate).put("desc", i.description) + .put("mature", i.mature).put("logo", i.logoUrl.orEmpty()).put("extra", JSONObject(i.extra as Map<*, *>)) + + private fun itemFrom(o: JSONObject): CatalogItem? { + val extra = LinkedHashMap() + o.optJSONObject("extra")?.let { e -> e.keys().forEach { k -> extra[k] = e.optString(k) } } + return CatalogItem( + store = store, id = o.optString("id").ifEmpty { return null }, title = o.optString("title").ifEmpty { return null }, + imageUrl = o.optString("image").ifEmpty { null }, tallImageUrl = o.optString("tall").ifEmpty { null }, tags = o.optString("tags"), + isFree = o.optBoolean("free"), hasPrice = o.optBoolean("hasPrice"), finalPrice = o.optString("final"), originalPrice = o.optString("orig"), + discountPercent = o.optInt("disc"), storeUrl = o.optString("url"), developer = o.optString("dev"), publisher = o.optString("pub"), + releaseDate = o.optString("rel"), description = o.optString("desc"), mature = o.optBoolean("mature"), + logoUrl = o.optString("logo").ifEmpty { null }, extra = extra, + ) + } + + companion object { + /** On an owned game standing in for a store card: the card's id, so a page opened on the card still finds it. */ + const val STORE_CARD = "storeCard" + private val SHELVES = listOf("new", "deals", "free", "trending") + private val MARKS = Regex("[\\u2122\\u00AE\\u00A9]") + private val COMBINING = Regex("\\p{M}+") + private val NOT_WORD = Regex("[^\\p{L}\\p{N}]+") + + /** A title reduced to letters and digits, so "Far Cry® 6" and "Far Cry 6" meet, and "Pokémon" meets "Pokemon". */ + fun titleKey(title: String): String = + Normalizer.normalize(title.replace(MARKS, ""), Normalizer.Form.NFD).replace(COMBINING, "") + .lowercase(Locale.ROOT).replace(NOT_WORD, " ").trim() + + /** + * Shelf cards the account owns become its library entry, which carries what installing needs, + * keeping the shelf's art and price. + */ + fun markOwned(s: StoreShelves, library: List?, match: (CatalogItem, CatalogItem) -> Boolean): StoreShelves { + if (library.isNullOrEmpty()) return s + fun mark(list: List) = markOwned(list, library, match) + return StoreShelves(mark(s.whatsNew), mark(s.deals), mark(s.free), mark(s.trending), s.art) + } + + fun markOwned(list: List, library: List?, match: (CatalogItem, CatalogItem) -> Boolean): List { + if (library.isNullOrEmpty()) return list + return list.map { shelf -> + val owned = library.firstOrNull { match(shelf, it) } ?: return@map shelf + owned.copy( + imageUrl = shelf.imageUrl ?: owned.imageUrl, tallImageUrl = owned.tallImageUrl ?: shelf.tallImageUrl, + tags = owned.tags.ifBlank { shelf.tags }, description = owned.description.ifBlank { shelf.description }, + releaseDate = owned.releaseDate.ifBlank { shelf.releaseDate }, storeUrl = shelf.storeUrl.ifBlank { owned.storeUrl }, + developer = owned.developer.ifBlank { shelf.developer }, mature = shelf.mature, + extra = owned.extra + (STORE_CARD to shelf.id), + ) + }.distinctBy { it.id } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index e7a9383f32..40fedbded2 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -236,6 +236,27 @@ object StoresState { var itchPicking by mutableStateOf(null) var gameJoltPicking by mutableStateOf(null) + /** Store cards whose free game is being added to the account. */ + val claiming = mutableStateMapOf() + + fun canClaim(item: CatalogItem): Boolean = !item.accessible && isSignedIn(item.store) && backends[item.store]?.canClaim(item) == true + + /** Adds a free game to the account, then refreshes the library so it can be installed; [failed] runs when the store refused. */ + fun claim(context: Context, item: CatalogItem, failed: () -> Unit) { + val backend = backends[item.store] ?: return failed() + if (claiming.put(item.key, true) == true) return + val app = context.applicationContext + background("stores-claim", onFailure = { main.post { claiming.remove(item.key); failed() } }) { + val ok = backend.claim(app, item) + logLine("${item.store.label}: ${item.title} ${if (ok) "added to the library" else "could not be added; opening the store page"}") + if (ok) backend.syncLibrary(app, true) + main.post { + claiming.remove(item.key) + if (!ok) failed() + } + } + } + fun requestInstall(context: Context, item: CatalogItem) { askForNotifications(context) if (item.store == Store.ITCH && item.extra["uploadId"].isNullOrEmpty()) { itchPicking = item; return } @@ -359,6 +380,12 @@ interface StoreBackend { fun syncLibrary(context: Context, force: Boolean) fun loadShelves(context: Context, force: Boolean) fun search(context: Context, query: String): List = emptyList() + + /** Whether this store can add a free game to the account itself, rather than through its website. */ + fun canClaim(item: CatalogItem): Boolean = false + + /** Adds a free game to the account; true once the store has it in the account's library. */ + fun claim(context: Context, item: CatalogItem): Boolean = false fun install(context: Context, item: CatalogItem, root: java.io.File) fun uninstall(context: Context, game: InstalledStoreGame) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt index 185e23f424..55ecf79455 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaApi.kt @@ -22,6 +22,7 @@ object EaApi { val downloadable: Boolean, val trial: Boolean, val ownership: List, + val productName: String = "", ) class Offer( @@ -109,6 +110,7 @@ object EaApi { downloadable = product.optBoolean("downloadable", true), trial = product.optJSONObject("trialDetails")?.optString("trialType").orEmpty().let { it.isNotEmpty() && it != "null" }, ownership = (0 until (methods?.length() ?: 0)).map { methods!!.optString(it) }, + productName = product.optString("name").replace("\n", " ").trim(), ) } val next = owned.optString("next").takeIf { it.isNotBlank() && it != "null" } @@ -197,6 +199,18 @@ object EaApi { } } + /** The free offer EA sells under a store slug, or null when the game has none. */ + fun freeOffer(token: String, slug: String): String? { + val variables = JSONObject().put("slug", slug).put("locale", "en-us").put("overrideCountryCode", "US") + val product = call(token, "GetGameProductOfferIds", variables).optJSONObject("game")?.optJSONObject("lowestPriceGameProduct") ?: return null + return product.optString("originOfferId").takeIf { product.optBoolean("isFree") && it.isNotBlank() && it != "null" } + } + + /** Adds a free offer to the account, as the EA app's "Get for free" does; the answer names what EA refused. */ + fun grantEntitlement(token: String, offerId: String): JSONObject = + call(token, "grantEntitlement", JSONObject().put("input", JSONObject().put("offerId", offerId).put("source", EaAuth.CLIENT_ID))) + .optJSONObject("grantEntitlement") ?: throw EaApiException(0, "EA gave no answer to the grant") + fun legacyEntitlements(token: String): List { val out = ArrayList() var next: String? = "0" diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt index 091243ae53..bd8d5c1212 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaBackend.kt @@ -11,6 +11,7 @@ import com.droiddeck.launcher.stores.InstalledStoreGame import com.droiddeck.launcher.stores.LoginFlows import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreFront import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLoginActivity import com.droiddeck.launcher.stores.StoresState @@ -40,6 +41,8 @@ object EaBackend : StoreBackend { val app = context.applicationContext EaAuth.signOut(app) EaLibrary.reset(app) + signOuts.incrementAndGet() + StoresState.post { StoresState.shelves.remove(store) } EaUpdates.available.clear() runCatching { WebCookies.expire(EaLogin.SIGN_IN_URLS, ".ea.com", listOf("/")) {} } } @@ -50,7 +53,32 @@ object EaBackend : StoreBackend { Thread({ EaLibrary.sync(app, force) }, "ea-sync").start() } - override fun loadShelves(context: Context, force: Boolean) {} + override fun loadShelves(context: Context, force: Boolean) { + val app = context.applicationContext + val account = signOuts.get() + EaStore.cached(app)?.let { s -> StoresState.post { StoresState.shelves[store] = StoreFront.markOwned(s, StoresState.library[store], EaStore::sameGame) } } + Thread({ + val shelves = EaStore.featured(app, force) ?: return@Thread + StoresState.post { if (signOuts.get() == account) StoresState.shelves[store] = StoreFront.markOwned(shelves, StoresState.library[store], EaStore::sameGame) } + }, "ea-shelves").start() + } + + private val signOuts = java.util.concurrent.atomic.AtomicInteger() + + override fun canClaim(item: CatalogItem): Boolean = item.isFree && !item.extra["slug"].isNullOrEmpty() + + override fun claim(context: Context, item: CatalogItem): Boolean { + val app = context.applicationContext + val token = EaAuth.accessToken(app) ?: return false + val slug = item.extra["slug"] ?: return false + val offer = EaApi.freeOffer(token, slug) ?: run { StoresState.logLine("ea: no free offer for $slug"); return false } + val answer = EaApi.grantEntitlement(token, offer) + StoresState.logLine("ea: grant $offer for $slug: $answer") + return answer.optBoolean("success") || answer.optJSONArray("entitledOfferIds")?.let { ids -> (0 until ids.length()).any { ids.optString(it) == offer } } == true + } + + override fun search(context: Context, query: String): List = + StoreFront.markOwned(EaStore.search(context.applicationContext, query), StoresState.library[store], EaStore::sameGame) override fun install(context: Context, item: CatalogItem, root: java.io.File) { val app = context.applicationContext diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt index 37fd6269f8..336b8b6390 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaLibrary.kt @@ -5,8 +5,8 @@ import android.content.SharedPreferences import com.droiddeck.launcher.R import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreFront import com.droiddeck.launcher.stores.StoreNet -import com.droiddeck.launcher.stores.StoreShelves import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.mergeItems import org.json.JSONArray @@ -36,13 +36,14 @@ data class EaGame( val masterTitleId: String = "", val cloudSaves: String = "", val locales: List = emptyList(), + val productName: String = "", ) { fun toJson(): JSONObject = JSONObject() .put("offerId", offerId).put("contentId", contentId).put("title", title).put("slug", slug) .put("tall", tall).put("wide", wide).put("logo", logo).put("version", version) .put("executePath", executePath).put("installCheck", installCheck).put("parameters", parameters) .put("multiplayerId", multiplayerId).put("masterTitleId", masterTitleId).put("cloudSaves", cloudSaves) - .put("locales", JSONArray(locales)) + .put("locales", JSONArray(locales)).put("productName", productName) companion object { fun fromJson(o: JSONObject): EaGame? { @@ -63,14 +64,15 @@ data class EaGame( masterTitleId = o.optString("masterTitleId"), cloudSaves = o.optString("cloudSaves"), locales = (0 until (locales?.length() ?: 0)).map { locales!!.optString(it) }, + productName = o.optString("productName"), ) } } } object EaLibrary { - private const val KEY_CACHE = "library_cache_v2" - private const val KEY_SYNCED_AT = "library_synced_at_v2" + private const val KEY_CACHE = "library_cache_v3" + private const val KEY_SYNCED_AT = "library_synced_at_v3" private const val THROTTLE_MS = 6 * 60 * 60 * 1000L private const val ART_TTL_MS = 7 * 24 * 60 * 60 * 1000L private const val ART_THREADS = 4 @@ -118,7 +120,7 @@ object EaLibrary { owned = true, sizeBytes = prefs.getLong("size_${g.offerId}", 0L), storeUrl = STORE_URL, - extra = mapOf("contentId" to g.contentId, "slug" to g.slug, "version" to g.version), + extra = mapOf("contentId" to g.contentId, "slug" to g.slug, "version" to g.version, "productName" to g.productName), logoUrl = g.logo.ifEmpty { null }, ) } @@ -199,8 +201,7 @@ object EaLibrary { StoresState.post { if (gen != generation.get()) return@post StoresState.library[store] = mergeItems(StoresState.library[store], items) - val installed = StoresState.installed.filter { it.sidecar.store == store }.map { it.sidecar.id }.toSet() - StoresState.shelves[store] = StoreShelves(trending = items.filterNot { it.id in installed }, art = StoresState.shelves[store]?.art.orEmpty()) + StoresState.shelves[store]?.let { StoresState.shelves[store] = StoreFront.markOwned(it, items, EaStore::sameGame) } } } @@ -271,6 +272,7 @@ object EaLibrary { tall = img?.tall.orEmpty(), wide = img?.wide.orEmpty(), logo = img?.logo.orEmpty(), version = offer.gameVersion, executePath = offer.executePathOverride, installCheck = offer.installCheckOverride, parameters = offer.executeParameters, multiplayerId = offer.multiplayerId, masterTitleId = offer.masterTitleId, cloudSaves = offer.cloudSaves, locales = offer.locales, + productName = o.productName, ) } if (!storeCache(app, games, gen)) return diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaStore.kt new file mode 100644 index 0000000000..b585dfec98 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaStore.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.stores.ea + +import android.content.Context +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreFront +import com.droiddeck.launcher.stores.StoreNet +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.cleanStoreText +import org.json.JSONObject +import java.time.Instant +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit + +/** EA's PC catalog, read from the game pages ea.com renders for the EA app's games. */ +object EaStore { + private const val SITE = "https://www.ea.com" + private const val CATALOG = "$SITE/games/library/pc-download" + private const val PAGE_SIZE = 12 + private const val MAX_PAGES = 20 + private const val SHELF = 24 + private val NEXT_DATA = Regex("""""", RegexOption.DOT_MATCHES_ALL) + + private var front: StoreFront? = null + + private fun front(context: Context): StoreFront = synchronized(this) { + front ?: StoreFront(Store.EA, { EaPrefs.get(context) }, { fetchAll().let { StoreFront.Catalog(shelves(it), it) } }, key = "store_front_catalog").also { front = it } + } + + fun cached(context: Context): StoreShelves? = front(context).cached() + + fun featured(context: Context, force: Boolean): StoreShelves? = front(context).shelves(force) + + fun search(context: Context, query: String): List { + val q = StoreFront.titleKey(query) + if (q.length < 2) return emptyList() + return front(context).everything().filter { StoreFront.titleKey(it.title).contains(q) } + } + + /** Whether a store card and a library entry are the same game. */ + fun sameGame(shelf: CatalogItem, owned: CatalogItem): Boolean { + val slug = shelf.extra["slug"].orEmpty() + if (slug.isNotEmpty() && slug == owned.extra["slug"]) return true + val shelfKey = StoreFront.titleKey(shelf.title).ifEmpty { return false } + return listOf(owned.title, owned.extra["productName"].orEmpty()).any { StoreFront.titleKey(it) == shelfKey } + } + + /** + * The device's currency. ea.com's pages are cached with whichever region asked first, so one page can carry + * roubles and the next dollars; a price in another currency is left off rather than shown wrong. + */ + private fun localCurrency(): String = + runCatching { java.util.Currency.getInstance(java.util.Locale.getDefault()).currencyCode }.getOrNull() ?: "USD" + + internal fun parsePage(html: String, currency: String = localCurrency()): Pair, Int> { + val data = NEXT_DATA.find(html)?.groupValues?.get(1) ?: return emptyList() to 0 + val props = JSONObject(data).optJSONObject("props")?.optJSONObject("pageProps") ?: return emptyList() to 0 + val games = props.optJSONArray("games") ?: return emptyList() to 0 + val items = (0 until games.length()).mapNotNull { games.optJSONObject(it) }.mapNotNull { item(it, currency) } + return items to props.optInt("totalItems", items.size) + } + + internal fun item(g: JSONObject, currency: String): CatalogItem? { + fun s(o: JSONObject?, k: String) = o?.optString(k)?.takeIf { it.isNotBlank() && it != "null" } + val slug = s(g, "slug") ?: return null + val title = s(g, "title")?.replace("\n", " ")?.trim() ?: return null + val art = g.optJSONObject("packArt") + val price = g.optJSONObject("price") + val total = s(price, "displayTotal").orEmpty() + val now = s(price, "displayTotalWithDiscount") ?: total + val discount = price?.optInt("discountPercentage") ?: 0 + val free = g.optBoolean("isFreeToPlay") || now.filter { it.isDigit() }.trimStart('0').isEmpty() && now.isNotEmpty() + val shown = !free && s(price, "currency").equals(currency, true) + val genres = g.optJSONArray("genres") + val franchise = s(g, "franchiseSlug") + return CatalogItem( + store = Store.EA, id = "ea-store:$slug", title = title, + imageUrl = s(art, "ar16X9") ?: s(art, "ar2X1"), tallImageUrl = s(art, "ar2X3") ?: s(art, "ar3X4"), + tags = (0 until (genres?.length() ?: 0)).mapNotNull { genres!!.optJSONObject(it)?.optString("name")?.takeIf(String::isNotBlank) }.take(3).joinToString(", "), + isFree = free, hasPrice = shown, finalPrice = if (shown) now else "", + originalPrice = if (shown && discount > 0) total else "", discountPercent = discount.coerceAtLeast(0), + storeUrl = if (franchise != null) "$SITE/games/$franchise/$slug" else "$SITE/games/$slug", + publisher = "Electronic Arts", releaseDate = s(g, "releaseDate")?.take(10).orEmpty(), + description = cleanStoreText(s(g, "shortDescription")), + extra = buildMap { put("slug", slug); s(g, "tier")?.let { put("tier", it) } }, + ) + } + + private fun page(n: Int): Pair, Int>? = + StoreNet.get(if (n == 1) CATALOG else "$CATALOG?page=$n", headers = mapOf("Accept" to "text/html"))?.let(::parsePage) + + /** Every page of the catalog; a page that fails fails the whole refresh, so a partial list never replaces a good one. */ + private fun fetchAll(): List { + val (first, total) = page(1) ?: throw java.io.IOException("ea.com catalog page 1 failed") + val pages = ((total + PAGE_SIZE - 1) / PAGE_SIZE).coerceIn(1, MAX_PAGES) + val rest = java.util.concurrent.ConcurrentHashMap>() + val pool = Executors.newFixedThreadPool(4) + try { + for (n in 2..pages) pool.execute { page(n)?.first?.let { rest[n] = it } } + } finally { + pool.shutdown() + if (!pool.awaitTermination(1, TimeUnit.MINUTES)) pool.shutdownNow() + } + (2..pages).firstOrNull { !rest.containsKey(it) }?.let { throw java.io.IOException("ea.com catalog page $it failed") } + return (first + (2..pages).flatMap { rest.getValue(it) }).distinctBy { it.id } + } + + internal fun shelves(all: List, now: Instant = Instant.now()): StoreShelves { + val today = now.toString().take(10) + val released = all.filter { it.releaseDate.isNotEmpty() && it.releaseDate <= today } + val headline = released.filter { it.extra["tier"] == "Tier1" || it.extra["tier"] == "Tier2" } + return StoreShelves( + whatsNew = released.sortedByDescending { it.releaseDate }.take(SHELF), + deals = released.filter { it.discountPercent > 0 }.sortedByDescending { it.discountPercent }.take(SHELF), + free = released.filter { it.isFree }.take(SHELF), + trending = (headline + released).distinctBy { it.id }.take(SHELF), + art = all.mapNotNull { it.imageUrl }.take(SHELF), + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt index 8a4b253135..5d1a8c31bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt @@ -10,6 +10,7 @@ import com.droiddeck.launcher.stores.InstalledStoreGame import com.droiddeck.launcher.stores.LoginFlows import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreFront import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadQueue @@ -44,7 +45,18 @@ object UbisoftBackend : StoreBackend { Thread({ UbisoftLibrary.sync(app, force) }, "ubisoft-sync").start() } - override fun loadShelves(context: Context, force: Boolean) {} + override fun loadShelves(context: Context, force: Boolean) { + val app = context.applicationContext + val account = UbisoftLibrary.account() + UbisoftStore.cached(app)?.let { s -> StoresState.post { StoresState.shelves[store] = StoreFront.markOwned(s, StoresState.library[store], UbisoftStore::sameGame) } } + Thread({ + val shelves = UbisoftStore.featured(app, force) ?: return@Thread + StoresState.post { if (UbisoftLibrary.account() == account) StoresState.shelves[store] = StoreFront.markOwned(shelves, StoresState.library[store], UbisoftStore::sameGame) } + }, "ubisoft-shelves").start() + } + + override fun search(context: Context, query: String): List = + StoreFront.markOwned(UbisoftStore.search(query), StoresState.library[store], UbisoftStore::sameGame) override fun install(context: Context, item: CatalogItem, root: java.io.File) { val app = context.applicationContext @@ -97,6 +109,9 @@ object UbisoftLibrary { StoresState.post { StoresState.shelves.remove(Store.UBISOFT) } } + /** Changes on every sign-out, so work begun for the old account can tell. */ + fun account(): Int = generation.get() + private fun post(gen: Int, block: () -> Unit) = StoresState.post { if (generation.get() == gen) block() } internal fun parsePage(body: String): Pair, Int> { @@ -224,8 +239,7 @@ object UbisoftLibrary { StoresState.status.remove(Store.UBISOFT) StoresState.problems.remove(Store.UBISOFT) StoresState.library[Store.UBISOFT] = games - StoresState.shelves[Store.UBISOFT] = com.droiddeck.launcher.stores.StoreShelves( - trending = games.sortedByDescending { it.extra.containsKey("productId") }, art = games.mapNotNull { it.imageUrl }) + StoresState.shelves[Store.UBISOFT]?.let { StoresState.shelves[Store.UBISOFT] = StoreFront.markOwned(it, games, UbisoftStore::sameGame) } } StoresState.logLine("Ubisoft: ${games.size} owned games") } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftStore.kt new file mode 100644 index 0000000000..13edb2084f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftStore.kt @@ -0,0 +1,129 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.content.Context +import android.net.Uri +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreFront +import com.droiddeck.launcher.stores.StoreNet +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.cleanStoreText +import com.droiddeck.launcher.stores.matureByAge +import org.json.JSONArray +import org.json.JSONObject +import java.text.NumberFormat +import java.time.Instant +import java.util.Currency +import java.util.Locale + +/** Ubisoft's PC catalog, from the product search the Ubisoft Store website uses. */ +object UbisoftStore { + /** The Ubisoft Store website's own read-only search key, sent by every store page. */ + private const val APP = "XELY3U4LOD" + private const val KEY = "5638539fd9edb8f2c6b024b49ec375bd" + private const val SHELF = 24 + private val RATING_AGE = mapOf("esrb-m" to 17, "esrb-ao" to 18, "pegi-18" to 18, "pegi-16" to 16, "usk-18" to 18) + + /** The store sites with an English catalog: site, index locale, currency. */ + private val SITES = mapOf( + "US" to Triple("us", "en_US", "USD"), "GB" to Triple("uk", "en_GB", "GBP"), + "CA" to Triple("ca", "en_CA", "CAD"), "AU" to Triple("anz", "en_AU", "AUD"), "NZ" to Triple("anz", "en_AU", "NZD"), + ) + + private fun site() = SITES[Locale.getDefault().country.uppercase(Locale.ROOT)] ?: SITES.getValue("US") + + private fun index(site: Triple, order: String) = "production__${site.first}_ubisoft__products__${site.second}__$order" + + private val fronts = HashMap, StoreFront>() + + /** Each store site keeps its own shelves, so a region change never shows another region's prices. */ + private fun front(context: Context): StoreFront = synchronized(fronts) { + val site = site() + fronts.getOrPut(site) { + StoreFront(Store.UBISOFT, { context.applicationContext.getSharedPreferences("stores.ubisoft", Context.MODE_PRIVATE) }, + { fetch(site) }, key = "store_front_${site.first}_${site.third}") + } + } + + fun cached(context: Context): StoreShelves? = front(context).cached() + + fun featured(context: Context, force: Boolean): StoreShelves? = front(context).shelves(force) + + fun search(query: String): List { + val term = query.trim() + if (term.length < 2) return emptyList() + return query(site(), "best_sellers", 40, query = term).orEmpty() + } + + /** Whether a store card and a library entry are the same game. */ + fun sameGame(shelf: CatalogItem, owned: CatalogItem): Boolean { + val product = shelf.extra["productId"].orEmpty() + if (product.isNotEmpty() && product == owned.extra["productId"]) return true + val key = StoreFront.titleKey(owned.title) + return key.isNotEmpty() && key == baseTitle(shelf.title) + } + + /** A product title without its edition, so "Far Cry® 6 - Gold Edition" is "far cry 6". */ + internal fun baseTitle(title: String): String = StoreFront.titleKey(title.substringBefore(" - ")) + + /** One page of the index, or null when Ubisoft did not answer. */ + private fun query(site: Triple, order: String, hits: Int, query: String = "", filters: String = "", facets: List = emptyList()): List? { + val facetFilters = JSONArray().put("product_type:Games").put("Platform:PC (Digital)").apply { facets.forEach { put(it) } } + val url = Uri.parse("https://$APP-dsn.algolia.net/1/indexes/${index(site, order)}").buildUpon() + .appendQueryParameter("query", query) + .appendQueryParameter("hitsPerPage", (hits * 2).toString()) + .appendQueryParameter("facetFilters", facetFilters.toString()) + .apply { if (filters.isNotEmpty()) appendQueryParameter("filters", filters) } + .build().toString() + val body = StoreNet.get(url, headers = mapOf("X-Algolia-Application-Id" to APP, "X-Algolia-API-Key" to KEY)) ?: return null + return parse(JSONObject(body), site.third).take(hits) + } + + internal fun parse(answer: JSONObject, currency: String, now: Instant = Instant.now()): List { + val hits = answer.optJSONArray("hits") ?: return emptyList() + val items = (0 until hits.length()).mapNotNull { hits.optJSONObject(it) }.mapNotNull { item(it, currency, now) } + return items.groupBy { baseTitle(it.title) }.values.map { editions -> editions.firstOrNull { " - " !in it.title } ?: editions.first() } + } + + private fun money(amount: Double, currency: String): String = NumberFormat.getCurrencyInstance(Locale.US).apply { + this.currency = Currency.getInstance(currency) + }.format(amount) + + internal fun item(h: JSONObject, currency: String, now: Instant): CatalogItem? { + fun s(k: String) = h.optString(k).takeIf { it.isNotBlank() && it != "null" } + val id = s("objectID") ?: s("id") ?: return null + val title = s("title") ?: s("name") ?: return null + if (s("Free_offer") == "demo") return null + val price = h.optJSONObject("price")?.optDouble(currency)?.takeUnless { it.isNaN() } + val base = h.optJSONObject("default_price")?.optDouble(currency)?.takeUnless { it.isNaN() } + val discount = s("promotion_percentage")?.toDoubleOrNull()?.toInt() ?: 0 + val released = s("release_date")?.let { runCatching { Instant.parse(it) }.getOrNull() } + if (released != null && released.isAfter(now) && s("preorder") != "true") return null + val free = s("Free_offer") == "freeplay" || price == 0.0 + val image = s("image_link")?.substringBefore("?") + return CatalogItem( + store = Store.UBISOFT, id = "ubisoft-store:$id", title = title.trim(), + imageUrl = image, tallImageUrl = image, tags = listOfNotNull(s("Genre"), s("Edition")).joinToString(", "), + isFree = free, hasPrice = price != null, finalPrice = price?.let { money(it, currency) }.orEmpty(), + originalPrice = if (discount > 0 && base != null) money(base, currency) else "", discountPercent = if (discount > 0 && base != null) discount else 0, + storeUrl = s("link") ?: s("linkWeb").orEmpty(), publisher = "Ubisoft", releaseDate = released?.toString()?.take(10).orEmpty(), + description = cleanStoreText(s("longDescription")), + mature = s("adult").equals("TRUE", true) || matureByAge(listOfNotNull(s("Rating")?.let(RATING_AGE::get))), + extra = buildMap { + s("productLauncherIDString")?.let { put("productId", it) } + if (s("partOfUbisoftPlus").equals("true", true)) put("ubisoftPlus", "true") + }, + ) + } + + /** All four rows, or a failure when any of them failed, so a partial refresh never replaces a good one. */ + private fun fetch(site: Triple): StoreFront.Catalog { + fun row(order: String, filters: String = "", facets: List = emptyList()) = + query(site, order, SHELF, filters = filters, facets = facets) ?: throw java.io.IOException("Ubisoft store $order $filters$facets failed") + val trending = row("best_sellers") + val newest = row("release_date") + val deals = row("best_sellers", filters = "promotion_percentage > 0") + val free = row("best_sellers", facets = listOf("Free_offer:freeplay")) + return StoreFront.Catalog(StoreShelves(whatsNew = newest, deals = deals, free = free, trending = trending, art = trending.mapNotNull { it.imageUrl })) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index f42a85de51..9ac3a96027 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -505,7 +505,12 @@ internal fun GameActions( InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } SecondaryButton(stringResource(R.string.stores_view_on, item.store.shortLabel)) { openStoreUrl(ctx, item) } } - item != null && item.isFree -> PrimaryButton(stringResource(R.string.stores_get_free), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } + item != null && item.isFree -> { + val adding = StoresState.claiming[item.key] == true + PrimaryButton(stringResource(if (adding) R.string.stores_claiming else R.string.stores_get_free), enabled = !adding, main = true, modifier = leadOn) { + if (StoresState.canClaim(item)) StoresState.claim(ctx, item) { openStoreUrl(ctx, item) } else openStoreUrl(ctx, item) + } + } item != null -> PrimaryButton(buyLabel(item), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } } if (cloud && (download != null || failed != null)) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5dbf1a47eb..cc56dbb7a7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2335,6 +2335,7 @@ منقطع تثبيت · %1$s احصل عليها مجانًا + جارٍ الإضافة إلى المكتبة… عرض على %1$s شراء · %1$s مثبَّتة 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 a14f49e9a1..46e5035656 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2304,6 +2304,7 @@ Interrumpida Instalar · %1$s Obtener gratis + Agregando a la biblioteca… Ver en %1$s Comprar · %1$s Instalado diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 09c26b8075..d3e14dd32c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2235,6 +2235,7 @@ Прекъснато Инсталация · %1$s Вземи безплатно + Добавяне в библиотеката… Виж в %1$s Купи · %1$s Инсталирана diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 43169adfb0..c318b3081b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2285,6 +2285,7 @@ Přerušeno Instalace · %1$s Získat zdarma + Přidávání do knihovny… Zobrazit na %1$s Koupit · %1$s Nainstalováno diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3a41c0928b..0936040739 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2235,6 +2235,7 @@ Afbrudt Installation · %1$s Få gratis + Føjer til biblioteket… Se på %1$s Køb · %1$s Installeret diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 53a0591334..1db47d2b34 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2227,6 +2227,7 @@ Unterbrochen Installieren · %1$s Kostenlos erhalten + Wird zur Bibliothek hinzugefügt… Auf %1$s ansehen Kaufen · %1$s Installiert diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1f2a7f6fa5..4fe414040c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2235,6 +2235,7 @@ Διακόπηκε Εγκατάσταση · %1$s Απόκτηση δωρεάν + Προσθήκη στη βιβλιοθήκη… Προβολή στο %1$s Αγορά · %1$s Εγκατεστημένο diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bc362f264d..8cff6535ff 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2260,6 +2260,7 @@ Interrumpida Instalar · %1$s Obtener gratis + Añadiendo a la biblioteca… Ver en %1$s Comprar · %1$s Instalado diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 70e0c2e8ee..71a1e78a74 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2235,6 +2235,7 @@ Keskeytynyt Asenna · %1$s Hanki ilmaiseksi + Lisätään kirjastoon… Näytä %1$s:ssä Osta · %1$s Asennettu diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8a8bd2cb69..a182aeb39a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2260,6 +2260,7 @@ Interrompu Installer · %1$s Obtenir gratuitement + Ajout à la bibliothèque… Voir sur %1$s Acheter · %1$s Installé diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 62f8a6d867..ad96817016 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2235,6 +2235,7 @@ बाधित इंस्टॉल · %1$s मुफ़्त में पाएं + लाइब्रेरी में जोड़ा जा रहा है… %1$s पर देखें खरीदें · %1$s इंस्टॉल है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 854208f327..26fafb1bd2 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2235,6 +2235,7 @@ Megszakítva Telepítés · %1$s Ingyenes beszerzés + Hozzáadás a könyvtárhoz… Megtekintés itt: %1$s Megvétel · %1$s Telepítve diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d18a42fe96..fc440af4e9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2210,6 +2210,7 @@ Terhenti Instal · %1$s Dapatkan gratis + Menambahkan ke pustaka… Lihat di %1$s Beli · %1$s Terinstal diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 655d1bb9e5..6e2493bc4b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2252,6 +2252,7 @@ Interrotto Installa · %1$s Ottieni gratis + Aggiunta alla libreria… Visualizza su %1$s Acquista · %1$s Installato diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0b16c04969..326f88634d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2210,6 +2210,7 @@ 中断 インストール · %1$s 無料で入手 + ライブラリに追加中… %1$sで見る 購入 · %1$s インストール済み diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ec2fc2dc3c..c93c5b0d20 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2210,6 +2210,7 @@ 중단됨 설치 · %1$s 무료로 받기 + 라이브러리에 추가하는 중… %1$s에서 보기 구매 · %1$s 설치됨 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index ff08492061..6d0077c92e 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2210,6 +2210,7 @@ Terganggu Pasang · %1$s Dapatkan percuma + Menambah ke pustaka… Lihat pada %1$s Beli · %1$s Dipasang diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 0be006b622..b95bffcc69 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2235,6 +2235,7 @@ Avbrutt Installer · %1$s Hent gratis + Legger til i biblioteket … Vis på %1$s Kjøp · %1$s Installert diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 6097f32580..b9c476a349 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2235,6 +2235,7 @@ Onderbroken Installeren · %1$s Gratis verkrijgen + Toevoegen aan bibliotheek… Bekijken op %1$s Kopen · %1$s Geïnstalleerd diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index bfe36b08d9..cba0b85efa 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2285,6 +2285,7 @@ Przerwano Instalacja · %1$s Odbierz bezpłatnie + Dodawanie do biblioteki… Zobacz w %1$s Kup · %1$s Zainstalowano diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index e278e59f25..39b93f25b0 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2252,6 +2252,7 @@ Interrompida Instalar · %1$s Obter grátis + A adicionar à biblioteca… Ver em %1$s Comprar · %1$s Instalado diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9d2305b2b6..b4d3cf7ddd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2252,6 +2252,7 @@ Interrompido Instalar · %1$s Obter grátis + Adicionando à biblioteca… Ver em %1$s Comprar · %1$s Instalado diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index cbd0b85423..bd8696e74a 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2260,6 +2260,7 @@ Întreruptă Instalare · %1$s Obține gratuit + Se adaugă în bibliotecă… Vezi pe %1$s Cumpără · %1$s Instalat diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0bfb8f26ae..8dee9e4c9e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2368,6 +2368,7 @@ Прервано Установить · %1$s Получить бесплатно + Добавление в библиотеку… Открыть в %1$s Купить · %1$s Установлено diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 674f7ca9ff..5a35123390 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2235,6 +2235,7 @@ Avbruten Installation · %1$s Hämta gratis + Lägger till i biblioteket … Visa på %1$s Köp · %1$s Installerat diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 31e38b728f..81017bbb02 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2210,6 +2210,7 @@ ถูกขัดจังหวะ ติดตั้ง · %1$s รับไปเลยฟรี + กำลังเพิ่มลงในคลัง… ดูบน %1$s ซื้อ · %1$s ติดตั้งแล้ว diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f66424d69d..b65fc85813 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2227,6 +2227,7 @@ Kesintiye uğradı Yükle · %1$s Ücretsiz al + Kitaplığa ekleniyor… %1$s\'te görüntüle Satın al · %1$s Yüklü diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8aebdeebdd..bd977f8e42 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2285,6 +2285,7 @@ Перервано Встановити · %1$s Отримати безкоштовно + Додавання до бібліотеки… Переглянути на %1$s Купити · %1$s Встановлено diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a6a392b8f0..a6411681d2 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2210,6 +2210,7 @@ Bị gián đoạn Cài · %1$s Lấy miễn phí + Đang thêm vào thư viện… Xem trên %1$s Mua · %1$s Đã cài diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 45aebc4133..e3263afcc6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2291,6 +2291,7 @@ 已中断 安装 · %1$s 免费领取 + 正在添加到游戏库… 在 %1$s 上查看 购买 · %1$s 已安装 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 65b40bad57..6ea69859e5 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2210,6 +2210,7 @@ 已中斷 安裝 · %1$s 免費領取 + 正在加入遊戲庫… 在 %1$s 查看 購買 · %1$s 已安裝 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c05aeafcd3..6b34c26263 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2210,6 +2210,7 @@ 已中斷 安裝 · %1$s 免費取得 + 正在加入收藏庫… 在 %1$s 檢視 購買 · %1$s 已安裝 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 114ec48d94..cc8da5f577 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2585,6 +2585,7 @@ Interrupted Install · %1$s Get for free + Adding to library… View on %1$s Buy · %1$s Installed diff --git a/app/src/main/resources/ea/graphql/GetGameProductOfferIds.gql b/app/src/main/resources/ea/graphql/GetGameProductOfferIds.gql new file mode 100644 index 0000000000..9c1c1dbd5c --- /dev/null +++ b/app/src/main/resources/ea/graphql/GetGameProductOfferIds.gql @@ -0,0 +1,15 @@ +query GetGameProductOfferIds($slug: String!, $locale: Locale!, $overrideCountryCode: String!) { + game(slug: $slug, locale: $locale) { + id + isFreeToPlay + slug + lowestPriceGameProduct(availabilities: [ACQUIRABLE], overrideCountryCode: $overrideCountryCode) { + id + isFree + name + originOfferId + __typename + } + __typename + } +} diff --git a/app/src/main/resources/ea/graphql/grantEntitlement.gql b/app/src/main/resources/ea/graphql/grantEntitlement.gql new file mode 100644 index 0000000000..9871d7231f --- /dev/null +++ b/app/src/main/resources/ea/graphql/grantEntitlement.gql @@ -0,0 +1,23 @@ +mutation grantEntitlement($input: GrantEntitlementInput!) { + grantEntitlement(input: $input) { + success + entitledOfferIds + entitlementType + errors { + ... on GrantEntitlementOfferDoesNotExistError { + __typename + } + ... on GrantEntitlementNotQualifiedError { + __typename + } + ... on GrantEntitlementNotFreeOrNoAppropriateSubscriptionError { + __typename + } + ... on GrantEntitlementUpstreamConflictError { + __typename + } + __typename + } + __typename + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt index 83c03495ae..b9deb11a11 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.stores.ea +import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreLaunch @@ -239,6 +240,47 @@ class EaTest { assertTrue(EaLibrary.withoutGameDownload(emptyList()).isEmpty()) } + @Test fun theStorePageNamesEachGameWithItsPrice() { + val game = { slug: String, title: String, date: String, price: String, sale: String, off: Int, free: Boolean -> + """{"slug":"$slug","title":"$title +","isFreeToPlay":$free,"franchiseSlug":"f","tier":"Tier1","releaseDate":"$date", + "packArt":{"ar16X9":"https://img/$slug-wide","ar2X3":"https://img/$slug-tall"},"genres":[{"name":"RPG"}], + "price":{"displayTotal":"$price","displayTotalWithDiscount":"$sale","discountPercentage":$off,"currency":"USD"}}""" + } + val html = """" + val (items, total) = EaStore.parsePage(html, "USD") + assertEquals("", EaStore.parsePage(html, "EUR").first.first().finalPrice) + assertEquals(40, total) + val ultima = items.first() + assertEquals("Ultima VII", ultima.title) + assertEquals("$2.49", ultima.finalPrice) + assertEquals("$4.99", ultima.originalPrice) + assertEquals(50, ultima.discountPercent) + assertEquals("https://www.ea.com/games/f/ultima-7", ultima.storeUrl) + assertTrue(items[1].isFree) + val shelves = EaStore.shelves(items, java.time.Instant.parse("2026-11-12T00:00:00Z")) + assertEquals(listOf("Ultima VII", "REDSEC"), shelves.whatsNew.map { it.title }) + assertEquals(listOf("Ultima VII"), shelves.deals.map { it.title }) + assertEquals(listOf("REDSEC"), shelves.free.map { it.title }) + val owned = CatalogItem(Store.EA, "Origin.OFR.1", "Ultima™ VII", null, owned = true, extra = mapOf("slug" to "other")) + val marked = com.droiddeck.launcher.stores.StoreFront.markOwned(shelves, listOf(owned), EaStore::sameGame) + assertEquals("Origin.OFR.1", marked.deals.single().id) + assertEquals("https://img/ultima-7-wide", marked.deals.single().imageUrl) + val bf = CatalogItem(Store.EA, "Origin.OFR.50.0005511", "Battlefield™", null, owned = true, extra = mapOf("slug" to "glacier", "productName" to "Battlefield™ 6")) + assertTrue(EaStore.sameGame(CatalogItem(Store.EA, "ea-store:battlefield-6", "Battlefield™ 6", null, extra = mapOf("slug" to "battlefield-6")), bf)) + assertFalse(EaStore.sameGame(CatalogItem(Store.EA, "ea-store:bf-2042", "Battlefield™ 2042", null), bf)) + } + + @Test fun titlesMatchAcrossMarksAndAccentsButNeverWhenEmpty() { + assertEquals("pokemon", com.droiddeck.launcher.stores.StoreFront.titleKey("Pokémon™")) + assertEquals("ファイナル 7", com.droiddeck.launcher.stores.StoreFront.titleKey("ファイナル® 7")) + val shelf = CatalogItem(Store.EA, "ea-store:a", "™", null) + assertFalse(EaStore.sameGame(shelf, CatalogItem(Store.EA, "Origin.OFR.2", "®", null, owned = true))) + } + @Test fun ownedPageParses() { val page = JSONObject( """{"me":{"ownedGameProducts":{"next":"100","items":[{"originOfferId":"Origin.OFR.50.0001","product":{"id":"x","name":"N","downloadable":true,"gameSlug":"titanfall-2", diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt index 7f163ce351..aecf4ca779 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -45,6 +45,36 @@ class UbisoftTest { assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, null).map { it.id }) } + @Test fun theStoreSearchNamesEachGameWithItsPrice() { + fun hit(id: String, title: String, price: Double, base: Double, off: String, date: String, free: String = "") = JSONObject() + .put("objectID", id).put("title", title).put("price", JSONObject().put("USD", price)).put("default_price", JSONObject().put("USD", base)) + .put("promotion_percentage", off).put("release_date", date).put("Free_offer", free).put("link", "https://store.ubisoft.com/us/$id.html") + .put("image_link", "https://img/$id.jpg?sw=300").put("productLauncherIDString", id.takeLast(3)).put("Rating", "esrb-m") + val answer = JSONObject().put("hits", JSONArray() + .put(hit("p-109", "Far Cry® 6", 15.0, 60.0, "75", "2021-10-07T00:00:00.000Z")) + .put(hit("p-110", "Far Cry® 6 - Gold Edition", 30.0, 100.0, "70", "2021-10-07T00:00:00.000Z")) + .put(hit("p-111", "Some Demo", 0.0, 0.0, "", "2021-10-07T00:00:00.000Z", free = "demo")) + .put(hit("p-112", "Next Year", 70.0, 70.0, "", "2030-01-01T00:00:00.000Z"))) + val items = UbisoftStore.parse(answer, "USD", java.time.Instant.parse("2026-11-12T00:00:00Z")) + assertEquals(listOf("Far Cry® 6"), items.map { it.title }) + val game = items.single() + assertEquals("$15.00", game.finalPrice) + assertEquals("$60.00", game.originalPrice) + assertEquals(75, game.discountPercent) + assertEquals("https://img/p-109.jpg", game.imageUrl) + assertTrue(game.mature) + val owned = CatalogItem(Store.UBISOFT, "space-fc6", "Far Cry 6", null, owned = true, extra = mapOf("productId" to "5266")) + val ezio = CatalogItem(Store.UBISOFT, "ubisoft-store:x", "Assassin's Creed® The Ezio Collection", null) + assertTrue(UbisoftStore.sameGame(game, owned)) + assertTrue(!UbisoftStore.sameGame(ezio, CatalogItem(Store.UBISOFT, "space-ac", "Assassin's Creed™", null, owned = true))) + } + + @Test fun theBaseEditionStandsForItsGameWhicheverComesFirst() { + fun hit(id: String, title: String) = JSONObject().put("objectID", id).put("title", title).put("price", JSONObject().put("USD", 10.0)) + val answer = JSONObject().put("hits", JSONArray().put(hit("gold", "Far Cry® 6 - Gold Edition")).put(hit("base", "Far Cry® 6"))) + assertEquals(listOf("ubisoft-store:base"), UbisoftStore.parse(answer, "USD").map { it.id }) + } + @Test fun theEntitlementNamesTheGamesApplication() { val body = JSONObject().put("items", JSONArray() .put(JSONObject().put("productId", 82).put("applicationId", "app-82")) From bd022f04beaab221e80c643299bf8c7130eb0a6f Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Thu, 12 Nov 2026 11:10:05 -0600 Subject: [PATCH 049/101] fix(apps): center the folder title and rename by selecting it (#2492) * fix(apps): center the folder title and rename by selecting it The open folder showed its name on the left with a pencil button and a close button. The title is now centered and is itself the rename control: tap it, or highlight it and confirm. The close button is gone; Back, B, or a tap outside the folder closes it as before. * fix(apps): the folder title shows a faint chip at rest, so it reads as selectable --- .../droiddeck/launcher/ui/AndroidAppsPage.kt | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt index f43e191a66..a7742c42ea 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -55,8 +55,6 @@ import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.FilterAlt import androidx.compose.material.icons.filled.Sort import androidx.compose.material.icons.filled.Widgets @@ -779,19 +777,30 @@ private fun FolderSheet( .focusGroup() .padding(16.dp), ) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)) { - if (renaming) Box(Modifier.weight(1f)) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)) { + if (renaming) { AdbTextField( value = name, onValueChange = { name = it.take(40) }, label = stringResource(R.string.apps_folder_name), keyboardType = KeyboardType.Text, imeAction = ImeAction.Done, compact = true, showLabel = false, placeholder = folder.name, focusOnShow = true, onDone = { commit() }, ) } else { - Text(folder.name, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) - SmallIconButton(Icons.Filled.Edit, stringResource(R.string.apps_folder_rename), tint = colors.onSurfaceVariant) { renaming = true } - Spacer(Modifier.weight(1f)) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val rename = { renaming = true } + Text( + folder.name, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center, + // A faint chip at rest shows the name can be selected, now that the pencil is gone. + modifier = Modifier.clip(Shape12) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else colors.onBackground.copy(alpha = 0.07f)) + .glideBorder(hot, Shape12, pal.signal) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, onClickLabel = stringResource(R.string.apps_folder_rename), role = Role.Button, onClick = rename) + .controllerConfirm(onClick = rename) + .padding(horizontal = 14.dp, vertical = 6.dp), + ) } - SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = colors.onSurfaceVariant) { close() } } LazyVerticalGrid( columns = GridCells.Adaptive(92.dp), From 52bf19ad8ece1a4857a0e6b4e54f73cbeaaf53e0 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Thu, 12 Nov 2026 11:10:32 -0600 Subject: [PATCH 050/101] feat(home): choose the page the Home button opens (#2493) * feat(home): choose the page the Home button opens As the Home app, DroidDeck always came back to whichever page was last open, and a cold start landed on Steam. A new choice under Setup > Launcher, shown while "Use as Home screen" is on, lets Home open the Android apps page instead. The default stays Steam, which keeps the current behaviour. * fix(home): a Home request for the apps page closes a page open over the rail --- .../droiddeck/launcher/FrontEndActivity.kt | 12 ++++++++++++ .../com/droiddeck/launcher/HomeActivity.kt | 6 ++++++ .../com/droiddeck/launcher/core/AppUiPrefs.kt | 19 +++++++++++++++++++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 10 ++++++++++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 5 +++++ app/src/main/res/values/strings.xml | 2 ++ .../com/droiddeck/launcher/ui/AppScaleTest.kt | 8 ++++++++ 7 files changed, 62 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 699dd9643b..23171a6c17 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -196,6 +196,7 @@ class FrontEndActivity : ComponentActivity() { private var stretch16x9 by mutableStateOf(false) private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) private var launcherOrientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) + private var homePage by mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_STEAM) private var launcherFullscreen by mutableStateOf(true) private var downloadSource by mutableStateOf(DownloadSource.MODE_AUTO) private var downloadMirror by mutableStateOf("") @@ -829,6 +830,10 @@ class FrontEndActivity : ComponentActivity() { private fun readGameIntent(request: Intent) { request.getStringExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV)?.let { navRequest = it; request.removeExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV) } + if (navRequest == com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_APPS) { + homeAppSelected = HomeApp.isHomeScreenEnabled(this) && HomeApp.isDefault(this) + if (!homeAppSelected) navRequest = null + } shortcutPicker = request.action == Intent.ACTION_CREATE_SHORTCUT if (shortcutPicker) { steamGames = emptyList() @@ -1122,6 +1127,7 @@ class FrontEndActivity : ComponentActivity() { orientation = SessionPrefs.orientation(this) launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) requestedOrientation = launcherOrientation + homePage = com.droiddeck.launcher.core.AppUiPrefs.homePage(this) launcherFullscreen = SessionPrefs.launcherFullscreen(this) downloadSource = DownloadSource.mode(this) downloadMirror = DownloadSource.mirror(this) @@ -1218,6 +1224,7 @@ class FrontEndActivity : ComponentActivity() { showPhantomGate = showPhantomGate, orientation = orientation, launcherOrientation = launcherOrientation, + homePage = homePage, launcherFullscreen = launcherFullscreen, downloadSource = downloadSource, downloadMirror = downloadMirror, @@ -1515,6 +1522,10 @@ class FrontEndActivity : ComponentActivity() { launcherOrientation = value requestedOrientation = value }, + onHomePage = { value -> + com.droiddeck.launcher.core.AppUiPrefs.setHomePage(this, value) + homePage = value + }, onLauncherFullscreen = { on -> SessionPrefs.setLauncherFullscreen(this, on) launcherFullscreen = on @@ -1907,6 +1918,7 @@ class FrontEndActivity : ComponentActivity() { orientation = SessionPrefs.orientation(this) launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) requestedOrientation = launcherOrientation + homePage = com.droiddeck.launcher.core.AppUiPrefs.homePage(this) SteamIntegration.syncShortcutsListing(this) refreshWifiDiscovery() com.droiddeck.launcher.stores.StoresState.refresh(this) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt index 59e10c48e7..3947263c03 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt @@ -25,6 +25,12 @@ class HomeActivity : Activity() { } else { Intent(this, FrontEndActivity::class.java) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + .apply { + val page = com.droiddeck.launcher.core.AppUiPrefs.homePage(this@HomeActivity) + if (page != com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_STEAM) { + putExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV, page) + } + } } startActivity(destination) finish() diff --git a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt index 7b8536202d..3f308636db 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt @@ -27,6 +27,25 @@ object AppUiPrefs { context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putInt("orientation", value).apply() } + const val HOME_PAGE_STEAM = "steam" + const val HOME_PAGE_APPS = "android-apps" + + val homePageOptions = listOf( + HOME_PAGE_STEAM to R.string.rail_steam, + HOME_PAGE_APPS to R.string.content_android_apps, + ) + + fun homePage(context: Context): String = + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE) + .getString("home-page", null) + .takeIf { value -> homePageOptions.any { it.first == value } } + ?: HOME_PAGE_STEAM + + fun setHomePage(context: Context, value: String) { + require(homePageOptions.any { it.first == value }) + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putString("home-page", value).apply() + } + internal fun normalizeScale(percent: Int): Int = percent.takeIf { it in scales } ?: DEFAULT_SCALE fun scale(context: Context): Int = normalizeScale( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 1e4aaa88b0..3cc28e1890 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -171,6 +171,7 @@ class FrontEndState( val showPhantomGate: Boolean = false, val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, val launcherOrientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER, + val homePage: String = com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_STEAM, val launcherFullscreen: Boolean = true, val downloadSource: String = DownloadSource.MODE_AUTO, val downloadMirror: String = "", @@ -271,6 +272,7 @@ class FrontEndActions( val onLauncherIcon: (String) -> Unit = {}, val onOrientation: (Int) -> Unit = {}, val onLauncherOrientation: (Int) -> Unit = {}, + val onHomePage: (String) -> Unit = {}, val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onLowStorageWarning: (Boolean) -> Unit = {}, @@ -466,6 +468,14 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com "setup:launcher" -> { SetupTabs.openLauncher = true; selected = "setup" } com.droiddeck.launcher.sync.SyncthingService.NAV -> com.droiddeck.launcher.sync.Syncthing.requestOpen() "setup:integration" -> { SetupTabs.openOverview = true; selected = "setup" } + com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_APPS -> { + // Home lands on the apps page itself, so a page open over the rail (Components, Performance) closes first. + if (s.pageKey != null) a.onPageBack() + Hops.origin = null + Hops.restore = null + Hops.sinking = null + selected = target + } else -> selected = target } a.onNavigated() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index f90cf1b26b..bfdbd7ecef 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -473,6 +473,11 @@ internal fun SetupPanel( ) { a.onHomeScreen(it) } if (s.homeScreenEnabled) { ActionRow(stringResource(R.string.setup_default_home), s.defaultHomeLabel ?: stringResource(R.string.setup_choose_home), stringResource(R.string.setup_choose), a.onHomeApp) + ChoiceRow( + host, "home-page", stringResource(R.string.setup_home_page), stringResource(R.string.setup_home_page_hint), + com.droiddeck.launcher.core.AppUiPrefs.homePageOptions.map { (value, label) -> value to stringResource(label) }, + s.homePage, onPick = a.onHomePage, + ) } ChoiceRow( host, "launcher-orientation", stringResource(R.string.setup_launcher_orientation), null, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc8da5f577..c5acad050c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -982,6 +982,8 @@ Use as Home screen DroidDeck can be the Home app DroidDeck is never offered as a Home app + Home button opens + The page shown when DroidDeck is the Home app and you press Home In Add Games, set DroidDeck to Include Orientation Launcher orientation diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt index 56a6db50b5..e3e741b65a 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt @@ -87,4 +87,12 @@ class AppScaleTest { assertEquals(540, base.screenHeightDp) assertEquals(320, base.densityDpi) } + + @Test fun homePageDefaultsToSteamAndIgnoresAnUnknownStoredPage() { + assertEquals(AppUiPrefs.HOME_PAGE_STEAM, AppUiPrefs.homePage(context)) + AppUiPrefs.setHomePage(context, AppUiPrefs.HOME_PAGE_APPS) + assertEquals(AppUiPrefs.HOME_PAGE_APPS, AppUiPrefs.homePage(context)) + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putString("home-page", "gone").commit() + assertEquals(AppUiPrefs.HOME_PAGE_STEAM, AppUiPrefs.homePage(context)) + } } From a1dfb967089deb7d1ee3aef570502c5c19d3b214 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:11:45 -0500 Subject: [PATCH 051/101] fix(steam): share the Steam app's prefix with shortcuts of the same install (#2463) * fix(steam): share the Steam app's prefix with shortcuts of the same install * fix(steam): prefer the matching install's save prefix * fix(steam): tolerate an unreadable library when linking a shortcut prefix A library folder that cannot be listed made the shortcut writer exit, so no added game was registered. * fix(steam): repair a dangling shortcut prefix link and keep Steam library installs to their own prefix * fix(steam): only change shortcut prefix links the importer created * fix(steam): record a prefix link only when the importer created it --- docs/development/steam-game-imports.md | 6 + .../usr/local/bin/droiddeck-steam-games | 70 +++++++- tools/tests/test_steam_games.py | 166 ++++++++++++++++++ 3 files changed, 239 insertions(+), 3 deletions(-) diff --git a/docs/development/steam-game-imports.md b/docs/development/steam-game-imports.md index 04065e3a55..2e4a0cc3e7 100644 --- a/docs/development/steam-game-imports.md +++ b/docs/development/steam-game-imports.md @@ -52,6 +52,12 @@ again. A failed title lookup undoes nothing. The launcher likewise drops artwork fetched for the app the files named before and fetches it again; pictures the user chose are kept. +A game that stays a shortcut but sits in a Steam install directory with a single matching +manifest links its shortcut prefix to that app's existing `compatdata/`, so cloud +saves the client downloaded are the ones the shortcut sees. A Steam library install only +uses its own library's prefix. An existing shortcut prefix is never replaced, a link to a +missing prefix is removed first, and nothing is copied. + The account's `.droiddeck-routes.json` maps shortcut IDs to real Steam app IDs so the Android launcher uses the same title and Proton prefix as Steam. Other accounts do not inherit those routes. Managed shortcuts are replaced; user-created shortcuts and diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games index c902676d3f..ac8213d41e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games @@ -71,7 +71,11 @@ def store_game(game): def manifest_ids(steamapps, name): matches = [] - for manifest in Path(steamapps).glob("appmanifest_*.acf"): + try: + manifests = list(Path(steamapps).glob("appmanifest_*.acf")) + except OSError: + return matches + for manifest in manifests: try: install = re.search(r'"installdir"\s*"([^"\\]*)"', manifest.read_text(), re.I) if install and install[1] == name: @@ -81,13 +85,21 @@ def manifest_ids(steamapps, name): return matches -def identify(game): +def manifest_identity(game): folder = Path(game["folder"]) steamapps = folder.parent.parent for library in ([steamapps] if folder.parent.name == "common" and steamapps.name == "steamapps" else []) + [folder.parent / WINNATIVE]: matches = [appid for appid in manifest_ids(library, folder.name) if appid != SPACEWAR] if matches: - return matches[0] if len(matches) == 1 else None + return (matches[0], library) if len(matches) == 1 else None + return False + + +def identify(game): + folder = Path(game["folder"]) + found = manifest_identity(game) + if found is not False: + return found[0] if found is not None else None ids = set() for parent in {folder, Path(game["exe"]).parent}: try: @@ -508,6 +520,57 @@ def release(steam_root, game, stale, reason): print(f"droiddeck-steam-games: {game.get('name', appid)} {reason}; it is no longer Steam app {appid}") +PREFIX_LINKS = ".droiddeck-prefix-links.json" + + +def steam_prefix(steam_root, game): + identity = manifest_identity(game) + if not identity or not identity[0]: + return None, None + appid, steamapps = identity + installed = steamapps == Path(game["folder"]).parent.parent + for library in [steamapps.parent] if installed else dict.fromkeys([steamapps.parent] + libraries(steam_root)): + prefix = library / "steamapps/compatdata" / str(appid) + if (prefix / "pfx/drive_c").is_dir(): + return appid, str(prefix) + return appid, None + + +def share_prefix(steam_root, game): + shortcut = Path(steam_root) / "steamapps/compatdata" / str(game["appid"] & 0xFFFFFFFF) + record = Path(steam_root) / "steamapps" / PREFIX_LINKS + links = read_json(record, {}) + if not isinstance(links, dict): + links = {} + before = dict(links) + key = str(shortcut) + name = game.get("name", "game") + appid, target = steam_prefix(steam_root, game) + try: + current = os.readlink(shortcut) if os.path.islink(shortcut) else None + if current is not None and links.get(key) == current and current != target: + if target is not None or (not os.path.exists(shortcut) and Path(current).parent.parent.is_dir()): + shortcut.unlink() + current = None + if current is None: + links.pop(key, None) + if current is None and os.path.lexists(shortcut): + if target is not None: + print(f"droiddeck-steam-games: {name} keeps its own prefix; Steam app {appid} saves are in {target}") + elif current is None and target is not None: + shortcut.parent.mkdir(parents=True, exist_ok=True) + shortcut.symlink_to(target) + links[key] = target + print(f"droiddeck-steam-games: {name} shares the saves prefix of Steam app {appid}") + except OSError as error: + print(f"droiddeck-steam-games: {name} keeps its own prefix ({error})") + if links != before: + try: + save_json(record, links) + except OSError as error: + print(f"droiddeck-steam-games: prefix links not recorded ({error})") + + def route(steam_root, acct, games): snapshot = read_json(Path(acct) / "config" / STATE, {}) if not isinstance(snapshot, dict): @@ -557,6 +620,7 @@ def route(steam_root, acct, games): elif named and seeded(steamapps, game, appid): routes[str(game["appid"])] = appid continue + share_prefix(steam_root, game) shortcuts.append(game) try: park(steamapps) diff --git a/tools/tests/test_steam_games.py b/tools/tests/test_steam_games.py index 16c08e142f..13235e68b4 100644 --- a/tools/tests/test_steam_games.py +++ b/tools/tests/test_steam_games.py @@ -3,6 +3,7 @@ import importlib.util import json import os from pathlib import Path +import shutil import subprocess import tempfile import unittest @@ -56,6 +57,171 @@ class ImportsTest(unittest.TestCase): self.assertEqual(self.folder, (self.steam / 'steamapps/common/DroidDeck-42').resolve()) self.assertEqual(b'game', self.exe.read_bytes()) + def steam_install(self, appid=42): + library = self.root / 'Library' + folder = library / 'steamapps/common/Example' + folder.mkdir(parents=True) + (folder / 'Example.exe').write_bytes(b'game') + (library / f'steamapps/appmanifest_{appid}.acf').write_text(f'"AppState"\n{{\n"appid" "{appid}"\n"installdir" "Example"\n}}\n') + saves = library / f'steamapps/compatdata/{appid}/pfx/drive_c/users/steamuser' + saves.mkdir(parents=True) + (saves / 'save.dat').write_bytes(b'cloud') + return dict(self.game, folder=str(folder), exe=str(folder / 'Example.exe'), dir=str(folder)), library + + def shortcut_prefix(self): + return self.steam / 'steamapps/compatdata' / str(self.game['appid'] & 0xFFFFFFFF) + + def link_shortcut_prefix(self, target, owned=True): + (self.steam / 'steamapps/compatdata').mkdir(parents=True, exist_ok=True) + self.shortcut_prefix().symlink_to(target) + if owned: + imports.save_json(self.steam / 'steamapps' / imports.PREFIX_LINKS, + {str(self.shortcut_prefix()): str(target)}) + + def test_shortcut_of_a_steam_install_shares_the_steam_apps_prefix(self): + game, library = self.steam_install() + (self.steam / 'steamapps').mkdir(parents=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + games, routes = imports.route(self.steam, self.acct, [game]) + self.assertEqual(([game], {}), (games, routes)) + self.assertEqual(library / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + self.assertEqual(b'cloud', (self.shortcut_prefix() / 'pfx/drive_c/users/steamuser/save.dat').read_bytes()) + + def test_matching_install_prefix_precedes_an_older_prefix_in_another_library(self): + game, library = self.steam_install() + (self.steam / 'steamapps').mkdir(parents=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + older = self.steam / 'steamapps/compatdata/42/pfx/drive_c/users/steamuser' + older.mkdir(parents=True) + (older / 'save.dat').write_bytes(b'old') + imports.route(self.steam, self.acct, [game]) + self.assertEqual(library / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + self.assertEqual(b'cloud', (self.shortcut_prefix() / 'pfx/drive_c/users/steamuser/save.dat').read_bytes()) + self.assertEqual(b'old', (older / 'save.dat').read_bytes()) + + def test_an_existing_shortcut_prefix_is_never_replaced(self): + game, library = self.steam_install() + (self.steam / 'steamapps').mkdir(parents=True, exist_ok=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + local = self.shortcut_prefix() / 'pfx/drive_c' + local.mkdir(parents=True) + (local / 'local.dat').write_bytes(b'local') + imports.route(self.steam, self.acct, [game]) + self.assertFalse(self.shortcut_prefix().is_symlink()) + self.assertEqual(b'local', (local / 'local.dat').read_bytes()) + self.assertEqual(b'cloud', (library / 'steamapps/compatdata/42/pfx/drive_c/users/steamuser/save.dat').read_bytes()) + + def test_shortcuts_without_a_manifest_identity_keep_their_own_prefix(self): + game, library = self.steam_install() + (self.steam / 'steamapps').mkdir(parents=True, exist_ok=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + imports.route(self.steam, self.acct, [self.game, dict(game, folder=str(self.folder.parent / 'Other'))]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + + def test_a_manifest_without_a_steam_prefix_links_nothing(self): + game, library = self.steam_install() + shutil.rmtree(library / 'steamapps/compatdata/42') + (self.steam / 'steamapps').mkdir(parents=True, exist_ok=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + imports.route(self.steam, self.acct, [game]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + + def test_an_older_prefix_in_another_library_is_not_linked_for_a_steam_install(self): + game, library = self.steam_install() + shutil.rmtree(library / 'steamapps/compatdata/42') + (self.steam / 'steamapps').mkdir(parents=True, exist_ok=True) + (self.steam / 'steamapps/libraryfolders.vdf').write_text(f'"libraryfolders"\n{{\n"1" {{ "path" "{library}" }}\n}}\n') + (self.steam / 'steamapps/compatdata/42/pfx/drive_c').mkdir(parents=True) + imports.route(self.steam, self.acct, [game]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + + def test_a_dangling_shortcut_prefix_link_is_replaced(self): + game, library = self.steam_install() + self.link_shortcut_prefix(self.root / 'moved') + imports.route(self.steam, self.acct, [game]) + self.assertEqual(library / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + + def test_a_dangling_shortcut_prefix_link_is_removed_without_a_replacement(self): + game, library = self.steam_install() + shutil.rmtree(library / 'steamapps/compatdata/42') + self.link_shortcut_prefix(self.root / 'moved') + imports.route(self.steam, self.acct, [game]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + + def test_a_link_the_user_made_is_never_changed(self): + game, library = self.steam_install() + for target in (self.root / 'moved', library / 'steamapps/compatdata/42', self.folder): + if os.path.lexists(self.shortcut_prefix()): + self.shortcut_prefix().unlink() + self.link_shortcut_prefix(target, owned=False) + imports.route(self.steam, self.acct, [game]) + self.assertEqual(str(target), os.readlink(self.shortcut_prefix())) + + def test_a_user_link_to_the_matching_prefix_is_never_recorded_or_removed(self): + game, library = self.steam_install() + target = library / 'steamapps/compatdata/42' + self.link_shortcut_prefix(target, owned=False) + imports.route(self.steam, self.acct, [game]) + self.assertEqual(str(target), os.readlink(self.shortcut_prefix())) + self.assertNotIn(str(self.shortcut_prefix()), imports.read_json(self.steam / 'steamapps' / imports.PREFIX_LINKS, {})) + shutil.rmtree(target) + imports.route(self.steam, self.acct, [game]) + self.assertTrue(os.path.islink(self.shortcut_prefix())) + self.assertEqual(str(target), os.readlink(self.shortcut_prefix())) + + def test_our_link_survives_a_library_that_is_temporarily_missing(self): + game, library = self.steam_install() + imports.route(self.steam, self.acct, [game]) + hidden = self.root / 'Hidden' + library.rename(hidden) + imports.route(self.steam, self.acct, [game]) + self.assertTrue(os.path.islink(self.shortcut_prefix())) + hidden.rename(library) + imports.route(self.steam, self.acct, [game]) + self.assertEqual(library / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + self.assertEqual(b'cloud', (self.shortcut_prefix() / 'pfx/drive_c/users/steamuser/save.dat').read_bytes()) + + def test_our_link_is_dropped_once_its_prefix_is_deleted(self): + game, library = self.steam_install() + imports.route(self.steam, self.acct, [game]) + shutil.rmtree(library / 'steamapps/compatdata/42') + imports.route(self.steam, self.acct, [game]) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + self.assertEqual({}, imports.read_json(self.steam / 'steamapps' / imports.PREFIX_LINKS, None)) + + def test_a_replaced_link_record_is_forgotten_when_the_user_makes_a_real_prefix(self): + game, library = self.steam_install() + imports.route(self.steam, self.acct, [game]) + self.shortcut_prefix().unlink() + (self.shortcut_prefix() / 'pfx/drive_c').mkdir(parents=True) + imports.route(self.steam, self.acct, [game]) + self.assertFalse(self.shortcut_prefix().is_symlink()) + self.assertEqual({}, imports.read_json(self.steam / 'steamapps' / imports.PREFIX_LINKS, None)) + + def test_a_shortcut_prefix_with_its_own_saves_is_reported_and_kept(self): + game, library = self.steam_install() + local = self.shortcut_prefix() / 'pfx/drive_c' + local.mkdir(parents=True) + with patch('builtins.print') as printed: + imports.route(self.steam, self.acct, [game]) + self.assertTrue(local.is_dir()) + self.assertIn('keeps its own prefix', printed.call_args_list[-1][0][0]) + + def test_a_winnative_game_shares_the_prefix_the_steam_client_uses(self): + self.winnative_manifest() + (self.steam / 'steamapps/libraryfolders.vdf').parent.mkdir(parents=True, exist_ok=True) + saves = self.steam / 'steamapps/compatdata/42/pfx/drive_c/users/steamuser' + saves.mkdir(parents=True) + (saves / 'save.dat').write_bytes(b'cloud') + imports.share_prefix(self.steam, self.game) + self.assertEqual(self.steam / 'steamapps/compatdata/42', self.shortcut_prefix().resolve()) + + def test_an_unreadable_library_does_not_stop_the_routing(self): + with patch.object(Path, 'glob', side_effect=PermissionError): + games, routes = imports.route(self.steam, self.acct, [self.game]) + self.assertEqual([self.game], games) + self.assertFalse(os.path.lexists(self.shortcut_prefix())) + def test_store_installs_stay_shortcuts_even_when_owned_on_steam(self): self.snapshot() game = dict(self.game, store='amazon') From 76f0c512352670369ff7adda78ddf26d8103a4f4 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:12:24 -0500 Subject: [PATCH 052/101] feat(stores): show the pre-install size in store game details (#2438) * feat(stores): show the download size in store game details * test(stores): preserve other catalog sizes * fix(stores): restart the pre-install size lookup when the item becomes accessible * fix(stores): retry size lookups that returned no size * fix(stores): complete shared size lookups only after a failed one is cleared * fix(stores): complete synchronous size lookup failures without an API 31 call --- .../droiddeck/launcher/stores/StoreSizes.kt | 23 ++++- .../com/droiddeck/launcher/ui/GameDetail.kt | 14 ++- .../launcher/stores/StoreSizesTest.kt | 96 +++++++++++++++++++ 3 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/StoreSizesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 5e8ce7c6d7..b102c8114c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -43,7 +43,7 @@ object StoreSizes { if (available != null) return CompletableFuture.completedFuture(available) val app = context.applicationContext val version = item.extra["version"].orEmpty() - return sizeRequests.computeIfAbsent(item.key) { + return shared(sizeRequests, item.key) { CompletableFuture.supplyAsync({ val cached = cache(app, item.store).get(item.id, version) val bytes = cached ?: runCatching { fetch(app, item) } @@ -66,6 +66,25 @@ object StoreSizes { } } + internal fun shared( + requests: ConcurrentHashMap>, + key: String, + start: () -> CompletableFuture, + ): CompletableFuture { + var created: CompletableFuture? = null + val shared = requests.computeIfAbsent(key) { CompletableFuture().also { created = it } } + if (created === shared) { + val source = runCatching(start).getOrElse { failure -> + CompletableFuture().apply { completeExceptionally(failure) } + } + source.whenComplete { bytes, error -> + if (bytes == null) requests.remove(key, shared) + if (error != null) shared.completeExceptionally(error) else shared.complete(bytes) + } + } + return shared + } + val onDisk = mutableStateMapOf() fun requestDisk(context: Context, key: String, game: InstalledStoreGame) { @@ -78,7 +97,7 @@ object StoreSizes { onDisk[key]?.let { return CompletableFuture.completedFuture(it) } val app = context.applicationContext val version = "disk:${game.sidecar.installedAt}:${game.sidecar.installVersion}" - return diskRequests.computeIfAbsent(key) { + return shared(diskRequests, key) { CompletableFuture.supplyAsync({ val c = cache(app, game.sidecar.store) c.get("disk:${game.sidecar.id}", version) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 9ac3a96027..bee82bbd2c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -309,7 +309,7 @@ private fun GameStatusLine(source: String, game: Library.SteamGame?, item: Catal item?.accessible == true -> listOf(stringResource(R.string.stores_eyebrow_library)) else -> listOf(stringResource(R.string.stores_eyebrow_store)) } - val size = if (folder != null && (installed != null || game != null)) diskSize(installed, folder) else (item?.sizeBytes ?: 0L).takeIf { it > 0 } + val size = if (folder != null && (installed != null || game != null)) diskSize(installed, folder) else catalogSize(item).takeIf { it > 0 } val line = (state + listOfNotNull(size?.let { formatBytes(it) })).filter { it.isNotBlank() }.joinToString(" · ").replaceFirstChar { it.uppercase() } val muted = colors.onBackground.copy(alpha = 0.78f) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { @@ -399,6 +399,7 @@ internal fun GameActions( val download = rawDownload?.takeIf { it.isActive } val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } val cloud = game?.library == Library.XBOX_CLOUD && installed == null + val downloadBytes = catalogSize(item) Actions { when { s.shortcutPicker && game != null -> { @@ -474,7 +475,7 @@ internal fun GameActions( if (item?.installable == true && item.xboxPc) { SecondaryButton( if (StoresState.isUnfinished(item)) stringResource(R.string.stores_resume_install) - else if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) + else if (downloadBytes > 0) stringResource(R.string.stores_install_size, formatBytes(downloadBytes)) else stringResource(R.string.stores_install), ) { StoresState.requestInstall(ctx, item) } } @@ -492,7 +493,7 @@ internal fun GameActions( } item?.installable == true -> { InstallButton( - if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) else stringResource(R.string.stores_install), + if (downloadBytes > 0) stringResource(R.string.stores_install_size, formatBytes(downloadBytes)) else stringResource(R.string.stores_install), leadOn, ) { StoresState.requestInstall(ctx, item) } if (store == Store.XBOX && item.xboxCloud) { @@ -1016,6 +1017,13 @@ internal fun FactRow(label: String, value: String, labelWidth: androidx.compose. } } +@Composable +internal fun catalogSize(item: CatalogItem?): Long { + val ctx = LocalContext.current + if (item != null) LaunchedEffect(item.key, item.accessible) { StoreSizes.request(ctx, item) } + return item?.let { StoreSizes.size(it) } ?: 0L +} + @Composable internal fun diskSize(installed: InstalledStoreGame?, folder: File): Long? { val ctx = LocalContext.current diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreSizesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreSizesTest.kt new file mode 100644 index 0000000000..2a306aeff8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreSizesTest.kt @@ -0,0 +1,96 @@ +package com.droiddeck.launcher.stores + +import java.util.concurrent.CompletableFuture +import java.util.concurrent.ConcurrentHashMap +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertSame +import org.junit.Assert.assertTrue +import org.junit.Test + +class StoreSizesTest { + private val ea = CatalogItem(Store.EA, "Origin.OFR.50.0001", "Game", imageUrl = null, owned = true) + + @After fun clear() { + StoreSizes.known.clear() + } + + @Test fun anUnresolvedSizeIsUnknown() { + assertEquals(0L, StoreSizes.size(ea)) + } + + @Test fun aResolvedSizeReplacesTheCatalogValue() { + StoreSizes.known[ea.key] = 4_200_000_000L + assertEquals(4_200_000_000L, StoreSizes.size(ea)) + } + + @Test fun aResolvedSizeOnlyAppliesToItsOwnGame() { + StoreSizes.known[ea.key] = 4_200_000_000L + assertEquals(0L, StoreSizes.size(ea.copy(id = "Origin.OFR.50.0002"))) + assertEquals(7L, StoreSizes.size(ea.copy(id = "Origin.OFR.50.0002", sizeBytes = 7L))) + } + + @Test fun anEaSizeDoesNotReplaceAnotherStoresCatalogSize() { + StoreSizes.known[ea.key] = 4_200_000_000L + val epic = ea.copy(store = Store.EPIC, id = "Epic.Game", sizeBytes = 7L) + assertEquals(7L, StoreSizes.size(epic)) + } + + @Test fun aFailedLookupIsRetriedOnTheNextRequest() { + val requests = ConcurrentHashMap>() + val failed = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(null) } + assertEquals(null, failed.get()) + val retried = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(9L) } + assertNotSame(failed, retried) + assertEquals(9L, retried.get()) + } + + @Test fun aResolvedLookupIsSharedAndKept() { + val requests = ConcurrentHashMap>() + val first = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(5L) } + val second = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(6L) } + assertSame(first, second) + assertEquals(5L, second.get()) + } + + @Test fun anInFlightLookupIsSharedBetweenRequests() { + val requests = ConcurrentHashMap>() + val pending = CompletableFuture() + val first = StoreSizes.shared(requests, ea.key) { pending } + val second = StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(1L) } + assertSame(first, second) + pending.complete(null) + assertEquals(null, second.get()) + assertEquals(0, requests.size) + } + + @Test fun aContinuationThatRequestsAgainAfterAFailureStartsANewLookup() { + val requests = ConcurrentHashMap>() + val pending = CompletableFuture() + val first = StoreSizes.shared(requests, ea.key) { pending } + val retried = CompletableFuture() + first.thenAccept { bytes -> + if (bytes == null) retried.complete(StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(9L) }.get()) + } + pending.complete(null) + assertEquals(9L, retried.get()) + } + + @Test fun concurrentCallersShareOneLookup() { + val requests = ConcurrentHashMap>() + val pending = CompletableFuture() + var starts = 0 + val callers = (1..3).map { StoreSizes.shared(requests, ea.key) { starts++; pending } } + pending.complete(3L) + assertEquals(1, starts) + callers.forEach { assertEquals(3L, it.get()) } + } + + @Test fun synchronousStartFailureCompletesAndAllowsRetry() { + val requests = ConcurrentHashMap>() + val failed = StoreSizes.shared(requests, ea.key) { throw IllegalStateException("boom") } + assertTrue(failed.isCompletedExceptionally) + assertEquals(4L, StoreSizes.shared(requests, ea.key) { CompletableFuture.completedFuture(4L) }.get()) + } +} From dacfee64abfa275a0f72c7693c6946cc1a2db910 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:21:36 -0500 Subject: [PATCH 053/101] feat(agent): compact composer, plan go or revise, usage limits, diffs and send now (#2531) * fix(runtime): the userland resolver survives a crash mid-write * feat(agent): compact composer, plan go or revise, usage limits, diffs and send now --- .../droiddeck/launcher/agent/AgentChats.kt | 9 +- .../droiddeck/launcher/agent/AgentHarness.kt | 78 ++- .../com/droiddeck/launcher/agent/AgentHost.kt | 69 ++- .../runtime/LinuxNetworkLinkComponent.kt | 25 +- .../com/droiddeck/launcher/ui/AgentEntries.kt | 124 +++- .../com/droiddeck/launcher/ui/AgentPage.kt | 554 +++++++++++++----- .../com/droiddeck/launcher/ui/AgentPanels.kt | 70 +++ .../droiddeck/launcher/ui/SessionOverlay.kt | 1 + app/src/main/res/values/strings.xml | 22 + .../droiddeck/launcher/agent/AgentHostTest.kt | 47 +- .../droiddeck/launcher/ui/AgentChangesTest.kt | 41 ++ 11 files changed, 874 insertions(+), 166 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt index e228f1aa5d..aedd840dd0 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt @@ -74,7 +74,11 @@ object AgentChats { is Entry.Used -> JSONObject().put("used", entry.tool).put("detail", entry.detail).put("id", entry.id).put("input", entry.input) .apply { entry.output?.let { put("output", it).put("failed", entry.failed) } } is Entry.Finished -> JSONObject().put("finished", true).put("error", entry.error ?: JSONObject.NULL).put("stopped", entry.stopped).apply { - entry.usage?.let { put("ms", it.durationMs).put("cost", it.costUsd).put("in", it.inputTokens).put("out", it.outputTokens) } + if (entry.planned) put("planned", true) + entry.usage?.let { + put("ms", it.durationMs).put("cost", it.costUsd).put("in", it.inputTokens).put("out", it.outputTokens) + if (it.context > 0) put("ctx", it.context).put("win", it.window) + } } }.toString() @@ -105,7 +109,8 @@ object AgentChats { o.has("result") -> Entry.Result(o.getString("result"), o.optString("output"), o.optBoolean("failed")) o.has("finished") -> Entry.Finished( if (o.isNull("error")) null else o.optString("error"), o.optBoolean("stopped"), - if (o.has("ms")) AgentHost.Usage(o.optLong("ms"), o.optDouble("cost", 0.0), o.optLong("in"), o.optLong("out")) else null, + if (o.has("ms")) AgentHost.Usage(o.optLong("ms"), o.optDouble("cost", 0.0), o.optLong("in"), o.optLong("out"), o.optLong("ctx"), o.optLong("win")) else null, + o.optBoolean("planned"), ) else -> null } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index 78dbbd1900..6709399b01 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -31,6 +31,8 @@ interface AgentHarness { fun parse(line: String): AgentEvent? /** Sets the CLI's own defaults in the userland before it runs; [rootfs] is the userland's root. */ fun prepare(rootfs: File) {} + /** Context and plan limits the CLI keeps on disk rather than printing, read once a turn of [conversation] is done. */ + fun usage(rootfs: File, conversation: String?): AgentEvent? = null data class Model(val id: String, val label: String) @@ -50,6 +52,9 @@ data class AgentEvent( val thinking: String? = null, /** Tokens the conversation's context holds after this step. */ val context: Long? = null, + /** Tokens the model's context can hold. */ + val window: Long? = null, + val limits: List? = null, val usage: AgentHost.Usage? = null, ) @@ -139,10 +144,12 @@ object ClaudeCode : AgentHarness { } AgentEvent(conversation, results) } + "rate_limit_event" -> AgentEvent(conversation, limits = limits(o.optJSONObject("rate_limit_info"))) // A resumed session first answers background tasks the last run left behind; that result is not the turn's. "result" -> if (o.optJSONObject("origin")?.optString("kind") == "task-notification") conversation?.let { AgentEvent(it) } else AgentEvent( conversation, listOf(AgentHost.Entry.Finished(if (o.optBoolean("is_error")) o.optString("result").ifEmpty { o.optString("subtype") } else null)), + window = window(o.optJSONObject("modelUsage")), usage = AgentHost.Usage( o.optLong("duration_ms"), o.optDouble("total_cost_usd", 0.0), o.optJSONObject("usage")?.let { it.optLong("input_tokens") + it.optLong("cache_read_input_tokens") + it.optLong("cache_creation_input_tokens") } ?: 0, @@ -153,6 +160,24 @@ object ClaudeCode : AgentHarness { } } + private val WINDOW_MINUTES = mapOf("five_hour" to 300, "seven_day" to 10_080) + + @VisibleForTesting + internal fun limits(info: JSONObject?): List? { + val windows = info?.optJSONObject("unifiedWindows") ?: return null + return WINDOW_MINUTES.mapNotNull { (key, minutes) -> + val w = windows.optJSONObject(key) ?: return@mapNotNull null + AgentHost.Limit(minutes, (w.optDouble("utilization", 0.0) * 100).toInt(), w.optLong("resetsAt")) + }.takeIf { it.isNotEmpty() } + } + + /** The context window of the model that did most of the turn; subagents may run a smaller one. */ + private fun window(models: JSONObject?): Long? { + models ?: return null + return models.keys().asSequence().mapNotNull { models.optJSONObject(it) } + .maxByOrNull { it.optDouble("costUSD", 0.0) }?.optLong("contextWindow")?.takeIf { it > 0 } + } + private fun resultText(content: Any?): String = when (content) { is String -> content is JSONArray -> (0 until content.length()).mapNotNull { i -> @@ -180,8 +205,8 @@ object ClaudeCode : AgentHarness { input ?: return "" return when { tool == "Bash" -> input.optString("command") - tool == "Edit" -> "${input.optString("file_path")}\n\n- ${input.optString("old_string").replace("\n", "\n- ")}\n\n+ ${input.optString("new_string").replace("\n", "\n+ ")}" - tool == "Write" -> "${input.optString("file_path")}\n\n${input.optString("content")}" + tool == "Edit" -> input.optString("file_path") + "\n" + lineDiff(input.optString("old_string"), input.optString("new_string")) + tool == "Write" -> input.optString("file_path") + "\n" + lineDiff("", input.optString("content")) tool == "TodoWrite" -> todos(input.optJSONArray("todos")) else -> input.toString(2) } @@ -287,6 +312,33 @@ object Codex : AgentHarness { return if (entries.isEmpty()) null else AgentEvent(entries = entries) } + private const val TOKEN_COUNT = "\"payload\":{\"type\":\"token_count\"" + + /** Codex prints no limits with --json; its session log, named after the thread, has a token_count event each step. */ + override fun usage(rootfs: File, conversation: String?): AgentEvent? { + conversation ?: return null + val log = File(rootfs, "root/.codex/sessions").walkBottomUp().filter { it.isFile && it.name.endsWith("-$conversation.jsonl") } + .maxByOrNull { it.lastModified() } ?: return null + val last = runCatching { log.readLines().lastOrNull { it.contains(TOKEN_COUNT) } }.getOrNull() ?: return null + return tokenCount(last) + } + + @VisibleForTesting + internal fun tokenCount(line: String): AgentEvent? { + val payload = runCatching { JSONObject(line).optJSONObject("payload") }.getOrNull()?.takeIf { it.optString("type") == "token_count" } ?: return null + val info = payload.optJSONObject("info") + val rates = payload.optJSONObject("rate_limits") + val limits = listOf("primary", "secondary").mapNotNull { key -> + val w = rates?.optJSONObject(key) ?: return@mapNotNull null + AgentHost.Limit(w.optInt("window_minutes"), w.optDouble("used_percent", 0.0).toInt(), w.optLong("resets_at")) + } + return AgentEvent( + context = info?.optJSONObject("last_token_usage")?.optLong("total_tokens")?.takeIf { it > 0 }, + window = info?.optLong("model_context_window")?.takeIf { it > 0 }, + limits = limits.takeIf { it.isNotEmpty() }, + ) + } + private fun todoEntry(id: String, item: JSONObject): AgentHost.Entry.Used { val items = item.optJSONArray("items") ?: JSONArray() val text = (0 until items.length()).mapNotNull { i -> @@ -305,6 +357,28 @@ object Codex : AgentHarness { @VisibleForTesting internal fun firstLine(text: String) = text.lineSequence().first().take(160) +private const val DIFF_CONTEXT = 2 + +/** + * [old] against [new], one line per changed or nearby line, each led by ' ', '-' or '+'. Edits + * replace a short span, so the lines both share at the start and end are cut to [DIFF_CONTEXT]. + */ +@VisibleForTesting +internal fun lineDiff(old: String, new: String): String { + val a = if (old.isEmpty()) emptyList() else old.removeSuffix("\n").lines() + val b = if (new.isEmpty()) emptyList() else new.removeSuffix("\n").lines() + var head = 0 + while (head < a.size && head < b.size && a[head] == b[head]) head++ + var tail = 0 + while (tail < a.size - head && tail < b.size - head && a[a.size - 1 - tail] == b[b.size - 1 - tail]) tail++ + return buildList { + a.subList(maxOf(0, head - DIFF_CONTEXT), head).forEach { add(" $it") } + a.subList(head, a.size - tail).forEach { add("-$it") } + b.subList(head, b.size - tail).forEach { add("+$it") } + a.subList(a.size - tail, minOf(a.size, a.size - tail + DIFF_CONTEXT)).forEach { add(" $it") } + }.joinToString("\n") +} + private val SHELL_WRAPPER = Regex("^/bin/(?:ba)?sh -l?c '(.*)'$", RegexOption.DOT_MATCHES_ALL) /** Codex runs each command as `/bin/bash -lc ''`; the command is what the user wants to read. */ diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index ac47bd5235..aa369a6883 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -32,10 +32,18 @@ object AgentHost { /** A tool call; [output] stays null until its result arrives. */ data class Used(val id: String, val tool: String, val detail: String, val input: String = "", val output: String? = null, val failed: Boolean = false) : Entry data class Result(val id: String, val output: String, val failed: Boolean) : Entry - data class Finished(val error: String?, val stopped: Boolean = false, val usage: Usage? = null) : Entry + /** [planned]: the turn ran in plan mode, so it ends on a plan that nothing has carried out yet. */ + data class Finished(val error: String?, val stopped: Boolean = false, val usage: Usage? = null, val planned: Boolean = false) : Entry } - data class Usage(val durationMs: Long, val costUsd: Double, val inputTokens: Long, val outputTokens: Long) + /** [context] of [window] tokens is what the conversation held when the turn ended. */ + data class Usage( + val durationMs: Long, val costUsd: Double, val inputTokens: Long, val outputTokens: Long, + val context: Long = 0, val window: Long = 0, + ) + + /** A plan usage limit over a rolling window of [minutes]; [resetsAt] is in epoch seconds. */ + data class Limit(val minutes: Int, val usedPercent: Int, val resetsAt: Long) /** A message typed while the agent was working, sent when the turn ends. */ data class Queued(val text: String, val files: List) @@ -103,6 +111,12 @@ object AgentHost { /** Tokens in the conversation's context after its last step. */ var context by mutableLongStateOf(0L) private set + /** Tokens the model's context can hold; 0 until a turn has told. */ + var window by mutableLongStateOf(0L) + private set + /** The account's plan limits as [harness] last reported them. */ + var limits by mutableStateOf>(emptyList()) + private set var lab by mutableStateOf(null) private set @@ -119,6 +133,7 @@ object AgentHost { /** The running Lab build was asked for by the current turn, so stopping the turn stops it. */ private var labFromTurn = false private var conversation: String? = null + private var turnPlanned = false private var loaded = false private var appContext: Context? = null @@ -136,6 +151,7 @@ object AgentHost { model = prefs(app).getString(modelKey(harness), null) effort = prefs(app).getString(effortKey(harness), null)?.takeIf { it in harness.efforts } plan = prefs(app).getBoolean(PLAN_KEY, false) + limits = decodeLimits(prefs(app).getString(limitsKey(harness), null)) available = LinuxRuntime.hasRootfs(app) installed = harness.files.all { guestFileExists(app, it) } if (!installed) state = State.MISSING else if (state == State.MISSING) state = State.IDLE @@ -158,7 +174,9 @@ object AgentHost { conversation = loaded.conversation entries.clear() entries.addAll(loaded.entries) - context = 0 + val last = loaded.entries.lastOrNull { it is Entry.Finished && (it.usage?.context ?: 0) > 0 } as? Entry.Finished + context = last?.usage?.context ?: 0 + window = last?.usage?.window ?: 0 } /** Opens a kept conversation, switching to the CLI it belongs to. */ @@ -263,11 +281,15 @@ object AgentHost { AgentHostService.start(app) val current = harness val prompt = AgentAttachments.prompt(message, attached) - val command = current.turn(prompt, conversation, AgentHarness.Options(model, plan && current.plans, BRIEF, effort)) + turnPlanned = plan && current.plans + val command = current.turn(prompt, conversation, AgentHarness.Options(model, turnPlanned, BRIEF, effort)) val workdir = workspace(app) + var threadConversation = conversation Thread({ runCatching { current.prepare(LinuxRuntime.rootDir(app)) } runCatching { AgentSetup.installHelpers(app) } + // Without a session nothing else keeps the userland's resolver current. + runCatching { com.droiddeck.launcher.runtime.LinuxNetworkLinkComponent(app, LinuxRuntime.rootDir(app)).publish() } val child = try { guest(app, command, workdir).start() } catch (e: Exception) { @@ -288,8 +310,12 @@ object AgentHost { runCatching { child.inputStream.bufferedReader().forEachLine { line -> runCatching { raw?.apply { write(line); newLine(); flush() } } - val event = current.parse(line) ?: return@forEachLine - if (event.entries.any { it is Entry.Finished }) ended = true + val parsed = current.parse(line) ?: return@forEachLine + parsed.conversation?.let { threadConversation = it } + val done = parsed.entries.any { it is Entry.Finished } + if (done) ended = true + val event = if (!done) parsed else runCatching { current.usage(LinuxRuntime.rootDir(app), threadConversation) }.getOrNull() + ?.let { parsed.copy(context = it.context ?: parsed.context, window = it.window ?: parsed.window, limits = it.limits ?: parsed.limits) } ?: parsed main.post { if (turn === started) apply(app, event) } } } @@ -323,6 +349,16 @@ object AgentHost { queue.remove(item) } + /** Sends [item] now: the running turn stops where it is, and the rest of the queue waits for the next one. */ + fun sendNow(context: Context, item: Queued) { + val app = context.applicationContext + if (!queue.remove(item)) return + val rest = queue.toList() + stop(app) + queue.addAll(rest) + send(app, item.text, item.files) + } + /** Starts a new conversation; the current one stays in the history. */ fun forget(context: Context) { stop(context) @@ -331,6 +367,7 @@ object AgentHost { chat = null conversation = null this.context = 0 + window = 0 prefs(context).edit().remove(CHAT_KEY).apply() state = if (installed) State.IDLE else State.MISSING } @@ -380,6 +417,11 @@ object AgentHost { event.text?.let { live += it } event.thinking?.let { liveThinking += it } event.context?.let { context = it } + event.window?.let { window = it } + event.limits?.let { reported -> + limits = (limits.filter { old -> reported.none { it.minutes == old.minutes } } + reported).sortedBy { it.minutes } + prefs(app).edit().putString(limitsKey(harness), encodeLimits(limits)).apply() + } for (entry in event.entries) when (entry) { is Entry.Finished -> finish(app, entry.error, usage = event.usage) else -> { @@ -397,7 +439,8 @@ object AgentHost { if (!stopped) labFromTurn = false live = "" liveThinking = "" - record(app, Entry.Finished(error, stopped, usage)) + val held = if (context > 0) (usage ?: Usage(0, 0.0, 0, 0)).copy(context = context, window = window) else usage + record(app, Entry.Finished(error, stopped, held, planned = turnPlanned && !stopped && error == null)) state = State.IDLE unseen = true failed = error != null @@ -555,6 +598,18 @@ object AgentHost { private const val RETRY_MS = 3_000L private fun modelKey(harness: AgentHarness) = "model_${harness.id}" + private fun limitsKey(harness: AgentHarness) = "limits_${harness.id}" + + @VisibleForTesting + internal fun encodeLimits(list: List) = org.json.JSONArray(list.map { + org.json.JSONObject().put("minutes", it.minutes).put("used", it.usedPercent).put("resets", it.resetsAt) + }).toString() + + @VisibleForTesting + internal fun decodeLimits(text: String?): List = runCatching { + val a = org.json.JSONArray(text ?: return emptyList()) + (0 until a.length()).map { a.getJSONObject(it) }.map { Limit(it.optInt("minutes"), it.optInt("used"), it.optLong("resets")) } + }.getOrDefault(emptyList()) private fun effortKey(harness: AgentHarness) = "effort_${harness.id}" internal fun prefs(context: Context) = context.getSharedPreferences("agent", Context.MODE_PRIVATE) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt index 7081d88114..46c29aadb8 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt @@ -157,9 +157,7 @@ class LinuxNetworkLinkComponent( synchronized(lock) { try { file.parentFile?.mkdirs() - val staged = File(file.path + ".staged") - staged.writeText(describe(properties, capabilities)) - if (!staged.renameTo(file)) throw IOException("Could not replace $file") + replace(file, describe(properties, capabilities)) } catch (e: IOException) { Log.w(TAG, "Could not publish the network link", e) } @@ -241,9 +239,7 @@ class LinuxNetworkLinkComponent( } try { val file = File(rootDir, "etc/droiddeck-network.json") - val staged = File(file.path + ".staged") - staged.writeText(state.toString()) - if (!staged.renameTo(file)) throw IOException("Could not replace network state") + replace(file, state.toString()) } catch (e: IOException) { Log.w(TAG, "Could not publish the network state", e) } @@ -272,6 +268,19 @@ class LinuxNetworkLinkComponent( return Pair(servers.sortedWith(order), gateways.sortedWith(order)) } + /** + * Writes [text] to [file] through a staged copy. The copy is synced before the rename, or a + * crash or power cut can keep the rename and lose the data, leaving a file of NUL bytes. + */ + private fun replace(file: File, text: String) { + val staged = File(file.path + ".staged") + java.io.FileOutputStream(staged).use { out -> + out.write(text.toByteArray()) + out.fd.sync() + } + if (!staged.renameTo(file)) throw IOException("Could not replace $file") + } + private fun writeResolver(properties: LinkProperties?) { val own = properties?.dnsServers.orEmpty() .filter { !it.isLinkLocalAddress && !it.isLoopbackAddress && !it.isAnyLocalAddress } @@ -286,9 +295,7 @@ class LinuxNetworkLinkComponent( } try { val etc = File(rootDir, "etc") - val staged = File(etc, "resolv.conf.staged") - staged.writeText(text) - if (!staged.renameTo(File(etc, "resolv.conf"))) throw IOException("Could not replace resolv.conf") + replace(File(etc, "resolv.conf"), text) val hosts = File(etc, "hosts") if (!hosts.isFile || !hosts.readText().contains("localhost")) { hosts.writeText("127.0.0.1 localhost\n::1 localhost\n") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt index 63dde38872..d651aec3a5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt @@ -29,6 +29,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue @@ -39,6 +40,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle @@ -57,7 +59,7 @@ import com.droiddeck.launcher.agent.AgentHost import com.droiddeck.launcher.agent.AgentHost.Entry @Composable -internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false) { +internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false, changes: Changes? = null, onRevise: () -> Unit = {}) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current when (entry) { @@ -72,12 +74,66 @@ internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false) { is Entry.Thought -> AgentThought(entry.text, live = false) is Entry.Used -> if (entry.tool == "TodoWrite") AgentTodos(entry.input) else AgentToolCall(entry, running) is Entry.Result -> Unit - is Entry.Finished -> if (last && AgentHost.answerless(AgentHost.entries)) AgentNoReply() else AgentTurnEnd(entry) + is Entry.Finished -> when { + last && AgentHost.answerless(AgentHost.entries) -> AgentNoReply() + last && entry.planned -> Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + AgentTurnEnd(entry, changes) + AgentPlanActions(onRevise) + } + else -> AgentTurnEnd(entry, changes) + } } } +/** A plan turn changed nothing; Go carries the plan out with plan mode off, Revise asks for another. */ @Composable -private fun AgentTurnEnd(entry: Entry.Finished) { +private fun AgentPlanActions(onRevise: () -> Unit) { + val context = LocalContext.current + val pal = LocalPalette.current + val go = stringResource(R.string.agent_plan_go_message) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(horizontal = 4.dp)) { + PrimaryButton(stringResource(R.string.agent_plan_go), compact = true, modifier = Modifier.testTag("agent-plan-go")) { + AgentHost.choosePlan(context, false) + AgentHost.send(context, go) + } + SecondaryButton(stringResource(R.string.agent_plan_revise), compact = true, modifier = Modifier.testTag("agent-plan-revise")) { + AgentHost.choosePlan(context, true) + onRevise() + } + Text(stringResource(R.string.agent_plan_untouched), fontSize = 12.sp, color = pal.onSurfaceVariant) + } +} + +/** What a turn's edits added up to: files touched and lines added and removed. */ +internal data class Changes(val files: Int, val added: Int, val removed: Int) + +/** The edits of the turn that ends at [end], or null when it changed no file. */ +internal fun turnChanges(entries: List, end: Int): Changes? { + val start = entries.subList(0, end).indexOfLast { it is Entry.Asked } + // Plan mode saves its plan as a file of its own, which is not a change to anything. + val edits = entries.subList(start + 1, end).filterIsInstance().filter { !it.failed }.mapNotNull { diffOf(it) } + .filter { !it.path.contains("/.claude/plans/") } + if (edits.isEmpty()) return null + return Changes(edits.map { it.path }.distinct().size, edits.sumOf { it.added }, edits.sumOf { it.removed }) +} + +internal class Diff(val path: String, val lines: List) { + val added = lines.count { it.startsWith("+") } + val removed = lines.count { it.startsWith("-") } +} + +/** The diff an Edit or Write carries: its path, then lines led by ' ', '-' or '+'. */ +internal fun diffOf(entry: Entry.Used): Diff? { + if (entry.tool != "Edit" && entry.tool != "Write") return null + val lines = entry.input.lines() + val body = lines.drop(1).filter { it.isNotEmpty() } + if (lines.first().isBlank() || body.isEmpty() || body.any { it[0] != ' ' && it[0] != '-' && it[0] != '+' }) return null + if (body.none { it[0] != ' ' }) return null + return Diff(lines.first(), body) +} + +@Composable +private fun AgentTurnEnd(entry: Entry.Finished, changes: Changes?) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val text = when { @@ -90,10 +146,19 @@ private fun AgentTurnEnd(entry: Entry.Finished) { if (u.inputTokens > 0 || u.outputTokens > 0) add(stringResource(R.string.agent_tokens, tokens(u.inputTokens), tokens(u.outputTokens))) }.joinToString(" · ") } - } ?: return - if (text.isEmpty()) return - Text(text, fontSize = 12.sp, color = if (entry.error != null && !entry.stopped) colors.error else pal.onSurfaceVariant, - modifier = Modifier.padding(horizontal = 4.dp)) + } + if (text.isNullOrEmpty() && changes == null) return + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(horizontal = 4.dp)) { + if (changes != null) Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.clip(Shape12).background(pal.surfaceVariant).padding(horizontal = 9.dp, vertical = 4.dp).testTag("agent-changes"), + ) { + Text(pluralStringResource(R.plurals.agent_files_changed, changes.files, changes.files), fontSize = 12.sp, color = pal.onSurfaceVariant) + Text("+${changes.added}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.good) + Text("−${changes.removed}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.error) + } + if (!text.isNullOrEmpty()) Text(text, fontSize = 12.sp, color = if (entry.error != null && !entry.stopped) colors.error else pal.onSurfaceVariant) + } } @Composable @@ -105,7 +170,11 @@ private fun AgentNoReply() { } } -internal fun tokens(n: Long) = if (n >= 1000) "${n / 1000}k" else n.toString() +internal fun tokens(n: Long) = when { + n >= 1_000_000 -> if (n % 1_000_000 == 0L) "${n / 1_000_000}M" else String.format(java.util.Locale.US, "%.1fM", n / 1_000_000.0) + n >= 1000 -> "${n / 1000}k" + else -> n.toString() +} @Composable internal fun AgentThought(text: String, live: Boolean) { @@ -149,12 +218,13 @@ private fun AgentTodos(list: String) { } } -/** A tool call: one line with its status, opening to the full input and output. */ +/** A tool call: one line with its status, opening to the full input and output, or to the diff of an edit. */ @Composable private fun AgentToolCall(entry: Entry.Used, running: Boolean) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current var open by rememberSaveable(entry.id.ifEmpty { entry.detail }) { mutableStateOf(false) } + val diff = remember(entry.input) { diffOf(entry) } Column( Modifier.fillMaxWidth().padding(horizontal = 4.dp).clip(Shape12).background(pal.surfaceVariant).animateContentSize(), ) { @@ -171,11 +241,19 @@ private fun AgentToolCall(entry: Entry.Used, running: Boolean) { } } Text(entry.tool, fontSize = 12.5.sp, fontWeight = FontWeight.SemiBold, color = pal.primary, modifier = Modifier.padding(start = 8.dp)) - Text(entry.detail, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, + Text(diff?.path?.substringAfterLast('/') ?: entry.detail, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f).padding(start = 8.dp)) + if (diff != null) { + Text("+${diff.added}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.good, modifier = Modifier.padding(start = 8.dp)) + Text("\u2212${diff.removed}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.error, modifier = Modifier.padding(start = 6.dp, end = 4.dp)) + } Icon(if (open) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) } - if (open) Column(Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + if (open && diff != null) Column(Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + if (diff.path.contains('/')) Text(diff.path, fontSize = 11.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + DiffBox(diff) + if (entry.failed && !entry.output.isNullOrBlank()) CodeBox(stringResource(R.string.agent_tool_output), entry.output, colors.error) + } else if (open) Column(Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { if (entry.input.isNotBlank()) CodeBox(stringResource(R.string.agent_tool_input), entry.input, colors.onSurface) when { entry.output == null && running -> Text(stringResource(R.string.agent_tool_running), fontSize = 12.sp, color = pal.onSurfaceVariant) @@ -187,6 +265,30 @@ private fun AgentToolCall(entry: Entry.Used, running: Boolean) { } } +@Composable +private fun DiffBox(diff: Diff) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column( + Modifier.fillMaxWidth().heightIn(max = 360.dp).clip(Shape12).background(colors.surface) + .verticalScroll(rememberScrollState()).padding(vertical = 6.dp), + ) { + for (line in diff.lines) { + val tint = when (line[0]) { + '+' -> pal.good + '-' -> colors.error + else -> null + } + Text( + line[0] + " " + line.substring(1), + fontSize = 12.sp, fontFamily = FontFamily.Monospace, lineHeight = 17.sp, + color = tint ?: pal.onSurfaceVariant, + modifier = Modifier.fillMaxWidth().background(tint?.copy(alpha = 0.12f) ?: Color.Transparent).padding(horizontal = 10.dp), + ) + } + } +} + @Composable private fun CodeBox(label: String, text: String, color: Color) { val pal = LocalPalette.current diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 645ce77f1c..868cf4fbf0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -2,13 +2,21 @@ package com.droiddeck.launcher.ui import android.app.Activity import android.content.ContextWrapper +import android.view.KeyEvent import android.view.WindowManager import androidx.activity.compose.LocalActivityResultRegistryOwner import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -18,13 +26,13 @@ import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.ime +import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape @@ -34,12 +42,15 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.Send import androidx.compose.material.icons.outlined.Add +import androidx.compose.material.icons.outlined.ArrowDownward import androidx.compose.material.icons.outlined.AttachFile import androidx.compose.material.icons.outlined.AutoAwesome +import androidx.compose.material.icons.outlined.Build import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.ExpandMore import androidx.compose.material.icons.outlined.History import androidx.compose.material.icons.outlined.Memory +import androidx.compose.material.icons.outlined.MoreHoriz import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.Stop import androidx.compose.material3.CircularProgressIndicator @@ -51,23 +62,38 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState +import androidx.compose.runtime.Stable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.nestedscroll.NestedScrollConnection +import androidx.compose.ui.input.nestedscroll.NestedScrollSource +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalView -import androidx.compose.ui.window.DialogWindowProvider import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -76,22 +102,33 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.compose.ui.window.DialogWindowProvider import com.droiddeck.launcher.R import com.droiddeck.launcher.agent.AgentAttachments import com.droiddeck.launcher.agent.AgentHost import com.droiddeck.launcher.agent.AgentHost.Entry import com.droiddeck.launcher.agent.AgentSetup +import kotlinx.coroutines.launch -internal enum class AgentPanel { NONE, MODEL, HISTORY, PROCESSES } +internal enum class AgentPanel { NONE, MODEL, USAGE, HISTORY, PROCESSES } /** Slash commands the app handles itself; others go to the CLI, which has its own. */ private val LOCAL_COMMANDS = listOf("/new", "/model", "/plan", "/history", "/processes", "/stop") private val CLI_COMMANDS = listOf("/compact", "/cost", "/review", "/init") +private const val COMPOSER_SLIDE_MS = 350L +/** + * The chat with the composer at the bottom. The composer is the full editor only while it is + * being typed in; reading shrinks it to one line, and scrolling back through older messages + * hides it behind a small pill. [startTyping] opens an empty conversation ready to type. + */ @Composable -internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true) { +internal fun AgentPage( + modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, +) { val context = LocalContext.current val view = LocalView.current DisposableEffect(view, visible) { @@ -114,58 +151,115 @@ internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, v return } var panel by rememberSaveable { mutableStateOf(AgentPanel.NONE) } - Column(modifier.fillMaxSize().imePadding()) { - AgentHeader(panel, { panel = if (panel == it) AgentPanel.NONE else it }, onSetup = { setup = true }) + val composer = remember { ComposerState(startTyping && AgentHost.entries.isEmpty()) } + val focusManager = LocalFocusManager.current + val togglePanel: (AgentPanel) -> Unit = { panel = if (panel == it) AgentPanel.NONE else it } + // The keyboard leaves too little height for a panel and the editor together, so typing closes the panel. + val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 + LaunchedEffect(keyboardOpen) { if (keyboardOpen && (panel == AgentPanel.MODEL || panel == AgentPanel.USAGE)) panel = AgentPanel.NONE } + Column( + modifier.fillMaxSize().imePadding().onPreviewKeyEvent { e -> + val k = e.nativeKeyEvent + if (k.keyCode != KeyEvent.KEYCODE_BUTTON_Y || composer.typing) return@onPreviewKeyEvent false + if (k.action == KeyEvent.ACTION_UP) composer.open() + true + }, + ) { when (panel) { - AgentPanel.HISTORY -> AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } - AgentPanel.PROCESSES -> AgentProcessList(Modifier.weight(1f)) + AgentPanel.HISTORY -> { + AgentPanelBar(stringResource(R.string.agent_history)) { panel = AgentPanel.NONE } + AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } + } + AgentPanel.PROCESSES -> { + AgentPanelBar(stringResource(R.string.agent_processes)) { panel = AgentPanel.NONE } + AgentProcessList(Modifier.weight(1f)) + } else -> { - Column(Modifier.weight(1f).clipToBounds()) { - if (panel == AgentPanel.MODEL) AgentModelPicker() - AgentConversation(Modifier.weight(1f)) - AgentStatus() + val list = rememberLazyListState() + val scope = rememberCoroutineScope() + // Only dragging back through older messages hides the composer; showing it again shrinks the list, which must not hide it once more. + var readingBack by remember { mutableStateOf(false) } + LaunchedEffect(list) { snapshotFlow { list.canScrollForward }.collect { if (!it) readingBack = false } } + val dragBack = remember { + object : NestedScrollConnection { + override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset { + if (source == NestedScrollSource.Drag && available.y > 1f && list.canScrollBackward) readingBack = true + return Offset.Zero + } + } + } + val toLatest: () -> Unit = { + readingBack = false + scope.launch { list.scrollToItem(maxOf(0, list.layoutInfo.totalItemsCount - 1), Int.MAX_VALUE / 2) } + } + val hidden = !composer.typing && readingBack && AgentHost.entries.isNotEmpty() + var wasHidden by remember { mutableStateOf(false) } + LaunchedEffect(hidden) { + if (hidden) wasHidden = true + else if (wasHidden) { + wasHidden = false + // The composer takes its height back as it slides in; the latest message stays above it. + kotlinx.coroutines.delay(COMPOSER_SLIDE_MS) + list.scrollToItem(maxOf(0, list.layoutInfo.totalItemsCount - 1), Int.MAX_VALUE / 2) + } + } + Box(Modifier.weight(1f).fillMaxWidth().clipToBounds().nestedScroll(dragBack)) { + AgentConversation( + Modifier.fillMaxSize().pointerInput(Unit) { + awaitEachGesture { + awaitFirstDown(requireUnconsumed = false, pass = PointerEventPass.Initial) + if (panel == AgentPanel.MODEL || panel == AgentPanel.USAGE) panel = AgentPanel.NONE + if (composer.typing) focusManager.clearFocus() + } + }, + list, onRevise = { composer.open() }, + ) + androidx.compose.animation.AnimatedVisibility( + hidden, enter = fadeIn(), exit = fadeOut(), modifier = Modifier.align(Alignment.BottomCenter).padding(bottom = 8.dp), + ) { + AgentJumpPill(toLatest) + } + } + androidx.compose.animation.AnimatedVisibility(!hidden, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { + AgentComposer(composer, draft, inputModifier, panel, togglePanel) { setup = true } } - AgentComposer(draft, inputModifier) { panel = it } } } } } -@Composable -private fun AgentHeader(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit) { - val context = LocalContext.current - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val working = AgentHost.state == AgentHost.State.WORKING - Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp)) { - Column(Modifier.weight(1f)) { - Text(stringResource(R.string.rail_agent), fontSize = 22.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) - val model = AgentHost.models(context).firstOrNull { it.id == AgentHost.model }?.label ?: AgentHost.model ?: stringResource(R.string.agent_model_default) - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.clip(Shape12).clickable { onPanel(AgentPanel.MODEL) }.padding(vertical = 2.dp).testTag("agent-model"), - ) { - val parts = listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) - Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant) - Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) - } - } - HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), selected = panel == AgentPanel.HISTORY, tag = "agent-history") { onPanel(AgentPanel.HISTORY) } - HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), selected = panel == AgentPanel.PROCESSES, tag = "agent-processes") { onPanel(AgentPanel.PROCESSES) } - HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), tag = "agent-new") { - AgentHost.forget(context) - if (panel != AgentPanel.NONE) onPanel(panel) - } - HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, tag = "agent-settings", onClick = onSetup) +/** Whether the composer is the full editor; [open] also puts the cursor in it. */ +@Stable +private class ComposerState(typing: Boolean) { + var typing by mutableStateOf(typing) + var focusRequests by mutableIntStateOf(0) + private set + /** Opened and waiting for the text field to take focus; focus passes through nothing on the way. */ + var opening = false + + fun open() { + typing = true + opening = true + focusRequests++ } } @Composable -internal fun HeaderAction(icon: ImageVector, label: String, enabled: Boolean = true, selected: Boolean = false, tag: String? = null, onClick: () -> Unit) { +private fun AgentPanelBar(title: String, onClose: () -> Unit) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp)) { + Text(title, fontSize = 17.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1f)) + HeaderAction(Icons.Outlined.Close, stringResource(R.string.agent_close), size = 36.dp, tag = "agent-panel-close", onClick = onClose) + } +} + +@Composable +internal fun HeaderAction( + icon: ImageVector, label: String, enabled: Boolean = true, selected: Boolean = false, tag: String? = null, size: Dp = 44.dp, onClick: () -> Unit, +) { val pal = LocalPalette.current Box( contentAlignment = Alignment.Center, - modifier = Modifier.padding(start = 8.dp).size(44.dp).clip(Shape12) + modifier = Modifier.padding(start = if (size < 44.dp) 4.dp else 8.dp).size(size).clip(Shape12) .background(if (selected) pal.primary.copy(alpha = 0.2f) else pal.surfaceVariant) .clickable(enabled = enabled, onClick = onClick) .then(if (tag != null) Modifier.testTag(tag) else Modifier), @@ -174,18 +268,21 @@ internal fun HeaderAction(icon: ImageVector, label: String, enabled: Boolean = t selected -> pal.primary enabled -> pal.onBackground else -> pal.onSurfaceVariant.copy(alpha = 0.5f) - }, modifier = Modifier.size(22.dp)) + }, modifier = Modifier.size(if (size < 44.dp) 19.dp else 22.dp)) } } @Composable -private fun AgentConversation(modifier: Modifier) { +private fun AgentConversation(modifier: Modifier, list: LazyListState, onRevise: () -> Unit) { val pal = LocalPalette.current - val list = rememberLazyListState() val working = AgentHost.state == AgentHost.State.WORKING val atBottom by remember { derivedStateOf { !list.canScrollForward } } val items = AgentHost.entries.size + (if (working) 1 else 0) - LaunchedEffect(items) { if (items > 0) list.animateScrollToItem(items - 1) } + LaunchedEffect(items) { + if (items == 0) return@LaunchedEffect + list.animateScrollToItem(items - 1) + list.scrollToItem(items - 1, Int.MAX_VALUE / 2) + } LaunchedEffect(AgentHost.live.length / 80, AgentHost.liveThinking.length / 80) { if (atBottom && items > 0) list.scrollToItem(items - 1, Int.MAX_VALUE / 2) } @@ -201,12 +298,31 @@ private fun AgentConversation(modifier: Modifier) { LazyColumn(modifier.fillMaxWidth(), state = list, verticalArrangement = Arrangement.spacedBy(10.dp)) { items(AgentHost.entries.size) { i -> val entry = AgentHost.entries[i] - AgentEntry(entry, running = working && i > start && entry is Entry.Used && entry.output == null, last = !working && i == AgentHost.entries.lastIndex) + AgentEntry( + entry, running = working && i > start && entry is Entry.Used && entry.output == null, last = !working && i == AgentHost.entries.lastIndex, + changes = if (entry is Entry.Finished) turnChanges(AgentHost.entries, i) else null, onRevise = onRevise, + ) } if (working) item { AgentLive() } } } +/** Where the composer was, while it is hidden for reading back: what the agent is doing, and the way to the latest message. */ +@Composable +private fun AgentJumpPill(onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.clip(CircleShape).background(colors.surface).border(1.dp, pal.line, CircleShape) + .clickable(onClick = onClick).padding(horizontal = 14.dp, vertical = 8.dp).testTag("agent-latest"), + ) { + if (AgentHost.state == AgentHost.State.WORKING) CircularProgressIndicator(Modifier.size(13.dp), strokeWidth = 2.dp, color = pal.primary) + Text(stringResource(if (AgentHost.state == AgentHost.State.WORKING) R.string.agent_working_short else R.string.agent_latest), fontSize = 13.sp, color = pal.onSurfaceVariant) + Icon(Icons.Outlined.ArrowDownward, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } +} + /** The reply being written, and what the agent is doing right now. */ @Composable private fun AgentLive() { @@ -235,65 +351,41 @@ internal fun clock(seconds: Long): String { } } -/** Above the composer: a Lab build's progress, the todo item in progress, and queued messages. */ @Composable -private fun AgentStatus() { +private fun AgentLabCard() { val context = LocalContext.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val lab = AgentHost.lab - if (lab != null) { - var armed by remember(lab.pid) { mutableStateOf(false) } - Column( - Modifier.fillMaxWidth().padding(top = 10.dp).clip(Shape14).background(colors.surface).border(1.dp, if (lab.failed) AttentionAmber else pal.line, Shape14) - .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-lab"), - ) { - Row(verticalAlignment = Alignment.CenterVertically) { - Column(Modifier.weight(1f)) { - Text( - stringResource(if (lab.prepare) R.string.agent_lab_preparing else R.string.agent_lab_building) + " · " + labStage(lab), - fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = if (lab.failed) AttentionAmber else colors.onBackground, - ) - val facts = buildList { - if (lab.running && lab.total > 0) add("${lab.done}/${lab.total}") - add(clock(lab.elapsedSeconds.toLong())) - if (lab.running && lab.etaSeconds >= 0) add(stringResource(R.string.agent_lab_left, clock(lab.etaSeconds.toLong()))) - } - Text(facts.joinToString(" · "), fontSize = 12.5.sp, color = pal.onSurfaceVariant) - } - if (lab.running) SecondaryButton(stringResource(if (armed) R.string.agent_lab_cancel_confirm else R.string.agent_lab_cancel), compact = true) { - if (armed) AgentHost.cancelLabBuild(context) else armed = true - } - } - if (lab.running) { - LinearProgressIndicator( - progress = { lab.permille / 1000f }, color = pal.primary, trackColor = pal.surfaceVariant, - modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(6.dp).clip(CircleShape), + val lab = AgentHost.lab ?: return + var armed by remember(lab.pid) { mutableStateOf(false) } + Column( + Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, if (lab.failed) AttentionAmber else pal.line, Shape14) + .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-lab"), + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column(Modifier.weight(1f)) { + Text( + stringResource(if (lab.prepare) R.string.agent_lab_preparing else R.string.agent_lab_building) + " · " + labStage(lab), + fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = if (lab.failed) AttentionAmber else colors.onBackground, ) - if (lab.task.isNotEmpty()) Text(lab.task, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, - maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 4.dp)) + val facts = buildList { + if (lab.running && lab.total > 0) add("${lab.done}/${lab.total}") + add(clock(lab.elapsedSeconds.toLong())) + if (lab.running && lab.etaSeconds >= 0) add(stringResource(R.string.agent_lab_left, clock(lab.etaSeconds.toLong()))) + } + Text(facts.joinToString(" · "), fontSize = 12.5.sp, color = pal.onSurfaceVariant) + } + if (lab.running) SecondaryButton(stringResource(if (armed) R.string.agent_lab_cancel_confirm else R.string.agent_lab_cancel), compact = true) { + if (armed) AgentHost.cancelLabBuild(context) else armed = true } } - } - val todos = AgentHost.todos()?.lines()?.filter { it.isNotBlank() } - if (AgentHost.state == AgentHost.State.WORKING && !todos.isNullOrEmpty()) { - val doing = todos.firstOrNull { it.startsWith("[~]") } ?: todos.firstOrNull { it.startsWith("[ ]") } - val done = todos.count { it.startsWith("[x]") } - if (doing != null) Text( - "${doing.drop(4)} · $done/${todos.size}", fontSize = 13.sp, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.padding(top = 8.dp, start = 4.dp), - ) - } - for (queued in AgentHost.queue) { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(top = 8.dp).fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(start = 12.dp), - ) { - Text(stringResource(R.string.agent_queued, queued.text), fontSize = 13.sp, color = pal.onSurfaceVariant, maxLines = 1, - overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) - Box(contentAlignment = Alignment.Center, modifier = Modifier.size(40.dp).clickable { AgentHost.unqueue(queued) }) { - Icon(Icons.Outlined.Close, stringResource(R.string.agent_unqueue), tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) - } + if (lab.running) { + LinearProgressIndicator( + progress = { lab.permille / 1000f }, color = pal.primary, trackColor = pal.surfaceVariant, + modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(6.dp).clip(CircleShape), + ) + if (lab.task.isNotEmpty()) Text(lab.task, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 4.dp)) } } } @@ -308,13 +400,99 @@ private fun labStage(lab: com.droiddeck.launcher.agent.LabProgress) = when (lab. else -> stringResource(R.string.agent_lab_stage_starting) } +private fun hasActivity() = AgentHost.lab != null || AgentHost.queue.isNotEmpty() || currentTodo() != null + +/** The todo item in progress and how many are done, while the agent works through a list. */ +private fun currentTodo(): String? { + if (AgentHost.state != AgentHost.State.WORKING) return null + val todos = AgentHost.todos()?.lines()?.filter { it.isNotBlank() }.orEmpty() + val doing = todos.firstOrNull { it.startsWith("[~]") } ?: todos.firstOrNull { it.startsWith("[ ]") } ?: return null + return "${todos.count { it.startsWith("[x]") }}/${todos.size} · ${doing.drop(4)}" +} + +/** A Lab build, the todo item in progress and queued messages, one chip each. */ @Composable -private fun AgentComposer(draftState: MutableState, inputModifier: Modifier, onPanel: (AgentPanel) -> Unit) { +private fun AgentActivity(labOpen: Boolean, onLab: () -> Unit) { val context = LocalContext.current - val colors = MaterialTheme.colorScheme val pal = LocalPalette.current + AgentHost.lab?.let { lab -> + AgentChip(selected = labOpen, warn = lab.failed, tag = "agent-lab-chip", onClick = onLab) { + Icon(Icons.Outlined.Build, null, tint = if (lab.failed) AttentionAmber else pal.onSurfaceVariant, modifier = Modifier.size(14.dp)) + Text(labStage(lab), fontSize = 12.5.sp, color = if (lab.failed) AttentionAmber else pal.onSurfaceVariant, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 160.dp)) + } + } + currentTodo()?.let { todo -> + AgentChip { + Text(todo, fontSize = 12.5.sp, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 220.dp)) + } + } + for (queued in AgentHost.queue) AgentChip(warn = true) { + Text(stringResource(R.string.agent_queued, queued.text), fontSize = 12.5.sp, color = AttentionAmber, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.widthIn(max = 180.dp)) + Text( + stringResource(R.string.agent_send_now), fontSize = 12.5.sp, fontWeight = FontWeight.SemiBold, color = pal.onPrimary, + modifier = Modifier.clip(Shape12).background(pal.primary).clickable { AgentHost.sendNow(context, queued) } + .padding(horizontal = 8.dp, vertical = 3.dp).testTag("agent-send-now"), + ) + Icon(Icons.Outlined.Close, stringResource(R.string.agent_unqueue), tint = pal.onSurfaceVariant, + modifier = Modifier.size(22.dp).clip(CircleShape).clickable { AgentHost.unqueue(queued) }.padding(3.dp)) + } +} + +@Composable +private fun AgentChip(selected: Boolean = false, warn: Boolean = false, tag: String? = null, onClick: (() -> Unit)? = null, content: @Composable () -> Unit) { + val pal = LocalPalette.current + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.height(30.dp).clip(Shape12) + .background(if (warn) AttentionAmber.copy(alpha = 0.14f) else if (selected) pal.primary.copy(alpha = 0.2f) else pal.surfaceVariant) + .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier) + .then(if (tag != null) Modifier.testTag(tag) else Modifier) + .padding(horizontal = 9.dp), + ) { content() } +} + +/** How full the context is, or failing that the plan limit nearest its end; amber when little is left. */ +@Composable +private fun ContextRing(tag: String, onClick: () -> Unit) { + val pal = LocalPalette.current + val percent = usagePercent() ?: return + val warn = percent >= 80 + val tint = if (warn) AttentionAmber else pal.primary + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp), + modifier = Modifier.height(30.dp).clip(Shape12).clickable(onClick = onClick).padding(horizontal = 6.dp).testTag(tag), + ) { + val track = pal.line + Canvas(Modifier.size(16.dp)) { + val stroke = Stroke(width = 2.5.dp.toPx(), cap = StrokeCap.Round) + drawArc(track, 0f, 360f, false, style = stroke) + drawArc(tint, -90f, 360f * percent / 100f, false, style = stroke) + } + Text("$percent%", fontSize = 12.5.sp, color = if (warn) AttentionAmber else pal.onSurfaceVariant) + } +} + +/** The context's fill, unless a plan limit is nearly reached: that is the wall the user meets first. */ +internal fun usagePercent(): Int? { + val limit = AgentHost.limits.maxOfOrNull { liveUsed(it) } + val context = if (AgentHost.window > 0 && AgentHost.context > 0) (AgentHost.context * 100 / AgentHost.window).toInt().coerceIn(0, 100) else null + return if (limit != null && (limit >= 90 || context == null)) maxOf(limit, context ?: 0) else context +} + +/** A limit whose window has passed since it was reported is back to nothing used. */ +internal fun liveUsed(limit: AgentHost.Limit) = if (limit.resetsAt > 0 && limit.resetsAt * 1000 < System.currentTimeMillis()) 0 else limit.usedPercent + +@Composable +private fun AgentComposer( + composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit, +) { + val context = LocalContext.current var draft by draftState - val working = AgentHost.state == AgentHost.State.WORKING + var labOpen by rememberSaveable { mutableStateOf(false) } + if (AgentHost.lab == null) labOpen = false + var hadFocus by remember { mutableStateOf(false) } val send = send@{ val text = draft.trim() when (text.substringBefore(' ')) { @@ -332,11 +510,84 @@ private fun AgentComposer(draftState: MutableState, inputModifier: Modif } draft = "" } + val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 + // Leaving the composer for the conversation, by touch or D-pad, is reading. + Column( + Modifier.fillMaxWidth().padding(bottom = if (keyboardOpen) 4.dp else 8.dp).onFocusChanged { + if (it.hasFocus) hadFocus = true + else if (hadFocus) { + hadFocus = false + if (composer.typing && !composer.opening) composer.typing = false + } + }, + ) { + if (labOpen) AgentLabCard() + when (panel) { + AgentPanel.MODEL -> Box(Modifier.padding(top = 8.dp)) { AgentModelPicker() } + AgentPanel.USAGE -> Box(Modifier.padding(top = 8.dp)) { AgentUsage() } + else -> Unit + } + if (composer.typing) { + if (hasActivity()) Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + ) { AgentActivity(labOpen) { labOpen = !labOpen } } + AgentEditor(composer, draftState, inputModifier, panel, onPanel, onSetup, send) + } else AgentReadingBar(composer, draft, inputModifier, labOpen, onLab = { labOpen = !labOpen }) { onPanel(AgentPanel.USAGE) } + } +} + +/** The composer while reading: one line holding what is going on, opened by a press or by Y. */ +@Composable +private fun AgentReadingBar( + composer: ComposerState, draft: String, inputModifier: Modifier, labOpen: Boolean, onLab: () -> Unit, onUsage: () -> Unit, +) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val working = AgentHost.state == AgentHost.State.WORKING + var focused by remember { mutableStateOf(false) } + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(44.dp).clip(Shape16).background(colors.surface) + .border(if (focused) 2.dp else 1.dp, if (focused) pal.primary else pal.line, Shape16) + .then(inputModifier).onFocusChanged { focused = it.isFocused }.clickable { composer.open() }.testTag("agent-composer-bar") + .padding(start = 14.dp, end = 4.dp), + ) { + Text( + draft.ifBlank { stringResource(if (working) R.string.agent_hint_working else R.string.agent_message) }, fontSize = 15.sp, + color = if (draft.isBlank()) pal.onSurfaceVariant else colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f, fill = !hasActivity()).widthIn(min = 72.dp), + ) + if (hasActivity()) Row( + horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f).padding(start = 8.dp).horizontalScroll(rememberScrollState()), + ) { AgentActivity(labOpen, onLab) } + ContextRing("agent-usage-bar", onUsage) + if (working) Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(start = 4.dp).size(36.dp).clip(CircleShape).background(pal.error.copy(alpha = 0.22f)) + .clickable { AgentHost.stop(context) }.testTag("agent-stop"), + ) { Icon(Icons.Outlined.Stop, stringResource(R.string.agent_stop), tint = colors.error, modifier = Modifier.size(20.dp)) } + } +} + +/** The full editor: model and usage on top, the text with attach, stop and send under them. */ +@Composable +private fun AgentEditor( + composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, + onSetup: () -> Unit, send: () -> Unit, +) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var draft by draftState + val working = AgentHost.state == AgentHost.State.WORKING if (draft.startsWith("/") && !draft.contains(' ')) { val matches = (LOCAL_COMMANDS + CLI_COMMANDS).filter { it.startsWith(draft) && it != draft } if (matches.isNotEmpty()) Row( horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.padding(top = 10.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), ) { for (command in matches) Text( command, fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = pal.primary, @@ -346,42 +597,77 @@ private fun AgentComposer(draftState: MutableState, inputModifier: Modif } if (AgentAttachments.pending.isNotEmpty()) Row( horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.padding(top = 10.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), ) { for (path in AgentAttachments.pending.toList()) AttachmentChip(path) { AgentAttachments.pending.remove(path) } } var focused by remember { mutableStateOf(false) } - val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 - Row( - verticalAlignment = Alignment.Bottom, - modifier = Modifier.fillMaxWidth().padding(top = 10.dp, bottom = if (keyboardOpen) 4.dp else 16.dp).clip(Shape16).background(colors.surface) - .border(1.dp, if (focused) pal.primary else pal.line, Shape16).padding(start = 6.dp, end = 6.dp, top = 6.dp, bottom = 6.dp), + var menu by rememberSaveable { mutableStateOf(false) } + val field = remember { FocusRequester() } + LaunchedEffect(composer.focusRequests) { if (composer.focusRequests > 0) runCatching { field.requestFocus() } } + Column( + Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape16).background(colors.surface) + .border(1.dp, if (focused) pal.primary else pal.line, Shape16).padding(6.dp), ) { - if (LocalActivityResultRegistryOwner.current != null) AttachButton() - Box(Modifier.weight(1f).padding(start = 8.dp, top = 11.dp, bottom = 11.dp)) { - if (draft.isEmpty()) Text( - stringResource(if (working) R.string.agent_hint_working else R.string.agent_hint), fontSize = 16.sp, - color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - ) - BasicTextField( - draft, { draft = it }, - Modifier.fillMaxWidth().onFocusChanged { focused = it.isFocused }.testTag("agent-input").then(inputModifier), - textStyle = TextStyle(fontSize = 16.sp, color = colors.onSurface), - cursorBrush = SolidColor(pal.primary), - keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), - keyboardActions = KeyboardActions(onSend = { send() }), - minLines = 1, - maxLines = 8, - ) + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().height(36.dp)) { + val model = AgentHost.models(context).firstOrNull { it.id == AgentHost.model }?.label ?: AgentHost.model ?: stringResource(R.string.agent_model_default) + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f, fill = false).height(30.dp).clip(Shape12).clickable { onPanel(AgentPanel.MODEL) } + .padding(horizontal = 8.dp).testTag("agent-model"), + ) { + val parts = listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) + Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } + ContextRing("agent-usage", onClick = { onPanel(AgentPanel.USAGE) }) + } + if (menu) { + HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), size = 32.dp, tag = "agent-history") { menu = false; onPanel(AgentPanel.HISTORY) } + HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), size = 32.dp, tag = "agent-processes") { menu = false; onPanel(AgentPanel.PROCESSES) } + HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), size = 32.dp, tag = "agent-new") { + menu = false + AgentHost.forget(context) + } + HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, size = 32.dp, tag = "agent-settings") { + menu = false + onSetup() + } + } + HeaderAction(if (menu) Icons.Outlined.Close else Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 32.dp, tag = "agent-menu") { menu = !menu } } - if (working) RoundButton(Icons.Outlined.Stop, stringResource(R.string.agent_stop), pal.error.copy(alpha = 0.22f), colors.error, "agent-stop") { - AgentHost.stop(context) + Row(verticalAlignment = Alignment.Bottom) { + if (LocalActivityResultRegistryOwner.current != null) AttachButton() + Box(Modifier.weight(1f).padding(start = 8.dp, top = 10.dp, bottom = 10.dp)) { + if (draft.isEmpty()) Text( + stringResource(if (working) R.string.agent_hint_working else R.string.agent_hint), fontSize = 16.sp, + color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + BasicTextField( + draft, { draft = it }, + Modifier.fillMaxWidth().focusRequester(field).onFocusChanged { + focused = it.isFocused + if (it.isFocused) composer.opening = false + }.testTag("agent-input").then(inputModifier), + textStyle = TextStyle(fontSize = 16.sp, color = colors.onSurface), + cursorBrush = SolidColor(pal.primary), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), + keyboardActions = KeyboardActions(onSend = { send() }), + minLines = 1, + maxLines = 8, + ) + } + if (working) RoundButton(Icons.Outlined.Stop, stringResource(R.string.agent_stop), pal.error.copy(alpha = 0.22f), colors.error, "agent-stop") { + AgentHost.stop(context) + } + val canSend = draft.isNotBlank() || AgentAttachments.pending.isNotEmpty() + RoundButton( + Icons.AutoMirrored.Outlined.Send, stringResource(if (working) R.string.agent_queue else R.string.agent_send), + if (canSend) pal.primary else pal.surfaceVariant, if (canSend) pal.onPrimary else pal.onSurfaceVariant, "agent-send", enabled = canSend, + ) { send() } } - val canSend = draft.isNotBlank() || AgentAttachments.pending.isNotEmpty() - RoundButton( - Icons.AutoMirrored.Outlined.Send, stringResource(if (working) R.string.agent_queue else R.string.agent_send), - if (canSend) pal.primary else pal.surfaceVariant, if (canSend) pal.onPrimary else pal.onSurfaceVariant, "agent-send", enabled = canSend, - ) { send() } } } @@ -411,9 +697,9 @@ private fun RoundButton( ) { Box( contentAlignment = Alignment.Center, - modifier = Modifier.padding(start = 6.dp).size(46.dp).clip(CircleShape).background(background) + modifier = Modifier.padding(start = 6.dp).size(42.dp).clip(CircleShape).background(background) .clickable(enabled = enabled, onClick = onClick).testTag(tag), ) { - Icon(icon, label, tint = tint, modifier = Modifier.size(22.dp)) + Icon(icon, label, tint = tint, modifier = Modifier.size(21.dp)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt index 8d247f8de6..eed2fd6d13 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -14,10 +14,12 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -190,3 +192,71 @@ internal fun AgentProcessList(modifier: Modifier) { } } } + +/** How full the conversation's context is, how much of the plan's limits is used, and what this conversation cost. */ +@Composable +internal fun AgentUsage() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column( + Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14).padding(horizontal = 14.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + if (AgentHost.window > 0) UsageRow( + stringResource(R.string.agent_usage_context), + stringResource(R.string.agent_usage_of, tokens(AgentHost.context), tokens(AgentHost.window)), + (AgentHost.context.toFloat() / AgentHost.window).coerceIn(0f, 1f), + ) + for (limit in AgentHost.limits) { + val used = liveUsed(limit) + val label = when { + limit.minutes in 9_000..11_000 -> stringResource(R.string.agent_limit_week) + limit.minutes >= 60 -> stringResource(R.string.agent_limit_hours, limit.minutes / 60) + else -> stringResource(R.string.agent_limit_minutes, limit.minutes) + } + val value = if (limit.resetsAt * 1000 > System.currentTimeMillis()) stringResource(R.string.agent_limit_resets, used, resetTime(context, limit.resetsAt)) else "$used%" + UsageRow(label, value, used / 100f) + } + val turns = AgentHost.entries.filterIsInstance().mapNotNull { it.usage } + val cost = turns.sumOf { it.costUsd } + val ms = turns.sumOf { it.durationMs } + Row(verticalAlignment = Alignment.CenterVertically) { + val facts = buildList { + if (ms > 0) add(clock(ms / 1000)) + if (cost >= 0.005) add("$" + String.format(java.util.Locale.US, "%.2f", cost)) + } + Text( + if (facts.isEmpty()) stringResource(R.string.agent_usage_unknown) else stringResource(R.string.agent_usage_conversation, facts.joinToString(" · ")), + fontSize = 12.5.sp, color = pal.onSurfaceVariant, modifier = Modifier.weight(1f), + ) + if (AgentHost.harness.plans && AgentHost.entries.isNotEmpty() && AgentHost.state == AgentHost.State.IDLE) { + SecondaryButton("/compact", compact = true) { AgentHost.send(context, "/compact") } + } + } + } +} + +@Composable +private fun UsageRow(label: String, value: String, fraction: Float) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 14.sp, color = colors.onBackground, modifier = Modifier.weight(1f)) + Text(value, fontSize = 12.5.sp, color = pal.onSurfaceVariant) + } + LinearProgressIndicator( + progress = { fraction }, color = if (fraction >= 0.8f) AttentionAmber else pal.primary, trackColor = pal.surfaceVariant, + modifier = Modifier.fillMaxWidth().height(5.dp).clip(CircleShape), + ) + } +} + +/** A reset later today shows its time; one further off shows the day too. */ +private fun resetTime(context: android.content.Context, epochSeconds: Long): String { + val ms = epochSeconds * 1000 + val flags = if (ms - System.currentTimeMillis() < 20 * 3_600_000L) DateUtils.FORMAT_SHOW_TIME + else DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_ABBREV_WEEKDAY or DateUtils.FORMAT_SHOW_TIME + return DateUtils.formatDateTime(context, ms, flags) +} 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 5752578234..e140ffa1ad 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -558,6 +558,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont Modifier.weight(1f).fillMaxWidth().padding(top = 8.dp, start = 14.dp, end = 14.dp), inputModifier = focus.track(page, "agent-input"), visible = open, + startTyping = false, ) else Column( modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll.getValue(page)), ) { CompositionLocalProvider(LocalChipMinWidth provides 96.dp, LocalCompactSettings provides true) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c5acad050c..3c6fb2b59e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1193,6 +1193,28 @@ Remove Default Reasoning effort + Go + Revise + Nothing changed yet + Go ahead with the plan. + Send now + Message + More + Close + Latest + Working + Context + %1$s of %2$s + This conversation · %1$s + Usage shows after the first reply + %1$d-hour limit + %1$d-minute limit + Weekly limit + %1$d%% · resets %2$s + + %1$d file + %1$d files + Plan first Plan Proposes a plan without changing anything diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt index 13e88edac4..11ecd7aea8 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt @@ -74,7 +74,8 @@ class AgentHostTest { } @Test fun claudeShowsWholeEditsAndTodos() { - assertEquals("a.kt\n\n- old\n\n+ new", ClaudeCode.fullInput("Edit", org.json.JSONObject("""{"file_path":"a.kt","old_string":"old","new_string":"new"}"""))) + assertEquals("a.kt\n-old\n+new", ClaudeCode.fullInput("Edit", org.json.JSONObject("""{"file_path":"a.kt","old_string":"old","new_string":"new"}"""))) + assertEquals("b.kt\n+one\n+two", ClaudeCode.fullInput("Write", org.json.JSONObject("""{"file_path":"b.kt","content":"one\ntwo"}"""))) assertEquals("[x] read\n[~] fix\n[ ] test", ClaudeCode.fullInput("TodoWrite", org.json.JSONObject( """{"todos":[{"content":"read","status":"completed"},{"content":"fix","status":"in_progress"},{"content":"test","status":"pending"}]}"""))) } @@ -164,6 +165,7 @@ class AgentHostTest { val written = listOf( Entry.Asked("hi", listOf("/root/x.png")), Entry.Said("hello"), Entry.Thought("hm"), Entry.Used("t1", "Read", "/root/x", "{}"), Entry.Result("t1", "contents", false), Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3)), Entry.Finished("boom", stopped = true), + Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3, context = 40_000, window = 200_000), planned = true), ) written.forEach { AgentChats.append(file, it) } file.appendText("broken line\n") @@ -173,6 +175,7 @@ class AgentHostTest { assertEquals(listOf( Entry.Asked("hi", listOf("/root/x.png")), Entry.Said("hello"), Entry.Thought("hm"), Entry.Used("t1", "Read", "/root/x", "{}", "contents", false), Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3)), Entry.Finished("boom", stopped = true), + Entry.Finished(null, usage = AgentHost.Usage(1, 0.5, 2, 3, context = 40_000, window = 200_000), planned = true), ), loaded.entries) assertEquals(emptyList(), AgentChats.read(File(file.path + ".missing")).entries) } @@ -208,4 +211,46 @@ class AgentHostTest { assertTrue(p.running && !p.prepare) assertEquals(95, p.etaSeconds) } + + @Test fun anEditBecomesALineDiffWithItsNearbyLines() { + assertEquals(" a\n b\n-c\n+C\n+D\n e\n f", lineDiff("x\na\nb\nc\ne\nf\ny", "x\na\nb\nC\nD\ne\nf\ny")) + assertEquals("+only", lineDiff("", "only")) + assertEquals("-gone", lineDiff("gone", "")) + assertEquals("+one\n+two", lineDiff("", "one\ntwo\n")) + } + + @Test fun claudeRateLimitsAndContextWindowAreRead() { + val event = ClaudeCode.parse("""{"type":"rate_limit_event","rate_limit_info":{"status":"allowed_warning","unifiedWindows":{"five_hour":{"utilization":0.07,"resetsAt":1794435600},"seven_day":{"utilization":0.85,"resetsAt":1794592800}}},"session_id":"s"}""")!! + assertEquals(listOf(AgentHost.Limit(300, 7, 1794435600), AgentHost.Limit(10_080, 85, 1794592800)), event.limits) + val result = ClaudeCode.parse("""{"type":"result","subtype":"success","is_error":false,"result":"done","usage":{},"modelUsage":{"claude-haiku":{"costUSD":0.01,"contextWindow":200000},"claude-sonnet":{"costUSD":0.7,"contextWindow":1000000}}}""")!! + assertEquals(1_000_000L, result.window) + } + + @Test fun codexTokenCountsCarryContextAndLimits() { + val event = Codex.tokenCount("""{"timestamp":"t","type":"event_msg","payload":{"type":"token_count","info":{"total_token_usage":{"total_tokens":90000},"last_token_usage":{"total_tokens":41000},"model_context_window":272000},"rate_limits":{"primary":{"used_percent":12.5,"window_minutes":300,"resets_at":1794435600},"secondary":{"used_percent":40.0,"window_minutes":10080,"resets_at":1794592800}}}}""")!! + assertEquals(41_000L, event.context) + assertEquals(272_000L, event.window) + assertEquals(listOf(AgentHost.Limit(300, 12, 1794435600), AgentHost.Limit(10_080, 40, 1794592800)), event.limits) + assertNull(Codex.tokenCount("""{"type":"event_msg","payload":{"type":"agent_message"}}""")) + } + + @Test fun codexUsageComesFromTheThreadsSessionLog() { + val root = Files.createTempDirectory("rootfs").toFile() + val log = File(root, "root/.codex/sessions/2026/11/12/rollout-2026-11-12T10-00-00-thread1.jsonl").apply { parentFile!!.mkdirs() } + log.writeText( + """{"type":"event_msg","payload":{"type":"token_count","info":{"last_token_usage":{"total_tokens":15692},"model_context_window":258400},"rate_limits":{"primary":{"used_percent":86.0,"window_minutes":10080,"resets_at":1794716485},"secondary":null}}}""" + "\n" + + """{"type":"response_item","payload":{"type":"additional_tools","tools":[{"description":"reports token_count as it goes"}]}}""" + "\n", + ) + val event = Codex.usage(root, "thread1")!! + assertEquals(15_692L, event.context) + assertEquals(258_400L, event.window) + assertEquals(listOf(AgentHost.Limit(10_080, 86, 1794716485)), event.limits) + assertNull(Codex.usage(root, "other")) + } + + @Test fun limitsRoundTripThroughPrefs() { + val limits = listOf(AgentHost.Limit(300, 7, 1794435600), AgentHost.Limit(10_080, 85, 1794592800)) + assertEquals(limits, AgentHost.decodeLimits(AgentHost.encodeLimits(limits))) + assertEquals(emptyList(), AgentHost.decodeLimits("not json")) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt new file mode 100644 index 0000000000..38eddd563b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.agent.AgentHost.Entry +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class AgentChangesTest { + @Test fun aTurnAddsUpTheEditsItMade() { + val entries = listOf( + Entry.Asked("before"), Entry.Used("e0", "Edit", "old.kt", "old.kt\n-a\n+b"), Entry.Finished(null), + Entry.Asked("fix it"), + Entry.Used("e1", "Edit", "a.kt", "src/a.kt\n x\n-y\n+z\n+w"), + Entry.Used("e2", "Write", "b.kt", "src/b.kt\n+one"), + Entry.Used("e3", "Edit", "a.kt", "src/a.kt\n-q", failed = true), + Entry.Used("e4", "Edit", "a.kt", "src/a.kt\n-r"), + Entry.Used("b1", "Bash", "ls", "ls"), + Entry.Finished(null), + ) + assertEquals(Changes(files = 2, added = 3, removed = 2), turnChanges(entries, entries.lastIndex)) + assertEquals(Changes(1, 1, 1), turnChanges(entries, 2)) + } + + @Test fun onlyEditsCarryingADiffCount() { + assertNull(diffOf(Entry.Used("c", "Edit", "a.kt, b.kt", "a.kt\nb.kt"))) + assertNull(diffOf(Entry.Used("b", "Bash", "ls", "ls\n+x"))) + assertEquals(2, diffOf(Entry.Used("e", "Edit", "a.kt", "a.kt\n\n- old\n\n+ new"))?.lines?.size) + assertNull(turnChanges(listOf(Entry.Asked("hi"), Entry.Said("hello"), Entry.Finished(null)), 2)) + } + + @Test fun aSavedPlanIsNotAChange() { + val entries = listOf(Entry.Asked("plan it"), Entry.Used("w", "Write", "plan.md", "/root/.claude/plans/plan.md\n+step"), Entry.Finished(null)) + assertNull(turnChanges(entries, 2)) + } + + @Test fun bigCountsReadAsMillions() { + assertEquals("1M", tokens(1_000_000)) + assertEquals("1.5M", tokens(1_500_000)) + assertEquals("23k", tokens(23_400)) + } +} From b1b6ab79317e6d752f3539863a214b1ca8cc65d8 Mon Sep 17 00:00:00 2001 From: measlesbagel <49631653+measlesbagel@users.noreply.github.com> Date: Thu, 12 Nov 2026 11:57:12 -0600 Subject: [PATCH 054/101] feat(apps): add icon packs, per-app icons and an Appearance panel (#2207) * feat(apps): add an Appearance panel to the Apps page A Palette button in the Apps header opens a panel for icon size, spacing and hiding app names. * feat(apps): support icon packs and per-app icons The Appearance panel gains an Icon pack choice. Packs are found through the ADW and Nova theme intents and must ship an appfilter.xml in res/xml, res/raw or assets. Work profile apps keep their badge. Apps a pack does not cover are drawn on its iconback, iconmask, iconupon and scale tags when it has them, and keep their system icon otherwise. For packs with an iconback, App color background paints that plate in each app's main color instead of the pack's own. With a pack selected, an app's long-press menu offers Change icon, which opens a searchable picker listing icons that match the app first. Reset icon removes one choice, and Reset in the panel removes them all. Calendar apps use the pack's icon for today's date. * feat(apps): translate the Appearance panel and icon strings Adds the 19 new strings to all 32 languages, reusing each language's existing wording where it has one. Icon size and spacing labels are kept short to fit the panel's tabs. * fix(apps): finish loading custom icons before marking them loaded Two app list refreshes can start together on resume. The second one could see the overrides as loaded before the first had read them, and build the list without custom icons. --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 6 + .../droiddeck/launcher/FrontEndActivity.kt | 8 + .../java/com/droiddeck/launcher/HomeApp.kt | 19 +- .../java/com/droiddeck/launcher/HomeIcons.kt | 46 ++++ .../java/com/droiddeck/launcher/IconPack.kt | 198 ++++++++++++++++++ .../droiddeck/launcher/ui/AndroidAppsPage.kt | 108 ++++++++-- .../droiddeck/launcher/ui/AppIconPicker.kt | 188 +++++++++++++++++ .../droiddeck/launcher/ui/AppsAppearance.kt | 120 +++++++++++ .../droiddeck/launcher/ui/FrontEndContent.kt | 2 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 1 + app/src/main/res/values-ar/strings.xml | 19 ++ app/src/main/res/values-b+es+419/strings.xml | 19 ++ app/src/main/res/values-bg/strings.xml | 19 ++ app/src/main/res/values-cs/strings.xml | 19 ++ app/src/main/res/values-da/strings.xml | 19 ++ app/src/main/res/values-de/strings.xml | 19 ++ app/src/main/res/values-el/strings.xml | 19 ++ app/src/main/res/values-es/strings.xml | 19 ++ app/src/main/res/values-fi/strings.xml | 19 ++ app/src/main/res/values-fr/strings.xml | 19 ++ app/src/main/res/values-hi/strings.xml | 19 ++ app/src/main/res/values-hu/strings.xml | 19 ++ app/src/main/res/values-in/strings.xml | 19 ++ app/src/main/res/values-it/strings.xml | 19 ++ app/src/main/res/values-ja/strings.xml | 19 ++ app/src/main/res/values-ko/strings.xml | 19 ++ app/src/main/res/values-ms/strings.xml | 19 ++ app/src/main/res/values-nb/strings.xml | 19 ++ app/src/main/res/values-nl/strings.xml | 19 ++ app/src/main/res/values-pl/strings.xml | 19 ++ app/src/main/res/values-pt-rPT/strings.xml | 19 ++ app/src/main/res/values-pt/strings.xml | 19 ++ app/src/main/res/values-ro/strings.xml | 19 ++ app/src/main/res/values-ru/strings.xml | 19 ++ app/src/main/res/values-sv/strings.xml | 19 ++ app/src/main/res/values-th/strings.xml | 19 ++ app/src/main/res/values-tr/strings.xml | 19 ++ app/src/main/res/values-uk/strings.xml | 19 ++ app/src/main/res/values-vi/strings.xml | 19 ++ app/src/main/res/values-zh-rCN/strings.xml | 19 ++ app/src/main/res/values-zh-rHK/strings.xml | 19 ++ app/src/main/res/values-zh-rTW/strings.xml | 19 ++ app/src/main/res/values/strings.xml | 19 ++ .../com/droiddeck/launcher/HomeIconsTest.kt | 26 +++ .../com/droiddeck/launcher/IconPackTest.kt | 127 +++++++++++ .../com/droiddeck/launcher/ui/AppsGridTest.kt | 21 ++ 47 files changed, 1475 insertions(+), 23 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/HomeIcons.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/IconPack.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AppIconPicker.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AppsAppearance.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/HomeIconsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/IconPackTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/AppsGridTest.kt diff --git a/app/build.gradle b/app/build.gradle index 35201d85c5..d493877cc2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -389,6 +389,7 @@ dependencies { implementation 'androidx.camera:camera-camera2:1.4.2' implementation 'androidx.camera:camera-lifecycle:1.4.2' implementation 'androidx.webkit:webkit:1.12.1' + implementation 'androidx.palette:palette:1.0.0' implementation 'io.github.webrtc-sdk:android:125.6422.07' implementation("com.google.mediapipe:tasks-vision:${trackingPack.MEDIAPIPE_VERSION}") { exclude group: 'com.google.auto.value', module: 'auto-value' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0f3addcb7b..01d980059d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,6 +18,12 @@ + + + + + + diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 23171a6c17..b2f45bc4ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -227,6 +227,11 @@ class FrontEndActivity : ComponentActivity() { refreshWifiDiscovery() } } + private val dateReceiver = object : android.content.BroadcastReceiver() { + override fun onReceive(context: android.content.Context?, intent: Intent?) { + refreshAndroidApps() + } + } private val mediaRefresh = Runnable { refresh() refreshAddedGames() @@ -1594,6 +1599,7 @@ class FrontEndActivity : ComponentActivity() { refreshHomeAppState() } }, + onAppIconsChanged = { refreshAndroidApps() }, onAndroidApp = { app, displayId -> launchAndroidApp(app, displayId) }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this, inverted) @@ -1972,6 +1978,7 @@ class FrontEndActivity : ComponentActivity() { override fun onStart() { super.onStart() registerReceiver(wifiLocationReceiver, android.content.IntentFilter(android.location.LocationManager.MODE_CHANGED_ACTION)) + registerReceiver(dateReceiver, android.content.IntentFilter(Intent.ACTION_DATE_CHANGED)) registerReceiver(mediaReceiver, android.content.IntentFilter().apply { for (action in listOf(Intent.ACTION_MEDIA_MOUNTED, Intent.ACTION_MEDIA_UNMOUNTED, Intent.ACTION_MEDIA_REMOVED, Intent.ACTION_MEDIA_EJECT, Intent.ACTION_MEDIA_BAD_REMOVAL)) addAction(action) @@ -2038,6 +2045,7 @@ class FrontEndActivity : ComponentActivity() { override fun onStop() { if (!homeChoiceOpen) HomeApp.releaseUnusedHomeEntry(this) unregisterReceiver(wifiLocationReceiver) + unregisterReceiver(dateReceiver) unregisterReceiver(mediaReceiver) getSystemService(android.content.pm.LauncherApps::class.java).unregisterCallback(packageCallback) HomeWidgets.stopListening(this) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 9a724d9044..8d3c7dc54c 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -41,7 +41,7 @@ object HomeApp { val userSerial: Long = 0L, ) { val component get() = ComponentName(packageName, className) - val key get() = "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else "" + val key get() = appKey(packageName, className, userSerial) val work get() = userSerial != 0L } @@ -101,6 +101,9 @@ object HomeApp { ?: resolved.loadLabel(pm)?.toString()?.trim()?.takeIf { it.isNotEmpty() } } + private fun appKey(packageName: String, className: String, userSerial: Long) = + "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else "" + fun roleRequestIntent(context: Context): Intent? { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return null val roles = context.getSystemService(RoleManager::class.java) ?: return null @@ -116,13 +119,25 @@ object HomeApp { val pm = context.packageManager val own = Process.myUserHandle() val iconPx = (ICON_DP * context.resources.displayMetrics.density).roundToInt() + val densityDpi = context.resources.displayMetrics.densityDpi + val pack = IconPack.active(context) + val appColors = IconPack.appColors(context) + HomeIcons.load(context) + val overrides = HomeIcons.overrides val apps = users.userProfiles.flatMap { user -> val serial = if (user == own) 0L else users.getSerialNumberForUser(user) runCatching { launcher.getActivityList(null, user) }.getOrDefault(emptyList()).mapNotNull { info -> val component = info.componentName if (component.packageName == context.packageName && user == own) return@mapNotNull null val label = info.label?.toString()?.trim().orEmpty().ifEmpty { component.packageName } - val icon = runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull() + val icon = runCatching { + (overrides[appKey(component.packageName, component.className, serial)] + ?.let { IconPack.drawable(context, it.pack, it.drawable, densityDpi) } + ?: pack?.icon(component, densityDpi) + ?: pack?.plated(info.getIcon(0), iconPx, densityDpi, appColors)) + ?.let { pm.getUserBadgedIcon(it, user) } + ?.toBitmap(iconPx, iconPx) + }.getOrNull() ?: runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull() val app = info.applicationInfo val updated = if (user == own) runCatching { pm.getPackageInfo(component.packageName, 0).lastUpdateTime }.getOrNull() else null @Suppress("DEPRECATION") diff --git a/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt b/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt new file mode 100644 index 0000000000..d3a57be2b4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomeIcons.kt @@ -0,0 +1,46 @@ +package com.droiddeck.launcher + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +object HomeIcons { + private const val PREFS = "home_launcher" + private const val KEY = "icon_overrides" + private const val SEPARATOR = '\t' + + data class Choice(val pack: String, val drawable: String) + + var overrides by mutableStateOf>(emptyMap()) + private set + @Volatile private var loaded = false + + @Synchronized + fun load(context: Context) { + if (loaded) return + overrides = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + .getStringSet(KEY, emptySet()).orEmpty().mapNotNull(::decode).toMap() + loaded = true + } + + fun set(context: Context, key: String, pack: String, drawable: String) = save(context, overrides + (key to Choice(pack, drawable))) + + fun clear(context: Context, key: String) = save(context, overrides - key) + + fun clearAll(context: Context) = save(context, emptyMap()) + + private fun save(context: Context, next: Map) { + overrides = next + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .putStringSet(KEY, next.map { (key, choice) -> encode(key, choice) }.toSet()).apply() + } + + internal fun encode(key: String, choice: Choice) = listOf(key, choice.pack, choice.drawable).joinToString(SEPARATOR.toString()) + + internal fun decode(entry: String): Pair? { + val parts = entry.split(SEPARATOR) + if (parts.size != 3 || parts.any { it.isEmpty() }) return null + return parts[0] to Choice(parts[1], parts[2]) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/IconPack.kt b/app/src/main/java/com/droiddeck/launcher/IconPack.kt new file mode 100644 index 0000000000..227714277e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/IconPack.kt @@ -0,0 +1,198 @@ +package com.droiddeck.launcher + +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.content.res.Resources +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter +import android.graphics.PorterDuffXfermode +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.util.Xml +import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.createBitmap +import androidx.core.graphics.drawable.toBitmap +import androidx.core.graphics.drawable.toDrawable +import androidx.palette.graphics.Palette +import org.xmlpull.v1.XmlPullParser +import java.time.LocalDate +import kotlin.math.roundToInt + +object IconPack { + const val NONE = "" + private const val PREFS = "home_launcher" + private const val KEY = "icon_pack" + private const val APP_COLORS = "icon_pack_app_colors" + private const val FILTER = "appfilter" + private const val DRAWABLES = "drawable" + + private val ACTIONS = listOf("org.adw.launcher.THEMES", "com.novalauncher.THEME") + + data class Pack(val packageName: String, val label: String) + + internal data class Plate(val back: String?, val mask: String?, val upon: String?, val scale: Float) + + internal data class Filter(val icons: Map, val calendars: Map, val plate: Plate?) { + fun names(component: String, day: Int) = listOfNotNull(calendars[component]?.plus(day), icons[component]) + } + + class Loaded internal constructor( + private val resources: Resources, + internal val pack: String, + internal val updatedAt: Long, + private val filter: Filter, + ) { + fun icon(component: ComponentName, densityDpi: Int) = + filter.names(component.flattenToString(), LocalDate.now().dayOfMonth).firstNotNullOfOrNull { load(resources, pack, it, densityDpi) } + + val hasBack get() = filter.plate?.back != null + + fun plated(icon: Drawable, size: Int, densityDpi: Int, appColor: Boolean): Drawable? { + val plate = filter.plate ?: return null + fun image(name: String?) = name?.let { load(resources, pack, it, densityDpi) }?.toBitmap(size, size) + val base = icon.toBitmap(size, size) + val color = if (appColor) Palette.from(base).generate().getDominantColor(0).takeIf { it != 0 } else null + return compose(base, image(plate.back), image(plate.mask), image(plate.upon), plate.scale, color).toDrawable(resources) + } + } + + @Volatile private var cached: Loaded? = null + + fun selected(context: Context): String = + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, NONE).orEmpty() + + fun select(context: Context, pack: String) { + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, pack).apply() + } + + fun appColors(context: Context): Boolean = + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getBoolean(APP_COLORS, false) + + fun setAppColors(context: Context, on: Boolean) { + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putBoolean(APP_COLORS, on).apply() + } + + fun installed(context: Context): List { + val pm = context.packageManager + return ACTIONS.flatMap { pm.queryIntentActivities(Intent(it), 0) } + .map { it.activityInfo.applicationInfo } + .distinctBy { it.packageName } + .filter { app -> resources(pm, app.packageName)?.let { withXml(it, app.packageName, FILTER) { true } } == true } + .map { app -> Pack(app.packageName, app.loadLabel(pm).toString().trim().ifEmpty { app.packageName }) } + .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) + } + + fun active(context: Context): Loaded? { + val pack = selected(context) + if (pack == NONE) return null + val pm = context.packageManager + val updatedAt = runCatching { pm.getPackageInfo(pack, 0).lastUpdateTime }.getOrNull() ?: return null + cached?.takeIf { it.pack == pack && it.updatedAt == updatedAt }?.let { return it } + val resources = resources(pm, pack) ?: return null + val filter = withXml(resources, pack, FILTER) { parse(it) } ?: return null + return Loaded(resources, pack, updatedAt, filter).also { cached = it } + } + + fun drawable(context: Context, pack: String, name: String, densityDpi: Int): Drawable? { + val resources = resources(context.packageManager, pack) ?: return null + return load(resources, pack, name, densityDpi) + } + + fun names(context: Context, pack: String): List { + val resources = resources(context.packageManager, pack) ?: return emptyList() + return withXml(resources, pack, DRAWABLES) { parseNames(it) }?.takeIf { it.isNotEmpty() } + ?: withXml(resources, pack, FILTER) { parse(it).icons.values.distinct().sorted() }.orEmpty() + } + + private fun resources(pm: PackageManager, pack: String): Resources? = + runCatching { pm.getResourcesForApplication(pack) }.getOrNull() + + private fun load(resources: Resources, pack: String, name: String, densityDpi: Int): Drawable? { + val id = resources.getIdentifier(name, "drawable", pack).takeIf { it != 0 } + ?: resources.getIdentifier(name, "mipmap", pack).takeIf { it != 0 } + ?: return null + return runCatching { ResourcesCompat.getDrawableForDensity(resources, id, densityDpi, null) }.getOrNull() + } + + internal fun parseNames(xml: XmlPullParser): List { + val names = LinkedHashSet() + forEachTag(xml) { if (xml.name == "item") xml.getAttributeValue(null, "drawable")?.trim()?.takeIf { it.isNotEmpty() }?.let { names.add(it) } } + return names.toList() + } + + internal fun parse(xml: XmlPullParser): Filter { + val icons = HashMap() + val calendars = HashMap() + var back: String? = null + var mask: String? = null + var upon: String? = null + var scale = 1f + fun image() = xml.getAttributeValue(null, "img1")?.trim()?.takeIf { it.isNotEmpty() } + forEachTag(xml) { + when (xml.name) { + "item" -> { + val key = componentKey(xml.getAttributeValue(null, "component")) + val drawable = xml.getAttributeValue(null, "drawable")?.trim() + if (key != null && !drawable.isNullOrEmpty()) icons.putIfAbsent(key, drawable) + } + "calendar" -> { + val key = componentKey(xml.getAttributeValue(null, "component")) + val prefix = xml.getAttributeValue(null, "prefix")?.trim() + if (key != null && !prefix.isNullOrEmpty()) calendars.putIfAbsent(key, prefix) + } + "iconback" -> back = back ?: image() + "iconmask" -> mask = mask ?: image() + "iconupon" -> upon = upon ?: image() + "scale" -> scale = xml.getAttributeValue(null, "factor")?.toFloatOrNull() ?: scale + } + } + return Filter(icons, calendars, if (back == null && mask == null && upon == null) null else Plate(back, mask, upon, scale)) + } + + internal fun compose(icon: Bitmap, back: Bitmap?, mask: Bitmap?, upon: Bitmap?, scale: Float, backColor: Int? = null): Bitmap { + val size = icon.width + val inset = (size * (1 - scale) / 2).roundToInt() + val result = createBitmap(size, size) + val canvas = Canvas(result) + val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG) + val full = Rect(0, 0, size, size) + canvas.drawBitmap(icon, null, Rect(inset, inset, size - inset, size - inset), paint) + mask?.let { + paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OUT) + canvas.drawBitmap(it, null, full, paint) + } + back?.let { + paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OVER) + paint.colorFilter = backColor?.let { color -> PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN) } + canvas.drawBitmap(it, null, full, paint) + } + paint.xfermode = null + paint.colorFilter = null + upon?.let { canvas.drawBitmap(it, null, full, paint) } + return result + } + + private inline fun forEachTag(xml: XmlPullParser, block: () -> Unit) { + var event = xml.eventType + while (event != XmlPullParser.END_DOCUMENT) { + if (event == XmlPullParser.START_TAG) block() + event = xml.next() + } + } + + internal fun componentKey(component: String?): String? = + component?.trim()?.removePrefix("ComponentInfo{")?.removeSuffix("}")?.let(ComponentName::unflattenFromString)?.flattenToString() + + private fun withXml(resources: Resources, pack: String, file: String, block: (XmlPullParser) -> T): T? = runCatching { + val xml = resources.getIdentifier(file, "xml", pack) + val raw = resources.getIdentifier(file, "raw", pack) + if (xml != 0) resources.getXml(xml).use(block) + else (if (raw != 0) resources.openRawResource(raw) else resources.assets.open("$file.xml")) + .use { stream -> block(Xml.newPullParser().also { it.setInput(stream, null) }) } + }.getOrNull() +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt index a7742c42ea..5c2dff86e3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -73,6 +73,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -108,10 +109,13 @@ import androidx.compose.ui.zIndex import com.droiddeck.launcher.HomeApp import com.droiddeck.launcher.HomeFolders import com.droiddeck.launcher.HomeHidden +import com.droiddeck.launcher.HomeIcons import com.droiddeck.launcher.HomePins +import com.droiddeck.launcher.IconPack import android.content.pm.ShortcutInfo import android.graphics.Bitmap import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.drop import kotlinx.coroutines.withContext import com.droiddeck.launcher.HomeWidgets import com.droiddeck.launcher.R @@ -229,6 +233,48 @@ internal object AppsView { } } +internal object AppsGrid { + const val SMALL = 44 + const val MEDIUM = 52 + const val LARGE = 64 + private val ICON_SIZES = listOf(SMALL, MEDIUM, LARGE) + const val TIGHT = -12 + const val NORMAL = 0 + const val ROOMY = 16 + private val SPACINGS = listOf(TIGHT, NORMAL, ROOMY) + + var labels by mutableStateOf(true) + private set + var iconDp by mutableStateOf(MEDIUM) + private set + var spacing by mutableStateOf(NORMAL) + private set + + private fun prefs(context: Context) = context.getSharedPreferences("home_launcher", Context.MODE_PRIVATE) + + fun load(context: Context) { + val p = prefs(context) + labels = p.getBoolean("grid_labels", true) + iconDp = p.getInt("grid_icon", MEDIUM).takeIf { it in ICON_SIZES } ?: MEDIUM + spacing = p.getInt("grid_spacing", NORMAL).takeIf { it in SPACINGS } ?: NORMAL + } + + fun setLabels(context: Context, value: Boolean) { + labels = value + prefs(context).edit().putBoolean("grid_labels", value).apply() + } + + fun setIconDp(context: Context, value: Int) { + iconDp = value + prefs(context).edit().putInt("grid_icon", value).apply() + } + + fun setSpacing(context: Context, value: Int) { + spacing = value + prefs(context).edit().putInt("grid_spacing", value).apply() + } +} + internal interface AppEntryKey { val label: String val installedAt: Long @@ -237,9 +283,9 @@ internal interface AppEntryKey { @OptIn(ExperimentalLayoutApi::class) @Composable -internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (HomeApp.LaunchableApp) -> Unit) { +internal fun AndroidAppsPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier, onLaunch: (HomeApp.LaunchableApp) -> Unit) { val ctx = LocalContext.current - remember { HomeFolders.load(ctx); HomeWidgets.load(ctx); HomeHidden.load(ctx); AppsView.load(ctx); true } + remember { HomeFolders.load(ctx); HomeWidgets.load(ctx); HomeHidden.load(ctx); AppsView.load(ctx); AppsGrid.load(ctx); true } val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current val padH = if (narrow) 16.dp else 22.dp @@ -247,6 +293,10 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho var openFolder by rememberSaveable { mutableStateOf(null) } var renameOnOpen by rememberSaveable { mutableStateOf(false) } var picking by rememberSaveable { mutableStateOf(false) } + var iconFor by remember { mutableStateOf(null) } + LaunchedEffect(Unit) { + snapshotFlow { HomeIcons.overrides }.drop(1).collect { a.onAppIconsChanged() } + } val folders = HomeFolders.folders val byKey = remember(s.androidApps) { s.androidApps.associateBy { it.key } } val byPkg = remember(s.androidApps) { s.androidApps.filterNot { it.work }.groupBy { it.packageName }.mapNotNull { (pkg, apps) -> apps.singleOrNull()?.let { pkg to it } }.toMap() } @@ -292,7 +342,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho ModeHeader( stringResource(R.string.content_android_apps), query, { query = it }, placeholder = stringResource(R.string.apps_search_hint), - clearSearchFocus = openFolder != null || picking, + clearSearchFocus = openFolder != null || picking || iconFor != null, lead = { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { Text(stringResource(R.string.content_android_apps), fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) @@ -303,6 +353,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho ) { AppsFilterButton() AppsSortButton() + AppsAppearanceButton(a) HeaderIconButton(stringResource(R.string.apps_add_widget), Icons.Filled.Widgets, "add-widget") { HomeWidgets.loadProviders(ctx) picking = true @@ -312,7 +363,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho Box(Modifier.weight(1f).fillMaxWidth()) { val scroller = q.isEmpty() && byName && entries.size > 16 LazyVerticalGrid( - columns = GridCells.Adaptive(if (narrow) 84.dp else 96.dp), + columns = GridCells.Adaptive((if (narrow) 84 else 96).dp + AppsGrid.spacing.dp), state = grid, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), @@ -343,7 +394,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho items(entries, key = { it.key }) { entry -> when (entry) { is AppEntry.App -> AppTile( - entry.app, folderId = null, onLaunch = onLaunch, onNewFolder = newFolder, + entry.app, folderId = null, onLaunch = onLaunch, onNewFolder = newFolder, onChangeIcon = { iconFor = it }, first = entry === entries.first(), ) is AppEntry.Shortcut -> PinnedTile(entry.pinned, first = entry === entries.first()) @@ -367,7 +418,7 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho var last by remember { mutableStateOf(folder) } if (folder != null) last = folder last?.let { f -> - FolderSheet(f, f.apps.mapNotNull(member).filter { it.key !in hidden }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }), renameOnOpen, onLaunch, newFolder) { + FolderSheet(f, f.apps.mapNotNull(member).filter { it.key !in hidden }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }), renameOnOpen, onLaunch, newFolder, { iconFor = it }) { openFolder = null renameOnOpen = false } @@ -377,11 +428,19 @@ internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (Ho picking, enter = fadeIn(Motion.tw(180)), exit = fadeOut(Motion.tw(160)), modifier = Modifier.fillMaxSize().zIndex(3f), ) { WidgetPicker(padH) { picking = false } } + AnimatedVisibility( + iconFor != null, enter = fadeIn(Motion.tw(180)), exit = fadeOut(Motion.tw(160)), + modifier = Modifier.fillMaxSize().zIndex(4f), + ) { + var last by remember { mutableStateOf(iconFor) } + iconFor?.let { last = it } + last?.let { app -> AppIconPicker(app, padH) { iconFor = null } } + } } } @Composable -private fun SwipeLock() { +internal fun SwipeLock() { DisposableEffect(Unit) { PageSwipe.locks++ onDispose { PageSwipe.locks-- } @@ -568,22 +627,22 @@ private fun AppIcon(app: HomeApp.LaunchableApp, size: androidx.compose.ui.unit.D private fun AppTile( app: HomeApp.LaunchableApp, folderId: String?, first: Boolean, onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, - modifier: Modifier = Modifier, + onChangeIcon: (HomeApp.LaunchableApp) -> Unit, modifier: Modifier = Modifier, ) { var menu by remember { mutableStateOf(false) } Box(modifier) { TileFrame(app.key, first, onClick = { onLaunch(app) }, onMenu = { menu = true }) { - AppIcon(app, 52.dp) - TileLabel(app.label) + AppIcon(app, AppsGrid.iconDp.dp) + if (AppsGrid.labels) TileLabel(app.label) } - AppMenu(app, folderId, menu, onDismiss = { menu = false }, onNewFolder = onNewFolder) + AppMenu(app, folderId, menu, onDismiss = { menu = false }, onNewFolder = onNewFolder, onChangeIcon = onChangeIcon) } } @Composable private fun AppMenu( app: HomeApp.LaunchableApp, folderId: String?, open: Boolean, - onDismiss: () -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, + onDismiss: () -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, onChangeIcon: (HomeApp.LaunchableApp) -> Unit, ) { val ctx = LocalContext.current var choosing by remember { mutableStateOf(false) } @@ -636,6 +695,14 @@ private fun AppMenu( onDismiss() HomeHidden.set(ctx, app.key, !isHidden) } + if (IconPack.active(ctx) != null) MenuItem(stringResource(R.string.apps_change_icon), checked = false) { + onDismiss() + onChangeIcon(app) + } + if (app.key in HomeIcons.overrides) MenuItem(stringResource(R.string.apps_reset_icon), checked = false) { + onDismiss() + HomeIcons.clear(ctx, app.key) + } MenuItem(stringResource(R.string.apps_app_info), checked = false) { onDismiss() runCatching { HomeApp.openAppInfo(ctx, app) } @@ -662,10 +729,10 @@ private fun PinnedTile(pinned: HomePins.Pinned, first: Boolean) { TileFrame(pinned.key, first, onClick = { runCatching { HomeApp.startShortcut(ctx, pinned.info) } }, onMenu = { menu = true }) { Box { val icon = pinned.icon - if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(52.dp)) - else Box(Modifier.size(52.dp).clip(CircleShape).background(artBrush(hueOf(pinned.label)))) + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(AppsGrid.iconDp.dp)) + else Box(Modifier.size(AppsGrid.iconDp.dp).clip(CircleShape).background(artBrush(hueOf(pinned.label)))) } - TileLabel(pinned.label) + if (AppsGrid.labels) TileLabel(pinned.label) } AnchoredMenu(menu, onDismiss = { menu = false }, title = pinned.label, compact = true, minWidth = 180.dp) { firstItem -> MenuItem(stringResource(R.string.apps_shortcut_remove), checked = false, detail = pinned.appLabel, focusRequester = firstItem) { @@ -700,8 +767,8 @@ private fun FolderTile(entry: AppEntry.Folder, first: Boolean, onOpen: () -> Uni var menu by remember { mutableStateOf(false) } Box { TileFrame(entry.key, first, onClick = onOpen, onMenu = { menu = true }) { - FolderIcon(entry.apps, 52.dp) - TileLabel(entry.folder.name) + FolderIcon(entry.apps, AppsGrid.iconDp.dp) + if (AppsGrid.labels) TileLabel(entry.folder.name) } AnchoredMenu(menu, onDismiss = { menu = false }, title = entry.folder.name, compact = true, minWidth = 160.dp) { firstItem -> MenuItem(stringResource(R.string.apps_folder_rename), checked = false, focusRequester = firstItem) { @@ -720,7 +787,8 @@ private fun FolderTile(entry: AppEntry.Folder, first: Boolean, onOpen: () -> Uni @Composable private fun FolderSheet( folder: HomeFolders.Folder, apps: List, renameFirst: Boolean, - onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, onClose: () -> Unit, + onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, + onChangeIcon: (HomeApp.LaunchableApp) -> Unit, onClose: () -> Unit, ) { SwipeLock() val ctx = LocalContext.current @@ -803,14 +871,14 @@ private fun FolderSheet( } } LazyVerticalGrid( - columns = GridCells.Adaptive(92.dp), + columns = GridCells.Adaptive(92.dp + AppsGrid.spacing.dp), state = grid, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), ) { items(apps, key = { it.key }) { app -> AppTile( - app, folderId = folder.id, first = false, onLaunch = { onClose(); onLaunch(it) }, onNewFolder = onNewFolder, + app, folderId = folder.id, first = false, onLaunch = { onClose(); onLaunch(it) }, onNewFolder = onNewFolder, onChangeIcon = onChangeIcon, modifier = if (app === apps.first()) Modifier.focusRequester(firstApp) else Modifier, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AppIconPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/AppIconPicker.kt new file mode 100644 index 0000000000..a438a09130 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AppIconPicker.kt @@ -0,0 +1,188 @@ +package com.droiddeck.launcher.ui + +import android.graphics.Bitmap +import android.util.LruCache +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.Image +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.focusGroup +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusDirection +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.graphics.drawable.toBitmap +import com.droiddeck.launcher.HomeApp +import com.droiddeck.launcher.HomeIcons +import com.droiddeck.launcher.IconPack +import com.droiddeck.launcher.R +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private val CELL_ICON = 44.dp + +@OptIn(ExperimentalComposeUiApi::class) +private fun Modifier.focusTrap(): Modifier = focusProperties { + exit = { dir -> + if (dir == FocusDirection.Up || dir == FocusDirection.Down || dir == FocusDirection.Left || dir == FocusDirection.Right) FocusRequester.Cancel + else FocusRequester.Default + } +}.focusGroup() + +private fun normalized(text: String) = text.lowercase().filter { it.isLetterOrDigit() } + +internal fun iconMatches(names: List, label: String, query: String): List { + val q = normalized(query) + if (q.isNotEmpty()) return names.filter { q in normalized(it) } + val hint = normalized(label) + val (likely, rest) = names.partition { hint in normalized(it) } + return likely + rest +} + +@Composable +internal fun AppIconPicker(app: HomeApp.LaunchableApp, padH: androidx.compose.ui.unit.Dp, onClose: () -> Unit) { + SwipeLock() + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pack = remember { IconPack.selected(ctx) } + val names by produceState?>(null, pack) { value = withContext(Dispatchers.IO) { IconPack.names(ctx, pack) } } + var query by remember { mutableStateOf("") } + val shown = remember(names, query) { names?.let { iconMatches(it, app.label, query) } } + val cache = remember { LruCache(256) } + val inputMode = LocalInputModeManager.current.inputMode + val ff = LocalFrontFocus.current + val first = remember { FocusRequester() } + var closing by remember { mutableStateOf(false) } + val close = { + closing = true + onClose() + if (inputMode == InputMode.Keyboard && ff != null) { + runCatching { ff.items.getValue("tile:${app.key}").requestFocus() } + .onFailure { runCatching { ff.firstTile.requestFocus() } } + } + } + LaunchedEffect(names != null, inputMode) { + if (names != null && !closing && inputMode == InputMode.Keyboard) { + repeat(2) { androidx.compose.runtime.withFrameNanos { } } + ff?.last = "icon:${shown?.firstOrNull()}" + if (!closing) runCatching { first.requestFocus() } + } + } + BackHandler { close() } + Column( + Modifier.fillMaxSize().imePadding().background(colors.background) + .blockTouches() + .focusTrap(), + ) { + val title = stringResource(R.string.touch_icon_for, app.label) + Box(Modifier.fillMaxWidth().padding(start = padH, end = padH, top = 8.dp)) { + ModeHeader( + title, query, { query = it }, placeholder = stringResource(R.string.apps_icons_search), + lead = { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { + BackLink(stringResource(R.string.rail_apps), compact = true, onClick = close) + Text(title, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + }, + inlineWhenStacked = true, + ) { } + } + LazyVerticalGrid( + columns = GridCells.Adaptive(64.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), + contentPadding = PaddingValues(horizontal = padH, vertical = 8.dp), + modifier = Modifier.fillMaxSize(), + ) { + when { + shown == null -> item(key = "loading", span = { GridItemSpan(maxLineSpan) }) { Note(stringResource(R.string.apps_icons_loading)) } + shown.isEmpty() -> item(key = "none", span = { GridItemSpan(maxLineSpan) }) { Note(stringResource(R.string.apps_icons_none)) } + else -> items(shown, key = { it }) { name -> + PackIconCell( + pack, name, cache, + modifier = if (name == shown.first()) Modifier.focusRequester(first) else Modifier, + ) { + HomeIcons.set(ctx, app.key, pack, name) + close() + } + } + } + } + } +} + +@Composable +private fun PackIconCell( + pack: String, name: String, cache: LruCache, modifier: Modifier, onPick: () -> Unit, +) { + val ctx = LocalContext.current + val iconPx = with(LocalDensity.current) { CELL_ICON.roundToPx() } + val bitmap by produceState(cache.get(name), name) { + if (value == null) value = withContext(Dispatchers.IO) { + runCatching { IconPack.drawable(ctx, pack, name, ctx.resources.displayMetrics.densityDpi)?.toBitmap(iconPx, iconPx) }.getOrNull()?.also { cache.put(name, it) } + } + } + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = modifier.fillMaxWidth().paneItem("icon:$name").clip(Shape12) + .background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, Shape12, pal.signal) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onPick) + .controllerConfirm(onClick = onPick) + .semantics { contentDescription = name.replace('_', ' ') } + .padding(10.dp), + ) { + val icon = bitmap + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(CELL_ICON)) + else Spacer(Modifier.size(CELL_ICON)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AppsAppearance.kt b/app/src/main/java/com/droiddeck/launcher/ui/AppsAppearance.kt new file mode 100644 index 0000000000..e04ff0d613 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AppsAppearance.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Palette +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.HomeIcons +import com.droiddeck.launcher.IconPack +import com.droiddeck.launcher.R +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private val PanelWidth = 348.dp +private val PanelHeight = 316.dp +private val TabsWidth = 204.dp + +@Composable +internal fun AppsAppearanceButton(a: FrontEndActions) { + val pal = LocalPalette.current + val title = stringResource(R.string.apps_appearance) + var at by remember { mutableStateOf(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(title, Icons.Filled.Palette, "apps-appearance") { + val from = at ?: return@HeaderIconButton + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = 2, maxWidth = PanelWidth, + handle = { Icon(Icons.Filled.Palette, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + Column( + Modifier.stepItem(1).fillMaxWidth().height(minOf(PanelHeight, (maxHeight - 64.dp).coerceAtLeast(44.dp))).verticalScroll(rememberScrollState()), + ) { AppearanceRows(a) } + }) + } + } +} + +@Composable +private fun StepOutScope.AppearanceRows(a: FrontEndActions) { + val ctx = LocalContext.current + val host = rememberMenuHost() + var packsOpen by remember { mutableStateOf(false) } + var selected by remember { mutableStateOf(IconPack.selected(ctx)) } + var appColors by remember { mutableStateOf(IconPack.appColors(ctx)) } + val installed by produceState(emptyList()) { + value = withContext(Dispatchers.IO) { runCatching { IconPack.installed(ctx) }.getOrDefault(emptyList()) } + } + val hasBack by produceState(false, selected) { value = withContext(Dispatchers.IO) { IconPack.active(ctx)?.hasBack == true } } + CompositionLocalProvider(LocalCompactSettings provides true) { + val packs = listOf(IconPack.Pack(IconPack.NONE, stringResource(R.string.apps_icon_pack_system))) + installed + val current = packs.find { it.packageName == selected } ?: packs.first() + Box(Modifier.focusRequester(first)) { + LinkRow( + stringResource(R.string.apps_icon_pack), current.label, "", "icon-pack", + arrow = if (packsOpen) "▴" else "▾", + ) { packsOpen = !packsOpen } + } + if (packsOpen) packs.forEach { (value, text) -> + MenuItem(text, checked = value == current.packageName) { + selected = value + IconPack.select(ctx, value) + a.onAppIconsChanged() + packsOpen = false + runCatching { first.requestFocus() } + } + } + SettingsRow(stringResource(R.string.apps_icon_size), null) { + SegmentedTabs( + listOf( + AppsGrid.SMALL to stringResource(R.string.apps_icon_small), + AppsGrid.MEDIUM to stringResource(R.string.apps_icon_medium), + AppsGrid.LARGE to stringResource(R.string.apps_icon_large), + ), + AppsGrid.iconDp, Modifier.width(TabsWidth), + ) { AppsGrid.setIconDp(ctx, it) } + } + SettingsRow(stringResource(R.string.apps_spacing), null) { + SegmentedTabs( + listOf( + AppsGrid.TIGHT to stringResource(R.string.apps_spacing_tight), + AppsGrid.NORMAL to stringResource(R.string.apps_spacing_normal), + AppsGrid.ROOMY to stringResource(R.string.apps_spacing_roomy), + ), + AppsGrid.spacing, Modifier.width(TabsWidth), + ) { AppsGrid.setSpacing(ctx, it) } + } + ToggleRow(host, "app-names", stringResource(R.string.apps_hide_names), null, !AppsGrid.labels) { AppsGrid.setLabels(ctx, !it) } + if (hasBack) ToggleRow(host, "app-colors", stringResource(R.string.apps_icon_app_colors), null, appColors) { + appColors = it + IconPack.setAppColors(ctx, it) + a.onAppIconsChanged() + } + if (HomeIcons.overrides.isNotEmpty()) ActionRow(stringResource(R.string.apps_icons_custom), null, stringResource(R.string.ctrl_reset), { + HomeIcons.clearAll(ctx) + runCatching { first.requestFocus() } + }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 2259a2b34e..28b3dc33bb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -275,7 +275,7 @@ private fun Content( return } if (selected == "android-apps" && s.isHomeApp) { - AndroidAppsPage(s, modifier, onAndroidAppClick) + AndroidAppsPage(s, a, modifier, onAndroidAppClick) return } Column(modifier = modifier.verticalScroll(rememberScrollState()).padding(horizontal = padH, vertical = padV)) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 3cc28e1890..f9914d5a38 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -293,6 +293,7 @@ class FrontEndActions( val onLibraryChanged: () -> Unit = {}, val onHomeApp: () -> Unit = {}, val onHomeScreen: (Boolean) -> Unit = {}, + val onAppIconsChanged: () -> Unit = {}, val onSteamIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature?) -> Unit = {}, val onDismissIntegration: () -> Unit = {}, val onIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature) -> Unit = {}, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index cc56dbb7a7..ad939d9696 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3697,6 +3697,25 @@ نقل إلى الخلف إعدادات الأداة إزالة الأداة + المظهر + حزمة الرموز + الافتراضي للنظام + خلفية بلون التطبيق + حجم الرموز + صغير + متوسط + كبير + إخفاء أسماء التطبيقات + التباعد + ضيق + عادي + واسع + تغيير الرمز + إعادة ضبط الرمز + البحث في الرموز + جارٍ تحميل الرموز… + لم يتم العثور على رموز. + رموز مخصّصة إضافة إلى مجلد مجلد جديد إزالة من المجلد 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 46e5035656..d3c6e048aa 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3556,6 +3556,25 @@ Mover después Configuración del widget Quitar widget + Apariencia + Paquete de iconos + Predeterminado del sistema + Fondo con color de la app + Tamaño de iconos + Pequeño + Mediano + Grande + Ocultar nombres de apps + Espaciado + Denso + Normal + Amplio + Cambiar icono + Restablecer icono + Buscar iconos + Cargando iconos… + No se encontraron iconos. + Iconos personalizados Agregar a carpeta Carpeta nueva Quitar de la carpeta diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d3e14dd32c..6d9aaa5d32 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3545,6 +3545,25 @@ Преместване по-късно Настройки на приспособлението Премахване на приспособлението + Външен вид + Пакет с икони + По подразбиране от системата + Фон в цвета на приложението + Размер на иконите + Малък + Среден + Голям + Скриване на имената + Разстояние + Плътно + Средно + Широко + Промяна на иконата + Нулиране на иконата + Търсене на икони + Иконите се зареждат… + Няма намерени икони. + Персонализирани икони Добавяне в папка Нова папка Премахване от папката diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c318b3081b..302d2b5fd5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3621,6 +3621,25 @@ Posunout později Nastavení widgetu Odebrat widget + Vzhled + Balíček ikon + Výchozí systémový + Pozadí v barvě aplikace + Velikost ikon + Malé + Střední + Velké + Skrýt názvy aplikací + Rozestupy + Těsné + Běžné + Volné + Změnit ikonu + Obnovit ikonu + Hledat ikony + Načítání ikon… + Nebyly nalezeny žádné ikony. + Vlastní ikony Přidat do složky Nová složka Odebrat ze složky diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 0936040739..3c8fe48493 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3545,6 +3545,25 @@ Flyt senere Widgetindstillinger Fjern widget + Udseende + Ikonpakke + Systemstandard + Baggrund i appens farve + Ikonstørrelse + Lille + Mellem + Stor + Skjul appnavne + Afstand + Tæt + Normal + Luftig + Skift ikon + Nulstil ikon + Søg efter ikoner + Indlæser ikoner… + Ingen ikoner fundet. + Brugerdefinerede ikoner Føj til mappe Ny mappe Fjern fra mappe diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1db47d2b34..a81afbdbd5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3545,6 +3545,25 @@ Nach hinten Widget-Einstellungen Widget entfernen + Darstellung + Symbolpaket + Systemstandard + Hintergrund in App-Farbe + Symbolgröße + Klein + Mittel + Groß + App-Namen ausblenden + Abstand + Eng + Normal + Weit + Symbol ändern + Symbol zurücksetzen + Symbole suchen + Symbole werden geladen… + Keine Symbole gefunden. + Eigene Symbole Zu Ordner hinzufügen Neuer Ordner Aus Ordner entfernen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4fe414040c..c6be6d3824 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3545,6 +3545,25 @@ Μετακίνηση αργότερα Ρυθμίσεις γραφικού στοιχείου Αφαίρεση γραφικού στοιχείου + Εμφάνιση + Πακέτο εικονιδίων + Προεπιλογή συστήματος + Φόντο με χρώμα εφαρμογής + Μέγεθος εικονιδίων + Μικρό + Μεσαίο + Μεγάλο + Απόκρυψη ονομάτων εφαρμογών + Απόσταση + Στενή + Μέτρια + Ευρεία + Αλλαγή εικονιδίου + Επαναφορά εικονιδίου + Αναζήτηση εικονιδίων + Φόρτωση εικονιδίων… + Δεν βρέθηκαν εικονίδια. + Προσαρμοσμένα εικονίδια Προσθήκη σε φάκελο Νέος φάκελος Αφαίρεση από φάκελο diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8cff6535ff..f3632dce18 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3583,6 +3583,25 @@ Mover después Ajustes del widget Quitar widget + Apariencia + Paquete de iconos + Predeterminado del sistema + Fondo con color de la app + Tamaño de iconos + Pequeño + Mediano + Grande + Ocultar nombres de aplicaciones + Espaciado + Denso + Normal + Amplio + Cambiar icono + Restablecer icono + Buscar iconos + Cargando iconos… + No se encontraron iconos. + Iconos personalizados Añadir a carpeta Carpeta nueva Quitar de la carpeta diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 71a1e78a74..49ef50fa3a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3545,6 +3545,25 @@ Siirrä myöhemmäksi Widgetin asetukset Poista widget + Ulkoasu + Kuvakepaketti + Järjestelmän oletus + Taustaväri sovelluksesta + Kuvakekoko + Pieni + Keski + Suuri + Piilota sovellusten nimet + Välit + Tiivis + Normaali + Väljä + Vaihda kuvake + Palauta kuvake + Hae kuvakkeita + Ladataan kuvakkeita… + Kuvakkeita ei löytynyt. + Mukautetut kuvakkeet Lisää kansioon Uusi kansio Poista kansiosta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a182aeb39a..dd2043ac1e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3583,6 +3583,25 @@ Reculer Paramètres du widget Retirer le widget + Apparence + Pack d\'icônes + Par défaut du système + Fond couleur de l\'appli + Taille des icônes + Petite + Moyenne + Grande + Masquer les noms des applications + Espacement + Serré + Normal + Aéré + Changer l\'icône + Réinitialiser l\'icône + Rechercher des icônes + Chargement des icônes… + Aucune icône trouvée. + Icônes personnalisées Ajouter à un dossier Nouveau dossier Retirer du dossier diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index ad96817016..5c39c28c16 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3545,6 +3545,25 @@ बाद में ले जाएँ विजेट सेटिंग विजेट हटाएँ + दिखावट + आइकन पैक + सिस्टम डिफ़ॉल्ट + ऐप के रंग का बैकग्राउंड + आइकन का आकार + छोटा + मध्यम + बड़ा + ऐप के नाम छिपाएं + स्पेसिंग + कम + सामान्य + ज़्यादा + आइकन बदलें + आइकन रीसेट करें + आइकन खोजें + आइकन लोड हो रहे हैं… + कोई आइकन नहीं मिला। + कस्टम आइकन फ़ोल्डर में जोड़ें नया फ़ोल्डर फ़ोल्डर से हटाएँ diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 26fafb1bd2..383658e191 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3545,6 +3545,25 @@ Hátrébb Modulbeállítások Modul eltávolítása + Megjelenés + Ikoncsomag + Rendszer alapértelmezett + Háttér az alkalmazás színével + Ikonméret + Kicsi + Közepes + Nagy + Alkalmazásnevek elrejtése + Térköz + Szűk + Normál + Tág + Ikon módosítása + Ikon visszaállítása + Ikonok keresése + Ikonok betöltése… + Nem található ikon. + Egyéni ikonok Hozzáadás mappához Új mappa Eltávolítás a mappából diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index fc440af4e9..7efa53767f 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3516,6 +3516,25 @@ Pindahkan ke belakang Setelan widget Hapus widget + Tampilan + Paket ikon + Default sistem + Latar warna aplikasi + Ukuran ikon + Kecil + Sedang + Besar + Sembunyikan nama aplikasi + Jarak + Rapat + Normal + Longgar + Ubah ikon + Setel ulang ikon + Cari ikon + Memuat ikon… + Ikon tidak ditemukan. + Ikon khusus Tambahkan ke folder Folder baru Keluarkan dari folder diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6e2493bc4b..bff0619db4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3583,6 +3583,25 @@ Sposta dopo Impostazioni widget Rimuovi widget + Aspetto + Pacchetto icone + Predefinito di sistema + Sfondo col colore dell\'app + Dimensione icone + Piccole + Medie + Grandi + Nascondi nomi delle app + Spaziatura + Stretta + Normale + Ampia + Cambia icona + Ripristina icona + Cerca icone + Caricamento icone… + Nessuna icona trovata. + Icone personalizzate Aggiungi a cartella Nuova cartella Rimuovi dalla cartella diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 326f88634d..1c9b9d6f4e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3516,6 +3516,25 @@ 後ろへ移動 ウィジェットの設定 ウィジェットを削除 + 外観 + アイコンパック + システムのデフォルト + アプリの色を背景に使用 + アイコンサイズ + 小 + 中 + 大 + アプリ名を非表示 + 間隔 + 狭い + 標準 + 広い + アイコンを変更 + アイコンをリセット + アイコンを検索 + アイコンを読み込み中… + アイコンが見つかりません。 + カスタムアイコン フォルダに追加 新しいフォルダ フォルダから削除 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c93c5b0d20..f75ed9bf91 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3516,6 +3516,25 @@ 뒤로 이동 위젯 설정 위젯 삭제 + 외관 + 아이콘 팩 + 시스템 기본값 + 앱 색상 배경 + 아이콘 크기 + 작게 + 보통 + 크게 + 앱 이름 숨기기 + 간격 + 좁게 + 보통 + 넓게 + 아이콘 변경 + 아이콘 초기화 + 아이콘 검색 + 아이콘 불러오는 중… + 아이콘을 찾을 수 없습니다. + 사용자 정의 아이콘 폴더에 추가 새 폴더 폴더에서 제거 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 6d0077c92e..006abdf4bf 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3516,6 +3516,25 @@ Alih ke belakang Tetapan widget Alih keluar widget + Rupa + Pek ikon + Lalai sistem + Latar warna apl + Saiz ikon + Kecil + Sedang + Besar + Sembunyikan nama apl + Jarak + Rapat + Biasa + Luas + Tukar ikon + Set semula ikon + Cari ikon + Memuatkan ikon… + Tiada ikon ditemui. + Ikon tersuai Tambah pada folder Folder baharu Alih keluar daripada folder diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b95bffcc69..c305b9387a 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3545,6 +3545,25 @@ Flytt senere Modulinnstillinger Fjern modul + Utseende + Ikonpakke + Systemstandard + Bakgrunn i appens farge + Ikonstørrelse + Liten + Middels + Stor + Skjul appnavn + Avstand + Tett + Normal + Luftig + Endre ikon + Tilbakestill ikon + Søk etter ikoner + Laster inn ikoner… + Fant ingen ikoner. + Egendefinerte ikoner Legg til i mappe Ny mappe Fjern fra mappe diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b9c476a349..625992011f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3545,6 +3545,25 @@ Naar achteren Widgetinstellingen Widget verwijderen + Weergave + Pictogrampakket + Systeemstandaard + Achtergrond in app-kleur + Grootte van pictogrammen + Klein + Middel + Groot + App-namen verbergen + Afstand + Krap + Normaal + Ruim + Pictogram wijzigen + Pictogram resetten + Pictogrammen zoeken + Pictogrammen laden… + Geen pictogrammen gevonden. + Aangepaste pictogrammen Toevoegen aan map Nieuwe map Uit map verwijderen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index cba0b85efa..fa5dcd2c03 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3621,6 +3621,25 @@ Przesuń później Ustawienia widżetu Usuń widżet + Wygląd + Pakiet ikon + Domyślny systemu + Tło w kolorze aplikacji + Rozmiar ikon + Mały + Średni + Duży + Ukryj nazwy aplikacji + Odstępy + Ciasne + Średnie + Luźne + Zmień ikonę + Resetuj ikonę + Szukaj ikon + Wczytywanie ikon… + Nie znaleziono ikon. + Własne ikony Dodaj do folderu Nowy folder Usuń z folderu diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 39b93f25b0..3c94b532eb 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3583,6 +3583,25 @@ Mover para depois Definições do widget Remover widget + Aspeto + Pacote de ícones + Predefinição do sistema + Fundo na cor da app + Tamanho dos ícones + Pequeno + Médio + Grande + Ocultar nomes das aplicações + Espaçamento + Justo + Normal + Amplo + Alterar ícone + Repor ícone + Pesquisar ícones + A carregar ícones… + Nenhum ícone encontrado. + Ícones personalizados Adicionar a pasta Nova pasta Remover da pasta diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b4d3cf7ddd..14bed70758 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3583,6 +3583,25 @@ Mover para depois Configurações do widget Remover widget + Aparência + Pacote de ícones + Padrão do sistema + Fundo na cor do app + Tamanho dos ícones + Pequeno + Médio + Grande + Ocultar nomes dos apps + Espaçamento + Justo + Normal + Amplo + Alterar ícone + Redefinir ícone + Buscar ícones + Carregando ícones… + Nenhum ícone encontrado. + Ícones personalizados Adicionar à pasta Nova pasta Remover da pasta diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index bd8696e74a..672122d817 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3583,6 +3583,25 @@ Mută mai târziu Setări widget Elimină widgetul + Aspect + Pachet de iconițe + Implicit de sistem + Fundal în culoarea aplicației + Dimensiune iconițe + Mică + Medie + Mare + Ascunde numele aplicațiilor + Spațiere + Strânsă + Normală + Largă + Schimbă iconița + Resetează iconița + Caută iconițe + Se încarcă iconițele… + Nu s-au găsit iconițe. + Iconițe personalizate Adaugă în dosar Dosar nou Elimină din dosar diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8dee9e4c9e..1449384134 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3704,6 +3704,25 @@ Переместить позже Настройки виджета Удалить виджет + Внешний вид + Набор иконок + Как в системе + Фон цвета приложения + Размер иконок + Мелкие + Средние + Крупные + Скрыть названия приложений + Отступы + Узко + Средне + Широко + Сменить иконку + Сбросить иконку + Поиск иконок + Загрузка иконок… + Иконки не найдены. + Свои иконки Добавить в папку Новая папка Убрать из папки diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5a35123390..7a5120525c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3545,6 +3545,25 @@ Flytta senare Widgetinställningar Ta bort widget + Utseende + Ikonpaket + Systemstandard + Bakgrund i appens färg + Ikonstorlek + Liten + Mellan + Stor + Dölj appnamn + Avstånd + Tätt + Normalt + Luftigt + Ändra ikon + Återställ ikon + Sök ikoner + Läser in ikoner… + Inga ikoner hittades. + Anpassade ikoner Lägg till i mapp Ny mapp Ta bort från mapp diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 81017bbb02..38b62c9fce 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3516,6 +3516,25 @@ ย้ายไปหลัง การตั้งค่าวิดเจ็ต นำวิดเจ็ตออก + รูปลักษณ์ + ชุดไอคอน + ค่าเริ่มต้นของระบบ + พื้นหลังสีของแอป + ขนาดไอคอน + เล็ก + ปานกลาง + ใหญ่ + ซ่อนชื่อแอป + ระยะห่าง + ชิด + ปกติ + กว้าง + เปลี่ยนไอคอน + รีเซ็ตไอคอน + ค้นหาไอคอน + กำลังโหลดไอคอน… + ไม่พบไอคอน + ไอคอนที่กำหนดเอง เพิ่มลงในโฟลเดอร์ โฟลเดอร์ใหม่ นำออกจากโฟลเดอร์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b65fc85813..df596656d4 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3545,6 +3545,25 @@ Arkaya taşı Widget ayarları Widget’ı kaldır + Görünüm + Simge paketi + Sistem varsayılanı + Uygulama rengi arka plan + Simge boyutu + Küçük + Orta + Büyük + Uygulama adlarını gizle + Aralık + Dar + Normal + Geniş + Simgeyi değiştir + Simgeyi sıfırla + Simge ara + Simgeler yükleniyor… + Simge bulunamadı. + Özel simgeler Klasöre ekle Yeni klasör Klasörden çıkar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bd977f8e42..2ee9ab4e36 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3621,6 +3621,25 @@ Перемістити пізніше Налаштування віджета Вилучити віджет + Вигляд + Набір значків + Як у системі + Фон кольору застосунку + Розмір значків + Малі + Середні + Великі + Сховати назви застосунків + Відступи + Вузькі + Середні + Широкі + Змінити значок + Скинути значок + Пошук значків + Завантаження значків… + Значків не знайдено. + Власні значки Додати до папки Нова папка Вилучити з папки diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a6411681d2..a4414e038f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3516,6 +3516,25 @@ Chuyển ra sau Cài đặt tiện ích Xóa tiện ích + Giao diện + Gói biểu tượng + Theo hệ thống + Nền theo màu ứng dụng + Kích thước biểu tượng + Nhỏ + Vừa + Lớn + Ẩn tên ứng dụng + Khoảng cách + Hẹp + Vừa + Rộng + Đổi biểu tượng + Đặt lại biểu tượng + Tìm biểu tượng + Đang tải biểu tượng… + Không tìm thấy biểu tượng. + Biểu tượng tùy chỉnh Thêm vào thư mục Thư mục mới Xóa khỏi thư mục diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e3263afcc6..100352717d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3520,6 +3520,25 @@ 后移 微件设置 移除微件 + 外观 + 图标包 + 系统默认 + 使用应用颜色作为背景 + 图标大小 + 小 + 中 + 大 + 隐藏应用名称 + 间距 + 紧凑 + 正常 + 宽松 + 更换图标 + 重置图标 + 搜索图标 + 正在加载图标… + 未找到图标。 + 自定义图标 添加到文件夹 新建文件夹 从文件夹中移除 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 6ea69859e5..729bf26c23 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3516,6 +3516,25 @@ 向後移 小工具設定 移除小工具 + 外觀 + 圖示包 + 系統預設 + 使用應用程式顏色作為背景 + 圖示大小 + 小 + 中 + 大 + 隱藏應用程式名稱 + 間距 + 緊密 + 正常 + 寬鬆 + 更改圖示 + 重設圖示 + 搜尋圖示 + 正在載入圖示… + 找不到圖示。 + 自訂圖示 加入資料夾 新資料夾 從資料夾移除 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6b34c26263..15d43fc4f0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3516,6 +3516,25 @@ 往後移 小工具設定 移除小工具 + 外觀 + 圖示套件 + 系統預設 + 使用應用程式顏色作為背景 + 圖示大小 + 小 + 中 + 大 + 隱藏應用程式名稱 + 間距 + 緊密 + 正常 + 寬鬆 + 變更圖示 + 重設圖示 + 搜尋圖示 + 正在載入圖示… + 找不到圖示。 + 自訂圖示 新增至資料夾 新資料夾 從資料夾移除 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c6fb2b59e..87271de25e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1386,6 +1386,25 @@ Move later Widget settings Remove widget + Appearance + Icon pack + System default + App color background + Icon size + Small + Medium + Large + Hide app names + Spacing + Tight + Normal + Roomy + Change icon + Reset icon + Search icons + Loading icons… + No icons found. + Custom icons Add to folder New folder Remove from folder diff --git a/app/src/test/java/com/droiddeck/launcher/HomeIconsTest.kt b/app/src/test/java/com/droiddeck/launcher/HomeIconsTest.kt new file mode 100644 index 0000000000..fc3ba72d75 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/HomeIconsTest.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher + +import com.droiddeck.launcher.ui.iconMatches +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class HomeIconsTest { + @Test fun aChoiceSurvivesEncoding() { + val choice = HomeIcons.Choice("com.pack", "chrome_alt") + assertEquals("com.app/.Main#10" to choice, HomeIcons.decode(HomeIcons.encode("com.app/.Main#10", choice))) + } + + @Test fun aDamagedEntryIsDropped() { + assertNull(HomeIcons.decode("com.app/.Main")) + assertNull(HomeIcons.decode("com.app/.Main\t\tchrome")) + } + + @Test fun iconsNamedLikeTheAppComeFirst() { + assertEquals(listOf("google_chrome", "alarm", "zoom"), iconMatches(listOf("alarm", "google_chrome", "zoom"), "Chrome", "")) + } + + @Test fun aSearchIgnoresCaseAndSeparators() { + assertEquals(listOf("google_chrome"), iconMatches(listOf("alarm", "google_chrome"), "Chrome", "Google Ch")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/IconPackTest.kt b/app/src/test/java/com/droiddeck/launcher/IconPackTest.kt new file mode 100644 index 0000000000..0c03ac3b7e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/IconPackTest.kt @@ -0,0 +1,127 @@ +package com.droiddeck.launcher + +import android.graphics.Color +import android.util.Xml +import androidx.core.graphics.createBitmap +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode +import java.io.StringReader + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class IconPackTest { + private fun filter(xml: String) = IconPack.parse(Xml.newPullParser().also { it.setInput(StringReader(xml)) }) + + private fun parse(xml: String) = filter(xml).icons + + private fun plate(xml: String) = filter(xml).plate + + private fun solid(color: Int) = createBitmap(10, 10).also { it.eraseColor(color) } + + @Test fun plateTagsAreReadFromTheFilter() { + val xml = """ + + + + + + """ + assertEquals(IconPack.Plate("back", "mask", "upon", 0.75f), plate(xml)) + } + + @Test fun aPackWithoutPlateImagesHasNoPlateEvenWithAScale() { + assertNull(plate("""""")) + } + + @Test fun anInvalidScaleLeavesTheIconFullSize() { + assertEquals(1f, plate("""""")?.scale) + } + + @Test fun theMaskCutsTheIconWhereItIsOpaqueAndTheBackShowsThrough() { + val mask = createBitmap(10, 10).also { it.setPixel(0, 0, Color.BLACK) } + val out = IconPack.compose(solid(Color.RED), solid(Color.BLUE), mask, null, 1f) + assertEquals(Color.BLUE, out.getPixel(0, 0)) + assertEquals(Color.RED, out.getPixel(5, 5)) + } + + @Test fun theScaleShrinksTheIconOntoTheBack() { + val out = IconPack.compose(solid(Color.RED), solid(Color.BLUE), null, null, 0.5f) + assertEquals(Color.BLUE, out.getPixel(1, 1)) + assertEquals(Color.RED, out.getPixel(5, 5)) + } + + @Test fun anAppColorRepaintsTheBackInsideItsShape() { + val back = createBitmap(10, 10).also { it.setPixel(5, 5, Color.WHITE) } + val out = IconPack.compose(createBitmap(10, 10), back, null, null, 1f, Color.GREEN) + assertEquals(Color.GREEN, out.getPixel(5, 5)) + assertEquals(Color.TRANSPARENT, out.getPixel(0, 0)) + } + + @Test fun theUponImageDrawsOverEverything() { + val out = IconPack.compose(solid(Color.RED), solid(Color.BLUE), null, solid(Color.GREEN), 1f) + assertEquals(Color.GREEN, out.getPixel(5, 5)) + } + + @Test fun drawableXmlNamesAreDistinctAndInOrder() { + val xml = """""" + assertEquals(listOf("b", "a"), IconPack.parseNames(Xml.newPullParser().also { it.setInput(StringReader(xml)) })) + } + + @Test fun aClassNameStartingWithADotIsExpandedWithThePackage() { + assertEquals("com.example.app/com.example.app.Main", IconPack.componentKey("ComponentInfo{com.example.app/.Main}")) + } + + @Test fun entriesWithoutAUsableComponentOrDrawableAreSkipped() { + val icons = parse( + """ + + + + + + """, + ) + assertTrue(icons.toString(), icons.isEmpty()) + } + + @Test fun theFirstEntryForAComponentWins() { + val icons = parse( + """ + + + """, + ) + assertEquals("first", icons["com.example/com.example.Main"]) + } + + @Test fun aCalendarTriesTodaysIconBeforeItsStaticOne() { + val filter = filter( + """ + + + + """, + ) + assertEquals(listOf("calendar_7", "cal"), filter.names("com.example/com.example.Cal", 7)) + assertEquals(listOf("main"), filter.names("com.example/com.example.Main", 7)) + } + + @Test fun tagsThatAreNotItemsAreIgnored() { + val icons = parse( + """ + + + + + """, + ) + assertEquals(mapOf("com.example/com.example.Main" to "main"), icons) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AppsGridTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppsGridTest.kt new file mode 100644 index 0000000000..6f09411ac1 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/AppsGridTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.test.core.app.ApplicationProvider +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class AppsGridTest { + @Test fun anUnknownStoredGridValueFallsBackToTheDefault() { + val context: Context = ApplicationProvider.getApplicationContext() + context.getSharedPreferences("home_launcher", Context.MODE_PRIVATE).edit().putInt("grid_icon", 999).putInt("grid_spacing", 7).commit() + AppsGrid.load(context) + assertEquals(AppsGrid.MEDIUM, AppsGrid.iconDp) + assertEquals(AppsGrid.NORMAL, AppsGrid.spacing) + } +} From b52ce7e4c5095c565056d3e39226b931998f317c Mon Sep 17 00:00:00 2001 From: LunaDL <91587464+EnzoDLofi@users.noreply.github.com> Date: Thu, 12 Nov 2026 15:36:55 -0400 Subject: [PATCH 055/101] Feat:Add per-game frame generation profiles (#2473) --- .../cpp/waylandcomp/src/framegen_bridge.c | 26 +- .../main/cpp/waylandcomp/src/framegen_jni.c | 6 + .../com/droiddeck/launcher/SessionActivity.kt | 298 +++++++++++++++++- .../droiddeck/launcher/frontend/Library.kt | 38 ++- .../com/droiddeck/launcher/gpu/FrameGen.kt | 69 +++- .../launcher/hud/DroidDeckHudHost.kt | 10 +- .../launcher/session/SelectedGameProfile.kt | 10 +- .../com/droiddeck/launcher/ui/FrameGenMenu.kt | 9 + .../droiddeck/launcher/ui/FrontEndSetup.kt | 47 ++- .../droiddeck/launcher/ui/SessionOverlay.kt | 25 +- .../launcher/wayland/WaylandCompositor.java | 1 + 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 + .../droiddeck/launcher/gpu/FrameGenTest.kt | 20 ++ .../session/SelectedGameProfileTest.kt | 16 + 46 files changed, 598 insertions(+), 43 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c index eceb796398..d29b328a05 100644 --- a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c +++ b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c @@ -33,7 +33,9 @@ static PFN_vkGetInstanceProcAddr g_gipa; static VkPhysicalDevice g_pd; static VkQueue g_queue; static uint32_t g_qfam; -static int g_dev_ready, g_dev_lost, g_features_enabled; +static _Atomic int g_dev_ready, g_dev_lost; +static int g_features_enabled; +static _Atomic int g_caps_lsfg_ok, g_caps_ddfg_ok; static VkPhysicalDeviceMemoryProperties g_memprops; static struct { PFN_vkCreateImage CreateImage; @@ -141,9 +143,12 @@ static void mark_failed(int kind) { } int vkp_framegen_problem(void) { - if (!g_dev_ready) return -1; + if (!atomic_load(&g_dev_ready)) return -1; int kind = atomic_load(&g_kind); - if (!fge_caps_ok(kind)) return 1; + int caps_ok = kind == VKP_FG_ENGINE_DDFG + ? atomic_load(&g_caps_ddfg_ok) + : atomic_load(&g_caps_lsfg_ok); + if (!caps_ok) return 1; if (start_failed_for(kind)) return 2; if (g_engine_ok && g_engine_kind == kind && fge_unavailable()) return 2; return 0; @@ -179,13 +184,17 @@ void vkp_framegen_device_ready(VkDevice dev, VkQueue queue, uint32_t qfam, int f #undef R g_vk.GetPhysicalDeviceMemoryProperties(g_pd, &g_memprops); fge_device_ready(g_gipa, g_inst, g_pd, dev, queue, qfam, features_enabled); - g_dev_ready = vk.CreateImage && vk.CreateImageView && vk.CmdPipelineBarrier; + atomic_store(&g_caps_lsfg_ok, fge_caps_ok(VKP_FG_ENGINE_LSFG)); + atomic_store(&g_caps_ddfg_ok, fge_caps_ok(VKP_FG_ENGINE_DDFG)); + atomic_store(&g_dev_lost, 0); + atomic_store(&g_dev_ready, + vk.CreateImage && vk.CreateImageView && vk.CmdPipelineBarrier); FGLOG("engines ready on the compositor's device: LSFG Native %s (%s), DD-FG Native %s", fge_caps_ok(VKP_FG_ENGINE_LSFG) ? "available" : "unavailable", fge_caps_reason(), fge_caps_ok(VKP_FG_ENGINE_DDFG) ? "available" : "unavailable"); } -void vkp_framegen_device_lost(void) { g_dev_lost = 1; } +void vkp_framegen_device_lost(void) { atomic_store(&g_dev_lost, 1); } static void destroy_ring(void) { @@ -244,7 +253,12 @@ static int ensure_ring(uint32_t w, uint32_t h, VkFormat fmt, uint32_t n) { static int engine_usable(void) { int kind = atomic_load(&g_kind); - return g_dev_ready && !g_dev_lost && fge_caps_ok(kind) && !start_failed_for(kind); + int ready = atomic_load(&g_dev_ready); + int lost = atomic_load(&g_dev_lost); + int caps_ok = kind == VKP_FG_ENGINE_DDFG + ? atomic_load(&g_caps_ddfg_ok) + : atomic_load(&g_caps_lsfg_ok); + return ready && !lost && caps_ok && !start_failed_for(kind); } int vkp_framegen_format_ok(VkFormat fmt) { diff --git a/app/src/main/cpp/waylandcomp/src/framegen_jni.c b/app/src/main/cpp/waylandcomp/src/framegen_jni.c index 35c5a3de46..e5a51456ed 100644 --- a/app/src/main/cpp/waylandcomp/src/framegen_jni.c +++ b/app/src/main/cpp/waylandcomp/src/framegen_jni.c @@ -50,6 +50,12 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeFrameGenCapsReason(J return (*env)->NewStringUTF(env, r ? r : ""); } +JNIEXPORT jboolean JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeFrameGenActive(JNIEnv *env, jclass clazz) { + (void)env; (void)clazz; + return vkp_framegen_active() ? JNI_TRUE : JNI_FALSE; +} + JNIEXPORT jfloatArray JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeFrameGenStats(JNIEnv *env, jclass clazz) { (void)clazz; diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 5f39d03c6c..dc87e93d04 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -452,6 +452,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerDefaultProton by mutableStateOf(null) private val drawerComponentMenu by lazy { ComponentsMenu(this, uiHandler) } private var drawerGameProfileId by mutableStateOf(null) + private var drawerGameProfileSelectionMade = false private var fpsLimit by mutableStateOf(SessionState.fpsLimit) private fun noSteamSession(): Boolean = (SessionState.mode == SessionService.MODE_RUN && @@ -460,7 +461,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET, )) || SessionState.mode == SessionService.MODE_DESKTOP private val drawerGameInventory = GameProfileInventoryCache() - private var drawerGameInventoryRevision = 0L + @Volatile private var drawerGameInventoryRevision = 0L private var drawerGameFexPresetSaving by mutableStateOf(false) private var drawerGameNoSteamSaving by mutableStateOf(false) private val drawerGameProfileFollowState = GameProfileFollowState() @@ -556,8 +557,25 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { importLossless(it) } } private var frameGen by mutableStateOf(FrameGen.Mode.OFF) + private var frameGenActiveGameId by mutableStateOf(null) + private var frameGenActiveGameName by mutableStateOf(null) + private var frameGenHasGameOverride by mutableStateOf(false) private var frameGenPip = false private val frameGenRequests = java.util.concurrent.atomic.AtomicInteger() + private val frameGenActivityGeneration = synchronized(frameGenGlobalLock) { + frameGenGlobalGeneration.incrementAndGet() + } + @Volatile private var frameGenActivityActive = true + private val frameGenForcePending = java.util.concurrent.atomic.AtomicBoolean() + @Volatile private var frameGenInventoryIds: Set? = null + @Volatile private var frameGenInventoryRevision = -1L + private val frameGenInventoryLock = Any() + @Volatile private var frameGenInventoryLastAttemptAt = 0L + private val frameGenInventoryRetryScheduled = java.util.concurrent.atomic.AtomicBoolean() + private val frameGenInventoryRefreshScheduled = java.util.concurrent.atomic.AtomicBoolean() + + @Volatile private var appliedFrameGenMode: FrameGen.Mode? = null + @Volatile private var appliedFrameGenHz: Float? = null private var fexPreset by mutableStateOf("") private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var steamDownloadsInBackground by mutableStateOf(false) @@ -859,7 +877,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { hud.attach(root, root.childCount) memoryHud = com.droiddeck.launcher.session.MemoryHud(this) hud.onPresentingWindowChanged = { - if (FrameGen.engine(this) != FrameGen.ENGINE_OFF) CompositorHost.rearmFrameGen { applyFrameGen() } + CompositorHost.rearmFrameGen { applyFrameGen(force = true) } } if (SessionState.running && SessionState.firstFrameSeen) { loading.visible = false @@ -892,8 +910,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } glassesScope.launch { com.droiddeck.launcher.handtracking.HandTracking.settings.collect { updateHandCamera() } } glassesScope.launch { + var lastRunGameId: String? = null while (true) { updateTrackingRecovery() + if (SessionState.mode == SessionService.MODE_RUN) { + val gameId = SessionState.gameId + ?.takeIf { it.toLongOrNull() != null } + ?: intent.getStringExtra(SessionService.EXTRA_GAME_ID) + ?.takeIf { it.toLongOrNull() != null } + if (gameId != lastRunGameId) { + lastRunGameId = gameId + if (drawerGameProfileFollowState.followsSteam) { + loadFrameGenFor(gameId?.toLongOrNull()) + } + applyFrameGen() + } + } else { + lastRunGameId = null + } kotlinx.coroutines.delay(100) } } @@ -956,7 +990,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyOutputPacing() if (pipUi != frameGenPip) { frameGenPip = pipUi - if (FrameGen.engine(this@SessionActivity) != FrameGen.ENGINE_OFF && ::surfaceView.isInitialized) applyFrameGen() + if (::surfaceView.isInitialized) applyFrameGen() } } androidx.compose.runtime.LaunchedEffect(AgentGuest.steamKeyboard) { updateOnScreenControls() } @@ -1032,7 +1066,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.BLACK)) }, ) - LaunchedEffect(AgentGuest.focusRevision, secondScreenDisplays.isNotEmpty()) { + LaunchedEffect(AgentGuest.focusRevision, secondScreenDisplays.isNotEmpty(), drawerGameInventoryRevision) { val nextGame = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { if (SessionState.mode == SessionService.MODE_RUN) SessionState.program?.let { "program:$it" } else { @@ -1045,11 +1079,40 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } } + if (SessionState.mode == SessionService.MODE_STEAM) { + val target = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { + val games = LibraryCache.load(this@SessionActivity) + val cachedIds = games.mapNotNull { it.profileKey.toLongOrNull() }.toSet() + val inventoryIds = synchronized(frameGenInventoryLock) { + frameGenInventoryIds + }.orEmpty() + val id = AgentGuest.activeSteamAppId( + this@SessionActivity, cachedIds + inventoryIds + ) + val name = id?.let { activeId -> + games.firstOrNull { it.profileKey == activeId.toString() }?.name + } + id to name + } + if (target.first != frameGenActiveGameId) { + frameGenActiveGameId = target.first + if (drawerGameProfileFollowState.followsSteam) { + loadFrameGenFor(target.first) + } + } + frameGenActiveGameName = target.second + } if (nextGame != gestureGame) { if (nextGame != null) gameStarts++ gestureGame = nextGame refreshGestureConfig() } + if ( + SessionState.mode == SessionService.MODE_STEAM && + CompositorHost.isStarted + ) { + applyFrameGen() + } if (secondScreenDisplays.isNotEmpty()) kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { runCatching { com.droiddeck.launcher.session.TelemetryOutput.applyAutomatic(this@SessionActivity, nextGame) } } @@ -1234,6 +1297,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { textureAnisotropy = if (drawerGameProfileId == null) textureAnisotropy else drawerTextureAnisotropy, textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias, frameGen = frameGen, + frameGenTargetGameId = frameGenTargetGameId()?.toString(), + frameGenTargetGameName = when { + !drawerGameProfileFollowState.followsSteam -> + drawerGameProfileRefresh.data?.profiles + ?.firstOrNull { it.first == frameGenTargetGameId() }?.second + SessionState.mode == SessionService.MODE_STEAM -> frameGenActiveGameName + SessionState.mode == SessionService.MODE_RUN -> + com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) + else -> drawerGameProfileRefresh.data?.profiles + ?.firstOrNull { it.first == frameGenTargetGameId() }?.second + }, + hasGameOverride = frameGenHasGameOverride, lossless = lossless, oscMode = oscMode, suspendPolicy = suspendPolicy, steamDownloadsInBackground = steamDownloadsInBackground, touchMode = touchMode, @@ -1293,9 +1368,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyOutputPacing() }, onFrameGenPick = { mode -> - FrameGen.set(this@SessionActivity, mode) + val appId = frameGenTargetGameId() + + if (appId == null) FrameGen.set(this@SessionActivity, mode) + else FrameGen.setForGame(this@SessionActivity, appId.toString(), mode) + loadFrameGenFor(appId) readPrefs() - applyFrameGen() + applyFrameGen(force = true) + }, + onFrameGenReset = { + val appId = frameGenTargetGameId() + + if (appId == null) FrameGen.clearGlobal(this@SessionActivity) + else FrameGen.clearGame(this@SessionActivity, appId.toString()) + loadFrameGenFor(appId) + readPrefs() + applyFrameGen(force = true) }, onImportLossless = { pickLossless.launch(InAppFilePicker.buildIntent( @@ -1628,9 +1716,35 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, "drawer-components").start() } + private fun frameGenTargetGameId(): Long? { + if (!drawerGameProfileFollowState.followsSteam) { + return drawerGameProfileId + } + if (SessionState.mode == SessionService.MODE_RUN) { + return ( + SessionState.gameId?.toLongOrNull() + ?: intent.getStringExtra(SessionService.EXTRA_GAME_ID)?.toLongOrNull() + ) + } + if (SessionState.mode == SessionService.MODE_STEAM) { + return frameGenActiveGameId + } + return drawerGameProfileId + } + + private fun loadFrameGenFor(appId: Long?) { + val profileId = appId?.toString() + frameGen = FrameGen.mode(this, profileId) + frameGenHasGameOverride = appId?.let { + FrameGen.hasGameOverride(this, it.toString()) + } == true + } + private fun selectDrawerGameProfile(appId: Long?) { drawerGameProfileFollowState.selectManually() + drawerGameProfileSelectionMade = true drawerGameProfileId = appId + loadFrameGenFor(frameGenTargetGameId()) drawerGameProfileRefresh = drawerGameProfileRefresh.retrying() readDrawerTextureFiltering(appId) refreshDrawerGameProfile() @@ -1703,6 +1817,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (refresh.followsSteam) { if (drawerGameProfileFollowState.followsSteam) { drawerGameProfileId = result.selectedAppId + loadFrameGenFor(result.selectedAppId) readDrawerTextureFiltering(result.selectedAppId) } } @@ -1727,6 +1842,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { gameProtonId = ProtonDefault.gameSelectedId(this, game.profileKey, protons), gameComponents = ComponentsManager.gameComponents(this, game.profileKey), gameWindowsComponents = WinComponents.picks(this, game.profileKey), + frameGenMode = FrameGen.mode(this, game.profileKey), + frameGenInherited = !FrameGen.hasGameOverride(this, game.profileKey), ) } @@ -1970,7 +2087,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (routedTouchMode != nextRoutedTouchMode) gestureTouchStreamGate.reset() routedTouchMode = nextRoutedTouchMode requestRelativeMouse() - frameGen = FrameGen.mode(this) + loadFrameGenFor(frameGenTargetGameId()) fexPreset = SessionPrefs.fexPreset(this) suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) @@ -2257,7 +2374,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (resized) { cancelTouchGestures() Log.i(TAG, "surface resized to ${width}x$height - rebinding the compositor") - CompositorHost.resize(holder.surface) { applyFrameGen() } + CompositorHost.resize(holder.surface) { applyFrameGen(force = true) } resizeOutputForWindow(width, height) } } @@ -2398,17 +2515,161 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } - private fun applyFrameGen() { + private fun frameGenModeForActiveGame(request: Int): FrameGen.Mode { + if (SessionState.mode == SessionService.MODE_RUN) { + val activeAppId = ( + SessionState.gameId?.takeIf { it.toLongOrNull() != null } + ?: intent.getStringExtra(SessionService.EXTRA_GAME_ID) + )?.toLongOrNull() + return FrameGen.mode(this, activeAppId?.toString()) + } + + val cachedIds = LibraryCache.load(this) + .mapNotNull { it.profileKey.toLongOrNull() } + .toSet() + + var inventoryRevision = drawerGameInventoryRevision + var ids = synchronized(frameGenInventoryLock) { + if (frameGenInventoryRevision != inventoryRevision) { + frameGenInventoryIds = null + frameGenInventoryRevision = inventoryRevision + frameGenInventoryLastAttemptAt = 0L + } + frameGenInventoryIds + } + if (ids == null) { + val now = SystemClock.elapsedRealtime() + val shouldScan = synchronized(frameGenInventoryLock) { + val currentRevision = drawerGameInventoryRevision + if (frameGenInventoryRevision != currentRevision) { + frameGenInventoryIds = null + frameGenInventoryRevision = currentRevision + frameGenInventoryLastAttemptAt = 0L + } + inventoryRevision = currentRevision + if (frameGenInventoryIds != null) { + false + } else if ( + frameGenInventoryLastAttemptAt != 0L && + now - frameGenInventoryLastAttemptAt < 15_000L + ) { + false + } else { + frameGenInventoryLastAttemptAt = now + true + } + } + + if (shouldScan) { + val currentIds = runCatching { + Library.launchableGames(this, strictRead = true) + .mapNotNull { it.profileKey.toLongOrNull() } + .toSet() + }.getOrNull() + + if (currentIds == null) { + if (frameGenInventoryRetryScheduled.compareAndSet(false, true)) { + uiHandler.postDelayed({ + frameGenInventoryRetryScheduled.set(false) + val retry = synchronized(frameGenInventoryLock) { + frameGenInventoryIds == null + } + if (retry && !isFinishing && !isDestroyed) { + applyFrameGen() + } + }, 15_000L) + } + } else { + var published = false + synchronized(frameGenInventoryLock) { + if (drawerGameInventoryRevision == inventoryRevision && + frameGenInventoryRevision == inventoryRevision + ) { + ids = cachedIds + currentIds + frameGenInventoryIds = ids + published = true + } + } + if (published) { + if (frameGenInventoryRefreshScheduled.compareAndSet(false, true)) { + uiHandler.postDelayed({ + frameGenInventoryRefreshScheduled.set(false) + if (frameGenActivityActive && !isFinishing && !isDestroyed) { + synchronized(frameGenInventoryLock) { + frameGenInventoryIds = null + frameGenInventoryLastAttemptAt = 0L + } + applyFrameGen() + } + }, 15_000L) + } + if (frameGenRequests.get() != request) { + applyFrameGen() + } + } + } + } + + if (ids == null) { + ids = synchronized(frameGenInventoryLock) { + frameGenInventoryIds + } ?: emptySet() + } + } + + val activeAppId = AgentGuest.activeSteamAppId( + this, cachedIds + (ids ?: emptySet()) + ) + if (activeAppId == null) return FrameGen.Mode.OFF + return FrameGen.mode(this, activeAppId.toString()) + } + + private fun applyFrameGen(force: Boolean = false) { + val request = synchronized(frameGenGlobalLock) { + if (force) frameGenForcePending.set(true) + frameGenRequests.incrementAndGet() + } val hz = refreshHz() val pip = pipUi && mirrorRefreshLimit() <= 0 - val request = frameGenRequests.incrementAndGet() Thread({ - val problem = synchronized(frameGenRequests) { + val mode = if (pip) FrameGen.Mode.OFF else frameGenModeForActiveGame(request) + val needsApply = synchronized(frameGenGlobalLock) { + if (frameGenActivityGeneration != frameGenGlobalGeneration.get()) return@Thread if (request != frameGenRequests.get()) return@Thread - if (pip) FrameGen.apply(this, FrameGen.Mode.OFF, hz) else FrameGen.apply(this, hz) + if (!frameGenActivityActive || isFinishing || isDestroyed) return@Thread + val lastAppliedHz = appliedFrameGenHz + frameGenForcePending.get() || appliedFrameGenMode == null || + mode != appliedFrameGenMode || lastAppliedHz == null || + kotlin.math.abs(lastAppliedHz - hz) > 0.1f + } + val prepared = if (needsApply) FrameGen.prepareApply(this, mode) else null + val problem = synchronized(frameGenGlobalLock) { + if (frameGenActivityGeneration != frameGenGlobalGeneration.get()) return@Thread + if (request != frameGenRequests.get()) return@Thread + if (!frameGenActivityActive || isFinishing || isDestroyed) return@Thread + val forcePending = frameGenForcePending.get() + val lastAppliedHz = appliedFrameGenHz + if (!forcePending && appliedFrameGenMode != null && mode == appliedFrameGenMode && + lastAppliedHz != null && kotlin.math.abs(lastAppliedHz - hz) <= 0.1f + ) { + null + } else { + val ready = prepared ?: return@Thread + frameGenForcePending.set(false) + FrameGen.applyPrepared(this, ready, hz).also { problem -> + if (problem == null) { + appliedFrameGenMode = mode + appliedFrameGenHz = hz + } else { + appliedFrameGenMode = null + appliedFrameGenHz = null + } + } + } } val state = Lossless.state(this) runOnUiThread { + if (frameGenActivityGeneration != frameGenGlobalGeneration.get()) return@runOnUiThread lossless = state if (problem != null) Toast.makeText(this, problem, Toast.LENGTH_LONG).show() } @@ -2425,12 +2686,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun importLossless(dll: File) { Thread({ - val message = Lossless.message(this, Lossless.import(this, dll)) + val result = Lossless.import(this, dll) + val message = Lossless.message(this, result) val state = Lossless.state(this) runOnUiThread { lossless = state Toast.makeText(this, message, Toast.LENGTH_LONG).show() - if (FrameGen.engine(this) == FrameGen.ENGINE_LSFG) applyFrameGen() + applyFrameGen(force = result == Lossless.ImportResult.UPDATED) } }, "lossless-import").start() } @@ -4708,12 +4970,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onResume() { super.onResume() + drawerGameInventoryRevision++ com.droiddeck.launcher.input.SystemKeyCapture.attach(this, { hasWindowFocus() && !appUiOwnsPointer() && CompositorHost.isStarted }) { event -> com.droiddeck.launcher.input.GuestKeys.send(event) { code, down -> sendGuestKey(code, down, 8) } } if (refreshActivityDisplayId() && started) { SessionService.setActivityDisplay(this, sessionActivityDisplayId) } + if (CompositorHost.isStarted) applyFrameGen(force = true) applyFollowOrientation(resources.configuration) if (runtimeRemovalBlocked) return if (!SessionState.suspended) pausedFrame = null @@ -5391,6 +5655,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onDestroy() { + synchronized(frameGenGlobalLock) { + frameGenActivityActive = false + frameGenRequests.incrementAndGet() + } if (AgentGuest.readyListener === agentReadyListener) AgentGuest.readyListener = null com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) relativeMouseRequests.shutdownNow() @@ -5505,6 +5773,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val BOTTOM_RECOVERY_MS = 1_000L private const val BOTTOM_RECOVERY_TRIES = 3 private const val TAG = "SessionActivity" + private val frameGenGlobalLock = Any() + private val frameGenGlobalGeneration = java.util.concurrent.atomic.AtomicLong(0L) private var startedScreens = 0 @Volatile private var activeInstallWorker: Any? = null private const val FEX_MISSING = "droiddeck-fex: x86 Linux programs need" diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index b303ecc71e..99732653b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -126,6 +126,7 @@ object Library { fun steamGames( context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context), withShared: Boolean = true, + onlyAppIds: Set? = null, ): List { val root = SessionPrefs.steamRoot(context, arch) val cache = File(root, "appcache/librarycache") @@ -138,7 +139,9 @@ object Library { if (strictRead && steamapps.isDirectory) check(manifests != null) { context.getString(R.string.game_sync_err_manifests) } manifests?.sortedBy { it.name }?.forEach { manifest -> val appId = manifest.name.removePrefix("appmanifest_").removeSuffix(".acf").toIntOrNull() ?: return@forEach - if (appId in NOT_GAMES || out.containsKey(appId)) return@forEach + if (appId in NOT_GAMES || out.containsKey(appId) || + (onlyAppIds != null && appId !in onlyAppIds) + ) return@forEach val text = try { manifest.readText() } catch (e: Exception) { if (strictRead) throw e; return@forEach } val name = NAME.find(text)?.groupValues?.get(1)?.trim().orEmpty() val flags = STATE.find(text)?.groupValues?.get(1)?.toIntOrNull() ?: 0 @@ -161,16 +164,41 @@ object Library { } if (withShared) { val other = if (arch == "x86_64") "arm64" else "x86_64" - val shared = sharedApps(context, arch) - out.keys - if (shared.isNotEmpty()) runCatching { steamGames(context, arch = other, withShared = false) }.getOrDefault(emptyList()) - .filter { it.appId in shared }.forEach { out[it.appId] = it } + val shared = try { + sharedApps(context, arch) - out.keys + } catch (e: IllegalStateException) { + if (strictRead) throw e + emptySet() + } + if (shared.isNotEmpty()) { + val otherGames = try { + steamGames( + context, + strictRead = strictRead, + arch = other, + withShared = false, + onlyAppIds = shared, + ) + } catch (e: Exception) { + if (strictRead) throw e + emptyList() + } + otherGames.forEach { out[it.appId] = it } + } } return out.values.toList() } internal fun sharedApps(context: Context, arch: String): Set { val view = File(LinuxRuntime.rootDir(context), "root/.droiddeck-x64/shared/${if (arch == "x86_64") "arm64" else "x86-64"}/steamapps") - return view.list().orEmpty().mapNotNull { Regex("appmanifest_(\\d+)\\.acf").matchEntire(it)?.groupValues?.get(1)?.toIntOrNull() }.toSet() + val entries = view.list() + if (entries == null) { + if (!view.exists()) return emptySet() + throw IllegalStateException("Unable to read the shared Steam library.") + } + return entries.mapNotNull { + Regex("appmanifest_(\\d+)\\.acf").matchEntire(it)?.groupValues?.get(1)?.toIntOrNull() + }.toSet() } fun steamLibraryArt(context: Context): List> { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt index c31cd348e8..1623c10106 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt @@ -28,12 +28,38 @@ object FrameGen { fun engine(context: Context): String = mode(context).engine - fun mode(context: Context): Mode { + fun mode(context: Context): Mode = mode(context, null) + + fun mode(context: Context, appId: String?): Mode { val prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) - val engine = prefs.getString("engine", ENGINE_OFF).let { if (it == LEGACY_ENGINE_WINFG) ENGINE_DDFG else it ?: ENGINE_OFF } - val target = prefs.getInt("target", 0) + val gamePrefix = appId?.takeIf { it.isNotBlank() }?.let { "game.$it." } + ?.takeIf { prefs.contains(it + "engine") } ?: "" + val engine = prefs.getString(gamePrefix + "engine", ENGINE_OFF) + .let { if (it == LEGACY_ENGINE_WINFG) ENGINE_DDFG else it ?: ENGINE_OFF } + val target = prefs.getInt(gamePrefix + "target", 0) if (engine == ENGINE_LSFG && target in ADAPTIVE_TARGETS) return Mode(engine, target = target) - return Mode(engine, prefs.getInt("multiplier", 2).coerceIn(2, 4)) + return Mode(engine, prefs.getInt(gamePrefix + "multiplier", 2).coerceIn(2, 4)) + } + + fun hasGameOverride(context: Context, appId: String): Boolean = + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).contains("game.$appId.engine") + + fun setForGame(context: Context, appId: String, mode: Mode) { + val prefix = "game.$appId." + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .putString(prefix + "engine", mode.engine) + .putInt(prefix + "multiplier", mode.multiplier) + .putInt(prefix + "target", mode.target) + .apply() + } + + fun clearGame(context: Context, appId: String) { + val prefix = "game.$appId." + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .remove(prefix + "engine") + .remove(prefix + "multiplier") + .remove(prefix + "target") + .apply() } fun set(context: Context, mode: Mode) { @@ -41,6 +67,11 @@ object FrameGen { .putString("engine", mode.engine).putInt("multiplier", mode.multiplier).putInt("target", mode.target).apply() } + fun clearGlobal(context: Context) { + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() + .remove("engine").remove("multiplier").remove("target").apply() + } + fun label(context: Context): String = label(context, mode(context)) fun label(context: Context, mode: Mode): String = when { @@ -50,14 +81,32 @@ object FrameGen { else -> context.getString(R.string.frame_gen_off) } - fun apply(context: Context, refreshHz: Float): String? = apply(context, mode(context), refreshHz) + data class PreparedApply internal constructor( + val mode: Mode, + internal val lsfgStatus: Int? = null, + internal val lsfgCachePath: String? = null, + ) - fun apply(context: Context, mode: Mode, refreshHz: Float): String? { + fun prepareApply(context: Context, mode: Mode): PreparedApply { + if (mode.engine != ENGINE_LSFG) return PreparedApply(mode) + val status = Lossless.sync(context) + val cachePath = Lossless.cacheFile(context)?.absolutePath + return PreparedApply(mode, status, cachePath) + } + + fun apply(context: Context, refreshHz: Float): String? = + apply(context, mode(context), refreshHz) + + fun apply(context: Context, mode: Mode, refreshHz: Float): String? = + applyPrepared(context, prepareApply(context, mode), refreshHz) + + fun applyPrepared(context: Context, prepared: PreparedApply, refreshHz: Float): String? { + val mode = prepared.mode when (mode.engine) { ENGINE_LSFG -> { - val status = Lossless.sync(context) - val cache = Lossless.cacheFile(context) - if (status != LsfgNative.STATUS_OK || cache == null) { + val status = prepared.lsfgStatus ?: LsfgNative.STATUS_NOT_INSTALLED + val cachePath = prepared.lsfgCachePath + if (status != LsfgNative.STATUS_OK || cachePath == null) { WaylandCompositor.nativeSetFrameGenArmed(false, 0, 0) val problem = context.getString( if (status == LsfgNative.STATUS_NOT_INSTALLED) R.string.lsfg_problem_missing else R.string.lsfg_problem_failed, @@ -66,7 +115,7 @@ object FrameGen { return problem } WaylandCompositor.nativeSetFrameGenEngine(WaylandCompositor.FG_ENGINE_LSFG) - WaylandCompositor.nativeSetLsfgCachePath(cache.absolutePath) + WaylandCompositor.nativeSetLsfgCachePath(cachePath) WaylandCompositor.nativeSetFrameGenTuning(FLOW_SCALE_LSFG, refreshHz) WaylandCompositor.nativeSetFrameGenArmed(true, mode.multiplier, mode.target) } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index f612477f33..014fc0b4e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -10,7 +10,6 @@ import android.view.View import android.view.animation.PathInterpolator import android.view.ViewGroup import android.widget.FrameLayout -import com.droiddeck.launcher.gpu.FrameGen import com.droiddeck.launcher.gpu.GpuInfo import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionPrefs @@ -238,8 +237,13 @@ class DroidDeckHudHost(context: Context) { } private fun presentedFps(): Float { - if (FrameGen.mode(context).engine == FrameGen.ENGINE_OFF) return 0f - val stats = runCatching { WaylandCompositor.nativeFrameGenStats() }.getOrNull() ?: return 0f + if (!runCatching { WaylandCompositor.nativeFrameGenActive() } + .getOrDefault(false)) return 0f + + val stats = runCatching { + WaylandCompositor.nativeFrameGenStats() + }.getOrNull() ?: return 0f + return if (stats.size > 3 && stats[3] > 1f) stats[3] else 0f } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt b/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt index 41eeac38f6..cdcc617a61 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.session import com.droiddeck.launcher.core.FexPreset import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.gpu.FrameGen data class ProfileValue(val value: String, val inherited: Boolean) @@ -17,6 +18,8 @@ data class SelectedGameProfile( val environmentOverrides: Int, val windowsComponentNames: List, val startWithoutSteam: Boolean = false, + val frameGen: FrameGen.Mode = FrameGen.Mode.OFF, + val frameGenInherited: Boolean = true, ) { val hasOverrides: Boolean get() = !fexPreset.inherited || @@ -24,7 +27,8 @@ data class SelectedGameProfile( components.values.any { !it.inherited } || environmentOverrides > 0 || windowsComponentNames.isNotEmpty() || - startWithoutSteam + startWithoutSteam || + !frameGenInherited companion object { fun resolve( @@ -38,6 +42,8 @@ data class SelectedGameProfile( gameProtonId: String?, gameComponents: Map, gameWindowsComponents: List, + frameGenMode: FrameGen.Mode = FrameGen.Mode.OFF, + frameGenInherited: Boolean = true, ): SelectedGameProfile? { val game = games.firstOrNull { it.profileKey == selectedAppId.toString() } ?: return null val fexOverride = GameEnvironment.gameFexPreset(environment, game.profileKey) @@ -68,6 +74,8 @@ data class SelectedGameProfile( environmentOverrides = otherEnvironment.size, windowsComponentNames = gameWindowsComponents.map(WinComponentNames::of), startWithoutSteam = GameEnvironment.gameNoSteam(environment, game.profileKey), + frameGen = frameGenMode, + frameGenInherited = frameGenInherited, ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrameGenMenu.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrameGenMenu.kt index bac30bd3b8..83f2e05436 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrameGenMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrameGenMenu.kt @@ -13,6 +13,9 @@ internal fun FrameGenMenu( host: MenuHost, mode: FrameGen.Mode, lossless: Lossless.State, onPick: (FrameGen.Mode) -> Unit, onImportLossless: () -> Unit, + gameProfileId: String? = null, + hasGameOverride: Boolean = false, + onResetGame: () -> Unit = {}, ) { val context = LocalContext.current AnchoredMenu(host.open == "fg", onDismiss = { if (host.open == "fg") host.open = null }, title = stringResource(R.string.frame_gen_title)) { firstItemFocus -> @@ -27,6 +30,12 @@ internal fun FrameGenMenu( onPick(m); host.open = null } item(FrameGen.Mode.OFF, focus = firstItemFocus) + if (gameProfileId != null) { + MenuItem(stringResource(R.string.comp_game_use_general), checked = !hasGameOverride) { + onResetGame() + host.open = null + } + } for (m in 2..4) item(FrameGen.Mode(FrameGen.ENGINE_DDFG, m)) val lsfg = (2..4).map { FrameGen.Mode(FrameGen.ENGINE_LSFG, it) } + FrameGen.ADAPTIVE_TARGETS.map { FrameGen.Mode(FrameGen.ENGINE_LSFG, target = it) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index bfdbd7ecef..3354839a7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -749,6 +749,17 @@ internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost val context = androidx.compose.ui.platform.LocalContext.current val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current val wincompKey = game?.takeIf { it.library == com.droiddeck.launcher.frontend.Library.ADDED || it.appId > 0 }?.profileKey + val frameGenProfileKey = game?.profileKey?.takeIf { it.isNotBlank() } + var gameFrameGenMode by remember(frameGenProfileKey) { + mutableStateOf(frameGenProfileKey?.let { + com.droiddeck.launcher.gpu.FrameGen.mode(context, it) + } ?: s.frameGen) + } + var gameFrameGenOverride by remember(frameGenProfileKey) { + mutableStateOf(frameGenProfileKey?.let { + com.droiddeck.launcher.gpu.FrameGen.hasGameOverride(context, it) + } ?: false) + } var wincompOpen by remember(wincompKey) { mutableStateOf(null) } val wincompPicks = remember(wincompKey, wincompOpen) { wincompKey?.let { com.droiddeck.launcher.session.WinComponents.picks(context, it) }.orEmpty() } val steamScope = game?.let { com.droiddeck.launcher.session.NoSteamLaunch.scope(it) } @@ -767,10 +778,42 @@ internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost } add { m -> Box(m) { - SettingCard(stringResource(R.string.frame_gen_title), s.frameGenLabel, "card:fg", Modifier.fillMaxSize()) { + SettingCard( + stringResource(R.string.frame_gen_title), + if (frameGenProfileKey != null) + com.droiddeck.launcher.gpu.FrameGen.label(context, gameFrameGenMode) + else s.frameGenLabel, + "card:fg", Modifier.fillMaxSize() + ) { host.open = if (host.open == "fg") null else "fg" } - FrameGenMenu(s, a, host) + FrameGenMenu( + host = host, + mode = if (frameGenProfileKey != null) gameFrameGenMode else s.frameGen, + lossless = s.lossless, + onPick = { mode -> + val key = frameGenProfileKey + if (key == null) { + a.onFrameGenPick(mode) + } else { + com.droiddeck.launcher.gpu.FrameGen.setForGame(context, key, mode) + gameFrameGenMode = mode + gameFrameGenOverride = true + } + }, + onImportLossless = a.onImportLossless, + gameProfileId = frameGenProfileKey, + hasGameOverride = gameFrameGenOverride, + onResetGame = { + val key = frameGenProfileKey + if (key != null) { + com.droiddeck.launcher.gpu.FrameGen.clearGame(context, key) + gameFrameGenMode = + com.droiddeck.launcher.gpu.FrameGen.mode(context) + gameFrameGenOverride = false + } + } + ) } } if (controller != null) add { m -> SettingCard(stringResource(R.string.setup_card_controls), stringResource(R.string.setup_card_controls_hint), "card:controls", m, controller.onMapping) } 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 e140ffa1ad..94f4ff1a3c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -220,6 +220,9 @@ class DrawerActions( val hudOn: Boolean, val hudConfig: Map = emptyMap(), val frameGen: FrameGen.Mode, + val frameGenTargetGameId: String? = null, + val frameGenTargetGameName: String? = null, + val hasGameOverride: Boolean = false, val lossless: Lossless.State, val oscMode: String, val suspendPolicy: String, @@ -262,6 +265,7 @@ class DrawerActions( val onHudReset: () -> Unit = {}, val onHudExport: () -> Unit = {}, val onFrameGenPick: (FrameGen.Mode) -> Unit, + val onFrameGenReset: () -> Unit = {}, val fpsLimit: Int = 0, val onFpsLimit: (Int) -> Unit = {}, val onImportLossless: () -> Unit, @@ -569,10 +573,21 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont val fgOpen = host.open == "fg" val offLabel = stringResource(R.string.frame_gen_off) val fgLabel = FrameGen.label(LocalContext.current, a.frameGen) - SettingsRow(stringResource(R.string.frame_gen_title), null, highlighted = fgOpen) { + SettingsRow( + stringResource(R.string.frame_gen_title), + if (a.frameGenTargetGameId != null) + "${stringResource(R.string.frame_gen_scope_game)} · ${a.frameGenTargetGameName ?: "ID ${a.frameGenTargetGameId}"}" + else stringResource(R.string.frame_gen_scope_global), + highlighted = fgOpen + ) { Box { ValueChip(fgLabel, fgOpen, modifier = focus.track(page, "fg")) { host.open = if (fgOpen) null else "fg" } - FrameGenMenu(host, a.frameGen, a.lossless, a.onFrameGenPick, a.onImportLossless) + FrameGenMenu( + host, a.frameGen, a.lossless, a.onFrameGenPick, a.onImportLossless, + gameProfileId = a.frameGenTargetGameId, + hasGameOverride = a.hasGameOverride, + onResetGame = a.onFrameGenReset, + ) } } if (a.direct) SliderRow( @@ -1352,6 +1367,12 @@ private fun SelectedGameProfileGroup(host: MenuHost, a: DrawerActions, track: (S if (!profile.fexPreset.inherited) { ProfileSummaryRow(stringResource(R.string.comp_game_fex), fexProfileLabel(profile.fexPreset)) } + if (!profile.frameGenInherited) { + ProfileSummaryRow( + stringResource(R.string.frame_gen_title), + FrameGen.label(LocalContext.current, profile.frameGen), + ) + } if (!profile.proton.inherited) { ProfileSummaryRow(stringResource(R.string.comp_proton), profileValueLabel(profile.proton)) } diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index 995f512471..10735a1710 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -340,6 +340,7 @@ public final class WaylandCompositor { public static native int nativeFrameGenProblem(); public static native String nativeFrameGenCapsReason(); + public static native boolean nativeFrameGenActive(); public static native float[] nativeFrameGenStats(); public static native long nativeHudFrameTimes(float[] out); diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ad939d9696..e6cb1ab87c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -28,6 +28,8 @@ تعليق الآن إيقاف الجلسة توليد الإطارات + إعدادات هذه اللعبة + الإعدادات الافتراضية اختر وضع توليد الإطارات إيقاف DD-FG %1$d× 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 d3c6e048aa..6f98b6bff0 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -28,6 +28,8 @@ Suspender ahora Detener sesión Generación de fotogramas + Ajustes para este juego + Ajustes predeterminados Elige el modo de generación de fotogramas Desactivada DD-FG %1$d× diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6d9aaa5d32..5aeb1e2e9a 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -28,6 +28,8 @@ Приспи сега Спри сесията Генериране на кадри + Настройки за тази игра + Настройки по подразбиране Изберете режима на генериране на кадри Изключено DD-FG %1$d× diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 302d2b5fd5..6011f2fe39 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -28,6 +28,8 @@ Pozastavit teď Ukončit relaci Generování snímků + Nastavení pro tuto hru + Výchozí nastavení Vyberte režim generování snímků Vypnuto DD-FG %1$d× diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3c8fe48493..f443c3346e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -28,6 +28,8 @@ Sæt på pause nu Afslut session Billedgenerering + Indstillinger for dette spil + Standardindstillinger Vælg metode til billedgenerering Fra DD-FG %1$d× diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a81afbdbd5..d16437026e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -28,6 +28,8 @@ Jetzt anhalten Sitzung beenden Frame-Generierung + Einstellungen für dieses Spiel + Standardeinstellungen Modus der Frame-Generierung auswählen Aus DD-FG %1$d× diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c6be6d3824..e64a289085 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -28,6 +28,8 @@ Αναστολή τώρα Διακοπή συνεδρίας Δημιουργία καρέ + Ρυθμίσεις για αυτό το παιχνίδι + Προεπιλεγμένες ρυθμίσεις Επιλέξτε τη λειτουργία δημιουργίας καρέ Ανενεργό DD-FG %1$d× diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f3632dce18..c9fbd09fa9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -28,6 +28,8 @@ Suspender ahora Detener sesión Generación de fotogramas + Ajustes para este juego + Ajustes predeterminados Elige el modo de generación de fotogramas Desactivada DD-FG %1$d× diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 49ef50fa3a..27acadee4a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -28,6 +28,8 @@ Keskeytä nyt Lopeta istunto Kehysten generointi + Tämän pelin asetukset + Oletusasetukset Valitse kehysten generoinnin tila Pois DD-FG %1$d× diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index dd2043ac1e..fd6bd7a654 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -28,6 +28,8 @@ Mettre en pause maintenant Terminer cette session Génération d\'images + Paramètres pour ce jeu + Paramètres par défaut Sélectionnez le mode de génération d\'images à utiliser Désactivé DD-FG %1$d× diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 5c39c28c16..1f48a5adef 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -28,6 +28,8 @@ अभी सस्पेंड करें सेशन बंद करें फ़्रेम जनरेशन + इस गेम की सेटिंग + डिफ़ॉल्ट सेटिंग फ़्रेम जनरेशन मोड चुनें बंद DD-FG %1$d× diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 383658e191..b855f4a1ca 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -28,6 +28,8 @@ Felfüggesztés most Munkamenet leállítása Képkocka-generálás + A játék beállításai + Alapértelmezett beállítások Válassza ki a képkocka-generálás módját Ki DD-FG %1$d× diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7efa53767f..7920ebc122 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -28,6 +28,8 @@ Jeda sekarang Hentikan sesi Pembuatan frame + Pengaturan untuk game ini + Pengaturan bawaan Pilih mode pembuatan frame Nonaktif DD-FG %1$d× diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bff0619db4..dfcf569d61 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -28,6 +28,8 @@ Sospendi ora Termina sessione Generazione di frame + Impostazioni per questo gioco + Impostazioni predefinite Seleziona la modalità di generazione di frame Disattivata DD-FG %1$d× diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1c9b9d6f4e..3dee08d37a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -28,6 +28,8 @@ 今すぐ一時停止 セッションを終了 フレーム生成 + このゲームの設定 + デフォルト設定 使用するフレーム生成モードを選択してください オフ DD-FG %1$d× diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index f75ed9bf91..b0b023b482 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -28,6 +28,8 @@ 지금 일시 중지 세션 종료 프레임 생성 + 이 게임의 설정 + 기본 설정 사용할 프레임 생성 모드를 선택하세요 끔 DD-FG %1$d× diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 006abdf4bf..89a213972f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -28,6 +28,8 @@ Gantung sekarang Hentikan sesi Penjanaan bingkai + Tetapan untuk permainan ini + Tetapan lalai Pilih mod penjanaan bingkai Mati DD-FG %1$d× diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c305b9387a..7a67d2317b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -28,6 +28,8 @@ Sett på pause nå Avslutt sesjon Bildegenerering + Innstillinger for dette spillet + Standardinnstillinger Velg modus for bildegenerering Av DD-FG %1$d× diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 625992011f..2aa326714f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -28,6 +28,8 @@ Nu onderbreken Sessie stoppen Framegeneratie + Instellingen voor dit spel + Standaardinstellingen Kies de modus voor framegeneratie Uit DD-FG %1$d× diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fa5dcd2c03..fbca1d88dd 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -28,6 +28,8 @@ Wstrzymaj teraz Zatrzymaj sesję Generowanie klatek + Ustawienia tej gry + Ustawienia domyślne Wybierz tryb generowania klatek Wył. DD-FG %1$d× diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3c94b532eb..2d09f7127a 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -28,6 +28,8 @@ Suspender agora Terminar sessão Geração de fotogramas + Definições para este jogo + Definições predefinidas Selecione o modo de geração de fotogramas Desligado DD-FG %1$d× diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 14bed70758..768753c6e6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -28,6 +28,8 @@ Suspender agora Encerrar sessão Geração de quadros + Configurações para este jogo + Configurações padrão Selecione o modo de geração de quadros Desativada DD-FG %1$d× diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 672122d817..fac1699e94 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -28,6 +28,8 @@ Suspendă acum Oprește sesiunea Generare de cadre + Setări pentru acest joc + Setări implicite Selectează modul de generare a cadrelor Dezactivat DD-FG %1$d× diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1449384134..cf3266525b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -28,6 +28,8 @@ Приостановить сейчас Остановить сессию Генерация кадров + Настройки этой игры + Настройки по умолчанию Выберите режим генерации кадров Выкл. DD-FG %1$d× diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7a5120525c..e64a59dc88 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -28,6 +28,8 @@ Pausa nu Stoppa sessionen Bildrutegenerering + Inställningar för det här spelet + Standardinställningar Välj läge för bildrutegenerering Av DD-FG %1$d× diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 38b62c9fce..1a778803c1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -28,6 +28,8 @@ หยุดชั่วคราวตอนนี้ หยุดเซสชัน การสร้างเฟรม + การตั้งค่าสำหรับเกมนี้ + การตั้งค่าเริ่มต้น เลือกโหมดการสร้างเฟรม ปิด DD-FG %1$d× diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index df596656d4..d4495911e0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -28,6 +28,8 @@ Şimdi askıya al Oturumu durdur Kare oluşturma + Bu oyunun ayarları + Varsayılan ayarlar Kare oluşturma modunu seçin Kapalı DD-FG %1$d× diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2ee9ab4e36..77c5b4067e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -28,6 +28,8 @@ Призупинити зараз Завершити сеанс Генерація кадрів + Налаштування цієї гри + Типові налаштування Виберіть режим генерації кадрів Вимк. DD-FG %1$d× diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a4414e038f..2ebccba807 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -28,6 +28,8 @@ Tạm dừng ngay Dừng phiên Tạo khung hình + Cài đặt cho trò chơi này + Cài đặt mặc định Chọn chế độ tạo khung hình Tắt DD-FG %1$d× diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 100352717d..358546b076 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -28,6 +28,8 @@ 立即暂停 停止会话 帧生成 + 此游戏的设置 + 默认设置 选择帧生成模式 关闭 DD-FG %1$d× diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 729bf26c23..8510ce17d0 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -28,6 +28,8 @@ 立即暫停 結束會話 幀生成 + 此遊戲的設定 + 預設設定 選擇幀生成模式 關閉 DD-FG %1$d× diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 15d43fc4f0..dc2ebfe803 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -28,6 +28,8 @@ 立即暫停 結束此工作階段 影格生成 + 此遊戲的設定 + 預設設定 請選擇你要使用的影格生成模式 關閉 DD-FG %1$d× diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87271de25e..cc7c632ddb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -55,6 +55,8 @@ Suspend now Stop session Frame generation + Settings for this game + Default settings Select the frame generation mode Off DD-FG %1$d× diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt index f4c3b79ea0..5afd7f83a9 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/FrameGenTest.kt @@ -2,6 +2,8 @@ package com.droiddeck.launcher.gpu import android.content.Context import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -45,4 +47,22 @@ class FrameGenTest { .putString("engine", "winfg").putInt("multiplier", 2).commit() assertEquals(FrameGen.Mode(FrameGen.ENGINE_DDFG, 2), FrameGen.mode(context)) } + + @Test fun perGameOverrideIsIsolatedFromGlobalMode() { + val global = FrameGen.Mode(FrameGen.ENGINE_LSFG, target = 90) + val game = FrameGen.Mode(FrameGen.ENGINE_DDFG, 3) + + FrameGen.set(context, global) + FrameGen.setForGame(context, "12345", game) + + assertEquals(global, FrameGen.mode(context)) + assertEquals(game, FrameGen.mode(context, "12345")) + assertTrue(FrameGen.hasGameOverride(context, "12345")) + + FrameGen.clearGame(context, "12345") + + assertFalse(FrameGen.hasGameOverride(context, "12345")) + assertEquals(global, FrameGen.mode(context, "12345")) + } + } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SelectedGameProfileTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SelectedGameProfileTest.kt index 7955fde23b..d02d76d3db 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SelectedGameProfileTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SelectedGameProfileTest.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.gpu.FrameGen import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -116,6 +117,17 @@ class SelectedGameProfileTest { assertEquals(ProfileValue("PERFORMANCE_TSO", true), resolve(environment = inherited)!!.fexPreset) } + @Test fun frameGenOverrideMakesProfileCustom() { + val profile = resolve( + frameGenMode = FrameGen.Mode.OFF, + frameGenInherited = false, + ) + + assertEquals(FrameGen.Mode.OFF, profile!!.frameGen) + assertFalse(profile.frameGenInherited) + assertTrue(profile.hasOverrides) + } + private fun resolve( selectedAppId: Long = 3180310, games: List = listOf(game), @@ -123,6 +135,8 @@ class SelectedGameProfileTest { gameChoice: ProtonDefault.GameChoice? = null, gameComponents: Map = emptyMap(), gameWindowsComponents: List = emptyList(), + frameGenMode: FrameGen.Mode = FrameGen.Mode.OFF, + frameGenInherited: Boolean = true, ) = SelectedGameProfile.resolve( selectedAppId = selectedAppId, games = games, @@ -134,6 +148,8 @@ class SelectedGameProfileTest { gameProtonId = "p1", gameComponents = gameComponents, gameWindowsComponents = gameWindowsComponents, + frameGenMode = frameGenMode, + frameGenInherited = frameGenInherited, ) private fun component(label: String) = From 39a4a1b60cca6722086c495f0a7cd5cb196d9b79 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 15:07:58 -0500 Subject: [PATCH 056/101] feat(agent): DeeDee, a floating pet that opens the agent's chat; chat-head flings for the pet and HUD (#2536) * feat(agent): DeeDee, a pet that floats over any app and opens the agent's chat * feat(agent): DeeDee docks and opens its chat like a chat head; throws pick their side by velocity, for the pet and the HUD * fix(hud): the strip tucks into its fps tab with a shorter pull, and a throw toward an edge counts * fix(hud): the HUD shows in desktop sessions again * feat(agent): DeeDee rests tucked past the screen edge like a chat head * fix(agent): DeeDee opens its own chat in every window, themed, and a fling across no longer tucks the HUD away * fix(agent): the chat grows from wherever DeeDee is as it hops to its corner * fix(agent): DeeDee hides with the PC keyboard, falls back if it cannot float, can be opened by accessibility, and settles when a drag is cancelled * fix(agent): B and Back close DeeDee's in-window chat before the window acts on them * fix(agent): Back closes only the chat open in that window --- app/src/main/AndroidManifest.xml | 1 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/FrontEndActivity.kt | 5 +- .../com/droiddeck/launcher/SessionActivity.kt | 5 +- .../launcher/hud/DroidDeckHudHost.kt | 59 +- .../launcher/hud/HudLockController.java | 17 +- .../com/droiddeck/launcher/ui/AgentPage.kt | 11 +- .../com/droiddeck/launcher/ui/AgentPet.kt | 319 ++++++++++ .../droiddeck/launcher/ui/AgentPetWindows.kt | 559 ++++++++++++++++++ .../java/com/droiddeck/launcher/ui/DeeDee.kt | 381 ++++++++++++ .../com/droiddeck/launcher/ui/EdgeFling.kt | 92 +++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 7 + app/src/main/res/values/strings.xml | 7 + .../droiddeck/launcher/ui/EdgeFlingTest.kt | 27 + 14 files changed, 1455 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/DeeDee.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/EdgeFling.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/EdgeFlingTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 01d980059d..80c9312fe6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,6 +26,7 @@ + diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index ac9995412b..9f74aa4e59 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -44,6 +44,7 @@ class App : Application() { CrashHandler.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.AgentPet.install(this) if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index b2f45bc4ed..26dae4858d 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -84,7 +84,7 @@ import com.droiddeck.launcher.session.SteamLibraries import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenDisplays -class FrontEndActivity : ComponentActivity() { +class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPetHost { override fun attachBaseContext(newBase: android.content.Context) { super.attachBaseContext(newBase) com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase) @@ -1782,6 +1782,8 @@ class FrontEndActivity : ComponentActivity() { }, "finish-abandoned").start() } + override val petBlocked: Boolean get() = false + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) @@ -1875,6 +1877,7 @@ class FrontEndActivity : ComponentActivity() { } override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (com.droiddeck.launcher.ui.AgentPet.handleBack(this, event)) return true if (compatLaunch != null) { if (event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { if (event.action == KeyEvent.ACTION_UP) cancelCompatLaunch() diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index dc87e93d04..5e7a39b639 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -151,7 +151,7 @@ import com.droiddeck.launcher.ui.sessionDrawerPages import com.droiddeck.launcher.ui.step import kotlin.math.abs -class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { +class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droiddeck.launcher.ui.AgentPetHost { override fun attachBaseContext(newBase: android.content.Context) { super.attachBaseContext(newBase) com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase) @@ -159,6 +159,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var pip: com.droiddeck.launcher.session.SessionPipController private var pipUi by mutableStateOf(false) + + override val petBlocked: Boolean get() = drawerOpenState || pipUi || pcKeyboardOpen private var pipAutoEnter by mutableStateOf(false) private var unfoldedControls by mutableStateOf(false) private var unfoldedControlsWithController by mutableStateOf(false) @@ -2899,6 +2901,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (com.droiddeck.launcher.ui.AgentPet.handleBack(this, event)) return true when (event.keyCode) { KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> { val steamVolume = diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index 014fc0b4e7..492d626c5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -13,7 +13,6 @@ import android.widget.FrameLayout import com.droiddeck.launcher.gpu.GpuInfo import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionPrefs -import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.ui.Motion import com.droiddeck.launcher.wayland.WaylandCompositor @@ -38,6 +37,8 @@ class DroidDeckHudHost(context: Context) { private var snapping = false private var previewFade: ValueAnimator? = null private var flingX = 0f + private var flingY = 0f + private var throwSpring: com.droiddeck.launcher.ui.FlingSpring? = null private var engine = "" private var gpuName = "" private var protonPid = 0 @@ -94,18 +95,22 @@ class DroidDeckHudHost(context: Context) { stopMotion(hud) shrinkPastEdge(hud, rawX, rawY) } - hud.setOnFlungListener { vx, _ -> flingX = vx } + hud.setOnFlungListener { vx, vy -> flingX = vx; flingY = vy } hud.setOnTabDraggedListener { x, y -> dragTab(hud, x, y) } hud.setOnTabDroppedListener { dropTab(hud) } hud.setOnTabDragCancelledListener { snapping = false; keepOnScreen(hud) } hud.setOnMovedListener { x, y -> wantX = x; wantY = y val vx = flingX + val vy = flingY flingX = 0f - dockEdgeFor(hud)?.let { edge -> setDock(hud, edge); return@setOnMovedListener } + flingY = 0f + // A throw only carries the strip into its tab; a floating HUD flung across goes to the other side. + val coast = hud.isStrip + dockEdgeFor(hud, if (coast) vx else 0f, if (coast) vy else 0f)?.let { edge -> setDock(hud, edge); return@setOnMovedListener } stopMotion(hud) fadeDockPreview(hud) - if (snaps && !hud.isStrip) { snapToAnchor(hud, vx); return@setOnMovedListener } + if (snaps && !hud.isStrip) { snapToAnchor(hud, vx, vy); return@setOnMovedListener } val fromX = hud.x; val fromY = hud.y keepOnScreen(hud) wantX = hud.x; wantY = hud.y @@ -178,9 +183,8 @@ class DroidDeckHudHost(context: Context) { private fun applyShown() { if (!running) return val show = !hidden && !backgrounded - val visible = show && SessionState.mode != SessionService.MODE_DESKTOP - view?.visibility = if (visible) View.VISIBLE else View.GONE - showing = visible + view?.visibility = if (show) View.VISIBLE else View.GONE + showing = show if (show != polling) { polling = show if (show) Choreographer.getInstance().postFrameCallback(frameCallback) @@ -247,23 +251,26 @@ class DroidDeckHudHost(context: Context) { return if (stats.size > 3 && stats[3] > 1f) stats[3] else 0f } - private fun dockEdgeFor(v: View): DroidDeckHudDock? { - val over = overhang(v) ?: return null + /** The edge the HUD tucks into: one it hangs far enough over, or would once a throw at [vx], [vy] coasts out. */ + private fun dockEdgeFor(v: View, vx: Float = 0f, vy: Float = 0f): DroidDeckHudDock? { + val over = overhang(v, vx * com.droiddeck.launcher.ui.EdgeFling.COAST_S, vy * com.droiddeck.launcher.ui.EdgeFling.COAST_S) ?: return null return over.key.takeIf { over.value >= DOCK_OVERHANG } } - private fun overhang(v: View): Map.Entry? { + private fun overhang(v: View, dx: Float = 0f, dy: Float = 0f): Map.Entry? { val p = v.parent as? View ?: return null if (p.width <= 0 || p.height <= 0 || v.width <= 0 || v.height <= 0) return null val strip = (v as? DroidDeckHudView)?.isStrip == true val density = v.resources.displayMetrics.density val w = if (strip) minOf(v.width.toFloat(), STRIP_PULL_ACROSS_DP * density) else v.width.toFloat() val h = if (strip) maxOf(v.height.toFloat(), STRIP_PULL_OFF_DP * density) else v.height.toFloat() + val x = v.x + dx + val y = v.y + dy return mapOf( - DroidDeckHudDock.LEFT to -v.x / w, - DroidDeckHudDock.RIGHT to (v.x + v.width - p.width) / w, - DroidDeckHudDock.TOP to -v.y / h, - DroidDeckHudDock.BOTTOM to (v.y + v.height - p.height) / h, + DroidDeckHudDock.LEFT to -x / w, + DroidDeckHudDock.RIGHT to (x + v.width - p.width) / w, + DroidDeckHudDock.TOP to -y / h, + DroidDeckHudDock.BOTTOM to (y + v.height - p.height) / h, ).maxByOrNull { it.value } } @@ -298,6 +305,7 @@ class DroidDeckHudHost(context: Context) { } private fun stopMotion(hud: DroidDeckHudView) { + throwSpring?.cancel() hud.animate().setUpdateListener(null) hud.animate().cancel() } @@ -327,23 +335,21 @@ class DroidDeckHudHost(context: Context) { } } - private fun snapToAnchor(hud: DroidDeckHudView, vx: Float) { + /** Sends the HUD to a side the way a chat head goes: by where the throw would carry it, springing on from its speed. */ + private fun snapToAnchor(hud: DroidDeckHudView, vx: Float, vy: Float) { val p = hud.parent as? View ?: return val maxX = (p.width - hud.width).toFloat().coerceAtLeast(0f) val maxY = (p.height - hud.height).toFloat().coerceAtLeast(0f) - anchorX = if (hud.x + vx * FLING_REACH_S < maxX / 2f) 0f else 1f + val right = com.droiddeck.launcher.ui.EdgeFling.toRight(hud.x + hud.width / 2f, p.width.toFloat(), vx, context.resources.displayMetrics.density) + anchorX = if (right) 1f else 0f wantX = anchorX * maxX - wantY = hud.y.coerceIn(0f, maxY) + wantY = com.droiddeck.launcher.ui.EdgeFling.restY(hud.y, vy, 0f, maxY) SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) stopMotion(hud) - if (Motion.scale == 0f) { - hud.scaleX = 1f; hud.scaleY = 1f - hud.x = wantX; hud.y = wantY - return - } + hud.scaleX = 1f; hud.scaleY = 1f snapping = true - hud.animate().x(wantX).y(wantY).scaleX(1f).scaleY(1f).setDuration(Motion.ms(260).toLong()).setInterpolator(EASE) - .withEndAction { snapping = false; keepOnScreen(hud) }.start() + val spring = throwSpring ?: com.droiddeck.launcher.ui.FlingSpring { sx, sy -> hud.x = sx; hud.y = sy }.also { throwSpring = it } + spring.start(hud.x, hud.y, vx, vy, wantX, wantY) { snapping = false; keepOnScreen(hud) } } private fun shrinkPastEdge(hud: DroidDeckHudView, rawX: Float, rawY: Float) { @@ -500,10 +506,9 @@ class DroidDeckHudHost(context: Context) { companion object { private const val DOCK_OVERHANG = 0.4f - private const val FLING_REACH_S = 0.18f private const val PREVIEW_FROM = 0.55f - private const val STRIP_PULL_ACROSS_DP = 600f - private const val STRIP_PULL_OFF_DP = 150f + private const val STRIP_PULL_ACROSS_DP = 360f + private const val STRIP_PULL_OFF_DP = 100f private const val EXPAND_FADE = 0.5f private val EASE = PathInterpolator(0.2f, 0.8f, 0.2f, 1f) diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java index 98c34df7ce..b4c1cfc7ea 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java @@ -50,6 +50,7 @@ public class HudLockController { private final Callbacks cb; private final GestureDetector detector; private final ScaleGestureDetector scaleDetector; + private final android.view.VelocityTracker velocity = android.view.VelocityTracker.obtain(); private boolean locked = false; @@ -86,8 +87,18 @@ public class HudLockController { public boolean onTouchEvent(MotionEvent event) { scaleDetector.onTouchEvent(event); detector.onTouchEvent(event); + // The HUD moves under the finger, so the throw is measured on the screen, not in the HUD. + MotionEvent onScreen = MotionEvent.obtain(event); + onScreen.setLocation(event.getRawX(), event.getRawY()); + if (event.getActionMasked() == MotionEvent.ACTION_DOWN) velocity.clear(); + velocity.addMovement(onScreen); + onScreen.recycle(); int action = event.getActionMasked(); if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { + if (dragging && !locked && !pinched && action == MotionEvent.ACTION_UP) { + velocity.computeCurrentVelocity(1000); + cb.onFlung(velocity.getXVelocity(), velocity.getYVelocity()); + } if (dragging && !locked) cb.onMoved(view.getX(), view.getY()); dragging = false; } @@ -124,12 +135,6 @@ public class HudLockController { return true; } - @Override - public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { - if (dragging && !locked && !pinched) cb.onFlung(velocityX, velocityY); - return true; - } - @Override public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { if (pinched) return true; diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 868cf4fbf0..ed036a4933 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -51,6 +51,7 @@ import androidx.compose.material.icons.outlined.ExpandMore import androidx.compose.material.icons.outlined.History import androidx.compose.material.icons.outlined.Memory import androidx.compose.material.icons.outlined.MoreHoriz +import androidx.compose.material.icons.outlined.Pets import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.Stop import androidx.compose.material3.CircularProgressIndicator @@ -127,7 +128,7 @@ private const val COMPOSER_SLIDE_MS = 350L */ @Composable internal fun AgentPage( - modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, + modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, hidesPet: Boolean = true, ) { val context = LocalContext.current val view = LocalView.current @@ -143,6 +144,11 @@ internal fun AgentPage( } remember { AgentHost.refresh(context) } LaunchedEffect(AgentHost.unseen, visible) { if (visible) AgentHost.seen() } + DisposableEffect(visible, hidesPet) { + val counts = visible && hidesPet + if (counts) AgentPet.agentOnScreen++ + onDispose { if (counts) AgentPet.agentOnScreen-- } + } remember { AgentSetup.check(context) } var setup by rememberSaveable { mutableStateOf(false) } val draft = rememberSaveable { mutableStateOf("") } @@ -631,6 +637,9 @@ private fun AgentEditor( menu = false AgentHost.forget(context) } + HeaderAction(Icons.Outlined.Pets, stringResource(R.string.setup_agent_pet), selected = AgentPet.enabled, size = 32.dp, tag = "agent-pet-toggle") { + AgentPet.set(context, !AgentPet.enabled) + } HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, size = 32.dp, tag = "agent-settings") { menu = false onSetup() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt new file mode 100644 index 0000000000..f154295450 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt @@ -0,0 +1,319 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.os.SystemClock +import android.provider.Settings +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.gestures.detectDragGestures +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.onClick +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.agent.AgentHost +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlin.math.roundToInt + +/** A DroidDeck window the pet can live in when it may not float over other apps. */ +internal interface AgentPetHost { + /** Something already covers the pet's place, such as the session drawer. */ + val petBlocked: Boolean +} + +/** + * DeeDee, the agent's pet: shows what the agent is doing and opens a chat with it. With the + * "display over other apps" permission it floats over every app in windows of its own + * ([PetWindows]); without it, it lives in DroidDeck's own windows. Either way it opens the same + * chat, growing out of it. + */ +internal object AgentPet { + var enabled by mutableStateOf(false) + private set + /** May draw over other apps. */ + var allowed by mutableStateOf(false) + private set + /** Agent pages on screen; the pet steps aside while the conversation itself is in view. */ + var agentOnScreen by mutableIntStateOf(0) + var now by mutableLongStateOf(SystemClock.elapsedRealtime()) + private set + /** When the agent last changed what it was doing. */ + var since by mutableLongStateOf(SystemClock.elapsedRealtime()) + private set + /** The floating windows could not be made, so the pet stays in DroidDeck's own windows instead. */ + private var floatFailed by mutableStateOf(false) + val floating get() = enabled && allowed && !floatFailed + /** How to close the chat open inside each DroidDeck window that has one. */ + private val closeInWindow = java.util.WeakHashMap Unit>() + + /** + * B and Back close a chat open inside [host] before the window acts on them, since the window's + * own keys (leaving a session, going back a page) would otherwise run under it. + */ + fun handleBack(host: AgentPetHost, event: android.view.KeyEvent): Boolean { + val close = closeInWindow[host] ?: return false + if (event.keyCode != android.view.KeyEvent.KEYCODE_BACK && event.keyCode != android.view.KeyEvent.KEYCODE_BUTTON_B) return false + if (event.action == android.view.KeyEvent.ACTION_UP) close() + return true + } + + internal fun chatOpenInWindow(host: AgentPetHost, close: (() -> Unit)?) { + if (close == null) closeInWindow.remove(host) else closeInWindow[host] = close + } + private var windows: PetWindows? = null + private val main = Handler(Looper.getMainLooper()) + private const val TAG = "agent-pet" + private const val KEY = "pet" + private const val SIDE = "pet_side" + private const val HEIGHT = "pet_y" + + fun set(context: Context, on: Boolean) { + enabled = on + AgentHost.prefs(context).edit().putBoolean(KEY, on).apply() + } + + /** Opens the system page where the user lets DroidDeck draw over other apps. */ + fun requestFloating(context: Context) { + val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:${context.packageName}")) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + runCatching { context.startActivity(intent) } + } + + internal fun place(context: Context) = AgentHost.prefs(context).let { it.getBoolean(SIDE, true) to it.getFloat(HEIGHT, 0.3f) } + + internal fun save(context: Context, right: Boolean, height: Float) { + AgentHost.prefs(context).edit().putBoolean(SIDE, right).putFloat(HEIGHT, height).apply() + } + + fun install(app: Application) { + enabled = AgentHost.prefs(app).getBoolean(KEY, false) + allowed = PetWindows.allowed(app) + val scope = MainScope() + scope.launch { + snapshotFlow { Triple(AgentHost.state, AgentHost.entries.size, AgentHost.lab?.running) }.collect { since = SystemClock.elapsedRealtime() } + } + scope.launch { + snapshotFlow { floating && AgentHost.installed }.collect { show -> + if (show && windows == null) windows = runCatching { PetWindows(app) }.onFailure { + android.util.Log.w("AgentPet", "could not float the pet", it) + floatFailed = true + }.getOrNull() + if (!show) windows?.close()?.also { windows = null } + } + } + tick(app) + app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { + override fun onActivityResumed(activity: Activity) { + allowed = PetWindows.allowed(activity) + attach(activity) + } + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit + override fun onActivityStarted(activity: Activity) = Unit + override fun onActivityPaused(activity: Activity) = Unit + override fun onActivityStopped(activity: Activity) = Unit + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + override fun onActivityDestroyed(activity: Activity) = Unit + }) + } + + private fun tick(app: Application) { + now = SystemClock.elapsedRealtime() + // The permission can be granted or taken back in Settings while DroidDeck is away. + if (enabled) allowed = PetWindows.allowed(app) + main.postDelayed({ tick(app) }, 1_000) + } + + private fun attach(activity: Activity) { + val host = activity as? AgentPetHost ?: return + val decor = activity.window.decorView as? ViewGroup ?: return + if (decor.findViewWithTag(TAG) != null) return + val layer = ComposeView(activity).apply { + tag = TAG + isFocusable = false + importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO + setContent { DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(activity)) { PetLayer(host) } } + } + decor.addView(layer, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + } +} + +private const val SLEEP_AFTER_MS = 5 * 60_000L +private const val CHEER_MS = 10_000L +internal const val PREVIEW_MS = 6_000L + +/** What the agent is up to, as the pet shows it; [since] is when the agent last changed what it was doing. */ +internal fun petState(now: Long, since: Long): PetState { + if (AgentHost.state == AgentHost.State.WORKING || AgentHost.lab?.running == true) return PetState.WORKING + val last = AgentHost.entries.lastOrNull { it is AgentHost.Entry.Finished } as? AgentHost.Entry.Finished + if (AgentHost.unseen && last != null && !last.stopped) { + if (last.error != null) return PetState.ERROR + val said = (AgentHost.entries.lastOrNull { it is AgentHost.Entry.Said } as? AgentHost.Entry.Said)?.text?.trimEnd().orEmpty() + if (last.planned || said.endsWith("?")) return PetState.QUESTION + if (now - since < CHEER_MS) return PetState.DONE + } + return if (now - since > SLEEP_AFTER_MS) PetState.SLEEP else PetState.IDLE +} + +internal fun petStateNow() = petState(AgentPet.now, AgentPet.since) + +/** The line the preview bubble shows while the pet has news, or null when it has none. */ +internal fun petBubbleText(): String? { + if (!AgentHost.unseen) return null + val state = petStateNow() + if (state != PetState.DONE && state != PetState.QUESTION && state != PetState.ERROR) return null + val last = AgentHost.entries.lastOrNull { it is AgentHost.Entry.Finished } as? AgentHost.Entry.Finished + last?.error?.let { return it } + val said = AgentHost.entries.lastOrNull { it is AgentHost.Entry.Said } as? AgentHost.Entry.Said ?: return null + return said.text.lineSequence().map { it.trim().trimStart('#', '*', '-', ' ') }.firstOrNull { it.isNotEmpty() } +} + +/** DeeDee in [state], with a dot while a reply waits to be read. */ +@Composable +internal fun PetFigure(state: PetState, modifier: Modifier) { + Box(modifier.testTag("agent-pet")) { + Box(Modifier.fillMaxSize().padding(4.dp).clip(CircleShape).background(Color(0xEB0E141B)).border(1.dp, Color(0x29FFFFFF), CircleShape)) + DeeDee(state, Modifier.fillMaxSize().padding(6.dp)) + if (AgentHost.unseen && (state == PetState.IDLE || state == PetState.SLEEP)) Box( + Modifier.align(Alignment.TopEnd).padding(8.dp).size(14.dp).clip(CircleShape).background(Color(0xFF1A9FFF)).border(2.dp, Color(0xFF0E141B), CircleShape), + ) + } +} + +@Composable +internal fun PetPreview(text: String, modifier: Modifier, onTap: () -> Unit) { + val shape = RoundedCornerShape(16.dp) + Text( + text, fontSize = 14.sp, color = Color.White, maxLines = 2, overflow = TextOverflow.Ellipsis, + modifier = modifier.widthIn(max = 260.dp).clip(shape).background(Color(0xF0171D25)).border(1.dp, Color(0x33FFFFFF), shape) + .pointerInput(Unit) { detectTapGestures { onTap() } }.padding(horizontal = 14.dp, vertical = 10.dp), + ) +} + +/** The pet inside one DroidDeck window, for when it may not float over other apps. */ +@Composable +private fun PetLayer(host: AgentPetHost) { + var chatOpen by remember { mutableStateOf(false) } + var chatShown by remember { mutableStateOf(false) } + val shown = AgentPet.enabled && !AgentPet.floating && AgentHost.installed && (chatShown || AgentPet.agentOnScreen == 0) && !host.petBlocked + if (!shown) return + val context = LocalContext.current + val motion = remember { PetMotion(context) } + val density = LocalDensity.current + val openLabel = androidx.compose.ui.res.stringResource(com.droiddeck.launcher.R.string.agent_pet_open) + val openChat = { + motion.dock() + chatShown = true + chatOpen = true + } + val closeChat = { + chatOpen = false + motion.undock() + } + BoxWithConstraints(Modifier.fillMaxSize()) { + motion.fit(constraints.maxWidth.toFloat(), constraints.maxHeight.toFloat()) + if (chatShown) PetChat(chatOpen, motion, closeChat) { chatShown = false } + androidx.compose.runtime.DisposableEffect(host, chatOpen) { + AgentPet.chatOpenInWindow(host, if (chatOpen) closeChat else null) + onDispose { AgentPet.chatOpenInWindow(host, null) } + } + var bubble by remember { mutableStateOf(null) } + val news = petBubbleText() + LaunchedEffect(news) { + bubble = news + if (news != null) { + delay(PREVIEW_MS) + bubble = null + } + } + if (motion.dragging) Box(Modifier.offset { + val (tx, ty) = motion.target + IntOffset((tx - motion.size / 2).roundToInt(), (ty - motion.size / 2).roundToInt()) + }) { PetCloseTarget(motion.overTarget) } + val text = bubble + if (text != null && !motion.dragging) { + var size by remember { mutableStateOf(IntSize.Zero) } + val gap = with(density) { 10.dp.toPx() } + PetPreview(text, Modifier.onSizeChanged { size = it }.offset { + val x = if (motion.right) motion.x - gap - size.width else motion.x + motion.size + gap + IntOffset(x.roundToInt(), (motion.y + motion.size / 2 - size.height / 2).roundToInt()) + }) { + bubble = null + openChat() + } + } + PetFigure( + petStateNow(), + Modifier.offset { IntOffset(motion.x.roundToInt(), motion.y.roundToInt()) } + .size(with(density) { motion.size.toDp() }) + .semantics { + contentDescription = openLabel + role = androidx.compose.ui.semantics.Role.Button + onClick { if (chatOpen) closeChat() else openChat(); true } + } + .pointerInput(Unit) { detectTapGestures { bubble = null; if (chatOpen) closeChat() else openChat() } } + .pointerInput(Unit) { + // The pet moves under the finger, so its velocity is measured where it is on the screen. + val tracker = androidx.compose.ui.input.pointer.util.VelocityTracker() + detectDragGestures( + onDragStart = { bubble = null; if (chatOpen) closeChat(); tracker.resetTracking(); motion.start() }, + onDrag = { change, amount -> + change.consume() + motion.move(amount.x, amount.y) + tracker.addPosition(change.uptimeMillis, androidx.compose.ui.geometry.Offset(motion.x + change.position.x, motion.y + change.position.y)) + }, + onDragEnd = { + val v = tracker.calculateVelocity() + if (motion.end(v.x, v.y)) AgentPet.set(context, false) + }, + onDragCancel = { motion.cancel() }, + ) + }, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt new file mode 100644 index 0000000000..c8d3aba8c9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt @@ -0,0 +1,559 @@ +package com.droiddeck.launcher.ui + +import android.animation.ValueAnimator +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.PixelFormat +import android.os.Build +import android.provider.Settings +import android.view.Gravity +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.view.WindowManager +import android.view.animation.OvershootInterpolator +import android.widget.FrameLayout +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.width +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.animation.core.Animatable +import androidx.compose.foundation.Canvas +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Alignment +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.unit.IntOffset +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.delay +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.LifecycleRegistry +import androidx.lifecycle.setViewTreeLifecycleOwner +import androidx.savedstate.SavedStateRegistry +import androidx.savedstate.SavedStateRegistryController +import androidx.savedstate.SavedStateRegistryOwner +import androidx.savedstate.setViewTreeSavedStateRegistryOwner +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentHost +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.launch +import kotlin.math.abs +import kotlin.math.hypot +import kotlin.math.roundToInt + +/** + * Where the pet is on the screen and how it moves: dragged anywhere, then settling against the + * nearer side edge, or dropped on the close target to turn it off. While its chat is open it is + * docked at the top corner, the way a chat head hops up when its conversation opens, and goes home + * when the chat closes. Positions are screen pixels. + */ +internal class PetMotion(private val context: Context) { + var x by mutableFloatStateOf(0f) + private set + var y by mutableFloatStateOf(0f) + private set + var right by mutableStateOf(true) + private set + var dragging by mutableStateOf(false) + private set + var width by mutableFloatStateOf(0f) + private set + var height by mutableFloatStateOf(0f) + private set + /** Docked for the chat; where to go back to is kept as a side and a relative height. */ + var docked by mutableStateOf(false) + private set + private val density = context.resources.displayMetrics.density + val size = 76 * density + private val margin = 6 * density + private val inset = 24 * density + private var settle: ValueAnimator? = null + private val spring = FlingSpring { sx, sy -> x = sx; y = sy } + + val dockX get() = width - size - margin + + private companion object { + /** The share of the pet that hangs past the edge it rests against. */ + const val TUCK = 0.2f + } + val dockY get() = inset + val target get() = Pair(width / 2, height - 72 * density) + val overTarget get() = dragging && hypot(x + size / 2 - target.first, y + size / 2 - target.second) < size + + /** Fits the pet into a [w] by [h] screen, keeping its side and relative height, as after a rotation. */ + fun fit(w: Float, h: Float) { + if (w <= 0 || h <= 0 || (w == width && h == height)) return + val first = width == 0f + val fraction = if (first) AgentPet.place(context).also { right = it.first }.second else if (docked) home else fractionOf(y) + settle?.cancel() + spring.cancel() + width = w + height = h + home = fraction + if (docked) { + x = dockX + y = dockY + } else { + x = edge(right) + y = inset + travel() * fraction + } + } + + private var home = 0f + private fun travel() = (height - size - inset * 2).coerceAtLeast(0f) + private fun fractionOf(at: Float) = if (travel() > 0) ((at - inset) / travel()).coerceIn(0f, 1f) else 0f + /** At rest the pet tucks part of itself past the screen edge, as a chat head does. */ + private fun edge(side: Boolean) = if (side) width - size * (1f - TUCK) else -size * TUCK + + /** Hops up to the top corner for the chat. */ + fun dock() { + if (docked) return + home = fractionOf(y) + docked = true + glide(dockX, dockY, 260, OvershootInterpolator(0.9f)) + } + + /** Goes back to where it was before the chat opened. */ + fun undock() { + if (!docked) return + docked = false + glide(edge(right), inset + travel() * home, 320, android.view.animation.DecelerateInterpolator(1.6f)) + } + + fun start() { + settle?.cancel() + spring.cancel() + docked = false + dragging = true + } + + fun move(dx: Float, dy: Float) { + x += dx + y += dy + } + + /** A drag the system took away: the pet goes back to an edge, never to the close target. */ + fun cancel() { + if (!dragging) return + dragging = false + right = x + size / 2 > width / 2 + val toY = y.coerceIn(inset, (height - size - inset).coerceAtLeast(inset)) + home = fractionOf(toY) + spring.start(x, y, 0f, 0f, edge(right), toY) + } + + /** Ends a drag let go at [vx], [vy] pixels per second; true when the pet was dropped on the close target. */ + fun end(vx: Float = 0f, vy: Float = 0f): Boolean { + val dismissed = overTarget + dragging = false + if (dismissed) return true + right = EdgeFling.toRight(x + size / 2, width, vx, density) + val toY = EdgeFling.restY(y, vy, inset, height - size - inset) + home = fractionOf(toY) + AgentPet.save(context, right, home) + spring.start(x, y, vx, vy, edge(right), toY) + return false + } + + private fun glide(toX: Float, toY: Float, ms: Long, curve: android.animation.TimeInterpolator) { + settle?.cancel() + spring.cancel() + val fromX = x + val fromY = y + settle = ValueAnimator.ofFloat(0f, 1f).apply { + duration = (ms * Motion.scale).toLong().coerceAtLeast(0) + interpolator = curve + addUpdateListener { + val f = it.animatedValue as Float + x = fromX + (toX - fromX) * f + y = fromY + (toY - fromY) * f + } + start() + } + } +} + +/** Lets a ComposeView live in a window no activity owns. */ +private class OverlayOwner : LifecycleOwner, SavedStateRegistryOwner { + private val registry = LifecycleRegistry(this) + private val saved = SavedStateRegistryController.create(this) + override val lifecycle: Lifecycle get() = registry + override val savedStateRegistry: SavedStateRegistry get() = saved.savedStateRegistry + + init { + saved.performRestore(null) + registry.currentState = Lifecycle.State.RESUMED + } + + fun destroy() { + registry.currentState = Lifecycle.State.DESTROYED + } +} + +/** + * The pet over every app, in windows of its own: the pet, its message preview, the close target + * while it is dragged, and the chat it opens. Needs the "display over other apps" permission. + */ +@SuppressLint("ClickableViewAccessibility") +internal class PetWindows(private val context: Context) { + private val windows = context.getSystemService(WindowManager::class.java) + private val owner = OverlayOwner() + private val motion = PetMotion(context) + private val scope = MainScope() + /** The chat is open, or opening; its window stays up until it has shrunk back into the pet. */ + private var chatOpen by mutableStateOf(false) + private var bubble by mutableStateOf(null) + private var bubbleWidth by mutableFloatStateOf(0f) + private var bubbleHeight by mutableFloatStateOf(0f) + /** The windows are in the window manager, so moving one goes through it. */ + private var added = false + private val turns = object : android.content.ComponentCallbacks { + override fun onConfigurationChanged(newConfig: android.content.res.Configuration) = fitScreen() + @Deprecated("Deprecated in Java") + override fun onLowMemory() = Unit + } + + // A window emptied to no size keeps showing its last frame, so each is hidden as a whole instead. + private val head = window(touchable = true, focusable = false) { + PetFigure(petStateNow(), Modifier.size(76.dp)) + } + private val preview = window(touchable = true, focusable = false, onSize = { w, h -> bubbleWidth = w.toFloat(); bubbleHeight = h.toFloat() }) { + bubble?.let { PetPreview(it, Modifier.padding(2.dp)) { openChat() } } + } + private val target = window(touchable = false, focusable = false) { + PetCloseTarget(motion.overTarget) + } + private val chat: Window = window(touchable = true, focusable = true, full = true) { + PetChat(chatOpen, motion, ::closeChat) { showChat(false) } + } + + init { + head.view.setOnTouchListener(DragTouch()) + head.view.contentDescription = context.getString(R.string.agent_pet_open) + head.view.setOnClickListener { if (chatOpen) closeChat() else openChat() } + scope.launch { snapshotFlow { Triple(motion.x, motion.y, motion.right) }.collectLatest { place() } } + scope.launch { snapshotFlow { bubbleWidth to bubbleHeight }.collectLatest { place() } } + scope.launch { snapshotFlow { AgentPet.agentOnScreen == 0 }.collectLatest { setVisible(head, it) } } + scope.launch { snapshotFlow { motion.dragging }.collectLatest { setVisible(target, it) } } + scope.launch { + snapshotFlow { bubble != null && !chatOpen && !motion.dragging && AgentPet.agentOnScreen == 0 }.collectLatest { setVisible(preview, it) } + } + scope.launch { + snapshotFlow { petBubbleText() }.collectLatest { text -> + bubble = text + if (text != null) { + kotlinx.coroutines.delay(PREVIEW_MS) + bubble = null + } + } + } + fitScreen() + context.registerComponentCallbacks(turns) + place() + listOf(target, preview).forEach { setVisible(it, false) } + showChat(false) + listOf(chat, target, preview, head).forEach { windows.addView(it.view, it.params) } + added = true + } + + private class Window(val view: FrameLayout, val params: WindowManager.LayoutParams, val touchable: Boolean) + + private fun window( + touchable: Boolean, focusable: Boolean, full: Boolean = false, onSize: ((Int, Int) -> Unit)? = null, content: @Composable () -> Unit, + ): Window { + val compose = ComposeView(context).apply { + setViewTreeLifecycleOwner(owner) + setViewTreeSavedStateRegistryOwner(owner) + setContent { DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(context)) { content() } } + } + val frame = object : FrameLayout(context) { + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (full && event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP && chatOpen) { + closeChat() + return true + } + return super.dispatchKeyEvent(event) + } + }.apply { + addView(compose) + setViewTreeLifecycleOwner(owner) + setViewTreeSavedStateRegistryOwner(owner) + } + val size = if (full) WindowManager.LayoutParams.MATCH_PARENT else WindowManager.LayoutParams.WRAP_CONTENT + val params = WindowManager.LayoutParams( + size, size, WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY, + (if (focusable) 0 else WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) or + (if (touchable) 0 else WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE) or + WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or + (if (full) 0 else WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS), + PixelFormat.TRANSLUCENT, + ).apply { + gravity = Gravity.TOP or Gravity.START + if (full) softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES + } + if (onSize != null) compose.addOnLayoutChangeListener { v, _, _, _, _, _, _, _, _ -> onSize(v.width, v.height) } + return Window(frame, params, touchable) + } + + /** A hidden overlay window still owns its frame, which the system can stretch over the screen, so it also stops taking touches. */ + private fun setVisible(window: Window, shown: Boolean) { + window.view.visibility = if (shown) View.VISIBLE else View.GONE + setTouchable(window, shown && window.touchable) + } + + private fun setTouchable(window: Window, on: Boolean) { + val flags = if (on) window.params.flags and WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE.inv() + else window.params.flags or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + if (flags == window.params.flags) return + window.params.flags = flags + if (added) runCatching { windows.updateViewLayout(window.view, window.params) } + } + + private fun place() { + val gap = 10 * context.resources.displayMetrics.density + update(head, motion.x, motion.y) + val bx = if (motion.right) motion.x - gap - bubbleWidth else motion.x + motion.size + gap + update(preview, bx, motion.y + motion.size / 2 - bubbleHeight / 2) + val (tx, ty) = motion.target + update(target, tx - motion.size / 2, ty - motion.size / 2) + } + + private fun update(window: Window, x: Float, y: Float) { + if (window.params.x == x.roundToInt() && window.params.y == y.roundToInt()) return + window.params.x = x.roundToInt() + window.params.y = y.roundToInt() + if (added) runCatching { windows.updateViewLayout(window.view, window.params) } + } + + private fun openChat() { + bubble = null + if (chatOpen) return + motion.dock() + showChat(true) + chatOpen = true + } + + private fun closeChat() { + if (!chatOpen) return + chatOpen = false + motion.undock() + } + + /** + * The chat window is always drawn; closed, it waits off the screen and takes neither touches nor + * keys, so opening it is a move and not a first layout. + */ + private fun showChat(on: Boolean) { + chat.params.x = if (on) 0 else OFFSCREEN + val quiet = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + chat.params.flags = if (on) chat.params.flags and quiet.inv() else chat.params.flags or quiet + if (added) runCatching { windows.updateViewLayout(chat.view, chat.params) } + } + + /** The whole screen, the status and navigation bars included, since overlay windows can cover them. */ + private fun fitScreen() { + val bounds = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) windows.maximumWindowMetrics.bounds + else android.graphics.Point().also { @Suppress("DEPRECATION") windows.defaultDisplay.getRealSize(it) }.let { android.graphics.Rect(0, 0, it.x, it.y) } + motion.fit(bounds.width().toFloat(), bounds.height().toFloat()) + } + + fun close() { + runCatching { context.unregisterComponentCallbacks(turns) } + scope.cancel() + listOf(head, preview, target, chat).forEach { runCatching { windows.removeView(it.view) } } + owner.destroy() + } + + /** Drags and taps on the pet, in screen coordinates, since its window moves under the finger. */ + private inner class DragTouch : View.OnTouchListener { + private val slop = ViewConfiguration.get(context).scaledTouchSlop + private var downX = 0f + private var downY = 0f + private var lastX = 0f + private var lastY = 0f + private var moved = false + private var tracker: android.view.VelocityTracker? = null + + /** The window moves under the finger, so velocity is measured on the screen. */ + private fun track(e: MotionEvent) { + val onScreen = MotionEvent.obtain(e).apply { setLocation(e.rawX, e.rawY) } + (tracker ?: android.view.VelocityTracker.obtain().also { tracker = it }).addMovement(onScreen) + onScreen.recycle() + } + + private fun release(): Pair { + val t = tracker ?: return 0f to 0f + t.computeCurrentVelocity(1000) + val v = t.xVelocity to t.yVelocity + t.recycle() + tracker = null + return v + } + + override fun onTouch(v: View, e: MotionEvent): Boolean { + track(e) + when (e.actionMasked) { + MotionEvent.ACTION_DOWN -> { + downX = e.rawX; downY = e.rawY; lastX = e.rawX; lastY = e.rawY + moved = false + } + MotionEvent.ACTION_MOVE -> { + if (!moved && (abs(e.rawX - downX) > slop || abs(e.rawY - downY) > slop)) { + moved = true + bubble = null + closeChat() + motion.start() + } + if (moved) motion.move(e.rawX - lastX, e.rawY - lastY) + lastX = e.rawX; lastY = e.rawY + } + MotionEvent.ACTION_UP -> { + val (vx, vy) = release() + if (moved) { + if (motion.end(vx, vy)) AgentPet.set(context, false) + } else v.performClick() + } + MotionEvent.ACTION_CANCEL -> { + release() + if (moved) motion.cancel() + } + } + return true + } + } + + companion object { + private const val OFFSCREEN = 10_000 + fun allowed(context: Context) = Settings.canDrawOverlays(context) + } +} + +/** + * The floating chat, opened the way a chat head opens its conversation: the pet hops into the top + * corner while the whole conversation scales up out of it and fades in, and closing shrinks it back + * into the pet as the pet glides home. In landscape it sits beside the docked pet, in portrait + * under it. Its contents are built while it is closed, so opening only animates. + */ +@Composable +internal fun PetChat(open: Boolean, motion: PetMotion, onClose: () -> Unit, onClosed: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val density = androidx.compose.ui.platform.LocalDensity.current + BoxWithConstraints( + Modifier.fillMaxSize().onPreviewKeyEvent { e -> + val k = e.nativeKeyEvent + if (k.keyCode != KeyEvent.KEYCODE_BUTTON_B || k.action != KeyEvent.ACTION_UP) return@onPreviewKeyEvent false + onClose() + true + }, + ) { + val w = constraints.maxWidth.toFloat() + val h = constraints.maxHeight.toFloat() + val margin = with(density) { 8.dp.toPx() } + val gap = with(density) { 6.dp.toPx() } + val wide = w > h + val panel = if (wide) { + val right = motion.dockX - gap + Rect((right - with(density) { 900.dp.toPx() }).coerceAtLeast(margin), motion.dockY, right, h - margin) + } else { + Rect(margin, motion.dockY + motion.size + gap, w - margin, h - margin) + } + val grow = remember { Animatable(0f) } + val fade = remember { Animatable(0f) } + LaunchedEffect(open) { + if (open) coroutineScope { + launch { grow.animateTo(1f, Motion.sp(0.82f, 520f)) } + launch { fade.animateTo(1f, Motion.tw(140)) } + } else if (fade.value > 0f) { + coroutineScope { + launch { grow.animateTo(0f, Motion.tw(170, easing = androidx.compose.animation.core.FastOutLinearInEasing)) } + launch { delay(Motion.ms(40).toLong()); fade.animateTo(0f, Motion.tw(130)) } + } + onClosed() + } + } + Box( + Modifier.fillMaxSize().graphicsLayer { alpha = fade.value }.background(Color(0x8C000000)) + .clickable(remember { MutableInteractionSource() }, null, enabled = open) { onClose() }, + ) + Column( + Modifier.offset { IntOffset(panel.left.roundToInt(), panel.top.roundToInt()) } + .size(with(density) { panel.width.toDp() }, with(density) { panel.height.toDp() }) + .graphicsLayer { + // Grows from where the pet is right now, so the two travel together while the pet hops to its corner. + transformOrigin = androidx.compose.ui.graphics.TransformOrigin( + ((motion.x + motion.size / 2 - panel.left) / panel.width.coerceAtLeast(1f)).coerceIn(0f, 1f), + ((motion.y + motion.size / 2 - panel.top) / panel.height.coerceAtLeast(1f)).coerceIn(0f, 1f), + ) + val s = 0.12f + 0.88f * grow.value + scaleX = s + scaleY = s + alpha = fade.value + } + .clip(Shape16).background(colors.background).border(1.dp, pal.line, Shape16) + .clickable(remember { MutableInteractionSource() }, null, enabled = open) {} + .padding(start = 12.dp, end = 12.dp, top = 6.dp), + ) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 2.dp)) { + Text(stringResource(R.string.agent_pet_name), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + modifier = Modifier.padding(start = 4.dp)) + Spacer(Modifier.weight(1f)) + HeaderAction(Icons.Outlined.Close, stringResource(R.string.agent_close), size = 34.dp, tag = "agent-pet-close", onClick = onClose) + } + AgentPage(Modifier.weight(1f).fillMaxWidth(), visible = open, startTyping = AgentHost.entries.isEmpty(), hidesPet = false) + } + } +} + +@Composable +internal fun PetCloseTarget(over: Boolean) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(4.dp).size(if (over) 84.dp else 68.dp).clip(androidx.compose.foundation.shape.CircleShape) + .background(Color(0xCC0E141B)) + .border(2.dp, if (over) Color(0xFFFF5A5F) else Color(0x66FFFFFF), androidx.compose.foundation.shape.CircleShape), + ) { Icon(Icons.Outlined.Close, null, tint = Color.White, modifier = Modifier.size(30.dp)) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DeeDee.kt b/app/src/main/java/com/droiddeck/launcher/ui/DeeDee.kt new file mode 100644 index 0000000000..c2632915fc --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeeDee.kt @@ -0,0 +1,381 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.core.CubicBezierEasing +import androidx.compose.animation.core.Easing +import androidx.compose.foundation.Canvas +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.produceState +import androidx.compose.runtime.withFrameNanos +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.PathOperation +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.rotate +import androidx.compose.ui.graphics.drawscope.scale +import androidx.compose.ui.graphics.drawscope.translate +import androidx.compose.ui.graphics.drawscope.withTransform +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.drawText +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.rememberTextMeasurer +import kotlin.math.PI + +internal enum class PetState { IDLE, WORKING, QUESTION, DONE, ERROR, SLEEP } + +private val White = Color(0xFFFFFFFF) +private val Blue = Color(0xFF1A9FFF) +private val Ink = Color(0xFF0E141B) +private val Amber = Color(0xFFFFB627) +private val Red = Color(0xFFFF5A5F) +private val Slate = Color(0xFF3A4A5A) +private val Term = Color(0xFF26303B) +private val TermLine = Color(0xFF8FA3B6) + +private val EaseInOut: Easing = CubicBezierEasing(0.42f, 0f, 0.58f, 1f) +private val EaseOut: Easing = CubicBezierEasing(0f, 0f, 0.58f, 1f) +private val Hop: Easing = CubicBezierEasing(0.3f, 0f, 0.4f, 1f) +private val Pop: Easing = CubicBezierEasing(0.3f, 1.6f, 0.5f, 1f) +private val Linear = Easing { it } +private val Step = Easing { 0f } + +/** Where 0..1 of a loop [period] seconds long is at [time]; [lead] starts it that many seconds early. */ +private fun loop(time: Float, period: Float, lead: Float = 0f): Float { + val t = (time + lead) % period + return (if (t < 0) t + period else t) / period +} + +/** A CSS-style keyframe track: [stops] holds (position, value) pairs, eased per segment. */ +private fun track(p: Float, easing: Easing, vararg stops: Float): Float { + if (p <= stops[0]) return stops[1] + var i = 0 + while (i + 2 < stops.size) { + val a = stops[i] + val b = stops[i + 2] + if (p <= b) { + val t = if (b > a) (p - a) / (b - a) else 1f + return stops[i + 1] + (stops[i + 3] - stops[i + 1]) * easing.transform(t) + } + i += 2 + } + return stops[stops.size - 1] +} + +private fun mix(a: Color, b: Color, t: Float) = Color( + a.red + (b.red - a.red) * t, a.green + (b.green - a.green) * t, a.blue + (b.blue - a.blue) * t, a.alpha + (b.alpha - a.alpha) * t, +) + +/** The DroidDeck mark the head is drawn from, in its own 128 by 223.72 space. */ +private val headMark: Path by lazy { + val d = Path().apply { + moveTo(-31.98f, 0f) + lineTo(63.97f, 0f) + cubicTo(125.81f, 0f, 175.93f, 50.08f, 175.93f, 111.86f) + cubicTo(175.93f, 173.64f, 125.81f, 223.72f, 63.97f, 223.72f) + lineTo(-31.98f, 223.72f) + close() + } + val cut = Path().apply { + addOval(Rect(Offset(63.98f, 111.86f), 71.81f)) + addRect(Rect(56.055f, 0f, 56.055f + 15.83f, 45f)) + addRect(Rect(56.055f, 178.72f, 56.055f + 15.83f, 223.72f)) + } + Path.combine(PathOperation.Difference, d, cut) +} + +private fun star(x: Float, y: Float, a: Float) = Path().apply { + moveTo(x, y - a) + quadraticBezierTo(x, y, x + a, y) + quadraticBezierTo(x, y, x, y + a) + quadraticBezierTo(x, y, x - a, y) + quadraticBezierTo(x, y, x, y - a) + close() +} + +private class Spark(val x: Float, val y: Float, val size: Float, val color: Color, val lead: Float) + +private val sparks = listOf( + Spark(90f, 120f, 14f, White, 0f), Spark(318f, 110f, 12f, Blue, 0.4f), Spark(104f, 210f, 9f, Blue, 0.8f), + Spark(312f, 200f, 10f, White, 0.4f), Spark(250f, 40f, 8f, White, 0f), +).map { it to star(it.x, it.y, it.size) } + +/** The rig of the DeeDee mock (a 400 by 360 view box) looping through [state]; [crop] is the part of the view box shown. */ +@Composable +internal fun DeeDee(state: PetState, modifier: Modifier, crop: Rect = Rect(35f, 15f, 365f, 345f)) { + val time by produceState(0f) { + val start = withFrameNanos { it } + while (true) withFrameNanos { value = (it - start) / 1_000_000_000f } + } + val text = rememberTextMeasurer() + Canvas(modifier) { + val k = minOf(size.width / crop.width, size.height / crop.height) + withTransform({ + translate((size.width - crop.width * k) / 2, (size.height - crop.height * k) / 2) + scale(k, k, Offset.Zero) + translate(-crop.left, -crop.top) + }) { rig(state, time, text) } + } +} + +private fun DrawScope.rig(state: PetState, t: Float, text: androidx.compose.ui.text.TextMeasurer) { + // Shadow under the feet. + var shadowX = 1f + var shadowAlpha = 0.4f + when (state) { + PetState.IDLE -> shadowX = track(loop(t, 3f), EaseInOut, 0f, 1f, 0.5f, 0.9f, 1f, 1f) + PetState.DONE -> { + val p = loop(t, 1.2f) + shadowX = track(p, Hop, 0f, 1f, 0.15f, 1f, 0.45f, 0.7f, 0.75f, 1f, 1f, 1f) + shadowAlpha = track(p, Hop, 0f, 0.4f, 0.15f, 0.4f, 0.45f, 0.2f, 0.75f, 0.4f, 1f, 0.4f) + } + else -> Unit + } + scale(shadowX, 1f, Offset(200f, 336f)) { + drawOval(Color.Black.copy(alpha = shadowAlpha), Offset(130f, 327f), Size(140f, 18f)) + } + + // The whole body moves together. + var dx = 0f + var dy = 0f + var sx = 1f + var sy = 1f + when (state) { + PetState.IDLE -> dy = track(loop(t, 3f), EaseInOut, 0f, 0f, 0.5f, -6f, 1f, 0f) + PetState.WORKING -> dy = track(loop(t, 1.6f), EaseInOut, 0f, 0f, 0.5f, -2f, 1f, 0f) + PetState.QUESTION -> dy = track(loop(t, 2.4f), EaseInOut, 0f, 0f, 0.5f, -4f, 1f, 0f) + PetState.DONE -> { + val p = loop(t, 1.2f) + dy = track(p, Hop, 0f, 0f, 0.15f, 0f, 0.45f, -30f, 0.75f, 0f, 1f, 0f) + sx = track(p, Hop, 0f, 1.03f, 0.15f, 1f, 0.75f, 1f, 0.85f, 1.04f, 1f, 1.03f) + sy = track(p, Hop, 0f, 0.96f, 0.15f, 1f, 0.75f, 1f, 0.85f, 0.95f, 1f, 0.96f) + } + PetState.ERROR -> dx = track(loop(t, 2f), EaseInOut, 0f, 0f, 0.04f, -7f, 0.08f, 7f, 0.12f, -5f, 0.16f, 5f, 0.2f, -2f, 0.24f, 2f, 0.3f, 0f, 1f, 0f) + PetState.SLEEP -> { + val p = loop(t, 4f) + sx = track(p, EaseInOut, 0f, 1f, 0.5f, 1.02f, 1f, 1f) + sy = track(p, EaseInOut, 0f, 1f, 0.5f, 0.97f, 1f, 1f) + } + } + val alarm = if (state == PetState.ERROR) track(loop(t, 2f), EaseInOut, 0f, 0f, 0.04f, 1f, 0.24f, 1f, 0.3f, 0f, 1f, 0f) else 0f + withTransform({ + translate(dx, dy) + scale(sx, sy, Offset(200f, 317f)) + }) { + legs() + body(state, t, alarm) + if (state == PetState.WORKING) terminal(t) + arms(state, t) + head(state, t, alarm) + } + extras(state, t, text) +} + +private fun DrawScope.legs() { + for ((x, y, w, h, r) in listOf( + floatArrayOf(166f, 283f, 18f, 30f, 8f), floatArrayOf(216f, 283f, 18f, 30f, 8f), + floatArrayOf(158f, 305f, 30f, 12f, 6f), floatArrayOf(212f, 305f, 30f, 12f, 6f), + )) drawRoundRect(White, Offset(x, y), Size(w, h), CornerRadius(r)) +} + +private operator fun FloatArray.component5() = this[4] + +private fun DrawScope.body(state: PetState, t: Float, alarm: Float) { + drawRect(White, Offset(194f, 200f), Size(12f, 20f)) + drawRoundRect(White, Offset(148f, 215f), Size(104f, 72f), CornerRadius(22f)) + val glow = when (state) { + PetState.WORKING -> track(loop(t, 0.8f), EaseInOut, 0f, 1f, 0.5f, 0.5f, 1f, 1f) + PetState.SLEEP -> track(loop(t, 4f), EaseInOut, 0f, 0.35f, 0.5f, 0.8f, 1f, 0.35f) + else -> 1f + } + drawCircle(mix(Blue, Red, alarm).copy(alpha = glow), 11f, Offset(200f, 251f)) +} + +private fun DrawScope.terminal(t: Float) { + drawRoundRect(Term, Offset(150f, 256f), Size(100f, 40f), CornerRadius(8f)) + drawRoundRect(Blue, Offset(150f, 256f), Size(100f, 40f), CornerRadius(8f), style = Stroke(3f)) + drawRoundRect(Blue, Offset(160f, 266f), Size(44f, 5f), CornerRadius(2.5f)) + val grow = track(loop(t, 1.6f), EaseOut, 0f, 0.1f, 0.7f, 1f, 1f, 1f) + scale(grow, 1f, Offset(160f, 278f)) { drawRoundRect(TermLine, Offset(160f, 276f), Size(60f, 5f), CornerRadius(2.5f)) } + val cursor = track(loop(t, 0.7f), Step, 0f, 1f, 0.5f, 0.2f, 1f, 0.2f) + drawRoundRect(White.copy(alpha = cursor), Offset(224f, 276f), Size(10f, 5f), CornerRadius(2f)) +} + +/** One arm: from the shoulder through a curve to the hand, turned about the shoulder. */ +private fun DrawScope.arm(shoulder: Offset, control: Offset, hand: Offset, degrees: Float) { + rotate(degrees, shoulder) { + val path = Path().apply { + moveTo(shoulder.x, shoulder.y) + quadraticBezierTo(control.x, control.y, hand.x, hand.y) + } + drawPath(path, White, style = Stroke(10f, cap = StrokeCap.Round)) + drawCircle(White, 9f, hand) + } +} + +private fun DrawScope.arms(state: PetState, t: Float) { + val l = Offset(151f, 236f) + val r = Offset(249f, 236f) + when (state) { + PetState.IDLE -> { + val sway = track(loop(t, 3f), EaseInOut, 0f, 0f, 0.5f, 4f, 1f, 0f) + arm(l, Offset(127f, 246f), Offset(123f, 276f), sway) + arm(r, Offset(273f, 246f), Offset(277f, 276f), sway) + } + PetState.WORKING -> { + val p = loop(t, 0.32f) + arm(l, Offset(133f, 258f), Offset(157f, 270f), track(p, EaseInOut, 0f, 0f, 0.5f, -6f, 1f, 0f)) + arm(r, Offset(267f, 258f), Offset(243f, 270f), track(p, EaseInOut, 0f, -5f, 0.5f, 1f, 1f, -5f)) + } + PetState.QUESTION -> { + arm(l, Offset(127f, 246f), Offset(123f, 276f), 0f) + arm(r, Offset(279f, 230f), Offset(287f, 198f), track(loop(t, 0.9f), EaseInOut, 0f, -8f, 0.5f, 14f, 1f, -8f)) + } + PetState.DONE -> { + val p = loop(t, 1.2f) + arm(l, Offset(121f, 230f), Offset(115f, 196f), track(p, EaseInOut, 0f, 0f, 0.45f, 12f, 1f, 0f)) + arm(r, Offset(279f, 230f), Offset(285f, 196f), track(p, EaseInOut, 0f, 0f, 0.45f, -12f, 1f, 0f)) + } + PetState.ERROR, PetState.SLEEP -> { + arm(Offset(151f, 238f), Offset(137f, 254f), Offset(135f, 284f), 0f) + arm(Offset(249f, 238f), Offset(263f, 254f), Offset(265f, 284f), 0f) + } + } +} + +private fun DrawScope.head(state: PetState, t: Float, alarm: Float) { + val tilt = when (state) { + PetState.QUESTION -> track(loop(t, 2.4f), EaseInOut, 0f, -9f, 0.5f, -5f, 1f, -9f) + PetState.SLEEP -> 6f + else -> 0f + } + withTransform({ + rotate(tilt, Offset(200f, 215f)) + if (state == PetState.SLEEP) translate(0f, 6f) + }) { + antenna(state, t) + withTransform({ + translate(200f, 150f) + scale(0.62f, 0.62f, Offset.Zero) + translate(-64f, -111.86f) + }) { + drawPath(headMark, White) + drawCircle(mix(Blue, Red, alarm).copy(alpha = if (state == PetState.SLEEP) 0.6f else 1f), 55.98f, Offset(63.98f, 111.86f)) + } + eye(state, t) + if (state == PetState.WORKING) { + val sweep = 46f / (2f * PI.toFloat() * 39.6f) * 360f + rotate(360f * loop(t, 1.1f), Offset(200f, 150f)) { + drawArc(Blue, 0f, sweep, false, Offset(160.4f, 110.4f), Size(79.2f, 79.2f), style = Stroke(5f, cap = StrokeCap.Round)) + } + } + } +} + +private fun DrawScope.antenna(state: PetState, t: Float) { + val lean = when (state) { + PetState.ERROR -> 22f + PetState.SLEEP -> -28f + else -> 0f + } + rotate(lean, Offset(200f, 100f)) { + drawLine(White, Offset(200f, 100f), Offset(200f, 52f), 7f, StrokeCap.Round) + var radius = 10f + val (color, alpha) = when (state) { + PetState.IDLE -> Blue to track(loop(t, 3f), EaseInOut, 0f, 1f, 0.5f, 0.45f, 1f, 1f) + PetState.WORKING -> Blue to track(loop(t, 0.5f), Step, 0f, 1f, 0.5f, 0.2f, 1f, 0.2f) + PetState.QUESTION -> { + val p = loop(t, 1f) + radius = track(p, EaseInOut, 0f, 10f, 0.5f, 13f, 1f, 10f) + Amber to track(p, EaseInOut, 0f, 1f, 0.5f, 0.5f, 1f, 1f) + } + PetState.DONE -> Blue to 1f + PetState.ERROR -> Red to track(loop(t, 1f), Step, 0f, 1f, 0.5f, 0.25f, 1f, 0.25f) + PetState.SLEEP -> Slate to 1f + } + drawCircle(color.copy(alpha = alpha), radius, Offset(200f, 45f)) + } +} + +private fun DrawScope.eye(state: PetState, t: Float) { + when (state) { + PetState.DONE -> drawPath(Path().apply { moveTo(186f, 156f); quadraticBezierTo(203f, 136f, 220f, 156f) }, Ink, style = Stroke(7f, cap = StrokeCap.Round)) + PetState.SLEEP -> drawPath(Path().apply { moveTo(186f, 152f); quadraticBezierTo(203f, 162f, 220f, 152f) }, Ink, style = Stroke(6f, cap = StrokeCap.Round)) + PetState.ERROR -> { + val stroke = 6f + drawLine(Ink, Offset(193f, 139f), Offset(215f, 161f), stroke, StrokeCap.Round) + drawLine(Ink, Offset(215f, 139f), Offset(193f, 161f), stroke, StrokeCap.Round) + } + else -> { + val blink = if (state == PetState.IDLE) track(loop(t, 4.5f), EaseInOut, 0f, 1f, 0.44f, 1f, 0.47f, 0.1f, 0.5f, 1f, 1f, 1f) else 1f + val (px, py) = when (state) { + PetState.IDLE -> track(loop(t, 9f), EaseInOut, 0f, 0f, 0.3f, 0f, 0.36f, -7f, 0.52f, -7f, 0.58f, 5f, 0.8f, 5f, 0.86f, 0f, 1f, 0f) to 0f + PetState.WORKING -> track(loop(t, 1.6f), EaseInOut, 0f, -7f, 0.5f, 6f, 1f, -7f) to 0f + else -> 5f to -5f + } + scale(1f, blink, Offset(204f, 149f)) { + translate(px, py) { + drawCircle(Ink, 16f, Offset(204f, 149f)) + drawCircle(White, 5f, Offset(210f, 143f)) + drawCircle(White.copy(alpha = 0.7f), 2.2f, Offset(199f, 155f)) + } + } + } + } +} + +private fun DrawScope.speechTail(color: Color) { + drawPath(Path().apply { moveTo(264f, 82f); lineTo(254f, 100f); lineTo(278f, 86f); close() }, color) +} + +private fun DrawScope.extras(state: PetState, t: Float, text: androidx.compose.ui.text.TextMeasurer) { + when (state) { + PetState.QUESTION -> { + val p = loop(t, 2.4f) + val s = track(p, Pop, 0f, 0.4f, 0.12f, 1f, 0.88f, 1f, 1f, 0.9f) + val a = track(p, Pop, 0f, 0f, 0.12f, 1f, 0.88f, 1f, 1f, 0f).coerceIn(0f, 1f) + scale(s, s, Offset(262f, 96f)) { + drawRoundRect(Amber.copy(alpha = a), Offset(254f, 30f), Size(62f, 58f), CornerRadius(18f)) + speechTail(Amber.copy(alpha = a)) + val mark = text.measure("?", TextStyle(color = Ink.copy(alpha = a), fontSize = 42f.toSp(), fontWeight = FontWeight.Bold)) + drawText(mark, topLeft = Offset(285f - mark.size.width / 2f, 74f - mark.firstBaseline)) + } + } + PetState.ERROR -> { + val nudge = track(loop(t, 2f), EaseInOut, 0f, 0f, 0.06f, -10f, 0.14f, 8f, 0.22f, -4f, 0.3f, 0f, 1f, 0f) + rotate(nudge, Offset(262f, 96f)) { + drawRoundRect(Red, Offset(254f, 34f), Size(54f, 54f), CornerRadius(16f)) + speechTail(Red) + drawRoundRect(White, Offset(277f, 44f), Size(8f, 24f), CornerRadius(4f)) + drawCircle(White, 5f, Offset(281f, 77f)) + } + } + PetState.DONE -> for ((spark, path) in sparks) { + val p = loop(t, 1.2f, spark.lead) + val s = track(p, EaseInOut, 0f, 0f, 0.4f, 1f, 0.7f, 0.6f, 1f, 0f) + val turn = track(p, EaseInOut, 0f, 0f, 0.4f, 45f, 0.7f, 90f, 1f, 0f) + val a = track(p, EaseInOut, 0f, 0f, 0.4f, 1f, 0.7f, 0.8f, 1f, 0f) + if (s <= 0.01f) continue + withTransform({ + rotate(turn, Offset(spark.x, spark.y)) + scale(s, s, Offset(spark.x, spark.y)) + }) { drawPath(path, spark.color.copy(alpha = a)) } + } + PetState.SLEEP -> for ((i, z) in listOf(Triple(250f, 96f, 22f), Triple(268f, 74f, 30f), Triple(286f, 52f, 38f)).withIndex()) { + val p = loop(t, 4f, -1.3f * i) + val a = track(p, EaseOut, 0f, 0f, 0.2f, 1f, 1f, 0f) + val zx = track(p, EaseOut, 0f, -10f, 1f, 14f) + val zy = track(p, EaseOut, 0f, 16f, 1f, -22f) + val glyph = text.measure("z", TextStyle(color = White.copy(alpha = a), fontSize = z.third.toSp(), fontWeight = FontWeight.Bold)) + // The view box places a glyph by its baseline. + drawText(glyph, topLeft = Offset(z.first + zx, z.second + zy - glyph.firstBaseline)) + } + else -> Unit + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/EdgeFling.kt b/app/src/main/java/com/droiddeck/launcher/ui/EdgeFling.kt new file mode 100644 index 0000000000..700d031776 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/EdgeFling.kt @@ -0,0 +1,92 @@ +package com.droiddeck.launcher.ui + +import android.view.Choreographer +import kotlin.math.abs +import kotlin.math.sqrt + +/** + * Where something dragged and let go against the side edges, like a chat head, comes to rest: + * a quick sideways flick sends it to the side it was thrown toward from wherever it is; a slower + * release goes to the side its coasting would carry it to; and its height carries on with the + * throw. Velocities are pixels per second. + */ +internal object EdgeFling { + /** How far a throw coasts, in seconds of its release velocity. */ + const val COAST_S = 0.18f + /** A sideways speed past this many dp per second picks its side outright. */ + private const val FLICK_DP_S = 600f + + fun toRight(centerX: Float, span: Float, vx: Float, density: Float): Boolean { + if (abs(vx) > FLICK_DP_S * density) return vx > 0 + return centerX + vx * COAST_S > span / 2 + } + + fun restY(y: Float, vy: Float, min: Float, max: Float) = (y + vy * COAST_S).coerceIn(min, max.coerceAtLeast(min)) +} + +/** + * A spring in two dimensions that starts with the velocity it was let go with, stepped on each + * display frame, so a throw flows into its settle instead of starting over from rest. + */ +internal class FlingSpring( + private val stiffness: Float = 340f, + dampingRatio: Float = 0.74f, + private val onFrame: (Float, Float) -> Unit, +) : Choreographer.FrameCallback { + private val damping = 2f * dampingRatio * sqrt(stiffness) + private var x = 0f + private var y = 0f + private var vx = 0f + private var vy = 0f + private var toX = 0f + private var toY = 0f + private var last = 0L + private var onEnd: (() -> Unit)? = null + var running = false + private set + + fun start(fromX: Float, fromY: Float, velocityX: Float, velocityY: Float, targetX: Float, targetY: Float, end: (() -> Unit)? = null) { + cancel() + x = fromX; y = fromY; vx = velocityX; vy = velocityY; toX = targetX; toY = targetY + onEnd = end + if (Motion.scale == 0f) { + onFrame(toX, toY) + end?.invoke() + return + } + running = true + last = 0L + Choreographer.getInstance().postFrameCallback(this) + } + + fun cancel() { + if (!running) return + running = false + Choreographer.getInstance().removeFrameCallback(this) + } + + override fun doFrame(frameTimeNanos: Long) { + if (!running) return + val dt = if (last == 0L) 1f / 120f else ((frameTimeNanos - last) / 1e9f).coerceIn(0f, 1f / 20f) + last = frameTimeNanos + // Small fixed steps keep the spring stable however long a frame took. + var left = dt / Motion.scale.coerceAtLeast(0.1f) + while (left > 0f) { + val h = minOf(left, 1f / 480f) + vx += (-stiffness * (x - toX) - damping * vx) * h + vy += (-stiffness * (y - toY) - damping * vy) * h + x += vx * h + y += vy * h + left -= h + } + val settled = abs(x - toX) < 0.5f && abs(y - toY) < 0.5f && abs(vx) < 20f && abs(vy) < 20f + if (settled) { + running = false + onFrame(toX, toY) + onEnd?.invoke() + return + } + onFrame(x, y) + Choreographer.getInstance().postFrameCallback(this) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 3354839a7d..c3a5bb3784 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -459,6 +459,13 @@ internal fun SetupPanel( ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { com.droiddeck.launcher.agent.AgentTab.set(railContext, it) } + ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { + AgentPet.set(railContext, it) + } + if (AgentPet.enabled && !AgentPet.allowed) ActionRow( + stringResource(R.string.setup_agent_pet_float), stringResource(R.string.setup_agent_pet_float_hint), + stringResource(R.string.setup_agent_pet_allow), onClick = { AgentPet.requestFloating(railContext) }, + ) } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc7c632ddb..d98d3e6462 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2689,6 +2689,13 @@ Sidebar labels Show names under the sidebar icons. Turn off for a slimmer sidebar. Agent tab + Agent pet + DeeDee floats over the launcher and games and shows what the agent is doing. + Over other apps + Let DeeDee float over every app and open its chat there + Allow + DeeDee + Chat with DeeDee Display Larger cards Smaller cards diff --git a/app/src/test/java/com/droiddeck/launcher/ui/EdgeFlingTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/EdgeFlingTest.kt new file mode 100644 index 0000000000..5a0e298541 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/EdgeFlingTest.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class EdgeFlingTest { + private val density = 2f + + @Test fun aQuickFlickGoesTheWayItWasThrownFromAnywhere() { + assertFalse(EdgeFling.toRight(centerX = 1800f, span = 1920f, vx = -1500f, density = density)) + assertTrue(EdgeFling.toRight(centerX = 100f, span = 1920f, vx = 1500f, density = density)) + } + + @Test fun aSlowReleaseGoesWhereItWouldCoast() { + assertTrue(EdgeFling.toRight(centerX = 1000f, span = 1920f, vx = 0f, density = density)) + assertFalse(EdgeFling.toRight(centerX = 900f, span = 1920f, vx = 0f, density = density)) + assertFalse(EdgeFling.toRight(centerX = 1100f, span = 1920f, vx = -1100f, density = density)) + } + + @Test fun theHeightCarriesOnWithTheThrowAndStaysOnScreen() { + assertEquals(436f, EdgeFling.restY(400f, 200f, 0f, 1000f), 0.01f) + assertEquals(1000f, EdgeFling.restY(900f, 5000f, 0f, 1000f), 0.01f) + assertEquals(24f, EdgeFling.restY(100f, -5000f, 24f, 1000f), 0.01f) + } +} From b5f6122d49a29ee07f889ce05695e59e4d8af3d6 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 12 Nov 2026 16:03:41 -0500 Subject: [PATCH 057/101] Stop walking SD card libraries on every session start and game launch (#2533) * Stop searching whole libraries on every game launch and session start The install script search ran over every library whenever any game's manifest changed, and again on each launch. It now runs per game, only when that game's build changes, and a launch that names its scripts does no search at all. A store game's shortcut walked its install folder on every scan instead of reusing the ranking the scan keeps. * Search a library for install scripts after the session has started, not before * fix(session): keep deferred seeding off a running prefix and recheck old folder caches * test(session): bound the held library search in the deferred seeding test * fix(session): search a game again when its install script search failed --- .../droiddeck/launcher/frontend/AddedGames.kt | 2 +- .../droiddeck/launcher/runtime/BattleNet.kt | 2 +- .../launcher/runtime/BattleNetTest.kt | 14 +++ .../usr/local/bin/droiddeck-seed-redists | 79 ++++++++++-- .../overlay/usr/local/bin/droiddeck-session | 4 +- tools/tests/test_seed_redists.py | 118 ++++++++++++++++++ 6 files changed, 204 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index c7d774bf2e..02edb1bcf8 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -97,7 +97,7 @@ object AddedGames { return File(LinuxRuntime.rootDir(context), guest.removePrefix("/")) } - fun candidates(folder: File): List = rank(folder).exes + fun candidates(folder: File, reuse: Boolean = false): List = rank(folder, reuse).exes fun rank(folder: File, reuse: Boolean = false): GameExePicker.Ranking { val key = "${folder.path}|${folder.lastModified()}" diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index e1dd1fff21..eeab317afe 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -374,7 +374,7 @@ object BattleNet { val guestPrefix = added.guestPath(context, prefix(context)) ?: return null val crc = java.util.zip.CRC32().apply { update("\"$guestExe\"${game.name}".toByteArray()) }.value val appId = com.droiddeck.launcher.session.SessionPrefs.addedGameAppId(context, game.folder.path, crc or 0x80000000L) - val exe = added.candidates(game.folder).firstOrNull() ?: client + val exe = added.candidates(game.folder, reuse = true).firstOrNull() ?: client return com.droiddeck.launcher.frontend.AddedGames.Game( game.folder, game.name, exe, guestExe, guestDir, appId, (appId shl 32) or 0x02000000L, listOf(exe), source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = game.uid, diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index c9a3fcb9e4..f74528c725 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -374,6 +374,20 @@ class BattleNetTest { } + @Test fun aScannedGamesShortcutReusesTheKeptRankingInsteadOfWalkingItsFolder() { + val added = com.droiddeck.launcher.frontend.AddedGames + val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Kept Game").apply { mkdirs() } + File(folder, "Game.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) + val kept = File(folder, "Other.exe").apply { writeBytes(byteArrayOf(0x4d, 0x5a)) } + com.droiddeck.launcher.frontend.AddedGamesCache(File(context.filesDir, com.droiddeck.launcher.frontend.AddedGamesCache.FILE)).apply { + keepRank(folder, com.droiddeck.launcher.frontend.GameExePicker.Ranking(listOf(kept), listOf(10), false)) + save() + } + added.scan(context) + assertEquals(kept, BattleNet.shortcut(context, BattleNet.Game("fenris", "Kept Game", "Fen", folder))!!.exe) + assertEquals("Game.exe", added.candidates(folder).first().name) + } + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index babcb86d3d..d2d2809bd3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -56,18 +56,75 @@ libraries="$steam_root" for library in $LIBRARIES; do libraries="$libraries $library"; done libraries=$(printf '%s\n%s\n' "$libraries" "$(sed -n 's/^[[:space:]]*"path"[[:space:]]*"\(.*\)"[[:space:]]*$/\1/p' "$steam_root/steamapps/libraryfolders.vdf" 2>/dev/null)" | awk 'NF && !seen[$0]++') -sig=$(while IFS= read -r library; do ls -l --time-style=+%s "$library"/steamapps/appmanifest_*.acf 2>/dev/null; done <<<"$libraries" | cksum) -if [ "$(head -n 1 "$cache" 2>/dev/null)" != "$sig" ]; then - { - printf '%s\n' "$sig" - while IFS= read -r library; do - [ -d "$library/steamapps/common" ] || continue - find "$library/steamapps/common" -mindepth 2 -maxdepth 5 -iname 'installscript*.vdf' \ - -not -path '*/Steamworks Shared/*' 2>/dev/null - done <<<"$libraries" | sort -u - } >"$cache.tmp" && mv -f "$cache.tmp" "$cache" +games=$(while IFS= read -r library; do + library="$library" awk ' + function flush() { if (dir != "") printf "%s|%s|%s|%s\t%s/steamapps/common/%s\n", file, build, updated, size, ENVIRON["library"], dir } + FNR == 1 { flush(); file = FILENAME; dir = build = updated = size = "" } + { + n = split($0, part, "\"") + for (i = 2; i + 2 <= n; i += 2) { + name = tolower(part[i]) + if (name == "installdir" && dir == "") dir = part[i + 2] + else if (name == "buildid" && build == "") build = part[i + 2] + else if (name == "lastupdated" && updated == "") updated = part[i + 2] + else if (name == "sizeondisk" && size == "") size = part[i + 2] + else continue + i += 2 + } + } + END { flush() } + ' "$library"/steamapps/appmanifest_*.acf 2>/dev/null +done <<<"$libraries") +legacy= +[ -s "$cache" ] && ! grep -q $'\t' "$cache" && legacy=$(tail -n +2 "$cache"; echo .) +declare -A scanned=() current=() +read_scanned() { + scanned=() + while IFS=$'\t' read -r key _; do + [ -n "$key" ] && scanned[$key]=1 + done < <(grep $'\t' "$cache" 2>/dev/null) +} +read_scanned +later= +fresh=() +while IFS=$'\t' read -r key dir; do + [ -n "$key" ] || continue + current[$key]=1 + [ -z "${scanned[$key]:-}" ] || continue + if [ -z "$legacy" ] && [ -n "${DROIDDECK_SEED_SCRIPTS:-}${DROIDDECK_SEED_LATER:-}" ]; then + [ -z "${DROIDDECK_SEED_LATER:-}" ] || later=1 + continue + fi + [ -d "$dir" ] || continue + scanned[$key]=1 + if [ -n "$legacy" ] && [ "$cache" -nt "${key%%|*}" ]; then + found=$(printf '%s\n' "${legacy%.}" | dir="$dir" awk 'index($0, ENVIRON["dir"] "/") == 1') + else + found=$(find "$dir" -mindepth 1 -maxdepth 4 -iname 'installscript*.vdf' \ + -not -path '*/Steamworks Shared/*' 2>/dev/null) || continue + found=$(printf '%s\n' "$found" | sort -u) + fi + fresh+=("$key" "$found") +done <<<"$games" +exec 9>"$cache.lock" && command -v flock >/dev/null 2>&1 && flock 9 +if [ ${#fresh[@]} -gt 0 ]; then + read_scanned + for ((i = 0; i < ${#fresh[@]}; i += 2)); do + [ -z "${scanned[${fresh[i]}]:-}" ] || continue + printf '%s\n' "${fresh[i + 1]}" | key="${fresh[i]}" awk '{ print ENVIRON["key"] "\t" $0 }' >>"$cache" + done fi -game_scripts() { { tail -n +2 "$cache" 2>/dev/null; printf '%s\n' "${DROIDDECK_SEED_SCRIPTS:-}"; } | sed '/^$/d' | tr '\n' '\0'; } +if [ -n "$later" ]; then + (DROIDDECK_SEED_LATER= DROIDDECK_SEED_SCRIPTS= DROIDDECK_SEED_DEFERRED=1 setsid "$0" "$steam_root" >/dev/null 2>&1 9>&- &) +fi +if [ -e "$cache" ]; then + keys=$(printf '%s\n' "${!current[@]}") awk -F'\t' ' + BEGIN { n = split(ENVIRON["keys"], key, "\n"); for (i = 1; i <= n; i++) want[key[i]] = 1 } + NF > 1 && ($1 in want) + ' "$cache" >"$cache.tmp" && { cmp -s "$cache.tmp" "$cache" && rm -f "$cache.tmp" || mv -f "$cache.tmp" "$cache"; } +fi +[ -z "${DROIDDECK_SEED_DEFERRED:-}" ] || ! pgrep -x wineserver >/dev/null 2>&1 || exit 0 +game_scripts() { { cut -s -f2- "$cache" 2>/dev/null; printf '%s\n' "${DROIDDECK_SEED_SCRIPTS:-}"; } | sed '/^$/d' | tr '\n' '\0'; } game_pairs=$(game_scripts | read_scripts) [ -n "$(printf '%s' "$game_pairs" | tr -d '[:space:]')" ] && pairs=$(printf '%s\n%s\n' "$pairs" "$game_pairs" | sort -u | sed '/^$/d') declare -A vulkan=() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 9ec12398f4..8bb519db52 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1190,7 +1190,7 @@ case $mode in step "adding the app's own games to the client's library" droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true fi - droiddeck-seed-redists "$steam_root" || true + DROIDDECK_SEED_LATER=1 droiddeck-seed-redists "$steam_root" || true else _bl_x64_tool=$(droiddeck-steam-x64 --default-tool) if [ -n "$_bl_x64_tool" ]; then @@ -1204,7 +1204,7 @@ case $mode in if [ -z "${BL_DESKTOP:-}" ] && [ "${BL_STEAM_UI:-}" != desktop ]; then droiddeck-steam-ui-scale "$steam_root" "${BL_WIDTH:-1280}" "${BL_HEIGHT:-720}" || true fi - droiddeck-seed-redists "$steam_root" || true + DROIDDECK_SEED_LATER=1 droiddeck-seed-redists "$steam_root" || true fi if [ -n "${BL_SHADER_PRECACHE:-}" ]; then droiddeck-steam-shaders "$BL_SHADER_PRECACHE" "$XDG_DATA_HOME/Steam" \ diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 1440b41b0f..f00dc1ae26 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -2,6 +2,7 @@ import os import shutil import subprocess import tempfile +import time import unittest from pathlib import Path @@ -128,6 +129,67 @@ class SeedRedistsTest(unittest.TestCase): self.run_seed(str(sd)) self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + def manifest(self, name, build): + path = self.steam / "steamapps/appmanifest_77.acf" + path.write_text('"AppState"\n{\n\t"installdir"\t\t"%s"\n\t"buildid"\t\t"%s"\n}\n' % (name, build)) + return path + + def test_a_game_is_searched_again_only_when_its_build_changes(self): + late = self.steam / "steamapps/common/Late Game/installscript.vdf" + late.parent.mkdir(parents=True) + manifest = self.manifest("Late Game", "1") + self.run_seed() + late.write_text(GAME_SCRIPT) + manifest.write_text(manifest.read_text() + "\n") + self.run_seed() + self.assertNotIn("VCRedist2022", self.reg.read_text()) + self.manifest("Late Game", "2") + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + + def test_one_changed_game_leaves_the_other_games_unsearched(self): + other = self.game("Other Game").parent / "installscript_extra.vdf" + self.manifest("Late Game", "1") + self.run_seed() + other.write_text(GAME_SCRIPT.replace("VCRedist2022", "Unsearched")) + self.manifest("Late Game", "2") + self.run_seed() + self.assertNotIn("Unsearched", self.reg.read_text()) + + def test_a_call_that_names_its_scripts_does_not_search_the_libraries(self): + script = self.game() + named = self.tmp / "legacycompat/evaluatorscript_1.vdf" + named.parent.mkdir(parents=True) + named.write_text(GAME_SCRIPT.replace("VCRedist2022", "Named")) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_SCRIPTS=str(named)) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + reg = self.reg.read_text() + self.assertIn('"Named"=dword:00000001', reg) + self.assertNotIn("VCRedist2022", reg) + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + self.assertIn(str(script), (self.steam / ".droiddeck-game-scripts").read_text()) + + def test_a_removed_game_leaves_the_list(self): + script = self.game() + self.run_seed() + cache = self.steam / ".droiddeck-game-scripts" + self.assertIn(str(script), cache.read_text()) + for manifest in (self.steam / "steamapps").glob("appmanifest_*.acf"): + manifest.unlink() + self.run_seed() + self.assertEqual("", cache.read_text()) + + def test_a_list_from_an_earlier_version_is_taken_over_without_a_search(self): + script = self.steam / "steamapps/common/Old Game/a/b/c/d/e/installscript.vdf" + script.parent.mkdir(parents=True) + script.write_text(GAME_SCRIPT) + self.manifest("Old Game", "1") + (self.steam / ".droiddeck-game-scripts").write_text("123 456\n%s\n" % script) + self.run_seed() + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + self.assertIn("\t%s\n" % script, (self.steam / ".droiddeck-game-scripts").read_text()) + def test_current_user_and_machine_markers_go_to_their_own_registries(self): self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) with self.reg.open("a") as out: @@ -398,6 +460,62 @@ class SeedRedistsTest(unittest.TestCase): self.assertEqual(self.reg.read_text().count('"Vulkan111080"'), 2) + def test_a_session_start_leaves_the_library_search_to_a_later_run(self): + self.game(script=GAME_SCRIPT.replace("Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2022", "SOFTWARE\\\\AGEIA Technologies").replace("VCRedist2022", "PhysX Version")) + shim = self.tmp / "bin" + shim.mkdir() + go = self.tmp / "go" + (shim / "find").write_text('#!/bin/sh\ncase "$*" in *"installscript*"*) n=0; while [ ! -e "%s" ] && [ $n -lt 600 ]; do sleep 0.1; n=$((n + 1)); done;; esac\nexec %s "$@"\n' % (go, shutil.which("find"))) + (shim / "find").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_LATER="1", PATH="%s:%s" % (shim, os.environ["PATH"])) + marker = '"PhysX Version"=dword:00000001' + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + self.assertNotIn(marker, self.reg.read_text()) + go.touch() + deadline = time.monotonic() + 30 + while marker not in self.reg.read_text() and time.monotonic() < deadline: + time.sleep(0.2) + self.assertIn(marker, self.reg.read_text()) + before = self.reg.read_text() + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + time.sleep(0.5) + self.assertEqual(before, self.reg.read_text()) + + def test_a_game_whose_search_failed_is_searched_again(self): + self.game() + broken = self.tmp / "broken" + broken.touch() + shim = self.tmp / "bin" + shim.mkdir() + (shim / "find").write_text('#!/bin/sh\n%s "$@"\n[ ! -e "%s" ]\n' % (shutil.which("find"), broken)) + (shim / "find").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", PATH="%s:%s" % (shim, os.environ["PATH"])) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, check=True) + self.assertNotIn("VCRedist2022", self.reg.read_text()) + broken.unlink() + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, check=True) + self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + + def test_a_later_run_leaves_the_registry_alone_while_a_wine_server_runs(self): + self.game(script=GAME_SCRIPT.replace("Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2022", "SOFTWARE\\\\AGEIA Technologies").replace("VCRedist2022", "PhysX Version")) + shim = self.tmp / "bin" + shim.mkdir() + (shim / "pgrep").write_text("#!/bin/sh\nexit 0\n") + (shim / "pgrep").chmod(0o755) + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_LATER="1", PATH="%s:%s" % (shim, os.environ["PATH"])) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + cache = self.steam / ".droiddeck-game-scripts" + deadline = time.monotonic() + 30 + while not (cache.exists() and "installscript" in cache.read_text().lower()) and time.monotonic() < deadline: + time.sleep(0.2) + self.assertIn("installscript", cache.read_text().lower()) + time.sleep(1) + self.assertNotIn("PhysX Version", self.reg.read_text()) + env.pop("DROIDDECK_SEED_LATER") + env["PATH"] = os.environ["PATH"] + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True) + self.assertIn('"PhysX Version"=dword:00000001', self.reg.read_text()) + def evaluator(self, appid, install_script): script = self.tmp / ("legacycompat/evaluatorscript_%s.vdf" % appid) script.parent.mkdir(parents=True) From 60098d4a1b989720ad34a0e385964ece65813bac Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Fri, 13 Nov 2026 01:08:07 +0000 Subject: [PATCH 058/101] Render Agent Markdown and open web links in an external browser (#2546) * Render Agent Markdown with clickable links in an external browser * Preserve Markdown selection and expose table text to copy and accessibility --- app/build.gradle | 5 + .../com/droiddeck/launcher/ui/AgentEntries.kt | 82 -------- .../droiddeck/launcher/ui/AgentMarkdown.kt | 154 +++++++++++++++ app/src/main/res/values/strings.xml | 1 + .../launcher/ui/AgentMarkdownTest.kt | 185 ++++++++++++++++-- 5 files changed, 327 insertions(+), 100 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentMarkdown.kt diff --git a/app/build.gradle b/app/build.gradle index d493877cc2..57b14a87fc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -382,6 +382,11 @@ dependencies { implementation 'androidx.activity:activity-compose:1.8.2' implementation 'androidx.compose.material:material-icons-extended' implementation 'io.coil-kt:coil-compose:2.6.0' + implementation 'io.noties.markwon:core:4.6.2' + implementation 'io.noties.markwon:ext-strikethrough:4.6.2' + implementation 'io.noties.markwon:ext-tables:4.6.2' + implementation 'io.noties.markwon:ext-tasklist:4.6.2' + implementation 'com.atlassian.commonmark:commonmark-ext-autolink:0.13.0' implementation 'com.caverock:androidsvg-aar:1.4' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' implementation 'com.flyfishxu:kadb-android:1.2.1' diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt index d651aec3a5..3300b7f8a7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt @@ -42,14 +42,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.AnnotatedString -import androidx.compose.ui.text.SpanStyle -import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage @@ -329,81 +325,3 @@ internal fun AttachmentChip(path: String, onRemove: (() -> Unit)?) { } } } - -/** The Markdown agents write: headings, lists, fenced code, `code` and **bold**. */ -@Composable -internal fun AgentMarkdown(text: String, modifier: Modifier) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - Column(modifier, verticalArrangement = Arrangement.spacedBy(6.dp)) { - for (block in markdownBlocks(text)) when (block) { - is MdBlock.Code -> Text(block.text, fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurface, - modifier = Modifier.fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(12.dp)) - is MdBlock.Line -> Text( - inlineMarkdown(block.text, pal.primary2, pal.surfaceVariant), - fontSize = if (block.heading) 17.sp else 15.sp, - fontWeight = if (block.heading) FontWeight.Bold else null, - lineHeight = 22.sp, color = colors.onSurface, - modifier = if (block.bullet) Modifier.padding(start = 12.dp) else Modifier, - ) - } - } -} - -internal sealed interface MdBlock { - data class Line(val text: String, val heading: Boolean = false, val bullet: Boolean = false) : MdBlock - data class Code(val text: String) : MdBlock -} - -private val HEADING = Regex("^#{1,6}\\s+") -private val BULLET = Regex("^\\s*[-*+]\\s+") - -internal fun markdownBlocks(text: String): List { - val out = mutableListOf() - val code = StringBuilder() - var inCode = false - for (raw in text.lines()) { - if (raw.trimStart().startsWith("```")) { - if (inCode) { - out += MdBlock.Code(code.toString().trimEnd('\n')) - code.clear() - } - inCode = !inCode - continue - } - if (inCode) { - code.append(raw).append('\n') - continue - } - val line = raw.trimEnd() - if (line.isBlank()) continue - val heading = HEADING.find(line) - val bullet = BULLET.find(line) - out += when { - heading != null -> MdBlock.Line(line.substring(heading.range.last + 1), heading = true) - bullet != null -> MdBlock.Line("• " + line.substring(bullet.range.last + 1), bullet = true) - else -> MdBlock.Line(line) - } - } - if (inCode && code.isNotEmpty()) out += MdBlock.Code(code.toString().trimEnd('\n')) - return out -} - -internal fun inlineMarkdown(text: String, codeColor: Color, codeBackground: Color): AnnotatedString = buildAnnotatedString { - var i = 0 - while (i < text.length) { - val boldEnd = if (text.startsWith("**", i)) text.indexOf("**", i + 2) else -1 - val tickEnd = if (text[i] == '`') text.indexOf('`', i + 1) else -1 - when { - boldEnd > i + 2 -> { - withStyle(SpanStyle(fontWeight = FontWeight.Bold)) { append(text, i + 2, boldEnd) } - i = boldEnd + 2 - } - tickEnd > i + 1 -> { - withStyle(SpanStyle(fontFamily = FontFamily.Monospace, color = codeColor, background = codeBackground)) { append(text, i + 1, tickEnd) } - i = tickEnd + 1 - } - else -> append(text[i++]) - } - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentMarkdown.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentMarkdown.kt new file mode 100644 index 0000000000..0d85087f85 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentMarkdown.kt @@ -0,0 +1,154 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.text.Selection +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.Spanned +import android.widget.TextView +import android.widget.Toast +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.unit.sp +import androidx.compose.ui.viewinterop.AndroidView +import com.droiddeck.launcher.R +import io.noties.markwon.AbstractMarkwonPlugin +import io.noties.markwon.Markwon +import io.noties.markwon.MarkwonConfiguration +import io.noties.markwon.MarkwonVisitor +import io.noties.markwon.core.MarkwonTheme +import io.noties.markwon.ext.strikethrough.StrikethroughPlugin +import io.noties.markwon.ext.tables.TableAwareMovementMethod +import io.noties.markwon.ext.tables.TablePlugin +import io.noties.markwon.ext.tables.TableRowSpan +import io.noties.markwon.ext.tasklist.TaskListPlugin +import org.commonmark.ext.autolink.AutolinkExtension +import org.commonmark.parser.Parser +import org.commonmark.ext.gfm.tables.TableCell +import org.commonmark.ext.gfm.tables.TableHead +import org.commonmark.ext.gfm.tables.TableRow +import org.commonmark.node.AbstractVisitor +import org.commonmark.node.CustomNode +import org.commonmark.node.Node + +@Composable +internal fun AgentMarkdown(text: String, modifier: Modifier) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val density = LocalDensity.current + val textSize = with(density) { 15.sp.toPx() } + val lineSpacing = with(density) { 3.sp.toPx() } + val renderer = remember(context, pal.primary2, pal.surfaceVariant, density) { + agentMarkdownRenderer(context, pal.primary2.toArgb(), pal.surfaceVariant.toArgb()) + } + val rendered = remember(renderer, text) { renderer.toMarkdown(text) } + AndroidView( + modifier = modifier, + factory = { TextView(it).apply { + setTextIsSelectable(true) + movementMethod = TableAwareMovementMethod.create() + includeFontPadding = false + } }, + update = { view -> + view.setTextColor(colors.onSurface.toArgb()) + view.setLinkTextColor(pal.primary2.toArgb()) + view.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, textSize) + view.setLineSpacing(lineSpacing, 1f) + setAgentMarkdown(view, renderer, rendered) + }, + ) +} + +internal fun agentMarkdownRenderer(context: Context, linkColor: Int, codeBackground: Int): Markwon = + Markwon.builder(context) + .usePlugin(StrikethroughPlugin.create()) + .usePlugin(TablePlugin.create(context)) + .usePlugin(TaskListPlugin.create(context)) + .usePlugin(object : AbstractMarkwonPlugin() { + override fun configureParser(builder: Parser.Builder) { + builder.extensions(listOf(AutolinkExtension.create())) + } + + override fun afterRender(node: Node, visitor: MarkwonVisitor) { + val rows = mutableListOf() + node.accept(object : AbstractVisitor() { + override fun visit(customNode: CustomNode) { + if (customNode is TableHead || customNode is TableRow) { + val cells = generateSequence(customNode.firstChild) { it.next }.filterIsInstance().toList() + if (cells.isNotEmpty()) rows += cells.joinToString(" | ") { markdownCellText(it) } + else visitChildren(customNode) + } else visitChildren(customNode) + } + }) + if (rows.isEmpty()) return + // Markwon keeps table cells outside the text buffer; expose them for copy and accessibility. + val builder = visitor.builder() + val text = SpannableStringBuilder(builder.removeFromEnd(0)) + val spans = text.getSpans(0, text.length, TableRowSpan::class.java).sortedBy { text.getSpanStart(it) } + for ((row, span) in spans.withIndex().reversed()) { + val start = text.getSpanStart(span) + val end = text.getSpanEnd(span) + val content = rows[row].ifEmpty { "\u00a0" } + text.removeSpan(span) + text.replace(start, end, content) + text.setSpan(span, start, start + content.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + } + builder.append(text) + } + + override fun configureTheme(builder: MarkwonTheme.Builder) { + builder.linkColor(linkColor).codeBackgroundColor(codeBackground) + } + + override fun configureConfiguration(builder: MarkwonConfiguration.Builder) { + builder.linkResolver { view, link -> + val intent = agentBrowserIntent(link) ?: return@linkResolver + try { + view.context.startActivity(intent) + } catch (_: android.content.ActivityNotFoundException) { + Toast.makeText(view.context, R.string.agent_browser_unavailable, Toast.LENGTH_SHORT).show() + } + } + } + }) + .build() + +private fun markdownCellText(node: Node): String = buildString { + node.accept(object : AbstractVisitor() { + override fun visit(text: org.commonmark.node.Text) { append(text.literal) } + override fun visit(code: org.commonmark.node.Code) { append(code.literal) } + override fun visit(lineBreak: org.commonmark.node.SoftLineBreak) { append(' ') } + override fun visit(lineBreak: org.commonmark.node.HardLineBreak) { append('\n') } + override fun visit(html: org.commonmark.node.HtmlInline) { append(html.literal) } + }) +} + +internal fun setAgentMarkdown(view: TextView, renderer: Markwon, rendered: Spanned) { + if (view.tag === rendered) return + val start = view.selectionStart + val end = view.selectionEnd + val sameText = view.text.toString() == rendered.toString() + renderer.setParsedMarkdown(view, rendered) + view.tag = rendered + if (sameText && start in 0..rendered.length && end in 0..rendered.length) { + (view.text as? Spannable)?.let { Selection.setSelection(it, start, end) } + } +} + +internal fun agentBrowserIntent(link: String): Intent? { + val uri = Uri.parse(link) + if (uri.scheme?.lowercase() !in listOf("http", "https") || uri.host.isNullOrBlank()) return null + return Intent(Intent.ACTION_VIEW, uri).apply { + addCategory(Intent.CATEGORY_BROWSABLE) + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + selector = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_APP_BROWSER) + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d98d3e6462..4d2e7cfe52 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3998,4 +3998,5 @@ Scarlet Snow White surfaces with red accents. + No web browser is available to open this link. diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt index c7ad34d894..171fe16f9f 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/AgentMarkdownTest.kt @@ -1,27 +1,176 @@ package com.droiddeck.launcher.ui -import androidx.compose.ui.graphics.Color -import org.junit.Assert.assertEquals +import android.content.Intent +import android.content.ClipboardManager +import android.text.Selection +import android.text.Spannable +import io.noties.markwon.ext.tables.TableRowSpan +import android.graphics.Color +import android.text.Spanned +import android.text.style.ClickableSpan +import android.widget.TextView +import org.junit.Assert.* import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.ConscryptMode +import org.robolectric.annotation.Config +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +@ConscryptMode(ConscryptMode.Mode.OFF) class AgentMarkdownTest { - @Test fun blocksSplitHeadingsBulletsAndCode() { - val blocks = markdownBlocks("## Done\n\n- one\n* two\n```kotlin\nval a = 1\n\nval b = 2\n```\nplain") - assertEquals( - listOf( - MdBlock.Line("Done", heading = true), - MdBlock.Line("• one", bullet = true), - MdBlock.Line("• two", bullet = true), - MdBlock.Code("val a = 1\n\nval b = 2"), - MdBlock.Line("plain"), - ), - blocks, - ) + private val context get() = RuntimeEnvironment.getApplication() + private val renderer get() = agentMarkdownRenderer(context, Color.BLUE, Color.DKGRAY) + private fun Spanned.links() = getSpans(0, length, ClickableSpan::class.java).toList() + + @Test fun namedPullRequestLinksKeepTheirLabelsAndOpenAnExternalBrowser() { + val text = renderer.toMarkdown("Created [**PR #2540**](https://github.com/Droid-Deck/DroidDeck/pull/2540).") + assertEquals("Created PR #2540.", text.toString()) + val link = text.links().single() + assertEquals("PR #2540", text.subSequence(text.getSpanStart(link), text.getSpanEnd(link)).toString()) + link.onClick(TextView(context)) + val intent = shadowOf(context).nextStartedActivity + assertEquals(Intent.ACTION_VIEW, intent.action) + assertEquals("https://github.com/Droid-Deck/DroidDeck/pull/2540", intent.dataString) + val browser = requireNotNull(intent.selector) + assertEquals(Intent.ACTION_MAIN, browser.action) + assertTrue(browser.hasCategory(Intent.CATEGORY_APP_BROWSER)) + assertTrue(intent.flags and Intent.FLAG_ACTIVITY_NEW_TASK != 0) } - @Test fun inlineMarkersAreDroppedAndUnclosedOnesKept() { - val text = inlineMarkdown("a **b** `c` d ** e ` f", Color.Red, Color.Black) - assertEquals("a b c d ** e ` f", text.text) - assertEquals(2, text.spanStyles.size) + @Test fun bareUrlsAndAutolinksAreClickableWithoutTrailingPunctuation() { + val text = renderer.toMarkdown("Visit https://github.com/Droid-Deck/DroidDeck/pull/2540. Also .") + assertEquals(2, text.links().size) + val labels = text.links().map { text.subSequence(text.getSpanStart(it), text.getSpanEnd(it)).toString() } + assertTrue(labels.contains("https://github.com/Droid-Deck/DroidDeck/pull/2540")) + assertTrue(labels.contains("https://example.org/help")) + } + + @Test fun referenceLinksAndEscapedParenthesesAreParsed() { + val text = renderer.toMarkdown("[Docs][guide] and [details](https://example.org/a\\(b\\)).\n\n[guide]: https://example.org/docs") + assertEquals("Docs and details.", text.toString().trimEnd()) + assertEquals(2, text.links().size) + } + + @Test fun codeStaysLiteralAndDoesNotBecomeClickable() { + val text = renderer.toMarkdown("`[PR](https://example.org)`\n\n~~~kotlin\nval url = \"https://example.org\"\n~~~") + assertTrue(text.toString().contains("[PR](https://example.org)")) + assertTrue(text.toString().contains("val url = \"https://example.org\"")) + assertTrue(text.links().isEmpty()) + } + + @Test fun commonMarkdownBlocksAndNestedFormattingRenderWithoutMarkers() { + val text = renderer.toMarkdown("# Heading\n\n> A **bold and *italic*** quote\n\n1. First\n - Nested\n2. Second\n\n~~Removed~~\n\n- [x] Done\n- [ ] Pending") + val result = text.toString() + for (word in listOf("Heading", "A bold and italic quote", "First", "Nested", "Second", "Removed", "Done", "Pending")) { + assertTrue(result, result.contains(word)) + } + for (marker in listOf("# Heading", "**", "~~", "[x]", "[ ]")) assertFalse(result, result.contains(marker)) + } + + @Test fun tablesAreParsedWithLinksInsideCells() { + val root = renderer.parse("| Result | Link |\n| --- | --- |\n| Ready | [PR](https://github.com/owner/repo/pull/1) |") + assertEquals("TableBlock", root.firstChild.javaClass.simpleName) + var links = 0 + root.accept(object : org.commonmark.node.AbstractVisitor() { + override fun visit(link: org.commonmark.node.Link) { + links++ + assertEquals("https://github.com/owner/repo/pull/1", link.destination) + } + }) + assertEquals(1, links) + renderer.render(root) + } + + @Test fun colorChangesPreserveSelectionAndRefreshLinkSpans() { + val source = "Read [the PR](https://github.com/owner/repo/pull/1)" + val view = TextView(context).apply { setTextIsSelectable(true) } + val original = renderer + setAgentMarkdown(view, original, original.toMarkdown(source)) + Selection.setSelection(view.text as Spannable, 5, 11) + val updated = agentMarkdownRenderer(context, Color.RED, Color.LTGRAY) + val rendered = updated.toMarkdown(source) + setAgentMarkdown(view, updated, rendered) + assertEquals(5, view.selectionStart) + assertEquals(11, view.selectionEnd) + assertSame(rendered, view.tag) + val paint = android.text.TextPaint() + (view.text as Spanned).links().single().updateDrawState(paint) + assertEquals(Color.RED, paint.color) + } + + @Test fun reversedSelectionsAndCursorsSurviveColorChangesButNotContentChanges() { + val view = TextView(context).apply { setTextIsSelectable(true) } + val original = renderer + val updated = agentMarkdownRenderer(context, Color.RED, Color.LTGRAY) + setAgentMarkdown(view, original, original.toMarkdown("A long reply")) + for ((start, end) in listOf(8 to 2, 4 to 4)) { + Selection.setSelection(view.text as Spannable, start, end) + setAgentMarkdown(view, updated, updated.toMarkdown("A long reply")) + assertEquals(start, view.selectionStart) + assertEquals(end, view.selectionEnd) + } + setAgentMarkdown(view, updated, updated.toMarkdown("New")) + assertFalse(view.selectionStart == 4 && view.selectionEnd == 4) + } + + @Test fun tableCellsRemainInNativeCopyAndAccessibilityTextOnAndroid28() { + val source = "Before\n\n| Result | Link |\n| --- | --- |\n| **Ready** | [PR](https://github.com/owner/repo/pull/1) |\n| Pending | `code` |\n\nAfter" + val markwon = renderer + val rendered = markwon.toMarkdown(source) + val view = TextView(context).apply { setTextIsSelectable(true) } + setAgentMarkdown(view, markwon, rendered) + val expected = "Result | Link\nReady | PR\nPending | code" + assertTrue(rendered.toString(), rendered.toString().contains(expected)) + assertTrue(view.createAccessibilityNodeInfo().text.toString().contains(expected)) + Selection.setSelection(view.text as Spannable, 0, view.text.length) + assertTrue(view.onTextContextMenuItem(android.R.id.copy)) + val copied = context.getSystemService(ClipboardManager::class.java).primaryClip!!.getItemAt(0).text.toString() + assertEquals(rendered.toString(), copied) + val rows = rendered.getSpans(0, rendered.length, TableRowSpan::class.java) + assertEquals(3, rows.size) + assertTrue(rows.all { rendered.getSpanEnd(it) > rendered.getSpanStart(it) }) + } + + @Test fun tableLinksStillOpenTheBrowserAfterExposingCellText() { + val markwon = renderer + val rendered = markwon.toMarkdown("| Result | Link |\n| --- | --- |\n| Ready | [PR](https://github.com/owner/repo/pull/1) |") + val view = TextView(context).apply { setTextIsSelectable(true) } + setAgentMarkdown(view, markwon, rendered) + view.measure(android.view.View.MeasureSpec.makeMeasureSpec(900, android.view.View.MeasureSpec.EXACTLY), + android.view.View.MeasureSpec.makeMeasureSpec(2000, android.view.View.MeasureSpec.AT_MOST)) + view.layout(0, 0, 900, view.measuredHeight) + val canvas = android.graphics.Canvas(android.graphics.Bitmap.createBitmap(900, 2000, android.graphics.Bitmap.Config.ARGB_8888)) + view.draw(canvas) + val row = rendered.getSpans(0, rendered.length, TableRowSpan::class.java).maxBy { rendered.getSpanStart(it) } + val cell = requireNotNull(row.findLayoutForHorizontalOffset(row.cellWidth() + 1)) + (cell.text as Spanned).links().single().onClick(view) + assertEquals("https://github.com/owner/repo/pull/1", shadowOf(context).nextStartedActivity.dataString) + } + + @Test fun multipleTablesAndEmptyCellsKeepTheirOwnTextAndRowSpans() { + val rendered = renderer.toMarkdown("| One | Two |\n| --- | --- |\n| | X |\n\nBetween\n\n| Three | Four |\n| --- | --- |\n| Y | |") + val text = rendered.toString() + assertTrue(text, text.contains("One | Two\n | X")) + assertTrue(text, text.contains("Three | Four\nY | ")) + assertTrue(text, text.contains("Between")) + assertEquals(4, rendered.getSpans(0, rendered.length, TableRowSpan::class.java).size) + } + + @Test fun unfinishedStreamingMarkdownDoesNotLoseTextOrCrash() { + val source = "Read [the PR](https://github.com/owner/repo/pull/1)\n\n```kotlin\nval x = 1" + for (end in 1..source.length) renderer.toMarkdown(source.take(end)) + assertTrue(renderer.toMarkdown(source).toString().contains("val x = 1")) + } + + @Test fun browserIntentsOnlyAcceptAbsoluteWebLinks() { + for (link in listOf("javascript:alert(1)", "file:///etc/passwd", "intent://open", "content://private", "/local/file", "https:")) { + assertNull(link, agentBrowserIntent(link)) + } + assertNotNull(agentBrowserIntent("http://example.org")) + assertNotNull(agentBrowserIntent("https://github.com/owner/repo/pull/1?diff=split#discussion")) } } From bd4bfce3af08be4d496a7a5e52f98b2e318355d6 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Thu, 12 Nov 2026 19:10:03 -0600 Subject: [PATCH 059/101] fix(apps): move straight down into a short last row (#2544) Down from the row above a short last row landed on a tile further left, because the grid's own search only sees the tiles laid out so far. Down now goes to the tile directly below, or to the last tile when there is none below, and scrolls the next row in first when it is not laid out yet. Widgets record focus too, so the grid knows when focus is not on a tile. --- .../droiddeck/launcher/ui/AndroidAppsPage.kt | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt index 5c2dff86e3..dce70549b2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.focusGroup import androidx.compose.foundation.focusable import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.foundation.gestures.scrollBy import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsPressedAsState @@ -91,6 +92,7 @@ import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.input.InputMode import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.platform.LocalContext @@ -147,6 +149,9 @@ private sealed interface AppEntry : AppEntryKey { } } +/** The focus id of the tile an entry is shown as. */ +private fun tileId(entry: AppEntry): String = "tile:" + if (entry is AppEntry.App) entry.app.key else entry.key + private fun indexLetter(label: String): String { val c = label.trim().firstOrNull()?.uppercaseChar() ?: return "#" return if (c in 'A'..'Z') c.toString() else if (c.isLetter()) c.toString() else "#" @@ -360,7 +365,27 @@ internal fun AndroidAppsPage(s: FrontEndState, a: FrontEndActions, modifier: Mod } } } - Box(Modifier.weight(1f).fillMaxWidth()) { + val front = LocalFrontFocus.current + val steer = rememberCoroutineScope() + // Down goes to the tile straight below. The grid's own search only sees the tiles laid out so far, so above a short or + // unseen last row it lands on a tile further left; above a gap in a short last row the row's last tile takes it. + Box(Modifier.weight(1f).fillMaxWidth().onPreviewKeyEvent { event -> + val k = event.nativeKeyEvent + if (k.keyCode != KeyEvent.KEYCODE_DPAD_DOWN || front == null) return@onPreviewKeyEvent false + val from = entries.indexOfFirst { tileId(it) == front.last } + val columns = (grid.layoutInfo.visibleItemsInfo.maxOfOrNull { it.column } ?: 0) + 1 + if (from < 0 || from / columns == entries.lastIndex / columns) return@onPreviewKeyEvent false + if (k.action == KeyEvent.ACTION_DOWN) { + val id = tileId(entries[minOf(from + columns, entries.lastIndex)]) + val shown = (front.attached[id] ?: 0) > 0 + if (!shown || runCatching { front.items.getValue(id).requestFocus() }.isFailure) steer.launch { + // The row below is not laid out yet: bring it in, then take it. + if (!shown) grid.scrollBy((grid.layoutInfo.visibleItemsInfo.firstOrNull { it.index == from + leadItems }?.size?.height ?: 0).toFloat()) + focusSoon { front.items.getValue(id) } + } + } + true + }) { val scroller = q.isEmpty() && byName && entries.size > 16 LazyVerticalGrid( columns = GridCells.Adaptive((if (narrow) 84 else 96).dp + AppsGrid.spacing.dp), @@ -900,7 +925,7 @@ private fun WidgetCard(w: HomeWidgets.Placed, maxWidthDp: Int) { val activity = remember(ctx) { ctx.findActivity() } Box { Box( - Modifier.size(width.dp, w.heightDp.dp) + Modifier.paneItem("widget:${w.id}").size(width.dp, w.heightDp.dp) .clip(Shape16) .background(colors.surface.copy(alpha = 0.35f)) .glideBorder(hot || menu, Shape16, pal.signal) From 9cc37d0a123bc8a6bd7ccad5827c96d2316688d4 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Thu, 12 Nov 2026 19:11:34 -0600 Subject: [PATCH 060/101] fix(ui): header search keeps the header height and returns focus when it closes (#2543) * fix(ui): keep the header height when search opens The search field in the page header reserved a line for its empty label, which made the open field taller than the header row and pushed the page down. * fix(ui): return focus to the search button when search closes Closing the header search with Back removed the field while it held focus, so the highlight was lost. The search button takes focus once it is back on screen. --- .../java/com/droiddeck/launcher/ui/StoresPage.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 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 7bc7c186d0..4e2c210b62 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -13,6 +13,7 @@ import androidx.compose.material.icons.outlined.Folder import androidx.compose.material.icons.outlined.SdCard import androidx.compose.material.icons.outlined.Smartphone import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged @@ -1072,12 +1073,20 @@ internal fun ModeHeader( var searching by remember { mutableStateOf(query.isNotEmpty()) } var focusOnOpen by remember { mutableStateOf(false) } val open by animateFloatAsState(if (searching) 1f else 0f, Motion.sp(0.75f, 420f), label = "searchOpen") + // Closing takes the field away with focus still in it; the search button gets it once it is back on screen. + val searchIcon = remember { FocusRequester() } + var toIcon by remember { mutableStateOf(false) } val close = { searching = false focusOnOpen = false + toIcon = true if (query.isNotEmpty()) onQuery("") } BackHandler(enabled = searching && !clearSearchFocus) { close() } + LaunchedEffect(toIcon, searching, open <= 0.01f) { + if (searching) toIcon = false + else if (toIcon && open <= 0.01f) { focusSoon { searchIcon }; toIcon = false } + } val heading: @Composable () -> Unit = { if (lead != null) lead() else Text( @@ -1093,7 +1102,7 @@ internal fun ModeHeader( Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { AdbTextField( value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, - placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, + placeholder = placeholder, compact = true, showLabel = false, focusOnShow = focusOnOpen, clearFocus = clearSearchFocus || !searching, onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, ) @@ -1103,7 +1112,7 @@ internal fun ModeHeader( } } val searchButton: @Composable () -> Unit = { - SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } + Box(Modifier.focusRequester(searchIcon)) { SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } } } BoxWithConstraints(Modifier.fillMaxWidth()) { val stacked = maxWidth < NarrowPaneWidth From b841b232b42defcf40ae6d527e3c9c463c3f1a08 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 20:24:13 -0500 Subject: [PATCH 061/101] feat(stores): add Rockstar store and classic GTA launches --- .github/workflows/build.yml | 12 +- .gitignore | 1 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/frontend/AddedGames.kt | 2 + .../launcher/session/SessionFiles.kt | 4 +- .../droiddeck/launcher/stores/CloudSaves.kt | 6 +- .../droiddeck/launcher/stores/LoginFlows.kt | 2 + .../com/droiddeck/launcher/stores/Store.kt | 3 +- .../launcher/stores/StoreAccounts.kt | 4 +- .../droiddeck/launcher/stores/StoreLaunch.kt | 19 +- .../launcher/stores/StoreLaunchRequests.kt | 8 + .../launcher/stores/StoreLoginActivity.kt | 2 + .../droiddeck/launcher/stores/StoreSizes.kt | 4 +- .../launcher/stores/rockstar/RockstarAuth.kt | 198 +++++++++ .../stores/rockstar/RockstarBackend.kt | 206 +++++++++ .../stores/rockstar/RockstarInstaller.kt | 263 ++++++++++++ .../stores/rockstar/RockstarLaunch.kt | 56 +++ .../stores/rockstar/RockstarLaunchCipher.kt | 66 +++ .../launcher/stores/rockstar/RockstarRos.kt | 96 +++++ .../stores/rockstar/RockstarTitles.kt | 84 ++++ .../com/droiddeck/launcher/ui/GameDetail.kt | 5 +- .../com/droiddeck/launcher/ui/StoreChips.kt | 2 + .../droiddeck/launcher/ui/StoresDownloads.kt | 5 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 1 + app/src/main/res/values/strings.xml | 1 + .../main/resources/rockstar/legacy-cipher.bin | Bin 0 -> 86852 bytes .../stores/StoreAccountsCipherTest.kt | 11 + .../rockstar/RockstarLaunchCipherTest.kt | 35 ++ .../launcher/stores/rockstar/RockstarTest.kt | 299 +++++++++++++ tools/build_local.sh | 7 + .../usr/local/bin/droiddeck-store-launch | 113 +++++ tools/release/runtime_inputs.py | 4 +- tools/rockstar-launcher/.gitignore | 1 + tools/rockstar-launcher/Cargo.lock | 105 +++++ tools/rockstar-launcher/Cargo.toml | 19 + tools/rockstar-launcher/README.md | 30 ++ tools/rockstar-launcher/build.sh | 12 + tools/rockstar-launcher/examples/capture.rs | 65 +++ tools/rockstar-launcher/src/lib.rs | 333 +++++++++++++++ tools/rockstar-launcher/src/main.rs | 152 +++++++ tools/rockstar-launcher/src/pipe.rs | 403 ++++++++++++++++++ tools/tests/test_store_launch_rockstar.py | 90 ++++ 42 files changed, 2708 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarInstaller.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipher.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarRos.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarTitles.kt create mode 100644 app/src/main/resources/rockstar/legacy-cipher.bin create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipherTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt create mode 100644 tools/rockstar-launcher/.gitignore create mode 100644 tools/rockstar-launcher/Cargo.lock create mode 100644 tools/rockstar-launcher/Cargo.toml create mode 100644 tools/rockstar-launcher/README.md create mode 100644 tools/rockstar-launcher/build.sh create mode 100644 tools/rockstar-launcher/examples/capture.rs create mode 100644 tools/rockstar-launcher/src/lib.rs create mode 100644 tools/rockstar-launcher/src/main.rs create mode 100644 tools/rockstar-launcher/src/pipe.rs create mode 100644 tools/tests/test_store_launch_rockstar.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57a2075145..15f68eb87c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -562,6 +562,12 @@ jobs: command -v x86_64-w64-mingw32-gcc >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq gcc-mingw-w64-x86-64; } bash tools/ubisoft-launcher/build.sh + - name: Rockstar launcher service (32-bit and 64-bit) + run: | + set -euo pipefail + command -v i686-w64-mingw32-gcc >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq gcc-mingw-w64-i686; } + bash tools/rockstar-launcher/build.sh + - uses: actions/download-artifact@v4 with: name: xbox-arm64 @@ -797,9 +803,11 @@ jobs: set -o pipefail cd app/src/main/rust/stores cargo test --locked 2>&1 | tail -60 - - name: Ubisoft launcher service host unit tests + - name: Windows launcher service host unit tests timeout-minutes: 10 - run: cargo test --locked --manifest-path tools/ubisoft-launcher/Cargo.toml + run: | + cargo test --locked --manifest-path tools/ubisoft-launcher/Cargo.toml + cargo test --locked --manifest-path tools/rockstar-launcher/Cargo.toml python-tests: name: Python and native regression tests diff --git a/.gitignore b/.gitignore index 0a404ef667..d0fe3ea9ea 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ __pycache__/ app/src/main/assets/directaudio/ app/src/main/assets/hybris/ /tools/vr/out/ +app/src/main/resources/rockstar/helpers/ diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 9f74aa4e59..1801f34b5a 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -72,6 +72,7 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.ubisoft.UbisoftBackend) com.droiddeck.launcher.stores.ea.EaBackend.app = this com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.ea.EaBackend) + com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.rockstar.RockstarBackend) } private fun prefetchAddonPacks() { diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 02edb1bcf8..d9db3374e9 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -418,6 +418,7 @@ object AddedGames { private fun scanGame(context: Context, folder: File, out: MutableList, single: AddedExes.Entry? = null, reuse: Boolean = false) { run { val sidecar = StoreGameSidecar.read(folder)?.let { com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, it) } + if (sidecar?.store == Store.ROCKSTAR && (!com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id) || sidecar.launcher != com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER)) return sidecar?.takeIf { it.id.isNotEmpty() }?.let { SessionPrefs.followStoreGame(context, "${it.store.id}:${it.id}", folder.path) { old -> !File(old).exists() } } val ranking = rank(folder, reuse) val candidates = ranking.exes @@ -433,6 +434,7 @@ object AddedGames { val autoName = sidecar?.title ?: identifiedName(folder, found) ?: folder.name val crc = CRC32().apply { update(("\"${foundGuest.replaceFirst(Regex("^$LIBRARY/"), "$LEGACY_LIBRARY/")}\"" + autoName).toByteArray()) }.value val appId = SessionPrefs.addedGameAppId(context, folder.path, crc or 0x80000000L) + if (sidecar?.store == Store.ROCKSTAR) com.droiddeck.launcher.stores.rockstar.RockstarLaunch.applyDefaults(context, sidecar.id, appId) val config = accountConfig(SessionPrefs.activeSteamRoot(context)) val record = config?.let { shortcutRecord(it, appId) } val rev = record?.optInt("rev", 0) ?: 0 diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 8c5e7431b1..13348cef74 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -70,6 +70,8 @@ object SessionFiles { GameEnvironmentStore.publish(context) WinComponents.publish(context) val files = arrayOf( + "rockstar/helpers/Launcher32.exe" to "usr/local/lib/droiddeck-rockstar/Launcher32.exe", + "rockstar/helpers/Launcher64.exe" to "usr/local/lib/droiddeck-rockstar/Launcher64.exe", "usr/local/bin/droiddeck-game-env" to "usr/local/bin/droiddeck-game-env", "usr/local/bin/droiddeck-game-gpu" to "usr/local/bin/droiddeck-game-gpu", "usr/local/bin/droiddeck-diagnostic-inventory" to "usr/local/bin/droiddeck-diagnostic-inventory", @@ -241,7 +243,7 @@ object SessionFiles { var installed = false try { target.parentFile?.mkdirs() - context.assets.open("linuxfs/$asset").use { input -> + (if (asset.startsWith("rockstar/")) requireNotNull(javaClass.getResourceAsStream("/$asset")) else context.assets.open("linuxfs/$asset")).use { input -> staged.outputStream().use { output -> FileUtils.copy(input, output) } } installed = staged.setExecutable(true, false) && staged.renameTo(target) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index f68ab0ce62..106719d559 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -87,7 +87,7 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> "" + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -148,7 +148,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -173,7 +173,7 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { 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 980f496b26..a1b54088eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -15,6 +15,7 @@ internal object LoginFlows { Store.GAMEJOLT -> gameJoltFlow(browserUserAgent) Store.UBISOFT -> ubisoftFlow(browserUserAgent) Store.EA -> eaFlow(browserUserAgent) + Store.ROCKSTAR -> rockstarFlow(browserUserAgent) Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @@ -22,6 +23,7 @@ internal object LoginFlows { @Volatile var amazonFlow: () -> StoreLoginActivity.Flow? = { null } @Volatile var ubisoftFlow: (String) -> StoreLoginActivity.Flow? = { null } @Volatile var eaFlow: (String) -> StoreLoginActivity.Flow? = { null } + @Volatile var rockstarFlow: (String) -> StoreLoginActivity.Flow? = { null } @Volatile var gameJoltFlow: (String) -> StoreLoginActivity.Flow? = { null } private class GogFlow(private val state: String, override val userAgent: String) : StoreLoginActivity.Flow { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index b8a6e8931e..b48530fbea 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -9,7 +9,8 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"), BATTLENET("battlenet", "Battle.net", "Battle.net"), UBISOFT("ubisoft", "Ubisoft Connect", "Ubisoft"), - EA("ea", "EA", "EA"); + EA("ea", "EA", "EA"), + ROCKSTAR("rockstar", "Rockstar Games", "Rockstar"); val folder: String get() = if (this == ITCH) "itch" else shortLabel diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt index 5de9b5e1ab..5e30fb7a5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt @@ -67,8 +67,8 @@ object StoreAccounts { fun write(context: Context, store: Store, json: JSONObject) { unavailable.remove(store) val f = credentialsFile(context, store) - if (seal(f, json, retry = store == Store.XBOX) == null) { - check(store != Store.XBOX) { "Android Keystore is unavailable for Xbox credentials" } + if (seal(f, json, retry = store == Store.XBOX || store == Store.ROCKSTAR) == null) { + check(store != Store.XBOX && store != Store.ROCKSTAR) { "Android Keystore is unavailable for ${store.label} credentials" } put(f, json.toString()) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt index 222b53702e..37d731a2f7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt @@ -18,8 +18,13 @@ object StoreLaunch { const val EA_ORIGIN = "C:\\Program Files (x86)\\Origin\\Origin.exe" fun writeLauncher(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { - val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA || sidecar.store == Store.UBISOFT + val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA || sidecar.store == Store.UBISOFT || sidecar.store == Store.ROCKSTAR val file = File(folder, LAUNCHER) + if (sidecar.store == Store.ROCKSTAR && java.nio.file.Files.isSymbolicLink(file.toPath())) return sidecar.copy(launcher = null) + if (sidecar.store == Store.ROCKSTAR && !com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id)) { + file.delete() + return sidecar.copy(launcher = null) + } if (!needs) { file.delete(); return sidecar.copy(launcher = null) } file.writeText(launcherText(sidecar)) return sidecar.copy(launcher = LAUNCHER) @@ -32,7 +37,7 @@ object StoreLaunch { val lines = ArrayList() lines += "@echo off" lines += "setlocal" - lines += "rem Written by DroidDeck for ${sidecar.store.label}: ${sidecar.title}. Steam's shortcut runs this file." + if (sidecar.store != Store.ROCKSTAR) lines += "rem Written by DroidDeck for ${sidecar.store.label}: ${sidecar.title}. Steam's shortcut runs this file." lines += "cd /d \"%~dp0$dir\"" for ((k, v) in sidecar.env) if (ENV_NAME.matches(k)) lines += "set \"$k=${v.replace("\"", "")}\"" val args = sidecar.args.joinToString(" ") { quoteArg(it) } @@ -54,6 +59,9 @@ object StoreLaunch { lines += "del \"%~dp0$EPIC_ARGS\"" lines += "if exist \"%~dp0$EPIC_CODE\" del \"%~dp0$EPIC_CODE\"" lines += "set \"$CLIENT_VAR=\" & \"%~dp0$exe\" %$CLIENT_VAR%" + } else if (sidecar.store == Store.ROCKSTAR) { + lines += "\"C:\\Program Files\\Rockstar Games\\Launcher\\Launcher.exe\"" + lines += "exit /b %errorlevel%" } else if (sidecar.store == Store.UBISOFT) { lines += "if not exist \"%~dp0$UBISOFT_LAUNCH\" goto direct" lines += "if not exist \"$UBISOFT_SERVICE\" goto direct" @@ -93,11 +101,12 @@ object StoreLaunch { return Library.addedGame(context, game) } - /** Gives a Ubisoft game installed before it needed one the launcher that starts the launcher service. */ fun adopt(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { - if (sidecar.store != Store.UBISOFT || !sidecar.isInstalled) return sidecar + if (sidecar.store !in listOf(Store.UBISOFT, Store.ROCKSTAR) || !sidecar.isInstalled) return sidecar + if (sidecar.store == Store.ROCKSTAR && !com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id)) return sidecar + if (sidecar.store == Store.ROCKSTAR && java.nio.file.Files.isSymbolicLink(File(folder, LAUNCHER).toPath())) return sidecar.copy(launcher = null) val wrongExe = !sidecar.exeFile(folder).isFile || sidecar.exe.contains("installer", ignoreCase = true) || sidecar.exe.contains("autorun", ignoreCase = true) - if (sidecar.launcher == LAUNCHER && !wrongExe) return sidecar + if (sidecar.store == Store.UBISOFT && sidecar.launcher == LAUNCHER && !wrongExe) return sidecar val exe = if (wrongExe) StoreExe.pick(folder, null, sidecar.title).ifEmpty { sidecar.exe } else sidecar.exe if (exe == sidecar.exe && sidecar.launcher == LAUNCHER && runCatching { File(folder, LAUNCHER).readText() }.getOrNull() == launcherText(sidecar)) return sidecar diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index 18f5a161e3..c89ada3f93 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -76,6 +76,14 @@ object StoreLaunchRequests { JSONObject().put("ok", true).put("code", code.written).put("reason", code.reason) } } + "rockstar-launch" -> runCatching { + lastLaunched = Store.ROCKSTAR to request.optString("id") + com.droiddeck.launcher.stores.rockstar.RockstarLaunch.prepare(app, request.optString("id")) + }.getOrElse { JSONObject().put("ok", false).put("reason", "error-" + it.javaClass.simpleName) } + "rockstar-exited" -> { + if (lastLaunched == (Store.ROCKSTAR to request.optString("id"))) lastLaunched = null + JSONObject().put("ok", true) + } "ubisoft-launch" -> { val id = request.optString("id") if (id.isEmpty()) JSONObject().put("ok", false).put("reason", "no-id") 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 a07e0be855..54571ab172 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -66,6 +66,7 @@ class StoreLoginActivity : ComponentActivity() { val pageScript: String get() = "(function(){ try { return document.body.innerText; } catch(e){ return ''; } })()" fun pageReady(result: String): Boolean = true fun forgetSignIn(done: () -> Unit) = done() + fun pageFinished(view: WebView, url: String) {} } private var store: Store? = null @@ -283,6 +284,7 @@ class StoreLoginActivity : ComponentActivity() { } override fun onPageFinished(view: WebView?, url: String?) { + if (!isPopup && url != null && view != null) flow?.pageFinished(view, url) if (url != null && view != null && flow?.readsPage == true && flow?.isRedirect(url) == true) complete(view, url) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index b102c8114c..21969dfbe7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -56,7 +56,7 @@ object StoreSizes { Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.ITCH, Store.GAMEJOLT -> {} Store.EA -> com.droiddeck.launcher.stores.ea.EaPrefs.get(app).edit().putLong("size_${item.id}", it).apply() - Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT -> {} + Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT, Store.ROCKSTAR -> {} } } }, pool).exceptionally { error -> @@ -132,7 +132,7 @@ object StoreSizes { AmazonManifest.parse(bytes).totalInstallSize } Store.EA -> com.droiddeck.launcher.stores.ea.EaSizes.size(context, item) - Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT -> 0L + Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT, Store.ROCKSTAR -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds.size(context, item) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt new file mode 100644 index 0000000000..781eddbe3f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt @@ -0,0 +1,198 @@ +package com.droiddeck.launcher.stores.rockstar + +import android.content.Context +import android.os.Build +import android.util.Log +import android.webkit.CookieManager +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder +import java.security.SecureRandom + +object RockstarAuth { + private const val TAG = "RockstarAuth" + const val SIGN_IN_HOST = "https://signin.rockstargames.com" + private const val LAUNCHER_SITE = "https://rgl.rockstargames.com" + private const val GATEWAY = "$LAUNCHER_SITE/api/connect/gateway" + + const val START_URL = "$SIGN_IN_HOST/robots.txt" + + const val CODE_URL = "$SIGN_IN_HOST/droiddeck/auth-code" + val SIGN_IN_URLS = listOf(SIGN_IN_HOST, LAUNCHER_SITE, "https://www.rockstargames.com", "https://socialclub.rockstargames.com") + const val COOKIE_DOMAIN = ".rockstargames.com" + + const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36" + private const val PREFS = "stores.rockstar" + private const val TICKET_MARGIN_MS = 15 * 60 * 1000L + private val lock = Any() + + class Ticket(val ticket: String, val sessionKey: String, val sessionTicket: String, val rockstarId: String, val nickname: String, val expiresAt: Long) + + internal fun fingerprint(context: Context): JSONObject { + val p = context.applicationContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + fun stable(key: String, bytes: Int): String = p.getString(key, null) ?: ByteArray(bytes).also { SecureRandom().nextBytes(it) } + .joinToString("") { "%02x".format(it) }.also { p.edit().putString(key, it).apply() } + val device = "DROIDDECK-" + (Build.MODEL ?: "ANDROID").uppercase().replace(Regex("[^A-Z0-9]"), "").take(12) + return fingerprintOf(device, stable("volume_serial", 4), stable("cpu_info", 8)) + } + + internal fun fingerprintOf(device: String, volume: String, cpu: String): JSONObject = JSONObject() + .put("device_name", device) + .put("machine_name", device) + .put("os_version", "10.0.19045") + .put("volume_serial", volume) + .put("cpu_info", cpu) + + internal fun state(fingerprint: JSONObject) = "{\"fp\": $fingerprint}" + + internal fun bridgeScript(fingerprint: JSONObject, title: String, codeUrl: String = CODE_URL): String = """ +(function(){ + if (window.__droiddeckRgsc) return 'again'; + window.__droiddeckRgsc = true; + var fp = $fingerprint, title = ${JSONObject.quote(title)}, back = ${JSONObject.quote(codeUrl)}, seq = 0; + function later(cb, v){ setTimeout(function(){ try { if (cb) cb(v); } catch (e) {} }, 0); } + var answers = { + GetWindowConfig: { serviceInfo: { rosPlatform: 'pc' }, platformInfo: {} }, + GetDeviceId: { fingerprintKvp: fp }, + GetVersionInfo: { isDebugSdk: false }, + GetProfileList: { profiles: [] }, + GetCommandLineArguments: { arguments: [] } + }; + window.rgscQueryCancel = function(){}; + window.rgscQuery = function(q){ + q = q || {}; + var p = q.params || {}; + if (q.method === 'CallAuthResult' && p.authCode) { + later(q.onSuccess, {}); + setTimeout(function(){ location.replace(back + '?code=' + encodeURIComponent(p.authCode)); }, 50); + } else if ((q.method === 'CallAuthResult' && p.result === 3) || (q.method === 'CallSetWindowState' && p.state === 3)) { + later(q.onSuccess, {}); + setTimeout(function(){ location.replace(back + '?cancel=1'); }, 50); + } else if (q.method === 'CallLaunchExternalBrowser' && p.url) { + window.open(p.url, '_blank'); + later(q.onSuccess, {}); + } else { + later(q.onSuccess, Object.prototype.hasOwnProperty.call(answers, q.method) ? answers[q.method] : {}); + } + return ++seq; + }; + window.rgscAddSubscription = function(s){ + s = s || {}; + if (s.method === 'OnStartAuth') later(s.onSuccess, { launchPlatform: 0, titleLaunchInfo: { activeTitleName: title, externalPlatformInfo: {} }, profile: null, errorMessage: null }); + return ++seq; + }; + var form = '/signin/user-form?cid=launcher&lang=en-US'; + fetch(form, { credentials: 'include' }) + .then(function(r){ return r.text(); }) + .then(function(h){ + history.replaceState(null, '', form); document.open(); document.write(h); document.close(); + var css = document.createElement('style'); + css.textContent = '[data-ui-name="launcherSettings"]{display:none!important}'; + (document.head || document.documentElement).appendChild(css); + }); + return 'ok'; +})() +""".trimIndent() + + fun isCodeUrl(url: String) = url.startsWith(CODE_URL) + + internal fun cancelled(url: String): Boolean = android.net.Uri.parse(url).getQueryParameter("cancel") == "1" + + internal fun codeFrom(url: String): String? = android.net.Uri.parse(url).getQueryParameter("code")?.takeIf { it.isNotBlank() } + + fun completeSignIn(context: Context, url: String): String? { + val code = codeFrom(url) ?: return "no auth code" + val fp = fingerprint(context) + val gateway = "$GATEWAY?code=" + URLEncoder.encode(code, "UTF-8") + "&fingerprint=" + URLEncoder.encode(state(fp), "UTF-8") + val c = URL(gateway).openConnection() as HttpURLConnection + c.connectTimeout = 20_000 + c.readTimeout = 25_000 + c.instanceFollowRedirects = false + c.setRequestProperty("User-Agent", USER_AGENT) + c.setRequestProperty("Accept", "application/json") + c.setRequestProperty("X-Requested-With", "XMLHttpRequest") + c.setRequestProperty("Origin", LAUNCHER_SITE) + c.setRequestProperty("Referer", "$LAUNCHER_SITE/") + runCatching { CookieManager.getInstance().getCookie(LAUNCHER_SITE) }.getOrNull()?.takeIf { it.isNotEmpty() }?.let { c.setRequestProperty("Cookie", it) } + val (status, body) = try { + val s = c.responseCode + s to ((if (s in 200..299) c.inputStream else c.errorStream)?.use { it.readBytes().toString(Charsets.UTF_8) }.orEmpty()) + } finally { + c.disconnect() + } + val o = runCatching { JSONObject(body) }.getOrNull() + val token = o?.optString("ScAuthToken")?.takeIf { it.isNotEmpty() && it != "null" } + if (token == null) { + Log.w(TAG, "gateway $status; fields ${o?.keys()?.asSequence()?.toList() ?: "not json"}") + return "gateway $status" + } + val account = JSONObject() + .put("access_token", token) + .put("remembered_machine_token", o.optString("RememberedMachineToken").takeIf { it != "null" }.orEmpty()) + .put("login_guid", o.optString("LoginGuid").takeIf { it != "null" }.orEmpty()) + .put("display_name", "Rockstar Games") + .put("signed_in_at", System.currentTimeMillis()) + StoreAccounts.write(context.applicationContext, Store.ROCKSTAR, account) + val t = runCatching { mint(context) }.onFailure { Log.w(TAG, "first ticket: ${it.message}") }.getOrNull() + if (t == null) { + StoreAccounts.clear(context.applicationContext, Store.ROCKSTAR) + return "ticket" + } + return null + } + + fun ticket(context: Context, fresh: Boolean = false): Ticket? = synchronized(lock) { + val o = StoreAccounts.read(context.applicationContext, Store.ROCKSTAR) ?: return null + if (!fresh) { + val current = stored(o) + if (com.droiddeck.launcher.session.SessionState.running && + com.droiddeck.launcher.stores.StoreLaunchRequests.lastLaunched?.first == Store.ROCKSTAR) { + return current?.takeIf { it.expiresAt > System.currentTimeMillis() } + } + current?.takeIf { it.expiresAt - System.currentTimeMillis() > TICKET_MARGIN_MS }?.let { return it } + } + runCatching { mint(context) }.onFailure { Log.w(TAG, "ticket: ${it.message}") }.getOrNull() + } + + private fun stored(o: JSONObject): Ticket? { + val t = o.optString("ticket").takeIf { it.isNotEmpty() } ?: return null + return Ticket(t, o.optString("session_key"), o.optString("session_ticket"), o.optString("rockstar_id"), o.optString("display_name"), o.optLong("ticket_expires_at")) + } + + private fun mint(context: Context): Ticket { + val app = context.applicationContext + val o = StoreAccounts.read(app, Store.ROCKSTAR) ?: throw IllegalStateException("not signed in") + val root = try { + RockstarRos.result("auth.asmx/CreateTicketScAuthToken2", listOf( + "ticket" to "", "platformName" to "pcros", "scAuthToken" to o.optString("access_token"), + "rememberedMachineToken" to o.optString("remembered_machine_token"), + ), headers = mapOf("SCS-MFAMachineFingerPrint" to state(fingerprint(app)))) + } catch (e: RockstarRos.RosException) { + if (e.code.startsWith("AuthenticationFailed")) com.droiddeck.launcher.stores.StoresState.markSignInExpired(Store.ROCKSTAR) + throw e + } + val t = parseTicket(root) ?: throw IllegalStateException("no ticket in the answer") + o.put("ticket", t.ticket).put("session_key", t.sessionKey).put("session_ticket", t.sessionTicket) + .put("rockstar_id", t.rockstarId).put("ticket_expires_at", t.expiresAt) + if (t.nickname.isNotEmpty()) o.put("display_name", t.nickname) + StoreAccounts.write(app, Store.ROCKSTAR, o) + return t + } + + internal fun parseTicket(root: org.w3c.dom.Element, now: Long = System.currentTimeMillis()): Ticket? { + val ticket = RockstarRos.text(root, "Ticket")?.takeIf { it.isNotEmpty() } ?: return null + val account = RockstarRos.first(root, "RockstarAccount") + val secs = RockstarRos.text(root, "SecsUntilExpiration")?.toLongOrNull() ?: 3600L + return Ticket( + ticket, RockstarRos.text(root, "SessionKey").orEmpty(), RockstarRos.text(root, "SessionTicket").orEmpty(), + (account?.let { RockstarRos.text(it, "RockstarId") } ?: RockstarRos.text(root, "RockstarId")).orEmpty(), + account?.let { RockstarRos.text(it, "Nickname") }.orEmpty(), + now + secs * 1000L, + ) + } + + fun signOut(context: Context) = synchronized(lock) { StoreAccounts.clear(context.applicationContext, Store.ROCKSTAR) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt new file mode 100644 index 0000000000..3e878d3290 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt @@ -0,0 +1,206 @@ +package com.droiddeck.launcher.stores.rockstar + +import android.content.Context +import android.content.Intent +import android.util.Log +import android.webkit.WebView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.LoginFlows +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreFront +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.StoreShelves +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 org.w3c.dom.Element + +object RockstarBackend : StoreBackend { + override val store: Store = Store.ROCKSTAR + + init { + LoginFlows.rockstarFlow = { ua -> RockstarLogin(ua) } + } + + override fun signIn(context: Context) { + context.startActivity( + Intent(context, StoreLoginActivity::class.java) + .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) + } + + override fun signOut(context: Context) { + RockstarAuth.signOut(context.applicationContext) + RockstarLibrary.reset() + runCatching { WebCookies.expire(RockstarAuth.SIGN_IN_URLS, RockstarAuth.COOKIE_DOMAIN, listOf("/")) {} } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + Thread({ RockstarLibrary.sync(app) }, "rockstar-sync").start() + } + + override fun loadShelves(context: Context, force: Boolean) { + StoresState.post { StoresState.shelves[store] = StoreFront.markOwned(RockstarCatalog.shelves(), StoresState.library[store], RockstarCatalog::sameGame) } + } + + override fun search(context: Context, query: String): List = + StoreFront.markOwned(RockstarCatalog.search(query), StoresState.library[store], RockstarCatalog::sameGame) + + override fun install(context: Context, item: CatalogItem, root: java.io.File) { + val app = context.applicationContext + val folder = StoreInstallRoot.folderFor(app, store, item.id, item.title, root) + val entry = DownloadEntry(store, item.id, item.title, cover = item.tallImageUrl ?: item.imageUrl, + bytesTotal = item.sizeBytes, location = StoreInstallRoot.labelFor(app, folder)) + DownloadQueue.enqueue(app, entry) { RockstarInstaller(app, item, folder) } + } + + override fun uninstall(context: Context, game: InstalledStoreGame) {} +} + +internal class RockstarLogin(override val userAgent: String) : StoreLoginActivity.Flow { + override val startUrl: String get() = RockstarAuth.START_URL + override fun isRedirect(url: String): Boolean = RockstarAuth.isCodeUrl(url) + + override fun pageFinished(view: WebView, url: String) { + if (!url.startsWith(RockstarAuth.START_URL)) return + val title = "launcher" + view.evaluateJavascript(RockstarAuth.bridgeScript(RockstarAuth.fingerprint(view.context), title)) { Log.d("RockstarLogin", "bridge: $it") } + } + + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(RockstarAuth.SIGN_IN_URLS, RockstarAuth.COOKIE_DOMAIN, listOf("/")) { done() } }.onFailure { done() } + } + + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? = if (RockstarAuth.cancelled(url)) null else try { + RockstarAuth.completeSignIn(activity, url)?.let { + Log.w("RockstarLogin", "sign-in incomplete: $it") + activity.getString(R.string.stores_login_error_verification) + } + } catch (e: Exception) { + Log.w("RockstarLogin", "sign-in failed: ${e.javaClass.simpleName}") + activity.getString(R.string.stores_login_error_generic) + } +} + +internal data class RockstarApp(val id: String, val name: String, val titleId: String, val branches: List, val parent: String = "") + +internal data class RockstarBranch(val id: String, val name: String, val buildId: String, val isDefault: Boolean, val accessToken: String) { + val hasBuild: Boolean get() = (buildId.toLongOrNull() ?: 0L) > 0 && accessToken.isNotEmpty() +} + +internal data class RockstarPackage(val title: String, val featured: Boolean) + +internal class RockstarAccountApps(val apps: List, val packages: List) + +internal object RockstarApps { + fun parse(root: Element): List = RockstarRos.all(root, "App").map { a -> + val branches = RockstarRos.first(a, "Branches")?.let { RockstarRos.children(it, "Branch") }.orEmpty().map { b -> + RockstarBranch(b.getAttribute("Id"), b.getAttribute("Name"), b.getAttribute("BuildId"), + b.getAttribute("IsDefault").equals("true", true), RockstarRos.text(b, "AccessToken").orEmpty()) + } + val parent = (a.parentNode?.parentNode as? Element)?.takeIf { it.tagName == "App" }?.getAttribute("Name").orEmpty() + RockstarApp(a.getAttribute("Id"), a.getAttribute("Name"), a.getAttribute("TitleId"), branches, parent) + } + + fun packages(root: Element): List = RockstarRos.all(root, "PackageJson").mapNotNull { p -> + val o = runCatching { org.json.JSONObject(p.textContent) }.getOrNull() ?: return@mapNotNull null + o.optString("title").takeIf { it.isNotEmpty() }?.let { RockstarPackage(it, o.optBoolean("isFeatured")) } + } + + fun fetch(ticket: String, log: (String) -> Unit): RockstarAccountApps { + val root = RockstarRos.result("app.asmx/GetAppsAndPackages", listOf("ticket" to ticket)) + val out = RockstarAccountApps(parse(root), packages(root)) + log("Rockstar: packages " + out.packages.joinToString(", ") { it.title + if (it.featured) " (featured)" else "" }.ifEmpty { "none" } + + "; builds " + out.apps.filter { a -> a.branches.any { it.hasBuild } }.joinToString(", ") { it.name }.ifEmpty { "none" }) + return out + } + + fun branch(app: RockstarApp): RockstarBranch? = app.branches.firstOrNull { it.isDefault && it.hasBuild } ?: app.branches.firstOrNull { it.hasBuild } + + fun deliverer(apps: List, title: RockstarTitle): RockstarApp? = apps + .filter { RockstarTitles.byId(it.name) == title && !it.name.endsWith("_steam") && !it.name.endsWith("_epic") } + .sortedBy { if (it.name == title.id) 0 else 1 } + .firstOrNull { branch(it) != null } +} + +object RockstarLibrary { + private val generation = java.util.concurrent.atomic.AtomicInteger() + private val running = java.util.concurrent.atomic.AtomicReference(null) + + fun reset() { + generation.incrementAndGet() + StoresState.post { + StoresState.library.remove(Store.ROCKSTAR) + StoresState.shelves.remove(Store.ROCKSTAR) + } + } + + private fun post(gen: Int, block: () -> Unit) = StoresState.post { if (generation.get() == gen) block() } + + internal fun owned(account: RockstarAccountApps): List = + account.packages.filter { !it.featured }.flatMap { RockstarTitles.forName(it.title) }.distinct() + + internal fun games(account: RockstarAccountApps): List = owned(account).mapNotNull { t -> + RockstarApps.deliverer(account.apps, t)?.let { RockstarTitles.item(t, owned = true, extra = mapOf("app" to it.name, "appId" to it.id)) } + }.sortedBy { it.title.lowercase() } + + fun sync(app: Context) { + val gen = generation.get() + if (running.getAndSet(gen) == gen) return + try { + val t = RockstarAuth.ticket(app) + if (t == null) { + post(gen) { StoresState.status.remove(Store.ROCKSTAR); StoresState.problems[Store.ROCKSTAR] = app.getString(R.string.stores_sync_sign_in) } + return + } + if (StoresState.library[Store.ROCKSTAR].isNullOrEmpty()) post(gen) { StoresState.status[Store.ROCKSTAR] = app.getString(R.string.stores_sync_game_list) } + val account = RockstarApps.fetch(t.ticket) { StoresState.logLine(it) } + val games = games(account) + owned(account).filter { o -> games.none { it.id == o.id } }.takeIf { it.isNotEmpty() }?.let { elsewhere -> + StoresState.logLine("Rockstar: owned through another store, installs from there: " + elsewhere.joinToString(", ") { it.name }) + } + post(gen) { + StoresState.status.remove(Store.ROCKSTAR) + StoresState.problems.remove(Store.ROCKSTAR) + StoresState.library[Store.ROCKSTAR] = games + StoresState.shelves[Store.ROCKSTAR]?.let { StoresState.shelves[Store.ROCKSTAR] = StoreFront.markOwned(it, games, RockstarCatalog::sameGame) } + } + StoresState.logLine("Rockstar: ${games.size} owned games") + } catch (e: Exception) { + StoresState.logLine("Rockstar: library sync failed: ${e.javaClass.simpleName} ${e.message.orEmpty().take(300)}") + post(gen) { StoresState.status.remove(Store.ROCKSTAR); StoresState.problems[Store.ROCKSTAR] = app.getString(R.string.stores_sync_failed) } + } finally { + running.compareAndSet(gen, null) + } + } +} + +internal object RockstarCatalog { + fun all(): List = RockstarTitles.all.map { RockstarTitles.item(it) } + + fun shelves(): StoreShelves { + val all = all() + val newest = all.sortedByDescending { it.releaseDate } + val headline = listOf("gta5_gen9", "rdr2", "rdr", "gta4", "gtasaunreal", "lanoire", "mp3") + return StoreShelves( + whatsNew = newest, + trending = headline.mapNotNull { id -> all.firstOrNull { it.id == id } } + all.filter { it.id !in headline }, + art = all.mapNotNull { it.imageUrl }, + ) + } + + fun search(query: String): List { + val q = StoreFront.titleKey(query) + if (q.length < 2) return emptyList() + return all().filter { StoreFront.titleKey(it.title).contains(q) } + } + + fun sameGame(shelf: CatalogItem, owned: CatalogItem): Boolean = shelf.id == owned.id +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarInstaller.kt new file mode 100644 index 0000000000..ac039d95f9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarInstaller.kt @@ -0,0 +1,263 @@ +package com.droiddeck.launcher.stores.rockstar + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreExe +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import org.w3c.dom.Element +import java.io.File +import java.io.RandomAccessFile +import java.net.HttpURLConnection +import java.net.URL +import java.nio.file.Files +import java.security.MessageDigest +import java.util.concurrent.ConcurrentLinkedQueue +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicLong +import java.util.concurrent.atomic.AtomicReference + +internal data class RockstarChunk(val fileEntryId: String, val chunkId: String, val sha256: String, val offset: Long, val size: Long) + +internal data class RockstarFile(val entryId: String, val versionId: String, val path: String, val size: Long, val sha256: String, val chunks: List) + +internal data class RockstarBuild(val buildId: String, val version: String, val preload: Boolean, val files: List) { + val bytes: Long get() = files.sumOf { it.size } +} + +internal object RockstarManifest { + fun inside(root: File, relative: String): File { + require(safePath(relative) == relative) { "Unsafe Rockstar install path" } + val base = root.canonicalFile + var target = base + for (part in relative.split('/')) { + target = File(target, part) + require(!Files.isSymbolicLink(target.toPath())) { "Rockstar install path is a symbolic link" } + } + require(target.canonicalFile.toPath().startsWith(base.toPath())) { "Rockstar install path leaves its folder" } + return target + } + + fun verified(target: File, chunk: RockstarChunk, cancelled: () -> Boolean = { false }): Boolean { + if (cancelled()) return false + if (!target.isFile || chunk.offset < 0 || chunk.size < 0 || chunk.offset > target.length() || chunk.size > target.length() - chunk.offset) return false + return RandomAccessFile(target, "r").use { input -> + input.seek(chunk.offset) + val digest = MessageDigest.getInstance("SHA-256") + val buffer = ByteArray(256 * 1024) + var remaining = chunk.size + while (remaining > 0) { + if (cancelled()) return false + val count = input.read(buffer, 0, minOf(buffer.size.toLong(), remaining).toInt()) + if (count <= 0) return false + digest.update(buffer, 0, count) + remaining -= count + } + digest.digest().joinToString("") { "%02x".format(it) }.equals(chunk.sha256, true) + } + } + + fun safePath(raw: String): String? { + val parts = raw.replace('\\', '/').split('/').filter { it.isNotEmpty() && it != "." } + if (parts.isEmpty() || parts.any { it == ".." || it.contains(':') }) return null + return parts.joinToString("/") + } + + fun parse(root: Element): RockstarBuild { + val result = RockstarRos.first(root, "Result") ?: throw IllegalStateException("manifest without a result") + val files = RockstarRos.all(result, "FileDetails").map { f -> + val entry = f.getAttribute("FileEntryId") + val path = safePath(RockstarRos.text(f, "RelativePath").orEmpty()) ?: throw IllegalStateException("unsafe path in the manifest") + val chunks = RockstarRos.first(f, "FileChunks")?.let { RockstarRos.children(it, "Chunk") }.orEmpty().map { c -> + RockstarChunk(entry, c.getAttribute("FileChunkId"), c.getAttribute("SHA256Hash").lowercase(), + c.getAttribute("StartByteOffset").toLong(), c.getAttribute("Size").toLong()) + } + val whole = RockstarRos.children(f, "SHA256Hash").firstOrNull()?.textContent?.trim()?.lowercase().orEmpty() + RockstarFile(entry, f.getAttribute("FileEntryVersionId"), path, f.getAttribute("FileSize").toLong(), whole, chunks) + } + return RockstarBuild(result.getAttribute("BuildId"), result.getAttribute("VersionNumber"), + RockstarRos.text(result, "IsPreload").equals("true", true), files) + } + + fun batches(chunks: List, maxBytes: Long = 48L * 1024 * 1024, maxCount: Int = 16): List> { + val out = ArrayList>() + var cur = ArrayList() + var bytes = 0L + for (c in chunks) { + if (cur.isNotEmpty() && (bytes + c.size > maxBytes || cur.size >= maxCount)) { out += cur; cur = ArrayList(); bytes = 0 } + cur += c + bytes += c.size + } + if (cur.isNotEmpty()) out += cur + return out + } + + fun key(file: RockstarFile, chunk: RockstarChunk) = "${file.versionId}:${chunk.chunkId}" +} + +internal class RockstarInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + + override fun run(handle: DownloadQueue.JobHandle): String? { + handle.stage(DownloadStage.MANIFEST, app.getString(R.string.stores_sync_sign_in)) + val ticket = RockstarAuth.ticket(app)?.ticket ?: throw IllegalStateException("Not signed in to Rockstar Games") + val title = RockstarTitles.byId(item.id) ?: throw IllegalStateException("Rockstar has no PC build of ${item.title}") + val account = RockstarApps.fetch(ticket) { handle.log(it) } + if (title !in RockstarLibrary.owned(account)) throw IllegalStateException("${item.title} is not in this Rockstar account's library") + val owned = RockstarApps.deliverer(account.apps, title) + ?: throw IllegalStateException("${item.title} is owned through another store and installs from there") + val branch = RockstarApps.branch(owned)!! + handle.log("rockstar: ${owned.name} branch ${branch.name} build ${branch.buildId}") + val build = RockstarManifest.parse(RockstarRos.result("app.asmx/GetBuildManifestFull", listOf("ticket" to ticket, "branchAccessToken" to branch.accessToken))) + if (build.preload) throw IllegalStateException("${item.title} is a preload Rockstar has not unlocked yet") + handle.log("rockstar: build ${build.buildId} ${build.version}, ${build.files.size} files, ${build.bytes} bytes") + handle.diskSize(build.bytes) + val cover = item.tallImageUrl ?: item.imageUrl + StoreInstalls.begin(folder, Store.ROCKSTAR, item.id, item.title, cover, item.imageUrl) + if (cancelled.get()) return null + + val ledger = RockstarManifest.inside(folder, LEDGER) + val done = HashSet().apply { if (ledger.isFile) ledger.readLines().filterTo(this) { it.isNotBlank() } } + val pending = ArrayList>() + var have = 0L + for (f in build.files) { + if (cancelled.get()) return null + val target = RockstarManifest.inside(folder, f.path) + target.parentFile?.mkdirs() + for (c in f.chunks) { + if (cancelled.get()) return null + if (RockstarManifest.key(f, c) in done && RockstarManifest.verified(target, c, cancelled::get)) have += c.size else pending += f to c + } + if (cancelled.get()) return null + RandomAccessFile(target, "rw").use { if (it.length() != f.size) it.setLength(f.size) } + } + val fileOf = pending.associate { (f, c) -> "${c.fileEntryId}:${c.chunkId}" to f } + val total = build.bytes + val progress = AtomicLong(have) + handle.stage(DownloadStage.DOWNLOAD) + handle.progress(have, total, "Downloading (${build.files.size} files)") + + val queue = ConcurrentLinkedQueue(RockstarManifest.batches(pending.map { it.second })) + val failure = AtomicReference(null) + val pool = Executors.newFixedThreadPool(WORKERS, DownloadQueue.workerFactory("rockstar-dl")) + val ledgerLock = Any() + repeat(WORKERS) { + pool.execute { + while (!cancelled.get() && failure.get() == null) { + val batch = queue.poll() ?: break + try { + val urls = chunkUrls(ticket, branch.accessToken, batch) + for (c in batch) { + if (cancelled.get()) break + val f = fileOf.getValue("${c.fileEntryId}:${c.chunkId}") + fetch({ retry -> (if (retry) null else urls[c.chunkId]) ?: chunkUrls(ticket, branch.accessToken, listOf(c)).getValue(c.chunkId) }, RockstarManifest.inside(folder, f.path), c, progress) { + handle.progress(progress.get(), total, "Downloading (${build.files.size} files)") + } + synchronized(ledgerLock) { ledger.appendText(RockstarManifest.key(f, c) + "\n") } + } + } catch (t: Throwable) { + failure.compareAndSet(null, t) + } + } + } + } + pool.shutdown() + while (!pool.awaitTermination(250, TimeUnit.MILLISECONDS)) Unit + if (cancelled.get()) return null + failure.get()?.let { throw it } + + handle.interruptible(false) + handle.stage(DownloadStage.INSTALL, app.getString(R.string.stores_registering)) + val exe = resolve(folder, title.exe) ?: StoreExe.pick(folder, null, item.title).ifEmpty { title.exe.replace('\\', '/') } + handle.log("rockstar: exe=$exe") + val sidecar = StoreGameSidecar( + Store.ROCKSTAR, item.id, item.title, exe = exe, + installVersion = build.version.ifEmpty { build.buildId }, installedAt = System.currentTimeMillis(), + cover = cover, hero = item.imageUrl, cloud = false, + extra = mapOf("rosTitleId" to title.rosTitleId.toString(), "app" to owned.name, "buildId" to build.buildId, "platform" to title.platform), + ) + StoreInstalls.complete(app, folder, sidecar, onStep = { d, steps -> handle.stageProgress(d.toLong(), steps.toLong()) }) + ledger.delete() + return folder.path + } + + private fun chunkUrls(ticket: String, branchToken: String, batch: List): Map { + val csv = batch.joinToString(",") { "${it.fileEntryId}:${it.chunkId}" } + val root = RockstarRos.result("app.asmx/RetrieveFileChunkMulti", listOf("ticket" to ticket, "branchAccessToken" to branchToken, "fileEntryAndChunkIdCsv" to csv)) + return RockstarRos.all(root, "Chunk").mapNotNull { c -> RockstarRos.text(c, "RedirectUrl")?.let { c.getAttribute("FileChunkId") to it } }.toMap() + } + + private fun fetch(url: (Boolean) -> String, target: File, chunk: RockstarChunk, progress: AtomicLong, report: () -> Unit) { + var lastError: Exception? = null + for (attempt in 0 until 3) { + if (cancelled.get()) return + val written = AtomicLong(0) + try { + val c = URL(url(attempt > 0)).openConnection() as HttpURLConnection + c.connectTimeout = 20_000 + c.readTimeout = 60_000 + try { + if (c.responseCode != 200) throw java.io.IOException("chunk ${chunk.chunkId}: HTTP ${c.responseCode}") + val digest = MessageDigest.getInstance("SHA-256") + RandomAccessFile(target, "rw").use { out -> + out.seek(chunk.offset) + c.inputStream.use { input -> + val buf = ByteArray(256 * 1024) + var last = 0L + while (true) { + if (cancelled.get()) { progress.addAndGet(-written.get()); return } + val n = input.read(buf) + if (n < 0) break + if (written.get() + n > chunk.size) throw java.io.IOException("chunk ${chunk.chunkId} is longer than the manifest says") + out.write(buf, 0, n) + digest.update(buf, 0, n) + written.addAndGet(n.toLong()) + progress.addAndGet(n.toLong()) + val now = System.currentTimeMillis() + if (now - last > 400) { last = now; report() } + } + } + } + val hex = digest.digest().joinToString("") { "%02x".format(it) } + if (written.get() != chunk.size || hex != chunk.sha256) throw java.io.IOException("chunk ${chunk.chunkId} failed its check") + report() + return + } finally { + c.disconnect() + } + } catch (e: Exception) { + progress.addAndGet(-written.get()) + lastError = e + } + } + throw lastError ?: java.io.IOException("chunk ${chunk.chunkId} failed") + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (deleteFiles) StoreInstalls.discard(app, folder, emptyList()) + } + + internal companion object { + const val LEDGER = ".droiddeck-rockstar-chunks" + private const val WORKERS = 4 + + fun resolve(folder: File, configured: String): String? { + var at = folder + for (part in configured.replace('\\', '/').split('/').filter { it.isNotEmpty() }) { + at = at.listFiles()?.firstOrNull { it.name.equals(part, ignoreCase = true) } ?: return null + } + return if (at.isFile) at.relativeTo(folder).invariantSeparatorsPath else null + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt new file mode 100644 index 0000000000..c83b6548d8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt @@ -0,0 +1,56 @@ +package com.droiddeck.launcher.stores.rockstar + +import android.content.Context +import com.droiddeck.launcher.session.GameEnvironmentStore +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import org.json.JSONObject +import java.security.MessageDigest +import java.util.Base64 + +object RockstarLaunch { + internal val pipes = mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe") + + fun supports(id: String?) = id != null && id in pipes + + fun applyDefaults(app: Context, id: String, appId: Long) { + val scope = (appId and 0xffffffffL).toString() + when (id) { + "gta3" -> GameEnvironmentStore.setDefault(app, scope, "FEX_X87REDUCEDPRECISION", "0") + "gtasa" -> GameEnvironmentStore.setDefault(app, scope, "PROTON_USE_WINED3D", "1") + } + } + + fun prepare(app: Context, id: String): JSONObject { + val pipe = pipes[id] ?: return failure("unsupported-title") + val title = RockstarTitles.byId(id) ?: return failure("unknown-title") + val folder = StoreInstallRoot.gameFolders(app).firstOrNull { folder -> + StoreGameSidecar.read(folder)?.let { it.store == Store.ROCKSTAR && it.id == id && it.isInstalled } == true + } ?: return failure("not-installed") + val installed = StoreGameSidecar.read(folder) ?: return failure("not-installed") + val exe = installed.exeFile(folder).canonicalFile + if (!exe.path.startsWith(folder.canonicalPath + java.io.File.separator) || !exe.isFile || + !java.io.File(folder, "MTLX.dll").isFile) return failure("missing-game-files") + var ticket = RockstarAuth.ticket(app) ?: RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") + val account = try { + RockstarApps.fetch(ticket.ticket) {} + } catch (e: RockstarRos.RosException) { + if (!(e.code.contains("Ticket", true) || e.code.contains("Sign", true) || e.code.contains("Auth", true))) throw e + ticket = RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") + RockstarApps.fetch(ticket.ticket) {} + } + if (RockstarLibrary.owned(account).none { it.id == id } || RockstarApps.deliverer(account.apps, title) == null) return failure("not-owned") + val tokenRoot = RockstarRos.result("app.asmx/GetTitleAccessToken2", listOf("ticket" to ticket.ticket, "titleId" to title.rosTitleId.toString(), "platformId" to "8")) + val token = RockstarRos.text(tokenRoot, "Result")?.takeIf { it.isNotEmpty() } ?: return failure("no-title-token") + val hash = MessageDigest.getInstance("SHA-256").digest(RockstarAuth.fingerprint(app).toString().toByteArray()).copyOf(16) + val launch = RockstarRos.result("app.asmx/GetTitleLaunchData", listOf("ticket" to ticket.ticket, "titleAccessToken" to token, + "machineHash" to Base64.getEncoder().encodeToString(hash))) + val encoded = RockstarRos.text(launch, "Data") ?: return failure("no-launch-data") + val iv = RockstarRos.text(launch, "EndpointIV") ?: return failure("no-launch-iv") + val material = RockstarLaunchCipher.decode(encoded, iv) + return JSONObject().put("ok", true).put("pipe", pipe).put("material", material).put("expiresAt", System.currentTimeMillis() + 90_000) + } + + private fun failure(reason: String) = JSONObject().put("ok", false).put("reason", reason) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipher.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipher.kt new file mode 100644 index 0000000000..dd65b40b7c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunchCipher.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.stores.rockstar + +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.util.Base64 + +internal object RockstarLaunchCipher { + private val data by lazy { + val bytes = requireNotNull(javaClass.getResourceAsStream("/rockstar/legacy-cipher.bin")).use { it.readBytes() } + require(bytes.size == 86852 && bytes.copyOfRange(0, 8).contentEquals("DDRGLC01".toByteArray())) + bytes + } + private val tables by lazy { + ByteBuffer.wrap(data, 8, 86016).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer().let { buffer -> IntArray(buffer.remaining()).also { buffer.get(it) } } + } + private val order = intArrayOf(0, 7, 10, 13, 1, 4, 11, 14, 2, 5, 8, 15, 3, 6, 9, 12) + + internal fun decrypt(cipher: ByteArray, iv: ByteArray, inner: Boolean): ByteArray { + require(cipher.isNotEmpty() && cipher.size <= 65536 && cipher.size % 16 == 0 && iv.size == 16) + val map = 86024 + val key = map + 272 + if (inner) 272 else 0 + val keys = ByteBuffer.wrap(data, key, 272).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer().let { buffer -> IntArray(68).also { buffer.get(it) } } + val output = ByteArray(cipher.size) + var previous = iv + for (offset in cipher.indices step 16) { + var state = cipher.copyOfRange(offset, offset + 16) + for (round in 0..16) { + val next = ByteBuffer.allocate(16).order(ByteOrder.LITTLE_ENDIAN) + for (column in 0..3) { + var word = keys[round * 4 + column] + for (slot in column * 4 until column * 4 + 4) { + val index = if (round == 0 || round == 1 || round == 16) slot else order[slot] + val table = data[map + round * 16 + index].toInt() and 255 + require(table < 84) + word = word xor tables[table * 256 + (state[index].toInt() and 255)] + } + next.putInt(word) + } + state = next.array() + } + for (i in 0..15) output[offset + i] = (state[i].toInt() xor previous[i].toInt()).toByte() + previous = cipher.copyOfRange(offset, offset + 16) + } + val padding = output.last().toInt() and 255 + require(padding in 1..16 && output.takeLast(padding).all { (it.toInt() and 255) == padding }) + return output.copyOf(output.size - padding) + } + + fun decode(encoded: String, endpointIv: String): String { + require(encoded.length <= 90000 && endpointIv.length <= 32) + val clear = decrypt(Base64.getDecoder().decode(encoded), Base64.getDecoder().decode(endpointIv), false) + require(clear.size > 128) + val xml = clear.copyOf(clear.size - 128).toString(Charsets.UTF_8) + val root = RockstarRos.parse(xml) + require(root.tagName == "EncryptedResponse") + val date = requireNotNull(RockstarRos.text(root, "CreationDate")).toLong() + require(date in 0..0xffffffffL) + val text = requireNotNull(RockstarRos.text(root, "Data")) + require(text.length == 672 && text.all { it.digitToIntOrNull(16) != null }) + val cipher = ByteArray(text.length / 2) { i -> text.substring(i * 2, i * 2 + 2).toInt(16).toByte() } + val iv = ByteBuffer.allocate(16).order(ByteOrder.LITTLE_ENDIAN).put(data, data.size - 12, 12).putInt(date.toInt()).array() + val material = decrypt(cipher, iv, true) + require(material.size == 320) + return material.joinToString("") { "%02X".format(it) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarRos.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarRos.kt new file mode 100644 index 0000000000..88217aed08 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarRos.kt @@ -0,0 +1,96 @@ +package com.droiddeck.launcher.stores.rockstar + +import org.w3c.dom.Element +import java.io.ByteArrayInputStream +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder +import javax.xml.XMLConstants +import javax.xml.parsers.DocumentBuilderFactory + +internal object RockstarRos { + const val HOST = "https://rgl-prod.ros.rockstargames.com" + const val PUBLIC_HOST = "https://prod.ros.rockstargames.com" + const val SERVICES = "/launcher/11/launcherservices/" + private const val MAX_BYTES = 32 * 1024 * 1024 + + class RosException(message: String, val code: String = "", val status: Int = 0) : Exception(message) + + class Reply(val status: Int, val body: String) + + fun form(fields: List>): String = + fields.joinToString("&") { (k, v) -> "$k=" + URLEncoder.encode(v, "UTF-8") } + + fun call(method: String, fields: List>, host: String = HOST, headers: Map = emptyMap()): Reply { + val c = URL(host + SERVICES + method).openConnection() as HttpURLConnection + c.requestMethod = "POST" + c.connectTimeout = 20_000 + c.readTimeout = 60_000 + c.instanceFollowRedirects = false + c.doOutput = true + c.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=utf-8") + c.setRequestProperty("User-Agent", RockstarAuth.USER_AGENT) + for ((k, v) in headers) c.setRequestProperty(k, v) + try { + c.outputStream.use { it.write(form(fields).toByteArray(Charsets.UTF_8)) } + val status = c.responseCode + val stream = (if (status in 200..299) c.inputStream else c.errorStream) + val bytes = stream?.use { input -> + val out = java.io.ByteArrayOutputStream() + val buf = ByteArray(64 * 1024) + while (true) { + val n = input.read(buf) + if (n < 0) break + out.write(buf, 0, n) + if (out.size() > MAX_BYTES) throw RosException("$method: answer too large", status = status) + } + out.toByteArray() + } ?: ByteArray(0) + return Reply(status, bytes.toString(Charsets.UTF_8)) + } finally { + c.disconnect() + } + } + + fun result(method: String, fields: List>, host: String = HOST, headers: Map = emptyMap()): Element { + val reply = call(method, fields, host, headers) + if (reply.status !in 200..299) throw RosException("$method: HTTP ${reply.status}", status = reply.status) + val root = runCatching { parse(reply.body) }.getOrNull() + ?: throw RosException("$method: HTTP ${reply.status} invalid response", status = reply.status) + if (text(root, "Status") != "1") { + val error = first(root, "Error") + val code = listOfNotNull(error?.getAttribute("Code")?.takeIf { it.isNotEmpty() }, error?.getAttribute("CodeEx")?.takeIf { it.isNotEmpty() }).joinToString("/") + throw RosException("$method: ${code.ifEmpty { "HTTP ${reply.status}" }}", code, reply.status) + } + return root + } + + fun parse(xml: String): Element { + require(!xml.contains(" 0) it.item(0) as Element else null } + + fun all(root: Element, tag: String): List = root.getElementsByTagName(tag).let { l -> (0 until l.length).map { l.item(it) as Element } } + + fun text(root: Element, tag: String): String? = first(root, tag)?.textContent?.trim() + + fun children(parent: Element, tag: String): List { + val out = ArrayList() + var n = parent.firstChild + while (n != null) { + if (n is Element && n.tagName == tag) out += n + n = n.nextSibling + } + return out + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarTitles.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarTitles.kt new file mode 100644 index 0000000000..bbbc0e69dd --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarTitles.kt @@ -0,0 +1,84 @@ +package com.droiddeck.launcher.stores.rockstar + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store + +internal data class RockstarTitle( + val id: String, + val rosTitleId: Int, + val name: String, + val exe: String, + val registryKey: String, + val steamAppId: Int, + val released: String, + val platform: String = "pcros", + val description: String = "", + val page: String = "", +) + +internal object RockstarTitles { + private const val ART = "https://cdn.cloudflare.steamstatic.com/steam/apps/" + + val all = listOf( + RockstarTitle("gta5_gen9", 11, "Grand Theft Auto V Enhanced", "GTA5_Enhanced.exe", "Rockstar Games\\GTAV Enhanced", 3240220, "2025-03-04", platform = "pcrosalt", + description = "Story mode and GTA Online with ray-traced visuals, faster loading and DualSense support.", + page = "https://www.rockstargames.com/gta-v"), + RockstarTitle("gta5", 11, "Grand Theft Auto V Legacy", "GTA5.exe", "Rockstar Games\\Grand Theft Auto V", 271590, "2015-04-14", + description = "Three criminals, one city: the original PC release of Grand Theft Auto V.", + page = "https://www.rockstargames.com/gta-v"), + RockstarTitle("rdr2", 13, "Red Dead Redemption 2", "RDR2.exe", "Rockstar Games\\Red Dead Redemption 2", 1174180, "2019-11-05", + description = "Arthur Morgan and the Van der Linde gang on the run at the end of the outlaw era.", + page = "https://www.rockstargames.com/reddeadredemption2"), + RockstarTitle("rdr", 8, "Red Dead Redemption", "RDR.exe", "Rockstar Games\\Red Dead Redemption", 2668510, "2024-10-29", + description = "John Marston's story, with the Undead Nightmare expansion.", + page = "https://www.rockstargames.com/reddeadredemption"), + RockstarTitle("gta4", 1, "Grand Theft Auto IV: The Complete Edition", "GTAIV.exe", "Rockstar Games\\Grand Theft Auto IV", 12210, "2008-12-02", + description = "Niko Bellic's Liberty City, with The Lost and Damned and The Ballad of Gay Tony.", + page = "https://www.rockstargames.com/games/IV"), + RockstarTitle("lanoire", 9, "L.A. Noire", "LANoire.exe", "Rockstar Games\\LANoireMTL", 110800, "2011-11-08", + description = "A detective story in 1947 Los Angeles.", + page = "https://www.rockstargames.com/games/lanoire"), + RockstarTitle("lanoirevr", 24, "L.A. Noire: The VR Case Files", "LANoireVR.exe", "Rockstar Games\\LANoireVR", 722230, "2017-12-15", + description = "Seven cases from L.A. Noire rebuilt for virtual reality."), + RockstarTitle("mp3", 10, "Max Payne 3", "MaxPayne3.exe", "Rockstar Games\\MP3MTL", 204100, "2012-05-29", + description = "Max Payne, years after New York, working private security in São Paulo.", + page = "https://www.rockstargames.com/games/maxpayne3"), + RockstarTitle("bully", 23, "Bully: Scholarship Edition", "Bully.exe", "Rockstar Games\\Bully", 12200, "2008-10-21", + description = "Jimmy Hopkins against the bullies, teachers and cliques of Bullworth Academy.", page = "https://www.rockstargames.com/bully"), + RockstarTitle("gta3unreal", 28, "Grand Theft Auto III – The Definitive Edition", "Gameface\\Binaries\\Win64\\LibertyCity.exe", "Rockstar Games\\GTA III - DE", 1546970, "2021-11-11", + description = "Liberty City, remastered with new lighting, controls and visual detail."), + RockstarTitle("gtavcunreal", 29, "Grand Theft Auto: Vice City – The Definitive Edition", "Gameface\\Binaries\\Win64\\ViceCity.exe", "Rockstar Games\\GTA Vice City - DE", 1546990, "2021-11-11", + description = "Tommy Vercetti's 1980s Vice City, remastered with new lighting, controls and visual detail."), + RockstarTitle("gtasaunreal", 30, "Grand Theft Auto: San Andreas – The Definitive Edition", "Gameface\\Binaries\\Win64\\SanAndreas.exe", "Rockstar Games\\GTA San Andreas - DE", 1547000, "2021-11-11", + description = "CJ's return to San Andreas, remastered with new lighting, controls and visual detail."), + RockstarTitle("gtasa", 18, "Grand Theft Auto: San Andreas", "gta_sa.exe", "Rockstar Games\\GTA: San Andreas", 12120, "2005-06-07", + description = "Carl Johnson's return to Los Santos and the state of San Andreas.", page = "https://www.rockstargames.com/games/sanandreas"), + RockstarTitle("gtavc", 27, "Grand Theft Auto: Vice City", "gta-vc.exe", "Rockstar Games\\Grand Theft Auto: Vice City", 12110, "2003-05-12", + description = "Tommy Vercetti's rise through 1980s Vice City.", page = "https://www.rockstargames.com/games/vicecity"), + RockstarTitle("gta3", 26, "Grand Theft Auto III", "gta3.exe", "Rockstar Games\\Grand Theft Auto III", 12100, "2002-05-20", + description = "Claude's revenge in Liberty City, the game that took the series into 3D.", page = "https://www.rockstargames.com/games/grandtheftauto3"), + ) + + private val byId = all.associateBy { it.id } + + private val PARENTS = mapOf( + "rdr2_sp" to "rdr2", "rdr2_rdo" to "rdr2", "rdr2_sp_rgl" to "rdr2", "rdr2_sp_steam" to "rdr2", "rdr2_sp_epic" to "rdr2", + "gtatrilogy" to "gtasaunreal", + ) + + fun forName(name: String): List = + if (name.equals("gtatrilogy", true)) listOf("gta3unreal", "gtavcunreal", "gtasaunreal").mapNotNull { byId[it] } else listOfNotNull(byId(name)) + + fun byId(id: String?): RockstarTitle? = id?.lowercase()?.let { byId[it] ?: byId[PARENTS[it]] } + + fun cover(t: RockstarTitle) = "$ART${t.steamAppId}/library_600x900.jpg" + fun hero(t: RockstarTitle) = "$ART${t.steamAppId}/library_hero.jpg" + fun wide(t: RockstarTitle) = "$ART${t.steamAppId}/header.jpg" + + fun item(t: RockstarTitle, owned: Boolean = false, extra: Map = emptyMap()) = CatalogItem( + store = Store.ROCKSTAR, id = t.id, title = t.name, imageUrl = hero(t), tallImageUrl = cover(t), + storeUrl = t.page.ifEmpty { "https://store.rockstargames.com" }, developer = "Rockstar Games", publisher = "Rockstar Games", + releaseDate = t.released, description = t.description, owned = owned, mature = true, + extra = mapOf("rosTitleId" to t.rosTitleId.toString()) + extra, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index bee82bbd2c..729fc5ad19 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -400,6 +400,7 @@ internal fun GameActions( val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } val cloud = game?.library == Library.XBOX_CLOUD && installed == null val downloadBytes = catalogSize(item) + val launchSupported = store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(id) Actions { when { s.shortcutPicker && game != null -> { @@ -411,8 +412,8 @@ internal fun GameActions( val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id) val preparing = (game?.launchKey ?: storeKey)?.let { it in s.preparingGames } == true PrimaryButton( - stringResource(if (preparing) R.string.store_starting else R.string.stores_play), - enabled = !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), + stringResource(if (!launchSupported) R.string.stores_rockstar_launch_unavailable else if (preparing) R.string.store_starting else R.string.stores_play), + enabled = launchSupported && !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn, ) { if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(store, id, s, a) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index 2fea8fc891..f1afd42c0d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -35,6 +35,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) Store.UBISOFT.id -> SourceColours(Color(0xFF0B1E44), Color(0xFFA8C6FF), Color(0xFF2E7DFF)) Store.EA.id -> SourceColours(Color(0xFF3A0E12), Color(0xFFFF9A9A), Color(0xFFFF4747)) + Store.ROCKSTAR.id -> SourceColours(Color(0xFF3A2A06), Color(0xFFFFD780), Color(0xFFFCAF17)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) else -> SourceColours(Color(0xFF1A1D22), Color(0xFF9AA3AF), Color(0xFF9AA3AF)) @@ -52,6 +53,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.BATTLENET.id -> Store.BATTLENET.label Store.UBISOFT.id -> Store.UBISOFT.shortLabel Store.EA.id -> Store.EA.label + Store.ROCKSTAR.id -> Store.ROCKSTAR.shortLabel else -> stringResource(R.string.source_added) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index 8988e16a17..d8daa53d58 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -85,6 +85,7 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadQueue @@ -220,7 +221,7 @@ private fun FinishedRow(d: DownloadEntry, s: FrontEndState, a: FrontEndActions, val ctx = LocalContext.current ArtStrip(d.cover, d.name) { StripLabel(d.name, d.store.id, stringResource(if (d.state == DownloadState.INSTALLED) R.string.stores_installed_chip else R.string.stores_dl_cancelled), Color.White.copy(alpha = 0.72f)) - if (d.state == DownloadState.INSTALLED) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { + if (d.state == DownloadState.INSTALLED && (d.store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(d.id))) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } } @@ -373,7 +374,7 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) RoundAction(Icons.Filled.Refresh, stringResource(R.string.stores_dl_resume), primary = true) { DownloadQueue.retry(ctx, d.key) } CancelAction { DownloadQueue.clear(ctx, d.key) } } - DownloadState.INSTALLED -> Box(Modifier.bloomIn(true, 420)) { + DownloadState.INSTALLED -> if (d.store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(d.id)) Box(Modifier.bloomIn(true, 420)) { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } DownloadState.CANCELLED -> {} 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 4e2c210b62..e5005a018e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1168,6 +1168,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) Store.UBISOFT -> Color(0xFF2E7DFF) to Color(0xFF1A5BD6) Store.EA -> Color(0xFFFF4747) to Color(0xFFE03030) + Store.ROCKSTAR -> Color(0xFFFCAF17) to Color(0xFFD98E00) null -> return base } val on = if (accent.luminance() > 0.18f) Color(0xFF0B0B0D) else Color.White diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4d2e7cfe52..b543ff3d78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3998,5 +3998,6 @@ Scarlet Snow White surfaces with red accents. + Launch unavailable No web browser is available to open this link. diff --git a/app/src/main/resources/rockstar/legacy-cipher.bin b/app/src/main/resources/rockstar/legacy-cipher.bin new file mode 100644 index 0000000000000000000000000000000000000000..b70beb43ed5c0622878ac36997fa03c338535a53 GIT binary patch literal 86852 zcmV(rK<>XpL{djgLohM!}xv{sQT<3tju>SZ;q5lEWM_`5*Bn(M+!*$ni!9kny$@VtJ$`;6ujD$r1YYyyE0VK0hiKx`(ax!n z_tPEDY?!S-)yV=6$+HL^TDvI1_Ca|l6kx)874oLctK*ULUc7_4u-OBY){ZeNXPgd} z5%mr1kQPhW8Md9OmsZoM3l#IRk$EnUHh=MDgf71$0B5d7bo$_ zioU&=OjqSnm4k#I?mXD<O~rxF*dJZ6c%e5p+R6&qtubwB z^#)4FJ~>SlCPeHP;Xlw#TPaNbaN?&ODM#dMGJSS-JFJ2TFO?YR1Cm;B11>bA7o)c!SI-_0*nv6R{s;E%Je&}ad5*apyx8Q z?R)D*R4PQLxd`_Ybma`>pA|!AsHCE@zuF7FB?I4l^VGIaoKkS|>N|6Z-(STpM!_N@ zXrBfpIzHwSz+(LU10HKflTmm(Koj2ZEkIAeF*-%p@RNlGayRgq_|O%(!zIs>gfG#X zKdUKVPJ*%x4#+fa6ChepQuw&V5NB!1`9g7Be5RZ+h->OP^pq|ReKh!N)LUlhu}f!n zk1KKIP0-KVNUX<4UY%f-p!%6o`)y; zjsW!&$S8aFGWl33H4_Z*fq~Mtc#;^d{l8na96IC)S9aZ3@Y+whR9RwM@)?M^i@P&9tKh0n0p-FsLDbWZONTs&VyxG_Q)7 zjmQ}$#DkIKx<4scYE>eA518Klfq9cU??=;Py?q~nwvMA5&^)%p&u}duj<@hFd)qR~ zV5)XRL6KldwEd#YDxMdm5Y$DR*M5M=`HS_Q$NYGj6zQ7AR#C2X>UQK`Im$kKU`t%&vi1{w@w}MOA zCnI%3$TAx)A#JN26RWJ5PG19eb601=g+xpz2Na8jKP}ihEYQhE8z=b}Z)6ocX5^@( z(?eh0u7C~<%>yh@kGmL(3Dy8p)eV6{3#9?T9A(dwGLX6&nh4iUJzm)&7nXAhhc`{= zjKuL#Oe_ND;EAwwDdGO^#_*64B~Ww)>v{~K!@;Mrgh-^RCNG_Q%n!uf^fs5eVWysT zu)uvWP#j6%&V0pS=gWoyV%c}_bQMwNBOa=p zUfug#xj?{{A`(K|z5@1hphAV%^M6A7+4Tm^K_wrbs4$E4Cgm; zW7VGyR3fj{5!kH=9v03^E!-h~RW3)auZ-qme(D8hZfN~9K%Iy+g9?((=?M+c0a{hb zIvnp5HPVb0tn&{fU7`}BTHqv1q<>n$-}2RNNDY$ z|HUf?vCNejz`jnazYZQY*}MyCn*=|Vc%<8FSd%3aym9w=+>Jc%1!sydlZa~CeUtg!I4&3+bW3jbU!d`8 z6UB$h`}Dk5w~@*yFD>=8V@QJ(i+Q+-#~jX;?{rHDqY*u+OCSa`2Ssp8pZQPL)0{bX zJFNohcgS?$6=O(!Sq47bu{Q-l{Zey2W$sL)DT_J+!MXvTjo){JrML1P>C%M10pq_S zO@_%`)jIaTnO}fmac;Z(Jqyhj7T{8fT7@Jlva}zz{?Td4W^GnfDhMF;!Z{mgj$CbY zrZnj3>QSCZ0$`=pP6gAd*17CAn%tU}a_ylDK8V-l-Lq(Tk=7pBdFLfWHG)$+tv+m~ z;aeI932GslMGseoZD-OOAp)ej$uplPg;wcU9qQJ_QIDWxxxSnE_1ol=I7(*p|IGFsFv4e8TYBYu^jO7qUz<_4wD6w67WYjAK{Ad)I zunl54SUg#z6j?7%KeDjWbJxamo96xQ*Mp0ZPd~H_16snZ>udQirw)%Sk7f$7!vlN} zD>6roXIC-u|LYEKvyOPqTfak77uq$w^x=vixP<(HP_@S#9MG|2glvxf$O-sgAUMOq zY+be9L^Uu&2vA1i;9-4#tON@HG`KXKc-=xgknDM(+=&lL_hOLOy9efWQ#Re}A5*K8 zhwqdL%ZlQtBfHr(Z{DvdN46@o3)5T`EK@jBwsUhB;Hbt7lakV9ddz*-UHi66gP@ zl}o1a7^H2ZC!9DRo*a@>RksGX4dEN~#!8P& zf665Qv|+LLOLw`ufZQzuIb4TN^7j)6bz4$IzVOEU2XJh#%-i@!GtKY|_-16YLFUf? zicMOyG7GEt`Jg{QKp>S2i;DsKbe##ezc!r@2DUdt%^jlzO0nWdff{!3IGWtN^D#(E z3@1Pb$Bfj!ehhx|wWsP;538FQ!~hSWeSoFywkt6jNj*7Mf|jlBI~E6`@V%4ecM;O5 zyt+ma1v>0q&XIVkF^6#G`YhyLL#$2`hzHtPFhMI7`|7`~LTVM^iNS#ucGrnoy?hFAJ4tS)MP1qZRCS6rcW2gSy>;8lJbi)D{>)!;Muh}XLa;+tlnVE z6<*4K-t}I0A>&p%>PW(aQ^;t~m}C5eASDgR>yDXlQVugbnWd-8X0xw{tr$B$6qu27 z-!la?Sf50AlQhu4Dztix;UDgM9tq|*)uM8bY$Djhr-@7`|KCw$G<3z>jr4DjMqm49 zxk>XYa^h!`%VN#n0LfXHhh-SlOwNpK^-d-rKIO94!SlMC3Ro^9v)F`hcykaWz%}7$ z3!Zh*vL4@@d9_PxhND9#O$gVY^oV`aKO^asxR0pVb0j=q%A}So0S^M({uv6FHL{*B zj50K1N133-{gu&)HaJ!xrq zy2U6pac;bg$nF-w14V*1{8Ng0H~1dHj(D_=MbjW<9fdt9)-I`$Z>|H~qy?8MTN9sV zkhlxpDLA2$;*&MiWj}P8u9V;*7Zgfu+`rzMBdONb=mJ7+QG)0qnkjr~B5#c)>BJeG zP(-uQo9`zkWce>@uTs0x7Sa)(-Fb!CTGhmrk$zAuDE|6k<5g~!97AT>*XZ(MZfIC8 zrNhh-c)=FpI$Nfykj#v8i(f>?-mCdyCFEwcl6|Mi za-s0_qVu{esFPfpYMW^^j%zlQ#*ttm1esN@BY8z#VoIcIt*0(%E2xO@0JUAq~qPYz9hx zp<3&V;AsjSLpPVCJjR9WgbUEFGKy=c2QUPdQElkrC;{13`})F0!o6ss34H3{zx`4B z9}1mZbGeG+Ir8_9W@fCzeC-~d$lZ<_XMWZ|_Xh`F9HY#ww1v%j0~`#IbtI`pM6%9Vzzjo6=(xxF z4*9d^o3s!sjM^RE>7c!GnyhL$q;8oTc8&NkJ>LJ*!=)1cy-a$Jca?&OLND!`duT_g z7Q-s}i1rmvO8y{qzU3=Fk<|A6DzNfHaR{L|2xO25Ps&nd0j(#UPSPmPM;o7~y2&FM z;c;*vlV#oLCQUc(mH7T}4N&4((f@6`K6kF~0t9xZt2zw_@-uZpVEd0SEG^N$oH0qa z1%WSYiSBRQeq1#dO?!D(ef4BGwVk)ta1h(s&FTEmMXI#IZ5}Xfm>oe*TMZ7q3(di} zxOfP3uNDO#)XN`1=JYAX&sf(Xf|m1d58=s|K%T~x*J4fq$B7zHNKXr}A;@lmOk)GQ z8b0sL!4x?yxnOc0#W*pbo`7NoqQfj^?s(pEfqg%hfUXevSt{C}GR zP<4{Isf#8|%<+Z{?Tocw^|ma^^sZJ&Znt68_8)z29untG-2$kY?3B;lZ?7B3V^ZE! z>Iv++FNA=>>k*dWt`2`me?(7XG#5zMVdM1{T!>dEw=A54U63urSfpRuS`~EWibp;i zQpCBOUm*tmtiM#{3`m&3`r^0~?>(OG6ZcpzE}Z%VbUf2wvKa36H4id>u&KrBv9Z5) zIO>f6)_OE9KX24W(@sW)?j_{)vjCJ5{?4%ThPwMYB4Iy@)zf8@;@BZtMg!$i-?M{i zyi@=)sv>vyB>Wt<6mkLSH@+FMFgrjhohdV95MBw3#2`!5=j>C?R_L)LF(W!9AkY+m z+n59yphA%~pO_d^&Oog@Gm;UK^D7T{l;DIZ8zz-LfG5}s$;I?r zSMbY$%50?&X)-urqwBzTDH)@sEj6o&Q{2O}gN}&_UO9XYdT>3_R9Tvz*)E_q8JE6| z@tP#@5k_-||JKU#mr2!UmQk<1jlyS2`Ag}9dD(3IJ44*q+#1q1mfVbSQJ0?BZ@K~* z_HN1>Vji;Jz~R-f$U|1@TMQ+^0F}%Scmgb<%&WeSiN+y6*u--!+$@_0hqZG0%apZY z!4D2Z%6e`hJ#Vu)#xMoIu{v#1L>7qJ`^tJ(e?2G9Pi|ACF-R z@`fTD%|&G}Ifq-UoJTkO)nLQrx=#(9Jb`HN5&SaDb*7xHE$Ehw9kyAQS4K_(4KaL5 znwIAmrh-FG5EALJdF=O1HO(+`bVx@ELn(uc141ujReyFX!r1L3Bb&vPa+#NAZdBQZ zc5#0PHX73(=$gD=F(uf?9$~u1ug)8Nl?!itB&5!e_#K(5g0n%iLdRI=E2zljovG}4I#9UC|00sRql9pbtQq*FWAJG&NL=IX^jGqJu++9F=La+qxOO#w zXoU$0X7*a-3*fBW+7|_ka(|hFht`JHBHC6U7Qv&XR^z>rG#u8D6m|R;ZQz zWY1!j=IQTSyP?+E-W8)@aG~d5r zZG$>Rd)3b;21Fdq#0fp=e$)IkvjbI7&}Q&1`SU_Dt@k57X=~DDON#(P)Q%XPjV{T$ z5-ZV24(6W|ECx*=sUOROOiJR#pmXTCY|JG~Yf|dlN@d&DKURx$ zYP>P_4+um@@1?gYb9YP-3E7l*t{}iVmqS8i`USx9hzXGV(hNUETFb zzezrdvh9w7{Pl4>{Tr&b*0&&0VaZWJ@lnA;Wg)ropi`3}7_e%!^Jw`tCvzrB$G78)u1;NwPSpr)-#K-}`vsFv|nZ;nw8Cl;yNF0<83Z0ecrS99V*6`Xr$} zOtcG!$KKxcD%YLeRFSP(3J!Pf(TFR)n6KY=Ph;q>xtQ*Ii~kwPPK`4=Qb2uFTH^kj zliI(deFPtq-NHZ)$*qm(&wO28fQoq<)3Fl+yq?|cMfg+2iV?ylEX*(#{ufn=iV z>Z63>6%^W8FVU`^sPPb_(qG7EKDbcGHIGvfzC4!=V0B^C>&B%o5l0pFn)K1?M7<|7 z&kp0hxr1b9GBBWf?0HtAXUdXUol7Es7Wn3z$gvPbLju&+q^`CPFCB6d@l=G$dgnkf zfM)RM3)M9A)ttgDUM~iqD58ORqY*`AeOR-+_Um^?3~I-ohuH&yS&;Qx(jzf?1kK%} zkA4}yQ8({q+Jq~eAO)L5tF~WQb^ob>{!DEQh{5XB19C3O-84gl2gmqOd357 z$Eo@CJt#>mwwsMGXwrM><6*yX9Um#EmaOfxNaY)C!&cvxIoEGbvSh1MY%N`i=bo7d zkrN)?8lc+3#OW*>Pg>~UwcA)ZK4_dJ;2~=KYm%;Sj6Te^2aO1-*~I>HQg=FtsP>9c zBSlV4{S3I2cE5ZX05bc)i-AAfRmjN&-g^!HB>KH4uSt13aR86v`m;;JEM2D>r|x40 zd8d`%@)S`d2$kXegC-^6U2oGk*4!7hpiz))E8PronY0As5(mKl%uY5YNB#1vF>rNqy2G(U1^ z6}U5%o(uPhKtcgf%kjk{zqeWXGz6XI>P>4uVg9egn|~i25X{>F&V?=5MK3SRmHf$csY zU!=&!)E5j(qMD16DJf5m_h7kKeA9ibhEmOS4dDrC)2RQjSQ|T$j`i0_1x6E8+YjZ9 zP`n{_sy&gfA&ynE|Hq?hbaZFu0{P%RiAp3QR|C@f+^`k^CNZYjt%733bIX(*_;^r{ zAJj5dlxOxzN-hAC!JWitI~;Veu&=PKZstaG70l76d-|)lkR6_?9uEMv>C2@1m`#6OOaEn1Gre&@1E!Ju6^PitIcr07b zg01To2_7#B*H_uoT;v^IDruUBq1s-Xf0L*}^dM}x4x!v&g%TKiTU+j>(C8{QH$+J9 zy!VXrV!nDR=?%Wo6O0ZBm_N!CMs_^S&BgdYyGVbTF#EfO?y^l>WdVt&pMW`j6f^x| z%6bdCLCMdkqw41`Z(E^Y1N%eg&q@WoAd_o4>>@37fP&BROf!j&DU0z5uIRr&+*4-=V8fV>FdW}I&GnwV0YupIZR9$1p;de?PK*+%f<08`?wz(_A}sJ7N0f+~ zizUw0=Y=d%D>P~d#O(x+2wXzIWc;8Zd9tl9r(zphKz8K^Ma;c(Uop8+9QNfCr zJz;1N@z5@8lxSA#SlJMyGiC-<1tImA$&j6O56B_xI_%KhlA z228HvYV1s9rd-88QmoPKo*kE>^1XE>J`6J`h)9*MMETR;C|NOQeP2ow?AwjED?eOhr5E-oR+^FiHum}hze7R12 zlVBkFU(sf@GjW76|G>gdns~a&R>}N^I%ysO_Sjfk838uj)v$1rxe$^Rb)nSCHLEgB z`5JTrmAaONSqsqLw$i>>dSmz(7Q-5l+Hzd%zse+Qb9-VWAKQSV(`v@~JhP~N@B;2J zoT3c2P!mdut@;ZMVM|Ry4ePJP!CL8`E`x^{;xfTkj*=tLLL+6YCz~BB>ndAhhl;u5 zOFRF$q~ei2Xj9j51oJia$U<}beg@TivbU2n-WPGS5~erq{eM|$G0q<*U2grMk>9)B z^k>6bIM#&~RCZ^Qn8zW=cOFkqyRQiV*AMH58@{c(=2z@ID(0$lMn*{ViuVq#WiDVT zsh=ih#XrR1366rDY&QBDpohFw%qL#b0G1et?@x9QBmOWzPhQf;gYT4JO=OslH2cV6 zFT8t=RwFCz*iz;Kq0P4Mx{3t=!xdG50mWBtcv=U8V;!_?8iM2ul=CU$?QD4t_AAQa zkF=U$dldbp zl8E-{9Qiv2WoB#Zej(Td2fm1f#cqmfyz$zHr?zQm-YGc!93|_+Iw1vqvQ(cEtSUyR0@~sPfa8RHqvy2^a6Hkjh!ZjmfDqR??uH4VKfNl z7^_$d1MKVMdULy%nk+DQr4;oJOc7+}oZNjbh6kYvx){Xy}uM)3x zv{f9N&B{#sL%V?#IwaBgA!A||So|`Ut3b?o(%+nv$(S#Dum^t|K6bM7N9p1jT&_{} zB{2ba=ivjGo_a5D%UgX^_sVihrj>^WgWX=%++RkvJ44 zA4%ECX4Z)$eUUoL1P*FS#@=Y9zd<-iqy~$p-I?3RQ|J~bDtAW3F);NiNUx=;yAxYQ z!i)>3*~_>`pj7B5E+r+%SGsj2O#Q~nHDZ=a_p+3vjxEGVm1=jU?DZ$cVub1`8ymXB z09*+xdBa&)nVizM-~)nM`$RFdg4QozAhkhKT}I{}xg;ac7^}2>8!86Tf`eY9K7HPSkopH%lt5EDV`KRg=jg+u{Vx zqJ2~#xjN_1z@@iN0(G^ad+Oy(V69f888QaLmqW`e?%bQf^_wUzj0AYDf4GK01}E06 z9bjccWdAiI>W=u#lM$#Ph*lfU@ySb1GZ{&sN`@ItQNgOBC|>%)rY|=w->_%E#P`%M zy=a77T{jQ2B&c6rKkw|ZMsU2*$N_Oav7RB*s@ak}(?-I*5thJGXbF(Nb50{r3ej^g zgrL6P{Xgz9=6GG*pXUu-Y+LiP6~v=o4ucS|cN{>_`E89qfb!kao3(B|;wnD8Ao@I0 zS!Ha#LL%Q$JH3xFwah}^%u^CG*A$`Lu8Z+TK6-4cPQUe;P(M9%Ao`?h@ORjTfU-ff zo-&D9?)MO=tW^0$+>u~+!V##NveYq!Vp&aS5}edp3>+M{eA$KFS@AY7DKxJFH?(K( zM{)k}m;8bq=Q$fM`MJ}=iF`^k%ip8kyBa#|rJC{q)n98K1=1Jubr+7oYnMhW8&cmK zxnLjh$)$$F*CkFar{LEycWtZO2dFac87TS#Y3*b3D^7|ZTZGPiw1A)`@{B!-s?qbt}fhIu&xxfz-x`F5a#hmU?XUCexsn64rV!NOvTWIJOD|y zB7lKgQbiacoJg#R$Jl*jw;kkGshupl*;uut3DwC-c@R*0XONhd z7gYggRrctLB{OljJF~e}OLibioBLd+>psPm^}Y>wg?p3|pi?LR(3ZZ<&K7nczSHkN zZeEkp9-9i_02{&$aNb+|GJUcULbxjDXI(W@bE zlL*Ly&W~~SJ7HFQu2H}KYI*ukZN=v^6RLghkBo6M|hCD7d_W8F2 z=y`wXn7ropNHLllIP?Q4CUnchRJ$LI06oF**pYbD7~o16+7<9o(>-Z5b(p zy_8jM%~8x;)6oR6qZFM^_=HTOh(Xnnmcbo-<^+UeHi`I-MoeM6Sj?$WC<1n-EFbSe>zq^E6Q)ME5f%Hlk~x+kU8pAQx|@5+w~@k&SMfsfw!Q39eBA;&u> zKS%S*Pl9SY4IzWpedHSCV`S0^6QN5M!z?%Zv+1tMt!ZW?-K_rR%))>)Grrk(=xLtsd$e0;niaYR(`u=IYIzq{v`br2$ zq)V#w?UGn2vy=K0{n7`{qtm5B;gF)9zmWi>@zDKwuhCy5BzbZ9dU(^rG&wFFYB-FO zD0_=ec6upvI6Ks-W;%8iFXM#BapETOKcm|(VWN4WBjJ93ec;?hGoc}vZJ>jkM(p%K z80}VjR;;V02(1Y#O70H!6z{CeTCPzM1h4b0O?Clr6L+IZT{d2q12_B{L3I1aA9Y#% zQ8c6=4>bmx9I?ViLa<7N7b`b+Nh+012Wx1M zS!&818!64eMJR9j3u%%kRcJ6Hek4c!ASLC*Ze$o4FlD-wawfe=EGHjxVrJs5JZC@> zb-uFCE58u+W&Z6bJO59mdAvw?C%x)IY5W(TH~qE3yj7bY;#4^$tQExg@)TxuuvcNI z?pDK+pcg(*{uZ3`x6f`a>CVg)r;jno`HquByUmoD<;*sttBuQk^^9qH-oPHGfWf?- z&VWHckb&dP(!%5rjKfAM!h*Z^oP!xl)mrP8i(5&o#TvA6n;RDV*;o-Fhgq{5$rw(? zml^DenmpfE#65j&ihO{u)O{j7mOdrm$UleLhJJbn*nil&k)|qU&!>o7f#!9A-{;p1 zoutsw!=-ZTjpUCu)8#EP_^Dd&rl|PU=;;Lrw&;xy6Rm6^E0pB ztuhVd<8$yiy>e2t|1ni*p)mJT?{Nx_v2duLzk&w9hM92U)2mS0o1MvPnA>G5tQ+4 z0uVK^ToIRx5>RSZOi{?&4ie7>P!nxD9#W9uKvObZ35vjgSBql08Oon$N6S6x1&BH~ zTZxzr706}KOUcL7V1=*=K7&=PzWlrEFtv`)$EgwJbb|>n)y*z+vf7o?uIA&>^gnfOHP*SWbdiMSg9nI52S zDva_aEHAc7pS|R9d+q=p$b3>&&fgX~eN9BVjhJQCJ_N>)B=O!ayM|7R#a8#K&NsHUD9t_9k39hZpo z?Lw)WUeNo{SaZL>>*4K$53&jCydYbkx`Q9j2@y?VC0H&EmdboakZCw6Bl~I+$Ec2d zbUNHNa+#P}!3)aSG2ZL8f=s#ngzx>5H+`?E(=JQKV7wWPW*=SR)r}AEpaue;6O>TY z6*m;Srlm%JLiVEX@nrC%_s6u$L{;WXw1CGX2NIQU0kP2lvLk~#R&Zxj<>ECT<3Vw7 zP}3vbe40SA&j=Fv$*WeDdN~BGo@(I2E%>sDD_i#Fn8~DOXdHzJ+m6>l-7S+XZok16 zitHtMIevFCKixB3j89>{z}(K!b55L^b?w;o#(#>=A}ns9k-j|YmmPS8B#$Zu)LIK_ zXUJJ0VQU>u()mwyHma){g*f?9gPXlRFbVII96*fxuhQPPsd1Xv8so_0{;({JO(K5B zOMyD5_!DR-2*ycAyHpztz4u>Z4rL8k>Ne>&S){vsUkCpa?3Jy_;hqPkQVdn?RId?& z=RHHY18%3*u>AF%wqLRG1 zc;<2oenmE9&DUgyfkeybGS-=+GK^=;@!~TYJsgzbGlS47z*%3K>6< zxr=QPNnT8T`ph0R{BK%XPyGmCtFG)07(Bj39-sOutqrI+*oLK7YZUh!ZMU;?-X-Bk zI(7voiR4#ok4F;&Jk>#i%m85Qf08n%c`WWWXyl*HU?Z(eXVHVqUQ#dr9tcIB#&lD1C&AtW5MCx=+ulobj~*^ABxby2Id5I*N>TfTec1KWj1 z1uE5bt#j@&u?5HiP_AJ)0jY~W?7#WCg>7y&72zn&c(CD5eQz$rf$lJRxjRjtqr5wV zotPH0d^5jhhaX_JSk>HH_BfAZ&h7HQppvBg7yx1w-X;&l0QDLw zE5!xAA&HKsI#OvQzLtz28ggue@s&=hXXsem8!r7^R|BBuN+}mva{Ov`Wtvvfj(v3X z;a;ij1PKWpXwM` z^XEX}r$1$$BBv444`yCNq0TiOrepNWm8O$u5=`k-FGgDi^h$vM8C>%bdcyB6k0IrG zankj?XnPzeVmFtFEi_eQqTs3!``N`xSdipZu3d38-3X9p1_Vk?G@ZQ46ur6Rg21oF z$Q+^~Q-J=^$B*V~+NDv}Dw&jC9`Q2s3`oJ$V`~QenHxykcO#{SxM$qGHmP^ zgPcAu4m!_;aE@f8^1IRayySu@<1D>?9p9~?*F+n&ktNNep0Z)gfagcOLc~B|5}@3Bl~~_Jfk_tT~90U#G!db zOxQ=b%%A+2&#_~BI3Q<&9D_XAzsen5))(wo$oPO3>En`uUp{sszo@X6mywT6~|oWzHe6A*Ywka=7h z%5JQE)ixFE`h`>tMCQV=HNh>72+Nx)st$5n^^Hc7HUJe;ptcUp*!AjZ^FE zmWT}CCL~WL_hcTj{V0`A{B#7}nl;xmFdpLhJ^!eOIehkxz#=Ef+*ASXvvQ1Q-4HQsO3b~P>R$npc-+G=tZKTr{7SFfi?#=gbh>Rp`wx|i$tAf5(X0*w{ zq!IdCI}Z2^#r^1a0mY)0*4g9B?{1$k_%F+=JRsO@!8fRdKF-R4qT>)5k@-1a?GelUKtl zs@^Z=%Q8J5?~!Ii&BJY~KetS06O)l*+U@(V_Q@vNBEjSr4&^x#$D32%>%WeN3F?(f zCC*4s?64w&z?A>@6r4ReIJn?H@y3es-Qri7Aa-?B3{t33#Vo>{=?EX`JpkP#5hMU1 z*jj4r^nSOr7AvfIIuCJt^Kl!o-&MxM3ta>WCwbWn?gz8M!Xs|*xA4q8o753FQmT9P zevYPqs)l4uhN8JhPu$amWB3l;fvpt~t%=ALWcQ-jNYj6W9Xd4US3Ri)R% zs4?{pgcT?YO>08NVNaj4wMSiknPY%^P#x;Fd^tDno@^{5vPkhJdp4WvR}w~^gBpZW zuRd8;WXtP-#ll-4SN%?Az#k5=pm$d z#07aECQxGS3Ut5d!wS_U?=A>XJ0{AV7XlZU-h6#k@>rl`hl>KKtFPazV$ro>PW5OM zn*FNTw%K>wf2SQ0Q-i=svDVv!o$>~ORE%s)c&M>Cte|uBfP}8`N&3V*W!@QAm`XdE zv~K2~eGrUNQ8ZB}g*=n$sTfZ0U}hvDOhWm3t{39Bf-^s|OHEaOXK9EEvtdfdpGB9# zRy+LPyi-q$ zUItV~aw3UCyIkXrmv}z=LvZ{yZ&V>OrYcMRiVl{~|J^hK)A{KK8i#|*Hltp@;;Wo; z&W}NN2k|SqE7kVm$$;%I<)knwEZSP<0RD%P)b>SR_|lkKF|6{J9f&Xd;2aGx%s9|A z1xC90DPm`g{c5E_(N1_o7%&ovG!)O#)5T9?wicC!z;zs+TIlj*oDalE79U6_94l;#vExWdU? zY|0CfKvA-pbT6`j3|L0Zhe~4 zLRm-Gizh7_rvvbBa|<$}UoY>cmQjUjx^-Av&!+m8oJX_wsd8(7o!bK*sP5ZAZ!xGKS_E*f9>zS* zEA!-$>@1h?*%?nTVd-g6RNS!+lLNwUrZyVj;`CO5*TIh75FY)%B`YO25rR!tB)63b z<7nn+)?Gg5lAm&hr>d&iV0GEJRX_pS$@!nV{LDw>I}?I*){G54v14$Yn25{ZRLkMWE61aFq$Hw@P}=f`6hy z#=Y(%^N2QlG*?9(0b-q%HOuw%0RAnj$01(I@)U+ew${odgX0o=L_A>{aS6GNYL()QNO2NHFS7eFZWRy4pc-kMEiP%PrNO{um9xImdpW4DzNZ zI9tw14Q>_|%CTj4|Af8xyGHSuj&mu-Nvv9@e3^o0#A&1k@mzdaHiHj11Gd+Hy^*z0xD;Y#q|{L@W9MNy?vu1h)8>V zPnQTBdZN&iK46^k3spp|%!)V6`M>W(%@&6x_#Km05k3d!`8P7Ap8dp=;Qyx|ke ziPXyrF(mD31Q9hg!_G!j_WPdOvN_VahYSkkK+}1Ib>^WAK~KqTbb1jov!!BFhLF14 z!cz9V_h&BRFt}ZV1&xK_nKT=KtO3K{Yu>QFUh8Nv8Yv`DFC6?2=);e0-S$`J>0dvG z+-m388?}_VE`UrnYC-^4Uw7CDn5e61t(|kJ6>U|>AXtr;=ZF6G(y}IbmT+nqqeZeu zWSYSyQLh=UWd?E2P&28Jm+ac{qS*p|<{M5Q(=L`k6!GODA;dklJhax=34soX&R%`# z`)j3Uzp3d5ikvZ6O+!LCcy^kxOyBa*dFm>UzBO6yivWRP&%(_B`u7!IJt$^A2pzuu zuKDaJ-y$8vo8VEUuGNY9X$tzATt6ZcXqHNHU89mM zntb6*uSq$>>x*@w-oCB<8DZX>EK~+ul%ya%p^^AvW=@L(Q+rd47r7tpB8ppbbdf#LZNn?5}u`&yGdX=j>_Z zNgT1JVSb&dLSLZkYCVjF9Bd!QG!8S!7cUNqKTRUMk-hr0Dn*QsvvYf~L^?mNY z-5jqgDicXW~WHpPQ_%?ZRA;zMTT{!>vpZ>!xVw);5EFc$XAfYz6Jw?mSiuBwM7!i zohLs3GuP(58@0-^IF$GB5cb=?R~Pd9e|6sTTvX$+bT-e2+Qt{f@}xV;(S-(x`R6L; zkG8p_r_`0Jg!QQDte1q}0%u&EDg|(o2_#L>Ax2?>($cBG`mlx1*^#)7@$;0sUjt0} zcVS@mR6t#{d?In$3UlI^A`#A)0WkB`DN^6#hoT3eufQv=jNumSq=P!5<6;xw%K$&` z=ph2Fz(X#ZZnO5;M$y{VW$@>eO_Iy{JHuGG6QOjsFn~$*7~*Bawi3O8o^X+ly-}>p zl{0|BaJaRDSlXG4d;6r$Q<;eP{b^9T)eC&J_9{X5-bihks2Tp-fP2!^qgwBli#Wre zCCD4%4XQWoE{h7U2I(f@K?o0{X=)>^N=qK@Vkt7%%-QOiwnCsX}u!;0Ulc>oC zyUOJ-6*@g~Jy;Qa9(gQ3HX8s@KuVJnXehrNO9_HrV{5Kx&6{>A<@s7A#@J_P?z&5A z3o(8uBU4f*0CI0-C=f$ahTxkKu7bB7jiZWOrNO2$(~vcA`|=ro*wZ9E@UaLBUO~`F zb|d^oRRX~TePHcMI)TIp665FxF~ZeF8KC)dw@@K5pE30_Q9!2z->Z}DnrN0UZoWU_lCOwd<$zeJxjmnO42vNGJ`!d4wx;ddYy$rTJ%j`SrIrj`jCg|{?Wt<@NB z10}#MD@W`i2xie>AO!smR#k3Hem6oxT^4@lSU+05L$$zZ7-)4jvU8cTIePFi1%77?kIK z2|8R|>%=FpC(}v2N4G0y_EBmRNgE+_#28xrW*yIK;DVAg%lJafKrv%{k43$38lPCsZbVaJZ)LIj?!+!{F) z&N7XV+Ao89)slK#S|Vn|H0ll)Wo5_)rq5q2FF=CCc?Utx=Z1q*tmc5!U=m3B}BC~GT*d#o~*d9 zbjx!jUy;)dH*5j1=l{_$Ilv3JsdAlZL$jIz|K@0wv>}-3!V(xZE8n1p%tu@MO?@)Psp~MyA+Fh$c$RYstb7 zveHqa*OE!_oEV^DHwO}S@@%8<)G{n;#8knTYZ3r{1gr-i^haKIB6AoI6A(ticn)3cOSMA?EYa z5}K=#0J0wyQ>rD5we}c>K$Bu70i*0Y4-e)tb=rUmi8s08(J(x_#5}=%L4uJ8m9qzL z*{O`(VnKmN#;ZN{L@^}6+dgnr8Uq{mMIhJjZ)=3;&9s6x?eU%8Shbo=ws039kN~o# z^7Ab8>ebYq5Dixu$Okw7*9C^uE9k#Gj{*aYZ0(Cq`f8k#BXJK}2rI91AF!@I;!I@t z=~LS{%%yP{8VjY}r5E1Sl51eiEq5EmtO-W26BRwUBx!@7n|1i8AO{@ApBrb+sAt*M z7ki@KmIeQ-DH(*L9%VYap?N{GG($^>i(fE+yd#d713&eUfgm64m5lS|1u2xNF znJV*tCN_w7r%2TT7*wtbFDMWakTh!=D@KoWlv?zBqb5pZ96B*56bRR+bAsVd}Le-uBKeUx<@i;FRc7*XUMDX!I>Z(}u|{Y?`tqTjmTsalm~J&fEqD`JlKSM!dro{mv(N zLegAtb*|!Q%CebYOU%R-^w7T@!>j=Xe6V^A%!3WlbDwtEMB~W8`~S1adV%h|#hsP3 z^5HA2P5n@$_K&p6Nt4gQe(!PG!Sf2zK#f+WNUDue5YO5xc z)wf-oRLKD8>(zVV+^NO+W3|5V*vDF*XWJo{P^X`d@4MuOZpFFs(b>ZK=B0e%S-A)5 zxtm0$28TbcG5dkGj_3Nm51FUSu!Y>ihxuaLIOQ4BgO~liJd1|43->s!wCh8qHI*LF ziiu^|z4hC`0_mX0m(!~AD9_RRAG2@cpsy6`A<;>mp3O3rsj-ZX7OnS&t=|*q62oZV zCBN4Anxn1o8{P1Qq``}glf5;SETK-FoRT>~BaT8z6!QF0tL}$cDv;VNm5iYzqVOL) z9qeQ@rk;RW8G`##F8)PIk>Wl=5S(K-uYedonEa+EC*a*Lvf9@a4aTe-I=T`Bg{El? z1lTlryTng%jJWY>Go*@Ph}LcoH_8@vCtQ!c>((omdrZA|BVS}<8<H{vh-G7jwVq@#6;~lo#TmjA0YkhOf)L{t3L0ba<{zrND$vemIb|<{&_gUeR zNJW~Oe>o(Az$IUbdsn;U#7n^J^EZC5a!DhBMKzt7`YGm-`ySXp>JbTm z)dXtX#0$F|5Jwhe0Z7NCK3$~wFH&_mHmqL?C!>za7`E+}3AsF0-Sv?#%=$p@^Y0_G z;^6XgeU*7g}Zf(%re_{b0 zKzCw6QFya~NQRlRS&2w;W}GW7ca!?=qu*DTve1TCjm6~)oXRxIdST7fYi=AARC|9& zMRcx+kvIeKfH%@Hzap`1t}S4#x6?|VrreuenaTJ9h{h?xT#AIdO@&o^a*#GBW1r{e z{OWA;?d82Q((vAI!~YMj7qg<)2E20?IjImzD5k-RF<9%lAXhqhA3|9r4o!&V+5sh; z%MSEh^c$A|oo?-IpH{v8yF!3cNN z&X*!ErK=i@%Q_U!L^BA`M8Gq01w47%{29kn4}>=S_w{Txuv!U;2y(+1*F z2TD&X7Db-xDNy~lIA1JxA)y9DFs|2x54*J39<*f`%J|4(+xHovi7*xam_NinOmk^QU3|EP zVrkpjb7l$}6td=#1-&;>I;d0)E2o9c|LZ8U?&SG&(eaun!2V0<*#KeN$Pcg^_Zrhj z<`n{mGFh+wBUXMs977#q4NT0Uk~v4VgEp3Syd(80tt=$!d0>f?Xm40kS9&`SMs@1X zUyH!}PJ|IWaglOhV4kC(w9*dQrQP2dn#jCGi^pw+ZETd9d}BpgLv|(xQhE2rhBaEh zmpY4os4wUvxga^?pxzVEvC+a1j>Mr%pUZHJONZU{T8IoaWu0$nbdtWQ>*qDS`sn0+ z#r=mN)bdv00KWT}5wR**E~H5WKdYF;CRMWcH(Fyi2u}cO89>pi%?y0f+yku=;}*_N z@);kFmCf@7gu)`lyVpUPs@RZOev~~RZ=3AkP>zqhL4jU;Sbua+NpPi)c4fxXXKEJ{ zvnIM~qA6>tojeHkj5FCb6Gl=Z0!f47JzU_vEK@Ol_#d1H=@3oF)&(w`#|r;j-t^UI z&-(B%;cV8@H*^3b=R?NeisL&9YOl!LVn=MG2V8!{8!FM_JuQ zOIztP&*Bz6Q&2I=*Xhp0+w1zVUs46X*}K0yT>?NdQ2=yD)wzpFdwI9d|G-GW^TK?z zcYA}n@sc??bt}d6zicZ6F@b>&c`|Z*W^fV{&gc=gW{d z_+<)geBAY7aNfZe^k+U9a*l+W_BVT!`ZZ7CevGj1;y#xcW`}4NYK2^5?mVMyXw@0+ z>}=-X;BL~DWY;a5$`=tGPOk0~Laf?m#uX)KK>VNU#6@7`$VXI=O#Z8$&`gYJRP}Rb zSocQ~+)lV0TBib^-X8st(j3X;R;4!TAX8D*r0TBQsOXxmEKy~ks<_`HE&(7dA_Ejy zrn>7^Ita|6zOgf}va<);HVXLEu;W5kG+Mn`I9Q1+yy12t5+O>YmYB7wnwo*%9wUCy zn99Ub9CJHd5OEJFl*sTW2zuAhjKe72fWaKA1bE}6f{|G!1}LT|3M!Iaj+1Rukv;bZ z6@&;08HPN3oj=2J8`gR8pKpf$lWnq!7t~FJi)Lzb58su21Kptrhh$y`0gdE^g)|$B zi8e3(4Uf?9qfhL1C-xI~EA%G~uT9tkDWqb6tsR|?p&zOHC8k#OxfF2%J*|!mF|WFL zwH8HpGynhew?+W^yF@gPKmE&rrN8G&AqE&kEd(qvslC%bFH~u~tL>Jur|+W2BUW9> zzvOy8J6(k^H(#+uv*u1qH4pU2v9=4wy|h2GISs(Qm(Bb;6LbSLA9goDo6pEj9VT+k znV*frm7Te^5hO;qjh10g2``>O1ud#Hfs|D`2Yv6kgTxTGkH#dz3xC_p6wyJLkZ8V^ zoN9{W7}Is_o;uHN8iO!k7J&p6k~sSt4vO6DiZdhPhA|hH0*L6Dgke$|0NAY*4BDAt zh+}4NCZk&Eq8g>=t{9P$Dxq$itVq-!DDf*1B=a9+pi1CsJov|*xIs9Rv_lN$F#7Z8 zwi8KfGOD&^KB$5ax)FUI%;y>*NM7YHL|oBYz~wGfMhukK!nJGJ&bMEzN)Di+*1U&R zQU!QhUI$Dr+PYVM|=APN9Vkai2eTlsD`7lHM^)h#e zaf^tC_hK>ybKA`ef7$td`(OreXVM{u<7?iD?`i7%YtR+)?K!V;X@F3FWrAc1;X9iI zPy45W%R*R;$3SfPL-~{U#SkfUL8;byO{?M$$r2p_RiHZd(HX_~-5c?ZS)vYu-%GRr zTk=Z|SMYy((@B7J)F-iWv*(ECfK<>==alK%{*w&hnNu}%s^D$h%^*}sQwmiOG|Fs+ z2YECtV7U#rdA{g_9)8glEzOC(N)50pYDXZo4Tl*ZJ~TmyS@d`vK=Yj@Co`n86oC92 zb3nz8?P|o=imLrWxf!ME-r1ag$KH8FpdLWcldTwe^lc&R8oa|peSG@XPS2u#DG!_L zFbICoSI9?2WP2a&1G^@8oslOY`cWRV$>K&Ft|EVlw8RF%+8d54z1z3HBk{K8L@|$ZcY@d35JK)w2}KKaZiO=7 zT{db+I`&iDjkIrW>U387*~bo3z6UqPrvTFZz`*Nh^K-Mnl(ULe3Ym)xZCSFJUh3*G zIV#hnAT2hZN9_*^bY54Y6P|82Gt~a6R20WNXQ!W(0B5EF8DK*?exQ1Wtv;EH?phe|?Yo=vA%`Hh~<%09+rt^WV;LoXd)B=0237hHT|aGXW=X`7(T z4qKU7J?O#lS}6Er!~*#}qr$+bka3s*_pzas?zTj(iFSQEy2T}v-31&5{ZEXTnvb;& zsXXna&ivFc*ZVOGusaBzgNRTz&f3Gj0xtjzq-B{*m{SJMo@;-A&|d85+mp7b>rTA zY~(vf3nT*4IG0*_Usq%Ae;xC27~RU`D{hiZOs=chRjE$mGHG{r0opI$W*Qbs_%Ig} zpYSe*tV4D#%Y#q5(uAsjwM3H@hWE?8;WzRq59SbuXeKEVTa|ITJXJ_9B~q;vLXwn$ zaUskp7UA{0h|Bcl?+eXv+_;t4yLhZkqJK$t#lLXl_6#UXk<1a^v4(*_)<(G1<@Mlw zf;HLbn=(Ap{PG1x&p}=8sDWgAHmhYKQEObcV%P*91sFYw93R-Rd*9(CNNl-`FRXwW znC`r)|1O0;%$?nrt6k&*vRVN-)tWf0<|$wVf$3S1AH!J4cmrWwORzchEN}o|HFxD( zQn%dBVFZL`2E@JdCXOv_K~5C-a{WwD6+Lyu3_6hhYx=2cSV{52KZ(dzp`*zU#$)iB z_0Xs?k`R%nix+g9?AJ{R-((e`xTGvJR&~ysF}3#&0tT<9WyY2>e8F=F8v#n4D6$eY zPjV}u(O4?^wwM!ag)2+M;_Grz`|Ou$oGh;Yub=i;$Y0OG=oMdFkJV<$yk61lJ4@OFT#MtDMT`cmB1}Ix5&vh9c0XPPvs&(^ z2OapLhWgBr3GWxJBC6csFq`s6X>3eQ#SD5_+v$@d$OfGKNI!|TjWXk2baAYl8{Rn! zRU&C;p55$#j>_uvR@z|A4GZ=ayK2b8Vx(h&zm6$;CQdzBS`McW-78v2ai@0XBlLD7z@wqP!16!Q0cS@y2Ff4PHG$0|~a5y&^Z%{*K^DPr?3 zW5IIGkmN#Ur@hzKK|x4sV^MKx~|{$96W zThNARMC(p#`9fcE%;J4T@p5?=Y*vho_HK~{Qa*uo9USmsM-xZEGh_Sh+BdRW8UPq` z)7iB~b8SS9(g&12;+=NM;bnhg1m*Dv4As|dM$KlqdtGAdId%0~Zg8Yu`np!w(f^&4 zWw?uwUg}1uocqL5LMev<4=vuuy{G}Hp=-bZ3&}r!^HfpAp99VK>vM6`-1U1gnmG+P zxRSwXV1i3f3Kt#+=6RQKT+D8Iv3$mKzEB7QE`A$4!RVXd{ieRkiPi$<>~ERI-qTa# z^_G~g?n$u}ZHTS)*b$nEt-lA|Dw_I)9Kz8V=~Y<)F;JaQMqLaz0AdK`gwU{T&erKX97YhE? zG=CHSBXs?lSSXLe!_KoZ@``Z1(tTcZsDo2r)L*T@p_Mpta$6lh+C*ymlbb z5->g%l*{5b=cl#_k?|t;2E*Cf_?&(UqfO}2@T^#GgTM??u%hP-Kes$E+0VQ2J5$|= zy0q!Lc2|T>tYIdlRQyOEf*vg?AyU;#>a9?$xlG^@OUHm5Ko76e|A3Ylk_jtaWM-=9 z$=JPxaFtCYPa|QZr>O~Qq)`CCYf5CFP#CGFz&5&=QO1bh8Tb*|kS_y|s-y4Ef#xKG zJWn;6rgtb3)f;>)t9{P5<$<2tnZX2-<3m@m?XkGNELbz{9_0DU6Yd{w&>_6+saxh{ zd_ju&sD;NJ^hmkaUo>aXd3#DZK4~3DBxn_jN*SSKYLrFio98S*gxusqI*t7Bj}*&{ zVO(k`Hd#9@R|G+|%l?&DdV@ogg#yJpCy*Q=*F9AJ`($^ZaZ7AmXtHfJv_=NB&l+^^ zZ?1(WmhH;rH-{QkErt@7HK8(xoh9WefH(#F7S!LaWPf=#X1G{m0HW(y0%gh!tcMAV zu0SZ*$Xc7@%ALBm`$TA?`GZOKpPBm1onG6RGrSlWF?%^oS7C~GRi>*Wuh65KtrvpM z%MCI0$;uF+XDHJlW$*HJ1NA{p0Wx43Fzd1oGAxr?R5l=CR`CHf_!Gjl`qbm$oX$|% zo(XY|jiC(gk7g~p>3p7n>$|_zMOl1RN1j~)A%yNaBSX(_5}F-)5M4Yjc1MpDbbziw z+G1_N*riOBzQ6yjym;RFMh@0PM9KFTBGW`HAQWYIj`pVbj4_9->MJyt=}0stfP{sLat+&emdY%n?I7V)KBzU^Joc z1}+lR1nDz?H8A0nH}}B6QSEd4Qz}xg{m79o{|~TxnH2*-o6;f_VWcXpV`B^X1$nr_ z2fmq>sa#qXtDAd5&4I{y&qnDj{+~NJ{8$=onnI~on1zS}HfKwMG@xqMQo7mgP<{Bh zL)C@ZK@y~mCkPj|CC@hEi!JqHiR#og@9<|0?KehQ-0qZ3-YK;ixHASKy7VV@6c*(6 z7SY9`aLaa?atv3^hJsjV2KimE%S;0*lTLx@M_2jR}_aly+kvTo5 zll~m@q9@Mhpy2Pb#`;`{#65l7YTv$GXc(Ue4gxGQ48;v+_Ok`v^mHVOl5Ur=kg2xi zK1+3FJd9K^T9)SuSW(7aX^0d`Yfm*E4ONCE50a;Gp>SmJqqjw+#jW<9$7ks!m)%y7;ys0 zervJve5{bB(oRz*(1~(#wv)k0v{c|7g^e-^he{J&;ZUGvWW(Qk1otE8JZ0j zd_J4a_kpxrk|iRBt!P)H$jrfcLv!xvCf9f}dsx7B9{g6Ul|y+w@aOO6&#Icjstybo zA+aNgL>0AD(xG%}w*}&`Ji5&xSsq*aW>YTS1NXQDh)9=}?d$FZQ>zZ2 z4kWhQYk(jD;6D$Lg`1g5y4LJ(-*S4jRLxZ+F=@m8r`-a_!g-V(NyfX3EMhHI6E9eE zc8kub{WRe?n2>kkep_tG8~^$fkU-Uf_2ffX%BePeuMME5B(je-K^7V8*P__fvIb5M zIk{n;TpjmBV^D%&2J{rWjY~T!=7A*A4bBJOV_%}_5os-*Lz#L;4 zrMUIOE(h9DOQTGPbnZE=5lXLjn)QI@|4|k^Y30`i3_(HPhyHF(;#&BW-4~6qxU(B; zGYmBPR;Z#N1=*5fV0{F*>%uE3j%K~{u`9^d)Q?^aUodf)_Q}P8lWkL5&f@DIt44jrAo)^MMP0;>dJwUzAG9ZNlnV&p@vojb zXB%Gw0>8=Gi2&wE?4)p#)9D4bwoQ|5J@UN#SXL?~aHZtW6#;S;p1xg#`x?t$#8IV!!hN+NRG-; zEh=1#%i%|$u0_#$CHnsBKwfAue-j-P8n=tikqD$;^sF+4Vi@zh2fSrwi~~yd>8IQ+ z*6OJUvra$KIPnleT~&se0NOs?Wqzm!?!kwai)9f^v?ye0(Twu5S~J}uKbK4RsUwQP z%!eEsM>sQzBAlgA9nsKrcy&gv^U7&HmTv##zMU}*+c~G#P=<&`H6k9I3U6z*o4=<{b@*Ftv=MMx>C(D*W18Rw>Hec8#f$bhUtQkKl^Tu$M~(fd)g52&xhHc z7+iEnDT6u~OAgfUH-s9ia<1;0y(wCQpS}?hJ)4Z^9}LHOBb=;TR$`oWv|Xg>oYi?a z$k%GEsWI$xr1O}S7{bH&F4G$<^+xb2!9!)KJeth zVC`WSGrz&GgW1!>JHWM-K@mc%6d2of!^3u=Fx07;(2H|pHRSls{WJgOGPFzoP&uUt zq<+Z)F4KuB{#cjKW!*4CrXDL~Hjj|xc9k`OKpM#78a$RRVvU1w|5F`+H1BePaLx?; zcb>n_+|S%y-mgA8X0}*rydu!d{5W-~ZK6bGg@Wq2CanDr3`D}XPCkXZTzv{Qfw?iF zB9|r<$=u-L3lwpR#`7oj_yex8+5e3Rs#=6vwmn9VPc;wpdeNG{%D0Hin}x~>6%$c8 z)8HFQkDYw_lls0dtqM12I?F%WSxsAF;9s|V4kRGnC#QEn7I--j`3NNazCtpp_9x@& zE92OH(SZ3ZboJNg?GTa;Np3cYlJPWP_bh3p2Tu3=w6 zD(F%%bERa}xe|exVdm>tG2bKBi>9aHY^lyEFW3WRA^c7~imffK9tTY|SVqw;Ex6$W zjs2dSIIG>fZ^EVktO30z9c(2WnC_w@5h#ixLvf(Wc(Hid@pn+z003=<)Uc>{iN-~T z0$`8eb^cwb23u77^hW`VN(Ek^YV!9~o!;|zs5)jm=pe&c>Odhsze%{|O;zoZB+MUa zS|&3~;y+ayux5YqrFBD1NM*dn*3e2G*z^ZR%e(@F4Npk-M@oCqkdf8~j+XYdZpkc9 zCC8N}RSEQ5jP?}MQ&P<#phXfHm%(K;Yx#W}uWHo}0So8J8l|i=CoZL5sNK!l*{eg` zbQm$B^p?|W3KKQxYBpCbXGEI0uW&Sj<;6d!o6bApfv1-AHJ5u_M((nLEEMF57^>^* z112-&%J=BUUWiysKS)oJZbSM!HhoE)_yKF@`Q#q|rLO=^ z{z>Piq)K&Gq3Fxke8@t#9|sb$Rk9hGCd<%Ad20MN5PF#Y0V#An5ufem+oS{p1#Z8j zi+G|r3Hb*o7BUpSI_mKdeiAW})w)9^z-JFaFj_e#ZrGl~%;IV&)_`Y<}Bp@icAfG0?EZw)3l1)Y*s`S7hwmD-!@};$l(Vs}K&C#!oMXbf(vboQ zN_h$nKCL>5#$ZrO$sO7Uz$n}bak`HqR#+=ppbfsy?G;SD^4?!6$Au+R_L-EkLre?< z*iJUYZgHHnB8(f}ck%;bNOn!u2pn=SteOTxo@|9<`|DXJ?*D#$1dGbNPusMQMFfCC zE%A|(#foB!h6-=3<}VFsz9ZN`vr!e)(4IxnJfeM3m?Q}zb^S!TeJwYyq5}CBorbrg z)ja!9h?0=``VK5Vzs9XtDqLvGjW8~F284}d{6?UD^>e0kdVtRMt2h4|iFf7ULaBKh z(R(n-|E!X}#BUdq=(qAb8$j7B;Aep;3-&#9>g@z=vWSPai}b$hcp%dU0kV0tH6`v(v{_B zBnjWc{$XH*2>n_hLmx!KwS#_UZ|lJ!nRokz;3ACy7QVNo%+?6vI!ZD|RLft%qE}^Q zct6@Aj-%j)_x6?o0cxzK+X55eEuJYwW_&lNkl+miN{F&VycCGw#X9u=@ zA1Og2hS_8Da79^Hsx9UaT(R7=CFH6w(|C}S2@o&S|BMxPv~CNPLh>;&n3|4uZU(f{ z7gNGk;m`Q;JEupr%{zS&r<~I_Q2^C{>>q-pQr2l`FeZ zW4D3zx!*prPeTM2HWqS{z=}vV8shhH?0(JFb&l@^gA&!DS$b;bujWuf*0UzYATJzZ z`bVQB4BMH3M>&UMv8BDoYs~_Hol!U>I*o ziiIO5^UzhJ1x#-T-z3mLDY)w7Vp{YDl*Z1YPOfp~xH3yY!Dl_iH~R-+?UT4B8xMkl zg8!gWbYq(Kt_vlxSeG9aA;M{q*IrXK4L0m@`>NK~ut>->M%40@<9KY@f4$sNA19o2k}>q$l`F(LVF$GyYJzUZ}0NOX_sk{mFuWPl0^FJctv+5Rp} z1D25s^$M%6j9=X=dc)_BpsQHORySg7&&NQ#Ia_)d<1@uy6|evMZ2F0Rnr5@xKn@I? zwvskD{ctGS3+xhp(S)rzCm5HVUQOW{sL|WKa=B#sge6{H>ZCK-95@Mm#!$98FwBge zNtyZ@zXia)Wo>`?lkr7e*b`g7E{|aw^yl7O0(<26doGfEjk2iNSK1e!p++q`IJOV# z&MGxe6hev!;@+^Vn~TOMZ5RBEw|_&+LF0LE3IS)0{GDAXCiUWO&}rDpsXVSuU!aug zg~%(db5s!t8S}p{?{9^RH3vG(!Yk=M@J25s5rnXxvKPotoIlkcAuwPfCHWX?t<`m7#_;p!gh6=H0n=3O}{z2 zyCVZ1VN1MNm)C~;+%=dUDygEn@WCDZ23;pve+W_CiIi)3Q~cCErC{!wJdn&v$_)1I z5M)WI=J<0BpREOnX)!-7vsr*@Ma8<#4kx56_`9BnBGVzy)K430tr~6bTZUIlf$r!G zcXHCGZ-2+#c;v>ADQf_M!wky`YRqyJ0x_VdWMFt5x?iG{*sMIp^wQO?Cf50;FkB18 zL6*`z&^3&p3aAjyS~ex|pzfx2+zxsnXXbai&L+;KfUCKmUxko3SfSZ@<$P|8i6i>g zt;D0*)rL7~8wRWF?{XqyHfgb{qiCtn)&Mroq)gzE*Ad0x7A&qqf54B?Q7M`+C&vni zyG~KME>B6oJ43Vu10Yj|3%TRq!W}py+bT0)Yu$l5qIp{WLjf+e+B?8bHSfL*dt%8p z;LqDdxX4}{=j)OLrrR7DVpYO&a_WkHl(x5YdG$5E(IkJ4bl)%$b-pQ#A6g%}K0 znVhoQjF3+r$P;wR93tYaKjHG?gbDw68If0Hn+r};N26#`hMoiPGRyZ(7=WZouu<-M zkQDKg>(FF{1r_P(uTx)9&7i>pO|2xnw{@pGily~&m8V2n(xPxEc1X;br^@d)F-`dE zRg2u#e$jmYzw8%XLJ-}Xkp%+1wDYK)KJWp|aD8_6moT`}5E&FKPAe-KB~bPN=|`9i z?DQ?foj&wD?d9I;)3bvH;oc}~0k^LXP&jEH#3+JG#=m~UgDti>`hMT1!J9XNV?;4r zR~#T-@nK+RPdeB%d`5tG4hmK&T@q}t9WxPw=vHeZQm>VlTmzq;)R)RfD0=g+NFI@O z_C+Zsp1Av(%&{^pH2zH@S+FWsX7_}Z5{~Gk_f*;lzWwBL>cN+*2`(RKA@Z>2ylNQx zx!J8UacqUyMzWiHje)!{J$4Ri=K5hO?qktRVbjgj6Q3K3Rt?i|AEfOIJZJqxlal^5 zfx1euh%yQJhmY{yX-a*v2Z9x0{7YrXAmc;HQ@&=oi?jw`ZRk5yD(w#^RGKgNMKqM! zdUHA$wq#TltMM7O8W&i?2tVvb6uVN(z>37IEByQk--vaGu0pJTf;>eRV8TB7N{Ma# zXj_h)BV|l)j}}05VL?vhRwc=Z|UX)`N;#eom z4;!Ti5eVl3OPHS1&o@1b`)@3XIK{i8EZDV3Z28E0jt8@rTPN1vsb=LqK!+g{%awa< zeOGf?rCk%hn2ka8{@j^BbNhKv z#W`_hWpRr$6{?}-<4M%x0H$0ZcUeET@Nkn!$pVMu{aTjhni{=*;2D%X8jK~-6?P$y z@8ghSXtDHkk|af$o!&vlXG`!aq)nuhUf30RQ6dp0tGA%bEak-A)^K$&*@|&*BOkzm z+PEToAT5)TFV~mO)j}pCQV>ElsD<;`r+@c{UFt?^p6n9UWO<`FYlEj}kroz;7DRHK z?9sz<<15E58NPPI{lw3Z2T^`~2&;M`@;=MYb!@NMkNF-nfCCz9dX}q(xsd-kLj_LM zO#e!YwrcxkF*u)a%dIY*#8)c9KEj(X$7OlZJ@CjpG78LN$e(?VPt6&awOFWix}vNq zKsO!7gE2{Xd8GK2c3%9-jLS_Y3z;b~@eG*U{`Q=M1Y<33p9>=`WuB72YGjt5kntyS z7o$UD?Kbj>;>`Be7+FU<+g}reA!Ljvg<}f#fTbdvTh6>rzy&5y$019zEe5v=g1K_%_`E?6jekX5BgtFeIi%8n}aouYavfDqaNKTGMN3@C=y&*gF zI&)v*z~=4`&m8JdHHllj%r3b@HoFL}IYA8Z!_>VTM26W4z7uHYvFU8MOMKl`h0MhBB`bSt!^}SpX4=C;YltAOZZq-s!VJ}t4!E%6B381&=k`aDuH7AC3|M1-|p8*SiG}eqA3Ehta}H85FpgLAKK96%)4gHT7 z0tbso_>wxMf52X|g;nofim&Sda5`G-(YR6h#UmTq!Y+%J^M>=Is z;YTHQ4HZ<9_;4;V9xM|$O*AQ?#IcW7I9#^ALW$6ZOeNZnhZgPkd6F~Povc-#h`q63n1?OnFYVbz2fG`vrg>6#wK&#|5Rsl zCQtOcIZZ{7(<+V|e_4XeXu^YmbVfZ4s(I&ydg?a?5*OvUHt@W+AbL*J$clN_q%*tDC7RJxj>*VP@!Z3 zo+0*!O97M4wR={sh^qwT+p|7>ZE-e8h6fJqGE(|b^h?;YBm6;fqTpBK9jY9jf~80b z&cDOBHk@_u66R0AUArNkbhTfW=E-w}A4A3fj}0WP8w z7PX^Z;=wA=%{j~-KY0KDSt%zE4wP6e3^Nqw%E8<>h0M zT$+-D@9QsrtzE9fk{SR8aO8XI&#o|*zGUfcGeZe}pD+cfTCXVVczw%_G-p6R4wG9n zyz>?2en@fR+M>-<$(xG#xKUF9=+9<8Lzp9|o03CL>}?>~FvSMgM7(P0RT9z5ea?PF zI?GBnyVqQ&3NaniYE^#;ra}<}(5!*IJKDJz7#XQo1f3V!El^8)_S_^pR+Qdtou~OB z1G!$CMk|(K{za5sarKDBgS5LOk(>{p4}z!~EJ3(cd2BeN7o<>dm=sLtm#MYSj-I}Y z+?RJeSUA*V=3{I(cG1Cv0;sLEB-jWuNtSO$`sdQR83wu1giYHg6Rd$fzn$IzBTTlF$9WJ9sr zJRL0V`e{+Fzt6IayO8>F3EIYzl*|LQOnfDVqqSU#fb}NF!}dFUxa~r(5MQ zz_a`BPIFAw!p^>h)FSJYQu)itPTt`@2E`BilMM?Nic(pJUA7apD0+<4@yWpL1snC)iT zpN~r}Mh#3S6e75V_DD3r5l)dWn&KkdU>x}+ z-gls?Ne~PgrBtCey}fl5#_i#s`_ zDVu+2bIPV$CAu01+9>E$GBXW_5Pk4_P`5hs&7uF)3g+X$L2e<7Y(1PxO;1GRbg9et zca`p?ncfGEhZV za{0#(mH%SloU$$?C$(Myoq#$1Jq-VfmX;HP{hABOtROoUICWb#%jcYYrV<6mjZ4Uh&edLESg%udhc7sJUeLNkP zP`o}-$qAXJwEg*vQY9bK{^&|WdG82y@q`BgHtIP-3GM`)M(Z`IW}bSkIfirtC9SYQ zCp3}5E)wYCz1x7S+l`06^4_tVV~+S%aSG;7+D;IqC|KNsze1re>3r6rh772Yg;pL2 zA|w+!XI<^I;{X{Oq3}fR$jT19urBOwP7d3UvF&?w0SoG<>*e<$G;}*t8&@$f~)_CiE?XSZ?aLI91!nVN$-N&=uXfdGm;=_&sq~OLDg5SM!mJyc=O5M(K zPt8n6GYycid@xd@d`&qJ-p z5=>*H3wI?R7N2%TOqco-fJU6~Voh&MRBtP@vvgYb_s%n8VAM{}S2dj~>Ly@2t;WAL zVHere27*c4ZhMrJRjj6(8eE*7#i}}P;*SmaY1=#;Zf2BMW z8)_PanSI(yh@*1KQGcmRT}e`t{Bdi*8S^^_tOY16<`A3X%o!VAoNZXL;99SO-kk+U z%2O{tHL#D{uV0?Er@C;Da!^p#Y4SJkdbPgn`C;iel}jO#!R&XONJQ`PJeKzRiaJwC zGy1!_(eX$I@JEms2rZL`Q|5@szJWG1FrW=1J`dM;R`v=o!*y045Y<8_=hF=NHz}@I zp7eP!GC3@uFVTPa z+yo@VJ0DemL~;}<-(Hek9OJqF(yRWT=)Xa@T#ChslK~a;#Xn+xpfl6-SXt0(wq)23 z6b4tt%aFJwAiXlVYN&yBOCDKhovzQQqiJPrcRlEQ-NpEvF+5f;@w_6?+YgB&VpKg>X4{j&VpL;JT< zxXS`m;h8v?Cie!|rg`U;k1ElzDVs}~WyH)kgq4XB*w-;8vbW9cbQ)y0`a55t6OZ)1 zK%oK4erBr<7hK_7uAB+49Uv~{L1LECMX`f3VxxuW`9}V(jB|(J7nb~|$G4$tTvFOB zDQBZ%vVzzpt#^9LHj)92L#KGd*g^w@2xDGIlZGV^=Cc4lK)}CTL48&y1~?jW?xX(+ zsn*JH=S?pQpq&m@YzFHsD|6mdW#~IEBKOXX&1@_7iWwe{#De?ugHqb5Psu;h2)qib zMknvk0Z(#sXVjMnAfcjhZaPN_De7id<#B^7q6D^8?4MIEtAM7AL>oi*18#PXP4$!Y z3MI0r#=ck6fy-j5&rpZah!x9(V2&>TC;J&5EXtlA%Y zLqYlg1T@ciO0Oyc4Sx$?!Q}2FhLPJ{$O=9tkEIxa`#$~pyi3S~^3W~#wEzsId7J6p zKJMJ7aCJG{H)_m&*zqX^pM)HI(I5E-me1H)T2wtD9U%xZ=FnBJv})<`})RDuYR+s$1;k0^La}_D3@VxDOZvFFhhbg8 zz!Ye>j*pGQ$;!c&AyFjlW+V}mD8KaYZ*SGIqx3Mz^MeD_D z3veJ1OrQZxfIH+i$4=2tiPbbT&UzA)y5aZe{glFyvkxcg^xp=zI7H*je=*jzF{(4p zcD2TAnJyz2-dh%Kkihd5*AUW38;dtHT>b(|5@qKxRUoTmy}M2y`p$c1v{jxR^M$`a zKOR~;cx!J$Ht>o$aqoYdo^+bv*#WPamzqlA&`N8+9MO)%Tco?a6+d3aQdh%eG|VO* zbGZ{|JtFoTdh*vnwrMgt@f-(3zlY*D_?Q=(7X$L)P>3m8Ry!($mwt zoJcmu+YNe>GnSv}bmOX!I(Sd(eW-4>u``R!_C~(6xZPXN|H7_q5LrtWS1f*S8Mm7h zUT3;VlKfvX)ro3Ln-Y&O+*`q5WY6%dBZI#BtQU_q>kKaL@|YhYwbW5`IzV8!ef0!q zQ(-l$6fJxGo4HCc+@kC0#Wva{f_jv54eq7CO8q-0FKG(vXeC6w=dpEhpsLiVxjyA( z{&K4`aps!;HdFo}7{|}-UyFgd&>ygNmjn^6j*uW?$=q%^xs3<_y zC%kbPV5iW*c{AY+K7X%UvFo0f_Fno(*viX^%j2W2rQ;B)Y08K`xu+24dB-iT31w&h15~*LienkTp6z zAE68JSQKwAc7R^uG0YIOzE~l6`9px9;McKirNfg_)d#&6NvN&Daz z4&Xu07j$p~P&htS->eUrm>FwEwvAef@xc__epMw9IZlMgAlkJAXO{a?=mN@~uMt!R z%7tahjmayV0$mzVMMk@bT+)g}8=k}xlnV9U)4!1c{VSl&x@Yd2HS^zBa_D}KYkW^b zEHD8Tqogp|3!x)t}&<`A*GqoX1+KHe<}&ZIA%waxAJyh@JAAW-qRyYnV)SM z77JX~Q4swONQBJ756FU)fLya!$4@Q5qT3t{<(E=gY6D}IEf~U1G>r3tbHKgS{8Wq> zyW!}^m37$*(m9u1U9F~(8ny>X10ptsL~eM~%lb(lj6x}>V%8XBC7M<;st#xV?G?r* z^nv&4v(34@JXwfvd+hA5Re0TF5;T)FouH!m+PecG!!I)JgkyZW3-?WTOytw=DRAN= zZal1Y;i#Rtrn5X@zb6f?_-jM^cmHxXFiIBa9^NM;S(0gT)&^L6Im&&7uP zKvB0a2d+kmhdOsfz;-zkPvQvQ2>Gc85p9^uRw34%*|q0Uo&bZ6u#~bw_t^XtcudXM zKUZu3Cc|CKVUH7gHl&0n#N}2 z-HIr(QXUz86{~%rJ3mZqd~*Uj^XD`7wEU7Ut!Sg;>Ll&8Ww6|NBBMg#M>lgV0DC=q zkM9h($n>pm(O{gTmMqfs8Mxy)UJZxlaGAC$H`VxjxIxLV|5|8h=FVB9p@J9kE*2&} zX`ejbCSR1SC?XZ;BmUZ1_!-qOFotVPr?$U{xI*~kvc0R6w2Cj|nHTYWX#KG<(Izf4 zIB`cvgqjSFa?~ICNKkCBo2ug>Lmvbko;+qEqJ(z54 z6s?H)U#x?35PxF@+)Ioa*wF$v8}!A`yQ#AxM9vPK=e(dE`?TL`-p>UWsK6@FzY@VL zJdPANf&qys{`|VTp6RKFA>iG4OZ(~wtl`%41ZFgrU21SSW86&=YA#Vn9SWT_^6&D# zT-7=301eHCz@_(%ddf9M{L4PfvrOEn>Wp;S4v0?y|1n+d;mKYu)pdN6pTQwo z@D}>_CnqJjcSWdIfH@+W#C!;C^|O!J?2#CfeltA}hY_ko6)ie1G+4wR8oK)@hLUso zSH^Ma!l##S9P7ztM@Z*#@pl|?`R$TiI&C0|QOs_Cfwk1&k%>f$uv(=3eA^wNSaK{N ztyPOUYf-S_aJ%rW$ppE0stcCCz2}X}d6X!_D&_4cA6d_pRl`BJmgu4lZU)(!%rI7G zu5L@>cs&_H-;IAzt2Jge`cJpP!y3L=8O>$&&OUM~_TDY<3_C)5qVtt}i98a>kY1lA zXR6prZ6I|DMezOb5G?S5#F zlX*Biq0(tzGSCUVRA>;}1+s)wqw=2i#$yD>35z6Y)+h>oU;^Sn*FcyC)Kc4tS&tvG z%`7pcd&hcXjRmsu<;Yc}n)anF-Pc(TW~BTFHMpC_;6am&n{;;>(8Li7q?IE{WgE59 zR^3LJC4oEtm7QEYK%=a*2Q+QGwO8xd4et3g699svu_*!cFBsmsfA_AZlCb2l#rT0> zg(XE>5#J_yLwZwGh~u^qVn@ie=A2iz5BZAf$_e&e+pp*wIX4E>oRAY3F&>430-(p- zE+kITUVQ`Sy0^3f_isRGH$QoxxrG2Ej$#i@Mj?KH3NKpCQiKbx!4RR&T2|mvLL(kx zY=c`J^EM4$(_v&KZ=$C@NE6DYbCyUUOdpO3O-Dm@67l&ZR z=nTdTk9%0&#|Zt`l=|U<<3yv~&tz0|JCk^D7^a-%Q|5+1Hst1_P_gejibL~m{VHml z22_BsBjUY_m`UvTzMeN#X@D?w+F)<5 zAS+=ONn5XXGlEc;yj}E8POjsTcA019TV-GVbfL^vVGpfjrb=D0#k9X)K8(U8jAlwz zN~njKv=Yyykvzyk%b?Z41Bt60>10|~pHy{pnnoq|aWbF=s?d5a+tm{mzCDX&tDE5W~T4m)vMIK2ls5YQ27M%G2s>~xK4Mj#wxPkBk@+M zhD#onqm6+A>aFgf(LxXDasrPeubshz)K+D8Ph}Z#`QrvCZP7Uiy%n~eAtR%p@`3q9 zUI3pbdTVhtm?w$9@dULvd0ZzfErx)8?ov-^Op&?7U=;PaM*-Xb9F>#XW1*JjWp7(5 zn~#wJKlU$?HeNR`_&K3^uH8XS3CL*oQdkW$E<;St6vJtYR`LaoH6gR3C&xpSRoi<~ z-h`{KzSjzb4d=BcE0@tT+~o8*w#QY4OvbUNDAG27?Aqo z2Je1v*-&3=nJkFI^{lOiw=di0Mw|Pe0)^9BU5?TwSz=&HNtDq11w=LVq#4fHmD4E- zXtTy-jz61bc)5f>?3Td)(4xh{*8FYCRNfM5x_Dxc6>)R##3h-$B>z6{=eDn0>%8p; ziAYVd5YG|J;>$bJ;e89Ja5jn=scM!P#q33g1yp+~qtpyHz$* z{D;F?h>N=(Jmh~9-L?F9Sg@5qJ)hBl0oMZ+YfNXY6KXON{^oBG2p+fMB`~lBe+T9q z%AA6vvVgi`IK&XJ=DUwH@TfmV&Bb?RQD@5(v$I&2AVC{W#)X$WJthpgQti9p@}JZgXSo5f^uxVj7O{c8-v*|>04bHIck~XGS z@;#A6&Adq#t=6aA)mMLywMFANO2j*ADz4R`QZEhjGSuD}7*z&Jct7ZY0KPEOV63cU zpDlDY|3{krhsHv$=goDz*i5bNxF$m-z^9vcptT3UUo_v6KVC6eN8jlSCo)vVbF++; z6WL;4YgoDs3rZ%s^vnL}l%WtK>>$W-j4S_Qv#KXB)4<95t3eT|%TtXWG}2W}RJgl` zEIDJ6^`OqwhncEwhrdq?u#xN}dzOnUD z-lJ*eAtJG~K}cVJImw4DS?N~EJ!p=bT>@ZGC4;yEMUf=6x)A*5+IkW!qWj8z!tniV z{c$Bfog2&a<(d#0HYVq-=Z&-0h@TyylZjgJ(+_;|-4oD($7{OIQ<)@eU&VmW;u8@^lQ4viDF?*xK zN&0({De+8#7I2i%b{cvc4x6G$ZiznrkqG9j@nQ&PiQ~{U=?-o9y^po3-Q`%W0Ki>)1tbS%Z$6h4 z_}J61fLROT;7gZPAIeV$f1shv2O)W$XDUvOSgV%bIKg-nKtP~IAW}T>-_zuyzqtx% z$2ihDr_5Fr9051^4)_yVRiiNoUYn@q3^*?gc3k+qcaCqI@Q0SdAx=}u(_XPp1e(3KK}kpCnwp#<8p4mVN4o0LF+j- z+mIMaPaw6-yIK{i1u$1hjj@`4`X*S~$-KwK%kk<2gai@>#FunO7mG?`I=1$5qDQKf z0uCdwt=W-p;0^0o6$O(W?s^u5n&|Q0V_?O%#c4e06fPj2G6_$-^{D{AH#%ni~u@m9$S9++Scv~%y1{$wTT0f zs72#ukatTzt7a&nw>G+8|JMXOX}5Q2h)F-ki{@mE>On_>aBwFw^OMk{_t0oDF)|*z zANi6&e{2~R-tHX95wII%&?^OC`0Q0XgE_7jTt+L8C{k_i{zPJZy4%>DazhSq;vYaS zvCbdoj+x;Uo(RsT-~WGC4aoBG{9=qnS8H_}hSQ+fi4at05^hlBOtim%Fx<3|D)i6$ zPD^$*8TC%!WaKS=c%~Hhl;3=Ll01v(mSIG!?-A8}IEaFZg1O>40Tl3q@-v^HH5z5m zd&RFy%{Mzl)r=-?VlmcIr>e+Sk1gnSiUWQNoFO#Vk*%a#*RoQULee3_qk#I)dC#8w zq;JvxW`tfVnfC`0_V$Je+{tt5)}DvqZ{ff5~+fP0souvbVCG}>8)SOB)-B)*O}S&^AhWi@iPM`I0MeNCGqYdh!V&bzC~ zlUdzDy+Fp9TEjwJzsKgeUmN7hQSu_~JRNvet2JZ2xMVXB~*a;jM3>T8!Ci*(x`!?9V2}u1Ldq`Qr`Vy zxY!VM%3XP;T>}3QwxIdp=8{pk-PKLb`>Z8E{osk3m{aWa)QzWgNC=x>#wC1-okK#H z)o!Iuj=o4nf0M6}B=wPjY}j^JH^6%H`0bq~ql=?7>!w8Fuy(2HL0e8d8a;3=QV^H> z37d!dvbJC>>Cj$1q5Zk*`YlxB3jnhI5EWqAB^l`J(B+LXQq<8R;;1QN-7-3KTk~`#IfkpkL!* z=yC+NvuX$vd`IuaCn3?)Zwxj9G~C+?#qm7co|gj6*1F{zjd;d{MpYqF9Wx(8RUY`2 z4$c*w|KsvYq=n2{?5Hb@x3DKDc%8uhBm4gEYt|V#Fb4E7!7CHznoTYC(qPIUiR;=S zGR8gkX`ln589j#RJ@`e9FaxIM~O*oh@`H&)54Id zo9}mgz(1OFF%o^EYIH-hB3YzmdD66G!v9mUnVD^)(X@(niezVfdr5$+ATPeUXaZSm zGa6OM{5P^5r%{X#?|f_7w5*2FMS)=l9_L>cR?4`*4H-bRlr*Pe&r+Flhkt&h+^>_Z zErN7=cH~NGKFO`TWznG+s{BUI@tSzwxwoGQ;%9OJ6H1lWNGz+y00B%8TZ&u};HSIC zyTOIl^Xy^(s63AdSrKU70(Vx=N?NfQ5kkGa-fvoKg$ZPO%_M`Ymh^6tFtmx5T4b7OZe-P1Jw*gSOwutsVD}U@=iF4x?|s5;d|5g zE><)ybubD)Jss`oX3YTMm*D3&%!b(}gsVRA-)S9h6h!*DPa?#q2M;5DT;I-it@0_L z_LLW~zPa#c<)Qq;DvTQyaq1-mImg1%VizyklRC%@$XxavfN>Ga+xh{@VAtjxJF(ae zbDTfhC`{7R*m^x_R} zuTXO;61fzwMt$^NXDk}g4? zV*{p1IAxeva7cfSE5mP(knV_C%ZRo}gQZcP*mb;?DOg)Taz15IIunA2VGE8Ut|n>q z^*~qTy=|~E=Dl4y7m&K_O!kER1lwaPUl|}B`y*LMNKv+nb7#VbRQPTWb!BB`XR5WE zhLUS627Ql(FEs8s&~?)csJ#N}9*Tj?PLRybHSxu)h0>uj2}kzOoaEI%E}OuQ_RsAp zB~s=?H=mJTp-4T@@`vZ=Pm#k}?l9 zwED^IMr+UBz{W<3)nPQXbasQp?Ar>E`6yKhi#kMtcWpWB-~yU8_veN8YUwXb&93B2 zl^t=-=+svMDY^slNfg>{7|lw{79Z9x+wFdw-WqV#znsCBp`A9p)z_rpW9ua=BAF4Qe>_w?$DhuK+#Q#F0DXLjB0~5gdl+pLyO@ zJcoO~tpUpYv#1hzwXpb^{XgP(6BySwj8?akB+5(EL3k;DOK6`Kgf>arDm$~N08gq}8-RMJ`ju)lQB4iIDCpQ`x?_`9NA|?D z(pl;P^eLhv{K6Mn##QHAU@oIOtFIGb;wK20Th{R78iL(L$-uC<^^=?iaTkiFT;8l| zoer05W3#AHx#A-Y4iYR}I1zl5e2swA8B`E)7mIf0If0FhjlFkNNsqQXRnqM3+)Nh^+)BHc*W?j3| z=N5g8D@j~yJINax1;rLZkppcXfFiD9Kfy5+3+%k^4trEu09n~WY}6*z1IiHZP~4I%JX7Qw%Yx= zj(d5x58qor>J!^`Pt3jHVQkLEm*#Ta9i$&1A-|;vE#)E=S-kbYX@%Tfo-b4p+|UNm zIz*-z*mrd9o6EfUHuaQzmeKM1P3nJyi8sFSl;hMVc_0aZ3}C~b1DR)S#Wfidr!c?i z!%#t?1hQXy&Lmh+A5#%&KGP(|tP3%g2e_mVdP)qV zfA=$j{>0G}BfYesO}_yL@=BSOjbb*NM>t3Rgh6Q-3ID9EOaQ+Cc!~ zyjxA+$Mj=X;iBmh0WI_M@5JF~=Bq-n@dcYLpg9yuGrRQIKCQHa(YN`5sz|FrOsVBl z!kCapvX(mh75hHNG0qwTQcU`hUrt?fY-Ey85DmwqCw|{eYYN7^a9m9IkUX-mSEo*kb91^HB*&qE=Zf<<2$)}@k973jeC7hKzI)XMe-K7Q?-{WHHL z|A(Z$Jflv(#urs31zHE42ksmP#CS1mF3c+S?SXhs?=@r8EKlM5HT(Kz_O__r^a8U) zHFG99@ z><{F^?z{h3Ex~+^!ipALC1b9am5r-h!5{i8hTiN_*do zNYBI;i&^P?VeRtgqM)E(pcK2sV{SR^dfFm)xtDOyyCZ8=c(q18k^x<$QA`gUQ}`5y zkg45stR2SbZ%~v`ZRC&3u5zNFM8>%~hl}fig+K5ZMn!TkU-4-QAID8w%`zJyFt&>`1Zr%vpY-$rnulznNMMx#Kh6Q&H zgt2UtN6YTKUVrr_oieAMpN6~yTo93Owxo*nb?MkmcU{BRw1@>_<2)YtAaP7UBE?tQ z;Zu6C3+G`g$f`4w${r{Q31q4v5YVx^)1Bi3(JAN>&*^N!h)FvE)~GIx-$@!`GO8&#%3 z*ckNr+N|$m8F?wzPR%k*jeubEk2HI3Orll=rWQ?~Wm_L7XYT~Pq?Lx1y&;_ser(UT zeAv`2zfSo^Rr=!Gmbb8Elmn~&S6K1K0qp8s!lAh3z!jr^1A~qf={J>*DtgB@D9+rh z>$F~k@&H91F-;eyGx-cW@NXek8rwR}*_LQ^+ah!C827bWPeZQ2j1K&Gj=JaKO)ScZ zr5Z9sEU0jIo)ugmR`Q26E|&;Dx#kJ@7M1~R(HU9Gh_c}_3;u%M@JzT< z{p`vGYjeOG+G|TaJb|2%@{fZVUoY`b$)md1i&Qgp8$@Bv^W+noWj~|$A#IH-pDQgo z83EGmZe(5O`Ou+!S5f9tqsKgebiU--)r3j5O4es;^pf2e0e;M)Yy-%S9pKOIwf0*; z{w(5t(kdiqaaB4ea|#$jdq`v^EnVZeeJM9tYO(SI5SbUZ6kqw;4vdf}L~foMgvlca z*{fqlg$5m|rB0$Sjz)W~fRz$l%I5&8ex-cQC{XVJ%RZ{5Nv3cAGumQ-D(=u`7->;n zPxVM~cO)mHyq4AUiH8^au>N#cMf~sm1?WuVs_UIOHyUH** z!a}FpP*1C3=7m7yBAX4=XL}ii)a4q<4IiJ~D<>$?#~p>fSgy8VJ;*9ru>}s8zPmC0 zZR-U=peQ~I0%uOv;t$Pb!`o}qLM9=DuLuGm2&ZPPTT}co&?5cze+}0Lu>Fzm>tKPB zDK~m)FL?vzr?e*|sBzkOsUDV(L*1>#;Z`XYXxyZiiP>?mG0p#d33Ubyd6*vMd}vq< zCvTTX>|XGQX7HU>T}f?pMTksYlt8_>BV6k16*XWAT*fuh91@dco#NGv#&;ZU3XY0P zHxrsR^{u5)CRjF}#hL_$4@GF7o5A{)*A!K9KKfp(Ag{kORWP+J_KwX+y4wIP;EY zMr?$6_d0ganTAu7vV(^5fzrDlB*ZVVZ-2$`1i34n9?tAc5?MdYt<`i}?~%?a z8qugOKS8wWOThEQzn<9h-|fR!0|LR^bs9?glT!6#xV0{J!2gSkn06IBVw}Q|tTUz@ z|JZoqSv!A%@!z+mk_!_033|$FzFv6(@S?3Ht*RqaC8q}5#xpS!SJimGdP|TPAjl9yq8=IM}%@K zwM<9p$X{vBIM9kX^-JVi-crp9^g2ZNph85YTrI;%u8Y8Gp49>$iZ? zmZYxrWJ`__)mWf5Cys-1lNBE^Rfiy?z^)Pqr>qGNk}= zz!~gHI|{;W$-?)qw9(m!Mn3s$_bt~;1?A$2c=pV$ib^1saaj(rgONLP{(==$3_Ml+ zuP=MrUFS|1AoO5A(nyR4DO;i-+mn~#rhvJ{RBxFf<$SjW7qo)JYNxE@m>WRbV+d~i zk-%F%?9+7_9!VmAjam$+f08+60)ZDo@ICu_3og}N`R3rCg!Rt2b{g(n#|glDHNo|{ zNYdM$x^6e7L46s4v$ZTk&ZYunJQpN0@&pPL0L(wuecuuBk7NDGba2z|hPdV|`>V(c z2}J1cxL3x=N}uxzH;mma#V|1yJ|iD8%0vvnj*2aXzGM_75S=A=S4H4Tf8x@G6ss^ToSk9A2CEdMX z*I`juEOLK;-nvS?qp4(?QS9RgtpCj~UN`vdBP7~&DvK1=*h3)~rBDwrSHCaR z=Bxqp6l63pX?GeHo6GhtVA$9Rk`V37?*qf^9hsDMj*7Zcd_s?q0a2m1^X*NK2>xTJ z`ZiW-hb4GTb;?+&#MyR^HW5QiO9E|cxxRr@LancKuw|OI&33erKgjeroZH$TZWHg_ z69B>b;k+%v8m|N8=w~)3m2?;YXPY?W)`%9vBtRnpSyK%rtMB0+Q2ft1qBQ#Z-zU`E zExm(9zOJoeOlFv%F?F_w!^v8|INEfW$`V0Zw*hZ`Mea|T^!;JJ1~pWCdnS5YiJF#U za*4P^fI*Fh{ZgZ$58M$!wXIFp^I(uZND<7a4pi~BKP9aodFXJ-!kH{zgcrNGre^0Z z;Hx^vTiRw(9iLlIEba%{Y9rb((Ncz{mkXyFb9(!XHMb^Zj>dZP$b(1i`SKfkzdy#3 z1WuX+Lck5N&B3tn_Sa7lknWQK2riNzig54;`<{v~2TS z@+r9w^;o@Yw(33bVmR{w=EibuJYj&9K zj|aqf$;ug#a=S$bH2!!Q1&<_;Lqhpx_%o&OzP&ORoXl>4+5xj@VQ}yMCpFUG7DSGA zP>EBY>-Y}|t;}%K7R~m~z5nr}mATH|2X5%*@-I8m!o3?fTgU2ap#R~L*etW1EI6jpK z2~WwMPl6P8^z%sJvVGqMkPL&6*1=wRZLk9GEA>C|8iZqKTuHu;=Q!dRp<%=GbgF4xR@*hp5Ekent7o*d?IMY)+*8#&nw|*N zA@5W}XF5#veM=ByJBH1QfcKFc#+{7_5w~Hu#DOGlKq8l)G%0wZ$ShRDFitW7w0W3r% zx?LEv{1_#z&1rc%i=?E|FxB`(c3W?wR4Owy66fyRsg|-z@6(S|-lEgOm~Rd%BOX${ zWi1!Kw_Hmp@sXCmO5n;?45jx-J=Ck-dl_~&z-TI=hUUFSq?h5);#xd8Su0?#A8uW- zE*}9WXwuxy)1!b`mHMINaf|(OH%1_vj5mA@%5p&y`vVNOCfaK4eY5jww?8&@Yu+_!Ksughh#~^ zJQWpHdYgi>SnA#+9w!6MrB+{C;}c><(qcZ-l&|ADFW$ebX@{N=jrPKZ%R3)$a7sh@ zHV=O12Yw=PL9_pu`og0Qyi7Fdo;_%P*zmQMV}a=aCB)Po6t#$mQg~Hi=?MwzUBx$VKCSl`L{ZMpm&lCuBRCiOD^9!O7<&Iie3?0Ffr4RwkNB^Al0{# zSMht}xD*s<761(1<{B_1PMy*~7m=3lDf(~!v-@nGT7cVmjWURG`|6<1}Y zTB}{XbrB>vLa|{+-H5?_sHis8T;~I~F8nmc$&&qt0Nu#ta*Cmz&SC0UI4{(&1x8Im z{&C4Q)9e?kA_iCIo8mL(dVP(W?M+!;^0^)|_+;7%Y@~8}V%hUPX$3rwvc;7Ayd}#f zM!=-4=m>MF!_I)g{3hVXD{_Z({+GjGlnU>*zpRjzI9A*xn4IzSeCga2Qy;Bul}`k_KAHX!?V5{b(8 z=N5E|aF)hg8#jol%T6*j+gx$ERuC_<4YL8HyNvp$v!f!(P(dB>%xRS@9X*#nh-&^s zG|1c8&FV~&U)J3De!fnD%EH7?j)(5Mzes5hrjD9L)jG$Fy6qexZQR3eJ??i&M02Uv zwaU9Yt1`IwpE<1LlNno0XCj-GbV7ESRIy944SnZ+hJ+-)6e&3c7V#(T|bOnm_m5?rz1OFAYQc zmn^^7EMFSYe?xr}s@Kx0!`q_tX|#_xQ? z3zyB-R0|lw>X4mfW>a2%LBr3*!N>F-+NF8$Em1z4C)<tV?O*>q4*CS(y|IJ^hG8r z*HASUXuT!r<0FtCJGd3Nx6zDBOs{5UZWn(5KV5n=869Ajd>;UG8cGT6zySwTslP=F zg`cvbacG{VQhbIGqW2)$#elvDjq@7;-i`4s`~)`z{q;aNqapD9UFa-uIc=`@2IOep z2evWw?|8k-xy|c{nVN$0C0Rk}0)Opzi|a=i5UmD;2-x_vCVuAf#F^=v4BD7hK-9b& z7>4CB@Jv$Fy_BZDeZ-%3^K13ad*x$QNLwKaWZ$R<6u0WAROE%yimJHVJo(q5;u&+@ zKS~^@;RGSBS65Edi8hbw*=6962P@r~v3RoMZw*a-^HM#P{^V8W&K$$3#EG843c; zuUT!kahrZGYse8*wT3KQ1Jy$&-8JW00A`3F-YB&xXnWdIwi+94=1FuHI0s1{j#MUO zP_%*=jpyxRQ>oBv<@&!7I}|t$9!FPnzzJ%7c3K4osJfwhb?MFltEck_9rT=X!=e5e)V%KLhr6dT^+$w;x7 z7Y2-xp;hDSe>5W1FK11!@hNboM|vOJnVP$xM9I|JnuqDrEYyan@;U*w*J*Cd2`5v< zzjQpmVU(D|yvO&sVu{MI)Y_%W3cF=pfiF-DU6?+CB*SzEw} zhndq5oyxpwLxh22_1EqhD>q7I_GBd=C@L5ho_Tj{Kp3`C5KGx8&IRNlcvg#BrnWC9 zd*wh~rK^2Z6ZjG?%@&n0=tcTVHVel>fLN$FUbqZIgX?2HU8P<(>-I5CHJ9*nWyGHe zyNaR!4cX0l(>ZAd4r&H`&?Gx`W_MH%xW9m2jO_0uQlio=iyTw~%~kYQqx~w2dwr0^UJj+%U#}`D3XCCoPl=k$(Gj zPo7^2lFcx1OoI)1`p{wnB(bACbmGiMs;u!&9RHp)!XG+FA52v;!2)PIcTopHsgo4h zv%q_!ZH`8&+ubS91wD#!o$h7y$r_u2OIDaI(vdt>L8ibFZ2H#r*b!8=W`0OU_upm4Ic* zBhw1A{WGr5AYj3@{x1ByNPUyWmc1=udhS9Sq@aHi67vvf%oDT}5kT8+&kp8id0mMe zr#wg__irazDIpqApK^67L6Xr{oWZ^ishdG#!_B=}!0!Hvq*1fm5n}Uy-@yMZ(sc zn~dv~E#HLi^FJVyE^JTf@FH^HMsXdQm=N5g$V0Q<77dQqpkCpve!fM~qwOlIeWMqm z%kX&E6(0Y`FinuX?gOo~SWv>whOlO`TjL4Hg{?HfGyYqhwrh|9F+d(OersdC3r^s9DITqmo`a-qS>XDu92Nx7TI#x+J$=(8+R{Xg-^)A1TD7JbLIIQy-)Eq8D% z1LOC#jBhF~qUk^{w`HBQnL!gZG0o1dA4{aK3deagBvbyatKTCwg;_~Akkyo|zSxKf z@l;ik-_k#m%3k6K?u$hD`v;k0)gu?;eXq)SQz@W$ zMx}k@XfgVF=e;N4$vaKp+_#W>^16)Py*5!rldwBPhCJrqsHkB^CnUVx38L2A94-q- zG75#pnub_iv;Z<(p^Wdxj~HlP0F<@GE)w6wJDvhx6;SEB(A+d2{#srk>(+z1#X;UegJB_^mhJooxXE&d5Jj&XKEuTwD^D1P1>2t=idRB}q|qpa zv0e2ZpJa3Bf9S4rQEtR?MB*9gYIdG*<@!VG%X}&7-thEs@YH(nSXifPcHYfuV^R?D zO~#jK!b(c>?93qY`9S??*G=Kfn87?(wntW0qsxoUjb98@0@KmYELFSCIoW1a7yane zzi~BBk@sItgnNS3s_z9%C1cpv3+1xb9%*k)FsFp6^($F2+pRM*&LQro;I(NnZ#lH8 zLBHOsR5JrGdKZnc(wk5!{2e+g>5=EK#|2<1NQu3&W)Ii1bAt*fU5*xw5(3K>JcOYa zDF}Rw2b}vAh!7@@rj|^Pvl@{UojxCxHL}7E8#Jg74!CucAT06?ub?lMfhI+ll&Y8v zx*R@Ps?$QV^aTUhU&?P%yCL4zNgAL865 z`7NN#r~Bcj3^bihQp+R1RRmvE3(_7wpdDh={(PZn7_;4jMrEAn?W*7cvw}kwOHDug z6`OvSzElEz;5EU(2Kv1!SS6n@uLRaST9MsJ{ zLmRQz9nJ8(wgQY+=wnao4y-c)Psp?=ntKvE&aW8Y^?pL}06D@~_v8ta+B^2e#@AS=TACzZg|p;m#B=N&#rv z6e-Kj?B=&5vM}~f8UKo;Bd#6EUj7P3P;W<|vm#xJgw0UWO^^p*gfL?5P z-iR#|bw^S8D<+ae&FSv0lRvM;IPlXiX4r5$o)-+!z`;$rYYs6`HE;6m)1ZzAjdss$ zCb_eQct#C$e~EFPAzv`{ijYhn)bWp^GCuQ2Z0NEh$0yFonGbE0|2hb4B%G3p8;Z#+v$#Pc_!nv(P$d|in2B8$nNiA1$^*K8JH zFQaOUadj);+PYT?gxi$2Vif3IJi@6qmkrh2$?|J1&OH~zkn2{jJ0vPaWku=ugNl_B z-CWdpc9W=+D7y=X&~$fgj-oaOC2dOVdkl$Dox}CJ!xgm9Xxhj+Hd*8LX_lWHH$dKZ zoR6ZN!tP-pBq1HjdiPwR(KsMWj}U`jci;cDDG9#bg2uu$+@}GFI%s`kWWGEI&v8KF zk&gZlmO+C0$d|*BV_3g?Jvn^F+x7q~g&;vkF7G|9aL1mxhzR0S*50EyeG%W%BXAsV z#lK*Mn`t5LFs5AuZtaDv*dqBxhV-~CEjz@=b6N*_m6dyt%R@T*V2nl)KBVOZ#%r1H zn7!D9GjgPEZ4+nHi`*MI)e2fte#IuZAUc>zC-vl@c_XFE((KtGjEx$cYC>jqG?XVD zpIck^!E^ZIIlP1kXKKY_%%!=AlEiv7bPERGD&0r4ff74j-x}Gt`x==g?i#m2Y#R66 zc^Xz=B^nm}Fd8_SvKn{G;P=o)tP{Tf)1e;ODKY8qw1 z-Wnxb%Nh$fNg7L~TpH>b02-=<6&i%#mm0)WXks68+%^J#$ z*ct#sK)k=?=~^13bWa*E4kj9KlQSA#_purtYNQ&!*7zF#OYIubFK-%=vU(a&2kROT zn*JI-{(KsKV`&=S-!&SaLLeHkCZZbgySEyQcLN&C>J}Q}j+7dr6M-57uiY9$GRPWj zR!SNz%U>Goe$E=Kk0J|DoWH}lf`79b? zHJBP9sEryA%nuq*Q5qWV?M51|a8nw96ww;MiNqQKJXIP&p+FjM#ljjdSl1ek1$FAbT3poF^KR0WuoAWw09j_@x>> zO*9&P&>%+~Y<(J>@n{+he@7Zj;!+x7hR_-!8^s!frz^6|j~yC95(paOu2dSMGeH`SSHl|3%GMgN24WiUn|B)C z|MeQ4V&ED--n<%rL#Y~3Co38ex;`4v53d@KlDZnc_Ba~;Yb_dI*KryjN@N-_F6J6> zv-29|$(kCaRF4{qFbx{Ztr!|=5kwj)j8Pf{=+hcRb;cTnz*ic@T|ye`IlvmLq}3V< z7>OE6g`65>;T{?!diAzk@gz+4C5L(xpEqL zBxf2|K;;@2-S8T=VXPYV{J9#~m^&Jn1uk4eX@2QXSjOc@qYF?(lCwo2e){k&PeS}E zw2w(9g*Q0k6K9R@BHw}N*%CD5=&B)s1ml#AHCvd9&Xz5P|1P52@EjM{!K53|I%%%l z3(>o|=a>$))*u41E$z3y99719iUo6byS;yKKyb=@ame2poq=i9SM<{!W=xM= zCa5}57Z5g9?A?P}-DQ?PF)Sl90F*B@`&pVe%Hiw%T(Ms9Z3$BLmc-}!r+o6COEpK6 zdW}nzfk6J4u=sJszskhPj&jJ(b-#VWLF;V6m*4PieDJlQi1#}tME z_N@2BVEjVJQAAG9s)_rM!;9Cy$#}_jJ0k2gNNAgvOm=KN%CR)cuI7h zlmo$%rMu0QUUqnyZ_Wu^`JTK`$R@B?GwTIg0#gt^?i!^s-=e8CBySu!71uy|RWtQ= zWQ+N6pGHi5uKrmVLbvP`a}VGXh{9DLxq2kpFDjAN9+I8W)aO08IIf7a2^NI2 z^4l@L!(+bU%ux&O{pknk1|+iOH=L({+tm_`>TMp25umGwAQ;+0wn%SIhwx)bd_C4h zO@+fCq0DwHkaT)0Yq`%SS^+nmI~9VF3ayTo@nAcez}PPTERmb@9VwUe=Hw#y*IZLQ zK@8?GaJ1?+i+Nu#(PCl)r*lrl9>DCmk5*wkSBcrs(&*}lo{!$Ih1)sRUG$-VPbi+}PMSER{ zzP9Luj}HCeV@F8sQvXEisWS2An2LZS4%#&@KVms3#IKAb^%t2z8D1<+DCQta(<_xm z;*%O1?V+z1+!><~C)5@k7Hk7~`X#n?%bmJ%Fi;PE0qB0am$=KfrU1vVUCna5Y;|YZ zfIQOGv4q~zN=a+pd-3?XNRCamc{V|@g8THnvqRz7UkX&zZn9X@m4EHuq{o~ZGM6b9 z11}{J_~MWq$y$YYB@-}o6stUQ?`DaA-rfcx(d@G>;8edU8<`3vDj^?0#%QWc_t2(G z3>_0kJ*8rTtM%88noZk@VSsLhP&j+wym8L#jmg66b_93lN4zVf2Uwn{HsF%4%`GRR z{FO4s5Zs5#A!Liq+NnOl>k&@`eL?yNO!@W?w=_cohKyEbYQ^JfTYc|sps-qDkqFg1 zo;qMKuYznhR8QGEW%tZpiN1MKxCV7qL(9Nfa&xhq^vpAMU9B^QRs1 z!XFX!Int#02x`A-G8F^hoX}=i4aC~gqXF3Q$=+mpXBz>-_7A;DSjvej@ANgHK`~Gn z&?W4Xe&Ft~6hBfry81VQEAER3g)2`YUyAdn@lTczU|TAh&Ymc_q(PK33WV{Cn~+Tb zHC1_If@{U;EUutYy}BIR6Mr7~d7z?l*Ja1bMsa&U=(I#&(PsGSf1{mJ?zbV>KyoAd zDy^S!glPK76?{fRySZ{942RCEqC%?^GgcRwos$*1_e`lUS&7Vu$enNkW>~Z+y!i;C z520Y>GukOc;mJU)+T~!VHiH+&)r*FUdiXt@C@bhn$uZ$G!{I- zr2>FT3&*T?n4i5}p!C)^>mtLi-}f zC?uXjhT;4A7xhPQxiEuTW0615%~V=wTtMdH@`dEVm|9p%HlIE7r;CAk2~M>ezHkYV z5VdS6fuYc&FJ#hyMZ0ba>wXKedTO^g)USvb?R_+oL%2~Y(yZ;Ed};547PeCfxN|nK zDQAj1hoZh&Fq{I@o>^yW4^7+Qp@`YS%U5McWs(5!^oG28T0?kHfa1j3E+?U4zcU@^ z5%wR;dnuzq)$GRkMEH7h>OD>oT?6u)^TwAWV$v(A%oiz&rpT252o3PKnHfwnH{4(k z*qYphc3-(Y=Su~*Nsb4UBT>5^jg;P|9DrghvPD)-1$*kmtGhK;0rG9aUYUo-`b`IXyh7<#vy++ zS2e@F`S8J=lP`T2J?a>*tp21W0y~=pJLxBnl`KLx1UUY^s{Q<)z#>2tZs#Se|MQt9 zQ8uka<_HnaNX>M1+1beacO1&!9m952vj!9GA`-7>jMr;TR(99N__MNqX{QeL$6^fD zt-Y{Z19;Wsl5A;iJgHp_ifINJ+;SK}P^@+U}DYX6D7P~@bGkWtoUGeCOFV750OFkcgi ze}2a@lu1+h)+T<>7L#p5#d3nitC+^JbmgW{InB%JDVCM7O^uEQo1G zvsYSKS+cqKE=BWmoXyJ?ja1%6TzHu3_wAhSfynoF>gckA)j4wO5027dMP-GVN%;sR z!>2yKzsqhIQ8q@Z2MQqpI#&DqRu@pVCZG9NK0$J`Rg!Bn+?c zYb|0tNGqU^=5z+yu2L)PZs+tYeymN={B~o!sE5@)rv%@{ywqUlJj3Q7P2nXI0}|l> zPb{7_^&q|cSYTh>&pSkMbK-XId8<&OLSpNLv`~)XvW3w)(IM?yww>{)=q2HQuYeW} z>G!Mj9SCcj$G=51;^03F^#r|qa5V>ISG|c z4qVgWrOA>J>^E=kC~&?axnZ15tIZ0+PaG7 z#GnrP!D^~>{iKXJ#%;Qzx&d7VyVFv6Hi}OQh@K)$;d3#-GLkbJMtZT>L4D5>`*E`a zHI-2!qRtzs5Joz?$?koWg4YFsIu^z0;Gv(j6^truj!S$LVtY!C9vAla3PfkP-l8nC zjE49KXR(u!43T?FfExPK6IraQ|7qoW*`>I6&gnxgk%Re&haDL5gaR!yY$|oM?e86S z5{nepogeTh2#NKqo&Z*TK(FZEAQVoDXfj3dlTPXcRQw60BMV8@ic^R^ut*=RW@E@r z84y_l&GuLQpaVhm7aEqgnm6mtTc5>|~i>5hu zXhQp|jbAVHZoAz)*>MSDI+e@6--sXJJZyyq!MIUbB3zS&$3aKhB&ELIke+IRb9$&< zmS=ndb%W;Qh*vVZYqRiYj;G-)93LJaO?*Xrr4COU) z@iE~o64fK|_sI9I6f6#^pcmTpL-QCZrtZvkMG97sxZZ-#TRK1!z9*DSUBhOC>It&j z3GHwP?C_*m4-`JW^1$lh5hN%*^f~-u7u}f;pN36Pd}5D`nSWc;dYi#Dhffu1WUJS< zfwlwbVp8!T)tDuIHhkxz(_u6HFomfb%~5?sF15dy%cyI|C`^*WoOec?f0KkjnvPH( zd1}h}guWi8XIk8Pf=37?VWax()@d%XHI3|U(2zJWGjyWY&Y*UPEkv|b$XQ?uE4?Xu zuMhnsOzS`RsrKuqN)mBFx5lL&R3c}>u|Kn&QrkgQ#ste2upxN?N(GA z4zi}yxp;DmTAZ*~zky^3TxI_5p|L8lLRIK(r${_9M6AU&@Rt#36LZtG_HGC26^fk< z=w3-v3%ZMs?x$bS4MVLMx`}y5S#7(Uyl`*CUzGJCqCg>iL8RlMq`5c#M_qo7!|$rm zAPZ;>#TL9$Ch{h<+a~hsIKnVD-QVPBK06kmiSfe!Y83z@j|kL!Z0t^&kvN*ga@<%M zm%)ribR~5{z#gF;Bl=^(#^<-5B?B#Z*w^_dJ2N}`-Y)N?J<1(yiU7$oY2*vichutN|Bp7f9BcGs`F0>X8j`x*=SFUV1fr~7;lFqR0$Ym7 zwUJ(yR&|_8vuH>aP>j;^tyl)EPQ1i$tDz7tNJZ%@{C+)jADaKD`iCp`8Dp^#IQ+?S#uBi=RO-;|ds8Ac@OSDpx&jyCfEaF5E z$^Vc~DjN!^*U#SeG%Fk`(Kg6+GSWJ|g&6MQX8bHZgW>pLUIin<$`L zc+6Q}%=e7|FB4DP$_|@@De3`b)IQZZH`*8G(#ONOF(WZ?hUw)lWeq3tfDrSoWAtfD zo*=yxeZ+srnAxkBdp-O$=ieQ&fWjGumQVNr@lvav@X<;cm&{HrfkCgT=3HAuZ2-E% z3LU=p9FSjddyNe5dJgSq9TVwX3!VtuY=bpZyDZey+%eGL%DgdWt)XK0tRjPd%Rh%p z-LhuPy04NVG4pe!R_=F^Kx38`Cw|3=CjBH1LEs=dS8c()FmNjjapTI17XHq^0CO)m zXKs9_X6>CI0q~g=7kzk>aA1sm`#f#>oFQq>imZr9?Xla|>@qr0i!VN9ouc33`oH38 zEf53kN(~3uT!7|YJDs(`Iv!L;T?0^ZOOCPiER#hWr_ZFEz|x?o)?Yy{u|g8Cu)*^; z*WC95!BG~3rc9qbTE2d|J)?S#D=wP}Of$%qO|U5uDy=OgJRr=XTRk{T&|%rjw|w3I zq47L;#_VtB$8U~cpmK^-w*PC>(c)HH22HozVNkQ^cimEN5WoTO5kug2c3$K|VABP} z2hQ;-jFJ$o>yH$f{Q~tKnjfZto18}m{DDI<>I|Z_jS)x$%z~+dtDmj6y%J0?+7BPE z+l>Awypj4GsvH}e%>nOqMqLi_AwUYoH_huoP|&#EQBzr2Hcnk_Aj7=sN8W*Aka1w; z_iSX*;o*f=hWysahkrLt;9@g+_V3dDk@6-J8m`BbeY3-$Yd#_;3?p&44WN)eYQ2;T zd@yy48!go_V)rz*1?n(@6KBx{bb5lCb@^i*669wo1Zjq@V{~#r=qQuNk2RO`nYeaz z{-q`B|0cw2m^;8&j8l)9J_P;HSsD4{Pm~yAD2Yq_DGI84P8Y6ESej4BKZm;} zwA)&t)5czv#Y?{uqE_sUqty)x#K;Lg(naXGwO9fO^vmOqlh)_Egf4hf0xT{s5mO=&m}J1 z*{IK2zO|gizczhB*eiK<&Ze00sk>|+BIk{mMf!=XQ+H@9G-^AvHR;+jQuN*jM0r1e zBV@KY-)%cOx)O&DUvu1Q@rR$aM!uF_U6grrJ81FK`iQ-9{d*?pCar#B%ga0cM67o<<;P*UH9*0K??1Cx$eUDP7kBTLOg_mB~ zcaktJ=ATP-6q;BEneiiBYxGU3`uR5T2>e0S0^vH2@Z?l@Vd*a;lk7t~ZJan@pP5#c z4wNm;{E=Ge_KYF21c^^Xm4q}OXMvDnbHD33fx3my5V!u6;K#C zd7_J6htlu`b=RKr?#G8Af6DxNjnD500Hl;t@}c^rW2}Mxk*W6D zo3xFAX|dyX_`H}b3c2(&^vREJ2F&4^m%*CCWyI~~Z`qc;o!t0K4AFxS{?retP7QSO zya*ZuEd^m;-vAbS)g5ghCl~|PwiS4dL=Y5}x?pe4NM!*y*=TxWD{T!&A#ipa({&i? zLU?1buzhgDJr)a?&l6>CULGDbtQ%<&rUnv9R0Djx#SRDOHw$b3$$Jo_JAQsrs&fSi zSaxzPQfmozpl)Y?F=HIt!)Caq*I2{-C0(rxv{2SiMpdD7Oi0=Hh}Pik{BTT}>WsZnO0I9wgY%2{gRz(f(cGC_Y#qf7)BQAubIuQ?M` zT|9lF%rOS}J~VONG${&(#w=uTS0NuOr6delC{K3++DaMpOGjd_xk43-vtMq|L0SMN z&{unXB2pJ++#+l~E++!Wzbbi?O)n0&M>2KnwKp3YBsyS0)<5j{X6Bcpl;inT1@3|l z_v`g4{q~M=5A)!Mp8lKMZ2R}bl8cO=V2y2CY|Fa;h4Yp2NoVzsvZoWb#WTQELmZn#T2dga8^{zn63*I}B`P)@y zXx1)0n$uYskj^4PV#`dl^Ts#t0mCGnjHqA6eyuSu@1RO+9i=@_7q~_g<-I84bg)yo zhP6MTc*R8eiohxi8_iKy>BuH?^*BV1Nz!C;#=}7ZpCe$Q$S}KV+ zkD9TVE*Z5&$BE_nZL^4A9d~s^Sgiky+-CrLIq5;*m?NzHiS zsg@7OH8Y)!V3%~t@DK`3u+D&%Q{f=1v$_N0Y_)m0#rrfKT(|kUGN|Z^SXdI%21NxB zAy2&P8}dY);f0*l4EhnJ&O*uTBR%eU6{4`fLUaI?q_R&OnUpzgX{zuJ7Y5K5ly>5I%U&bG2Az3l(6*42Sb6*Ka5dvV&%xRPf$%VJ^mYg+CD#? zB&Ojcgd=PJXAESb_Kj~Mj+`Uid%dED;DfLA)o9&W%rIYcp9%KoqbY?G)*RaM?WY%3 zgSf5RaRN%29BCRQwo}W(hgZQGlPevLm&6~SGp={MI2UKsK8n7@znHgcW8)t9U&DIO z4g5W@fXx3%e^RFdWqvAir^fi=Ud89v$=Tj71UJtgZpQ>jO(JR0!)Am_x^e7RvB)+s z_}%Rf-KEk5U9qVKn3Al69dD!FjPCJFg1(CuEAWa=N1fHLd?q4=7tmX&c9}py2o
itKpDzo zQIpO`0;&^>YA7zQPF6m~NXx~?db`A*7S`&d{4xT&0N5;m>O9wh*i2c6((`Q$D)x1f zoP7}eqAxW@Fxn1~Szf=L)Af^xoqM3DMCr%r-qFlyrojFY6F+@qENfy>yLVGx#*e^4 z|3)h-%d6?qG&No<^JEktOTSJ;_4%tPJox=*+c=-2#QjyQi*=R_7={eK{WRZqXj<$1 zkY6G5-`D!g`mcs%9vjhemA2W0C7@=EQs}D5w+0$8{@g(0q$_w7V(IFUak#L;{L+8h&3dU&vL8pdQYLbfx z(4(ls7lh!;DFHWm_e`9ISj{xC9`t{4$;nbLU1xN`Wr~N?akx*AVqme@%wq?bT;)yK zkn#x)4{SY1Kqc2kkMLw8;Jn=SBeP~|5-!u?YY>Ww%Zc=jNY_aGZ#bz!46ZnBzwcji z=T;0T@TSqLnSwebO?|gD+7VIbwBOdpl-gp>_RbBd>x>@)oG9qCZ2HKsLS?*#c2ahT zml&8Lye$hv{r>kwp>JbP?c}ANt+lQ$0rpC@ovPSU$5W@*Unj4x8r-W3{ydCi-TTXU ztKGtZ^$aNvA@emb1>UAsL=97}MooLwEh(&L^JL}j*2@&KFl+cx>CA%hj&d?w2!=_0 zbP^tehXRBgm;e*rJu{LM3q;EKu=l!XU?8pL=uW=Oguw1zdWg^}f~bX^gDPCQ4(`S6 z_*DG$4J_;zh#Do*favP_o@me9Pd)NrUZuO~dkO({N|#z!7@VVXyT@)4SJf;l-Z}of z|Gt`QPQN+qq{Vj$j5074`V<1aqc5PlQhzVwH-Yh}w;e*w*ijB)0yKd+XUYo2=G2J5 zIU94WXwv^ZJA1ON6(hG@1)zBF6*Qpwx1nK zZn_#LW8(SH^5#6rTMuhDs2^0qOBF?-)d@pP!+Q~z&!H`<#S z$V;=4KJmi!8;qKc*yB8chFXgxrcu6(&HBU!ufqTJ6i-$ zwOvMOJh4{_qOHKl2cBxSvo&2i6~wBFMs-xNHIG4wG$v-7Y%;F?BZl)PW(!ev))iP5y186Noem(>vqAr7F63Gv`TZ6z3pi? zAM;1R;?Z4XK+pKP7-!-hx_Qj$M_blSBKBKOWK6BLVcbQ;A61n z9YLx>zh4iW=l2yjMd>@wxXU4H8r3s=&`~Maa!&^@k8K@`Epxb4b=#ux*TswmD(9A> zi1|J)fnFqvBR~p$-eM5he0;SBB-F2?hRT6dd+3|++4jY6A{pPyfCuqBeI@Id-#bo5 zhm%y|C5?I&*sox*da=koa~9H>(Fpu*EGp*8jx<9Q)|^?ebb@zBiJ)!cE57qqXO8Le z#gNAZII`WLnyh$#!USU5U>Zy;oj6vAKPLVJHi6`zl%L91X}!?%%cFHIlM8Q&F%?06 z%r{%wZYc#tmBt_8H`p;2%K9s^XylG;Fie!ll2W=qZ*ZWS&29)6#K{t~X4gDKoAoB( zIqQQyVMCdk!(F#+K7XyroMFG-R^_F7^!tmA3E7b;tH(6=^KULwQE>pItWz2Q4o$L* z2kNLOrSyj1Sk|0-`p7w@qF^Hd0DcYj{ahDPUqVUEq^(nF2D5#h`;lilS&zcx0Vmi% zqdE4sUK{Ka`~^gx^`c%oSG;h{s-9|S2!PMFP$<wR~Ish;u z$090+Wjv2rJ(QLGpNhK*VyL06z_tk@$q^HVYY#nfmMtgMG&6z=Y@3*`&V{yEGpDTl zk-73?YF6mS$VkR8HEP_Hmvnhb&)j3~ZNg0%klL>7f7G~_^ptOTa^P$1O7k@rTpDOY|FD&zf zwMDLPL~5Q8-x|aFE;YaejTW0Et~{?GSxUJY$6C67$J z;Dk5n+A*lB0|k|Wxox`r+Etlb$j(sXGdjdya#uAL0@PYRIYG# z2{f!!eIWkzUF^j4W?sv_x4m4JB$iMkR#qsfi8>)Dirbjm4HyXg)>vkjA0+0Q0Cs93 zZRDw73;{wis}8wJ$P-F;GKRR0QhM4@>Bfr6@Id>)EX|)Sv~8KJi~^hqVv$o-_8a z#AI}a;(UoUQ)92I-UAU=5v#O2Ai8PY&c_PJ?-BxncAALs$qEOy2fL^4M~gE#cY{;h z^>yQ}aaS1D5=sd;OfjO`HmX+Wgj9V8;hmML<*{8-zW)`c`r`ve?DM`wfOs(iPRV@3 zd-R+u=1^p;CT^{e=Sg}9srKDpp{?a*qgA@KYcPg?f`DLL%_b%%!mzV6Xwi+uxGMxn zq?o*ZxiStn1X??M?h7^z2BNVKQJZnHlU=J@HA`nxg-x~q8Su=p|JH}Q80lhX^lZpM z6rMrN2rca(I^Ec7(2VaJ1D74*V{2~GhOGJpwxk!F!>N~%-23V;a<-%qIXrWTsuxk`%s)%BsPA<`cokuoS5E-BPtY_rKj=JjreI#J9o#?(l0@Qa z>ppDhzvhlQ8wj26d^zdR(UmpwrGd$Xj`!h}NFC5FNd$6DFn;;^6^BN`Kt?K(uyA(0 z+cs|&9K|i2_#5Y5njeu`4*B$p{VqiyFDVpgNjEO9N;ZGzEGQH6@*P6ElmmEtmjWp? z@f=r?fVKwN=BPX#<*98}gSP=fU4l>wJDh6GIGsC%UV}_)LRTFlBuOXaCrEazK~@^L zpJPk#`F(LW`g|aNoMK+u?Z^+3i`F$&h}UEt?#T!VF#K6TR^nrZRpT{}h!LcuLup53l)&)fU)dUr_vl@A!Z7(S43o#Nd z2rxrtZZ0&4a{6V!6y#qA7v&C5ar6Ouz*ylJ!(#^y_Y=_v%0Gk@P`G;9d{_hCnLEg+Y6d<6jq>J!(eNTXcLBSamI2 zK5JUCBEJjzM4>S~N1$MJA-)V@|BGEInU!bmnv^!C{EA2ejUX9I>pmll=s$AAjv*e< zP!vy?HVSoLH47vcQx*RbOT?~PE!vcwF5AV`NX4namhkwA@b1D+^Y4=emGSMPbi1i6yn5?>moY>^j~riX^f-R1xEIG7s6bF%F3QR}hEsdui6W9e3=09(KJp zcxcfgrd@z)z(cyN!$RxjrCgOj)b_*(vgrQLvFWde*Z0Gd3Br=wZ``OHY~A@(3d4@N z78l?0a0%r#a|pD36&BcO%Oi;)tv$2mt~}zd$ReBzxrog}-wvY(g5fd z(E+($w;$C?X)1&Q4>Z2T3^nhKYAcvycK^vM5aILe6X2qxb^gwEhqA4yS%>`LKbgiRJeZemT87|&MpCiJ zAWVx7BTd>zMN_s@n`Y-5{dnEn{&|d)m}l}a>CK~gkJFjHjMB*V>dd6#H2L+aQs>WY zQRbc{H~8tz*%NR;-JjYx*3i_HObe;}Cnd8N-CNa0qH zPGmXz9J-)(8b9}wD|>DpE&iM8VbKC-XH->!RuIe&P?e)(0!upS1kP;?HH!3sGY@l8 z$KvYW!DqcX@FOI*_NGhRqbM^QT zb#SlsL^L*dLb0){wp=JCu-SjZft}_~hZu<^)y5F0(?ds1;s@TqY0%wB-io`4xxm<3L~sX^B;uf$N}TPewI zU96sqZ0H9DYHet3IJ5EKJ~pNW4{|?<3HN%UjHKf)iXpVhyJam$z2HJD?>^h1>AQ?X z*#8yD-g=T6DwhkFED~ID9ahEv8`G+kNewd@Pl#mve$4%Gcu5F_G-iD%@y|g%_evJq#tx5Gz>7>S z6Pwke6&`{{Bw8EGBHwhNZ~^Ttc7(dfN5CURK}DpNwWvKCvn^`=f@$+}gzTIc)-nZ^ z(6>@>;q%M==XO2`t68Unt=#ZooS13snjHp*$itrs&PK@Z{{m5B`G?lA4Qfw33-1`& zI;(+HJTC4(Zt!=qXmuc0SuwfVU$p%2+UI3`++s4A?Ix=g>!ZYexqV&pzxWCkj=Ynb zh&dEUeAJD_dQsXSOBF+{O^__cA5OJP8O!3XD35z1E((sQ9+@+Y12n-HwMRDPtb0FXl;49-`2~7$?7}O8F)vOnh;{ zeK_b$d%YdFHg`2G%7uR0zDgQjP0gW65&UWlZ$|k)dpjmn1uAreLDw zpykbu@;g)m^u7b;#rm3S!++mFMl43mK&cTaaqWntcWCF&CANM-BQq(d5_hmF6!JIu z;2*AZ=9>AD*WO?p(OVC9gN2s*g#f`Hv_x2vvcaup{_ZsE_-kVh$uIhY&#IN^opcOk zoAFzKsRd4;M4t(=W{ zRJf%|fT6SEol2Y0NmIP7uy>T6WNsZawmmfmVk8oKn*cgUPZ=!WQt|}ThU+7*f6oh? ztJWLG0{t`e*5nk3FTgyz``IcJ<}v~xGAkuq%MT529~Okg%|)#C8C;8s;CQ3CG-0(7 zDTOSJV!a9=w2S(5qdW6#bYM5Y)B4nHj?JFSTGWVRM?auYlO~5OY67nxz8m@ol4R05Mt${1zggXM zYe37~cB|v>qO!!3TbAsgkB?;vUEEDMiN$I~aN$CBr1(_cxf6WtZ37#`l8%m?}5H6zi|;W}7&Gih*3=Wtgy z9#nq>%1vpk*QPa-fqKCKFrmxdyz zL!SlPy1OmtZlXItb4e3(r%*HxUUVEhifxsaSU$a_j3=7ebpx{Mp&Fz@yzz{2Xy~gA zk<5cWMb)ksf=h-ZR#Kr@uXc%RdvBk^W`wu!vYn8OOS!nepP(@nP4gKhnd&}TV9pk4 zwATQ^sXQq1eI*Z$gaIeLP#8Dn`7j-sFu@^C zHj9AQ;*zJU8@7*_&###<(nPTX23?ka|9QSlD`4we2Oq;|(+1=eDk97${yW-_+sLKksOy>-K&O_8nF~A_Q?m+aOtR4>{1<-D>#h z33K0-@K^VyBu?QDIi<-x?Y!))ZN@dTplW+DHx>@HGslV9vk)v4;jyU8??>r z=R7%>Zn6+nG85ty0rC>U&YN}w>ZYS4kM9U`%6Z1~Sp4{<1rUtfX(2lgk~(v@UvJ9D zu6=@VV<^DJ;*&Cm(Q=K=nh)WU4pgm(h2|(W)sW2n6cUb0m8q5MVrAV^uP|Ys>+6c? z(@uLX?+NfcwRUuq7A`IWZ~rh5E&8;-j-qU}?nEEx%QVA4?KOHo94Bj$rv(+}huTu( zv#2E;&_9&=kxPkh+~`GkvgH)_boBp$Oi?Sa+BP>dWV>IvoZQuR(}4JC%sCC`Il zkOm(4I2zgU>DK~%hL^I6G|hRr6M<<4Ta7G~lXqU&MJdr}S+Tyc!c450cE|&4b-5s~ zW%f9Uot#!d^-s8jcq6wtfdnrSoYAN|FfUJb{tE&7i80gvr8(A25bzpXe*JMEqvzh$ zpqA{o3;WXURu`f*e8Ks&_CEU~3bt=E;o?5LC-YoSxuO1$zkkJbS6aL#KEy*!2#Rnq zP|40}=$dF3sH4|iatN&b*n*Q`lHL}cx$_|>Yc%%`=keT+fc^a5&tR4Wcfa2A-sXUdEC zAYiTzia>oERc3(apP)d?2P`QkCcfwzO&ps?XlxNg!99dU*+&@6f^}{p63qP;u-P=S zYaKi*+j|5^JotPHrbwM~(gRf13CH9iyPe;}Q@BKFLCXr{Hu2>!NV8pDN{^Y)l;qgp z8u^FA*5U3i_j5-6y+fgE$%8aa+sTT~p_$v^!-ztqe7zm^1G_1YLfeTEOuw zMp#(w|3>2l^4y>0E{ocC=5c4LQG{TQ7{$M!F=8YQBN6J2v6Pa}D)iQv0dD7AKm%QS_hRZh5X)^*5K zX3*z?C-3#1X8o zGk_aoMKf|F#L2{7QmO^}E51%c$d*)QB;V5IpwYu9wwoBN@Z@G>&N zOeSUWr$1{3dCX2jzfM`u7+FH>o4!aN=Dn9<&0+?=D#O|7gkuHXoXFw|U3N7AyqpD_)L5u?jDJ$MZb&&MsAZit-3Dw#6SHb=*TWk<$!SnSk%|NaQfX<(1jmeU#t@_5G zxFbjD#xwAZ-&-W68l8(#i@lp18FndaIVZ3vKA8YR#}zd$+z^Z8u0#uW?Py{Y-Y=-#*f0ON9I zBDu28QMc15*J%&uX0of9!ZtJ~zM*dlY9jzSK*qnDO$I5op5leJ^@^;4as7dSdUwud zew0a4k&8{)H$f`=@VSaH7w`3cB8`Vc>EGKbAf6J(FkzW}N#(9y)g*Igbsh$MLT}-C zd9?Z|OZGdK0wY+;e?;geWHBtrAEu7E+D*Ga(geW3VA89YCT;-XobeEMR&(v7wgn+y z-mX0M?=Q(>MNd)~l(=i)mwR6~OxB3=-+rAFfTU;MXYv>pu=O+Uvo;5GJsZR;D->PD zP=o(Nxoqhjr0GAPjovyC>&#B2y^n4KyL?$f2b?SjvR(v=+2BM_k9S zuCvjs$#Dc3pE4wlUOJY;3%Y`O8CIP7tAO|0SEEdoX-jd54vC~$g_l8WVFC)c(Z}@Z zlbF~|oguML{lnL&@~R&Ks6)dHj1HSUQ$Wk9`5;gZ?Ckw}65P`>cMX%h;g+BY zykF0aHB!HtMvP`q@o6g(i!LZavgW4JBV8t2<#i|b)6@SoaGl3nvgsbZof8z(UuVsV{3-S1K3yy!5P$Pe(hDjUaYYh%voXsEA=W%* zj2BW5HZF zp|yqmkC$4LP2+>g?yb9|EZJhzzCM+@d`e8?-vo4x9dNBkGg5LU@g}Q(QfQMAkQ_?) zzve)heUh2L-rS+C9H@9}GK!}K@cw>WQ?N!dk;I=icn39Dx^wIS89mf*+er+L73a^s@)&Hpkw+m5JuiSN%Vr#Tv-Y2W}CU zq#!BzW>oMzNOmt$iURfvDNN2~>o^yK#KIlz2DZesrTF~XXN)BuNv`^Fi`pY7D3lvU z>fpla=kJ_^C7VUvhShzuM4_a1YJ+FBtww?hYhHZMR{>m zYg?{6sV{e83SmzS$Q71+TJm8Mn1;AZJIH_~`Mg=+*Pe!s73yEtwxnmdbkM$ETPn0M znO<#ZIuKO`_+*U3)<#pU6f%nRw|ugibqH(KPe?MmjXdk(E^^b1>;?)+!X(uv08k8m zqaHL6VQTI6PLSuAjO0GSFRBKw?cU#N!~6gQ0f^aMqQ>DfV6r$v@>S0*Fd-InlW#5> zQ5*N)e>o_zy-o4x9s|jS+;JocT;{(?j*(RfZo6AYIfutKkMayE9hTokF; zo?vi+JuXP^|5}lsZM|mkugSlt42Ort&huUa;L(9?BBfX~f$LyeL!Y_4Y-O|3t`TaB z4PR2_&nt@{;R#euBYlk*fHSpuLPurL}wbui8 zoAuloS%C#W`p-QsIJ@M?7eVf()ipQ&c6$$zv=7!)nk@-BSXt0x`xod9Ib$)QG;D9r z_87L7RaTDpmm*g^xd4b$dvs9>*g9!s8cwi+HMF|y_rPPdRE}HQmimGoxY%8AdaQ&g z+2XuM864~S zE9ZZR1;wD|$FX_8WdA|Yri++S<|FJJV^AQSHw2bfjzEgLXs)N}t618At!a6`+$En7 z_oB=2g}x1ljS#9K&h(hmZ|54Jo7gZ~8_Iuk4FcuZk`9Rq1k_wqQ_#xC)QdQqUuW>e z2xDf#VR#;<^2128NY`{2*V`EAsvyJ_LQ(B>WEq{*2K-_rdVioSTYhbcjA*pTo#~UH znxHQFc`tyM%at22z-yc-?u|scd&%7)53+cAy z##%pk@auLzi3vA_7@A*Bpr&2BRP7-VLF^y^uhYe;y;w^@{a+ECVR^?cHlY=)CAmd`<)SrN`byT~E$+WnqI2 zZOXg>}5lrSe;c8LF)$=BX z#R?y_AhZ=UU3AJgK^C>pg-q25Co)}sbJRpDtDp1HF_H7uxJuR%vPs0jK3B(0CK zNv~=~fZvX>ls_ujlXjPI(2}M75H$FKtPy9#2^)B$M=)+n6;*o&kzT1^t~psBzQACE zaQQiT@sns<8nR)~vUggNer7$xU;qF@G*q?}Ln-s_!b76Z^z!Q)3QJhpPUhE*IOB{w zRGD`xGG!I44pPM$3o}MXfv1ptMHo=#;yQ5*Y_~eyC;hM02ZVem@AXwO9D~B%`fcyr zCWWyP_S)4=eKsBBKGH8%k2sV&J%SGi*gOK(+7vvz0kz*)$08vC`9066yP@MF5*)_M zKzY+Xh;b^JwGaU;xb(p&M?4@iR!#ljVwLa&ZHhhSrE-MyF6fI?L zmv0Keyy#w+HxxTsP1K zO}6)x76n^4;1W-4ONUhDKdLb_bl{}^&7`>h%-p7sqK;#Nae*hIMo4f;$-O0NBjhr6 zxbeehUxH*!Rsz`_B0)7_6}AQ321^uuK5|Exydr=tN-?XNB?AK(GQ-UY>}yTXFtE%D zw%ycL^kv|Lm*&F$>LruC+3$P{bxO{%wW2*xzEOdAF7Uq;1UMByqi!3?3-)#<^=Sz6 zA4yT@y)J0``loAO(j34`95%SL|CU@X5Qj2#+njw2{OPrM?PsO1EQ7w0np>b|oE3hy zX1CvD1vLG!?-ZoJK+gZyxf8cSI!~B!2#KGGVu}FLsgX}V&M&f6uG4wyBoFJmliMBg z+}=wz=vI=B>nVFdVEF+WtKv?>cR9~TD$QVY7z<|^@l@A?9!0sUj^u}pv7h29!;;Y5 z#oP`OP7HKJaC`Y7e9CiP5sTWLte|*PXs* zFZ@>@yI{7nb~PtY&m&qJXmwN%re7@HpK6yPCVcAl56h{B4#z>FsGX;w@+&^;=a})z zQ9$n;;npwN7Rl^4E5V4BNlrpa-=U&8gd5Xf)*&CKxF269HvSRqr=~{Z*kLYhN(-0_}Z#QDVEss{j{+hIs z!0kD~?ift}DYA){6ZqR%m?)t$_|$6kRedmfbVeo)Wym(D)KVVgi`B3N+K`p!(PJsN z$!&zB;;F`_dx%AF%N~Wdr69$Kp&c5>q%18pvfvBTY6ew*r&GlEpb_%-%v`hla|964 z^C#9wMt~usYYM&Q67(}-PXL@Czg=lQ4Y;UiGtVUlL$MYF83&Kz!Qs*HMgPcK0SO|h z7sUjxUGZf+l$k49!k##Dk*FMO;M&LWhG^15`PhP7h^kp-#-rzLBTd~=ea4$tH}d*` zMDrkOs_v$>JOM@{+9VfE?HLBba>qGI!zf3=#0RB_mg`>TU100qkIZaa$Q zNJ6R&KYp*s$YE?3UXF~*lGpXlf>jN<3i_Vuez|gEjF*Nbuiudakfik5On-F%$`Wm* zAwJyL)n4}cIWTdQirH9#-O{5enIuW{mg*`bY)Fd{6uRwFCvXCfD86A-ZA4=zTC-E1 zHG%t1475O#19~HhI6Rq`&~L$Sx@=xsF~>=CTfe(H-mOag73mG6N7KP$DeZyd zrwq)-!oe_l601A7Y!`zDC0q;F9BHuH=>>9B$UbDV(@!A2CL`inXXHPEc&MZw9vZRh zLgMyV{>8imynToOZ)j>(Q6J|8f9jGuxIkA@f(iwl3EF@6X(qHW#EVbw z3#oph4d_tG!0GnR`J^^LXACIAf9fU)^kxKOv_s zwf!}J0x82bO)Qo2d8ABAdfTOi@eAMHIuMWt=F1U-yFb3LiTSzRV5SL2kGE%U9~N0j zAZvnSqNfAoLn0KislY|u!vB2soX6V<^R$bBm zjL42TAz{?E!_C-embD_(M&BtZJYG&k7MA1)iiS|a5!BKG_DSh@i;B2z+<`-!%1ved zPhXTC-HofnTi~-{u*?D+M64)2sKT#M8!LuJOdx&j2-cS{2N?9={km1vg-A1&wu0PC zxlF&1{Iq;n;TokpHll8F6Ism@1JL7g9~E1rO==n0zn#{BR6)_xa(A|5?t zpicVm;Dyg$cV@@Z4C_ce@^m)3^)>*A1ZN$naVQxz7n%%*XewNo8CZv*S5Y~svcChB z>@-D_rT`>F)dBvlI~;g%t@D`YbQvy<6y@dh@CP>w&@jpLGmtG^?ngvH#e)VUx{BTI^eMG}0SPFz>_zHQw{_BNEjY`}B*uHlZ3kG2<*VU9N37 z;`YuJV$}$Y*K+@7`uJlag9h!U-tt1^F0Z%xoJw}AqCNY=(nH9=i1kq>P!kU{)D0G& zko){?hBw-4%mcgl1#9)5Q*7q909wMd=RjkVjTSd5(rZZ#xIG;m(kft>C&)Z7UrHvlK`QSU{leTYM%*zpbrkzFqX9%>| z4PM}3QX`&5ICaWaWEk&p4o~BO2FKyu zS-PM4GwjPXaxv`^7-zYwM;gbBEliV~aUr(58+YOYL<*cGE?meUdbqa-5boo?Pm`UQ zCB?~!d8q8J6aKgtOoPTSCe@NV%`(v(r(}ht_!;|xl25Oa&LWDnq;%d4`w5^ckze#K z#k-3MukGKk@Q|UGn#T2q#;eevto?);^MLw3nbxlH*b9i(vR&M7?I5B^hj#W@+Z)q= zu}z1@?lAe`gl4Ve(1Oy#y3~ex<*E2xkN>Pq(~^m5xy0Sm=DDNvjPLhwO?n1bCoEF# zcu_3L5(jwMPHJ8LBs>X6dqH<#5f>w6Me|%jFQo|kaM*U-8jd2&M&k$TEVWZobI2`q z8J>B%SVLc(G8GFXZD@4^2R; zQ`%l3IgARJX7O~t45uJB^jVA$o)6fm!E&aKt0eNC_es~eogae$!ead=s5Ge}{Lt0~ zmWG17$@~19qphfm|GFJNpgTLE$+`^?%wv_Qf>iN`WfUkhx-_rj0wS=mCbP-!y9!C%2K{|28 zD{LjzcL4zM9amIKLMke3D13fte3$`F7S2`oNwX`^Bjta}lVmMhi2yP95R}*ulJw+#@X`xtz1NRI)T#9lUHryr(YOwi`r1fmT2f-8*GAw{08+-s@*bB^`K05pY|B@USsLhG&Q|#Ye>UN0UnoH zU30R1Hznr8Xjquz0uIdPR_e3CJiO<4W5JnU375@JRr=^?KdijbV9~<%3Wt_COIolV zAq?cFesP+B6erG*NJ{IsA{@UCePO{V7dMqGL(}RDDTThWcKE=R9IljwK*O=3DwX9M zb?BQsAHL6ZHcSVb3q)fG!YnPzi&ks$8>~ zl4alo^w;%VWqKn~kQU)JUodgfL_szDp44hUPQGD)sUuoG;Aqk!%dC)lnU-8-D|4OY zrIOGI0lPOH&yi1T4GO*X;v3Vk0>s{A=;VjF=PKl?prhwj8MT@^Gkq|N7JK;uzT=ch zXvabS#A5RjqudVgs4ub<>F94rt593K_oy7kifc_;FHS<(IF5{xEj>d^@#exmBmc;r z8^)V&SG*+Jp|1}QOOIA1LJ#XB2s?^jKg_!6lW7RS1IRXL-XCAjtP*VnH$d-!YP3LG z?Acg01%~L%_N4T5_1hg-wr{}$eRPhfIf7&tvtIVF!BfQfj#iS(e+Q2<6$B7{)1p0) zv>d?wT|;p5@|i0DC&Cw%q@Fk=ftc~rht@A97`bxvdpb}~;bb~D#u4)JF%B_1@aihN zehX(*fRq^yh!{*fc}Y>?EHSGGu3>E1`x%yYZ2F!oWOmCfr{U3hS^-9XN`t=99`~#a z5joG*&EihTC9xJ3aLMe=H8bwrC=7IJM?TzUam56-i)W<}I{l4P2{&TamsHodB)$G? zgsH~Bz+Wsv*Pr5;QS$nl$kTb}JhM~iQ2rAB2leTA!yv^PMlv*x2KfQQn(4KKdN#O3 zovVZH8p?ApPqK-xupu8(%Aj~x+9H6g>X(MUtsaGW0Jq;m6bSf_#cmsyJ-@r5ANxc! zoTqDWCeHtqX9*&shT6w&lq)_dbo4XD(B0IcMNQq7{wSfXDFB@B*&m zKz!;kj3tv8-xIg8SaL_8+-zR!3P_6?9E7bZE<&n&5H%-81d0GfUObtk4|%-dc84-z zqR{3bQjHV7Zi%0@(a}5#TMe$0?y6alcZ=G0uWf|7y_|hLy539mxUEVu){_c_xuK%U zypWap)Zh!H%JCijVXI)vQi$2k6LBJ&`}N&HvaVmK9P9f(EA<|Yhte0XLHn3}Y5zwdmFTu+!Nw__>7 zS$?l!_-23iA&ki{KEP5Z+b(DoDt~noU`rIUo8?_D{Z~jHl_%B#jcUaE0VW3AanvYkv4aCm!Er5x1naA!bQy&dv`(%w#JqslNbo}NI09@&_*F+? zh^J{GPLXE@K4VF+{xo8jj>b%L0*a1Qa(JNPvM-Cp!ri3}2S+0+ceM?ix8f$d#}Ei# zOI*r$JFeu;`}xo5iwohIQ(3USBdeYWqQLRXCMMCCa=0<(-h(m2bZJ%;qoNyc7Xwd_yWv z46y{Ofc?gd@DJ!ZFj&JKK&tK4g)nRK^}V$t!}Ox!J51d5(uM34Ez> z&q}9OzqpCufA6Bl4;_pngHcWd^P^z0GxST9Lk4AChMePi_HND0HaX_&M$5<#%7+Rl zx^*O;dLj?G3eX|R(t>dAqHtbVVkdQf64hIqo|&1v?rXOSE!uoX zEAcT?TLT}r*H7J$r@iwgXX@Ai7Z~^OeCS?Jl2l@u$oOLz-VKU06$2!aLs0ZwO8O-#ih>g1@h&{bpXpO`Ai85iM}Vj zN$CulIU6GC;YoANk-J@cQS5eHAs$$`tx}qw-JrB79rvFOZ3VH$sGm3C*lihC7&X{ly>k1R3Y0UB-8a`;^q5Ak{8wUQb7LHBC^mhuKp4i-V8jU9$OcNZmBs= zt24i8+rg3F8v^13djHz25iN79BjhlQ;W_jiNzdpkkX3(0R~%br9+yKHI#eOhEC4X8?! z&HrJvy$w%LF+q)YL9?U5f#ith@fM~oG>jk#M1BsxgefJM^xF%3c$djr2xaH($TG~z zxWMANV3M<)5MZ4v&^NXWpv9QzEQwmrTzhnRoGf2n?A~#fDMa_NS+>~+nc?yv=@Z<< zWnUiS6|FE;)%qK9r3f`LV?H|-6U-H()0;koqiGOeFD24PU)TKcpMcla?{fJbD(HVX zS{hN0noWAB>c3P>X7iS776G{3)>f1Hrlh@ymsIl3P>-y8<2#!@B;dujkZ{@YSF49a zT2{I2`5;|Hrs5w&yQtaXfL{!iYwi z1ydLhvBLybb{JaY#jI_m0(UbYYUFultv@Hz9*Yo_*-%a&ZNO4lsv8XK8LvC4-gIS6 z)w_HP5?~^}q0|-lW)Dkp(w|o}6+{Vvrtm(;VJl!l3Aic*&SP}3eb+Gt>VWfM>{GN4%ER^DK&!H22gdheP9FK$yMdC=2(a@6f3h zTx6b5o4>%?FE8Aj==6dqTR^pMoSW4V~^S~u11o$QNb zDSVeA?x)F@T@(J%n#iD3@>}W>HGs6IhBSlWLGRsb^?$)FGNhlFfe@(PM$7g&O$6_M zir=xyIctWD{;=2vN+85Qjr*GQK2NQ)`IPfEkq5bOR@~>s*e5QLu(V{?cW*jk#M=!d z0{~O5w~$Zha7z(g!~Z551SELdvN<)Kb>eF%##UTz0gVFWwH+R!a>hUx!E$#|2B|63 zZaQO)Yh*IEyJLcEM{5^?GNUfC$k9NzyJi`3>`x&Ah@YcInHx1?O zgt^kILt=~}_wtZuFe%Q`gPr-5L`J6(EYkhNxSh|FypJCcAEAhr?>?)YuU!Jd< zm__lq(Pd`;7QQ%2r3w!WV$o5C)Ug^&onKF@(EuxLq>Uq;+S>4w41s7ls&=-N<*pmbBM6ZVfDcA3NUcvcp`JsDp^x!t-N(tRVZS_B;x z#x;QPU8&q)avGh1%y|nvy$kH->#O=2PYY#y~s!I(iYVgLVIBOQ0z?kfOIERHkRvym}({F3uz*8Y8SSauTw z$)?1WiWuEYt(6%W8kCzSZfv{k;+ESbC!Q%a#Ty?C-R@^{*=;#HP)L>r>{$*Y%7|O1 zB0=VAL#_0aXAZB(MO>ut+_LslTUd-YjOmT#8^{W){^0!|_k!t|*P`rx1JLnIZo=|>oW>P-<02A%tJ~zPKf+koj-oW@}SLIi- z3Doqpj#@GmIC_3-CN332(3*fFTJi8eyBWFRm$4f3bz4}hsU(NnyjPE5Yx zzbxwZF{FeODyRWn$0%7BxI<%gTSt^3fV54rd2rX!1y7MKJ3j_C~hNT7x_z|rD0Z)9m z)Qod`AT#I%B(SzEU)$0-8M*{77AZimtjUNddL$ThG>YqNCnl|W=!YVYNe<`snp zZ9*i4Xr1fZZ!juAaWn#lA#Zt7+C!$D@?9pP2fi%z`As}9;N;chn$sZIr`eKZo1>rK_CpDt}{~b4CoV+aEVvPY^HXQaYGgq6S^T zyaIJboFZ^&3SVYQK!a;n|GaDpF!&XEp(w)R_TG5XmTvohgx3gI>-5iY5rl#Ab!oGa zM{)C)aYe+{ef-{#Jav(ET5`am#KOIO5F(adsM~3sy-hcSw^OnN)p(R&)87lwwv;Z7 zh6je6#z|Gbez2|8?Mz(K^{R8B@ zgY0cVl=0hLRfn!sAJ_P{PvoBMNkajSds{)?%J5J0LtTWz3x+y2Ezh{aaDrH>j*{!K z0@TZCn*_DmdYs)%70G>iT@u42kln1l1+>U!oMg5jAhABH^_Gd1_Z?xD3PGl2VK{Lv zT-9GIm%XpY!0yVK4I!oF0~1$Zs!)O0{KR+-)FoXvwy|pco#KM zue)mh^idVhioTqW0AC~E$a|+x=#{#&gp6*}OUUWsP9p;E&l{vzp6_1cH78(3*};x^ zpiTrmn!_o6?S4@^toI&h-~iX7zsBD{@AbI>9uQ<_=U~)Y7`OW`C(%9DfS?%%C?r$Y z`=om!rs`*cVsr(-jozPjr!EI7?77V|=BG&CvGgq!l{QBfXlj5p(35{i zrKRugv>(RAJ+cigp^2Eavbb3e8E|LZOsML(Gl2g%QLEYdKRM;-f-CXr1anl>2Kc;I z;)_2%XP@qdF$))mN)L6r&fGYkI~9`kI9cXnR}4mz!6{Y?(ioS8%vaEeO>cG)C0f<4 zKK^-gY)1FeFwBc=P;5n}bgnN{WYe09ursl5tuTTt+Ku{6Zp|Mf-R=2wA$Fn{6K>*s zYbNw!EC?h+5~+TnIi7lOks2^3ZGmeN*ai||(NyC+;m1pfHft2GMfw}42+B@JqQ&g} zatW|BtCt-RUS79&+e&8Vg-i0J^7e|F@O@$msT}pJxTf4!nU7r^-)0f5!=k>Jb|uFQ zpD4oo2@TS2)->QUouewq$BxPH^D!1vDdW!q<4mJ48~cx-LYf%HyXvUScj8-v`eWxQ z5#K;-6WfTUfbIvU6GDl(={rxipkmEly>52s(;k+3rnAIau z^~*12jG`4Xa$R!;3p7c5W-3KXA47j<7jk0x7l4Ce_|9vz; zh7=BMjv^9T_e&@vnpGqe<2)Wf9m9BcWU4|A3A9c*aNTqjcB8 zJAeV&Lg_oBFZVZ;R-O&GUZ@d|C&4TBO5Z2JGqxR-%}INrv>-v-**;C|pjUUms9|gO z(FjqFycS)##eZj?R2~YbEq5@{KxsVYIRFOAF*X|gNM9g?B|$8+TqqXjqStWH+rCPv zwxC9y&&hnU$Nyl3zLr}2(}-5fs^M&x;QW`MnU$^C^oybHjpCcah17@j{Jp)5k)yG@ z=*o-l7B%hIZ(P@*0z%uCdn@6(a~=JS3UtTxXKKsC9s}{^k7AtC_6w$~n-!{@;(U;> z>Pn1`wU+A9) zCV{1XOP{GpGWL^YI>3)oL#eeZF1NWHSKfn2sUhWm&`93~y;jpP#6RgB%n9`>wP4Rv z*nY!gp%?i=Fm{x6Ngu8ZBmts3U1*pWRbGT3EH}PcK`F9sI6#Ox#=q_jzt+@r(#Y6D ztD)j=qnG|z+Wy2Lx8TSY&WZA_TC*RSBibe4PQ)qKH?0%@4=+b*Vlhiy z8(49Bia8ui^H3%=o=z$P=O+*@?-2|cmUuQ``(`>5j7H`XV1lzm^Lo0zpt$7Cao1_%eoY(NDKvf@x#A=*# zpQ&!D^Ikrq!x?x#QsHQ`W~)^F0M^EtdFBNf?fTywed~XzOEzs)AhOvMUh)3fTxQUXUl>k2>WMq(HFZjuYP-UOZ(j%{e|%9!J!q!7R_qdG5@NAMg#h&| zPdgXfgy}`Da1vP-^~7p!i4bFpcVWE*`$N+63$?UFmR&Nr?u0={E;V6{Oht)`WITGz zAzNwBnKL>Lb8N@GZOA4H@F1X^>G!3>Ic40e+b7L?ytD5(X~kTt-~;&xTNO08{n>_N zIvYalwmB`=ADfr*80d44^ex(X7lwP=zs+&k6!_&(u%me^bRQ!!;p$12Vc4*m!H!nR zu}aCFLc%e39OVfo)Jetni22iq&k63a&7QzC$&Rg#Rsl2Aw=#e*yb=pGf+r}M;7qyD~ql*$|fz-Q)94KLtef^!k5 zSZk`-2c;s8=WrePkjG{nZnn68KmUl{FWk|$<>xb|QwZ1%%LJ6A>tKuLEldCUJM!{h zsGZE~jU5?Ri-%2KyTA*BRC_%2Bg{uRdYGF|9&#r!S%MlK*52y?cn`JV1u_iQ48~Bz z0zv5No=SSMD6chfG@SZ6!tlsz83DsU z6%keGCMb=Q@yQUI($kT}5gac!ar^18-opnG&fs25wMVnjH{xWqPSU5yq8AQyq>WlG zhJI@o=9#Taj$?-?%y)4AtK(8B z-zvAfewE=?nA(cktdO?+6N>>8W!1`QvNTs9?``oyz9hjr(X9`n&_uuQ4pDx`x+%L4 zU@-uCukI+m)u44R_ftgUt_PR`(>ftYHVf3>Jb@NH`PBS%x6qviP9jkeV%qn1E7)V`%^~VBnX0j-1}A3=mR!%5b)tc&#NWlH(2r!?AgY#6e5vGlBw)2YO*F|B1F6AkuQX*de7VjpOW!br3tfs!RVJQn)C$W0d5Uq z`JLLx&1Jc0HI{B)>dmVE5@w0PjJOp7;|lhE@xYa=9*U)x7ArznsGcym;x zfPjN_{=Q_@22Hc#*%o&~A?2Xx6&=G!?d}wRGPTg(%0>q*5yvx)=``fJHg6yr&YbtK z`ec+40+&N4-OPuFB|lIWaQzv!hz`zyS5*ojucqCLn_j*vW36c%y!NfUL|>DQoR!_An{N4#WNvksfceY3;a#wzhmE zPDQJZdcDXlf=(Y9T@~B8rREGverGuAhLrEzS-u=C-vS#9C-KZX_^Jq-09oH@+t};LBP%@q{BZbQ1cNX1Fndf? z$cUR`7t>$E?;wa$y5hm|LJ=0lol4SWWw`~(^jV1 zE2VKL@FYcu2-lLo*Nj#lFMolx8;9Z*<8(D5JTLKr#M~zT5Oh6O71Au0x^~JxztG!I zc#OXJeJZax(vC@x*C<$+6bfZA5v+9az6g?7yRL&beDda=c~tja*6+gJ(?n!M`LG6qDL`#~JgBSlghOzGYDHRA)EVCI~?~x?(>NhnqMU&H; zKsCbjhiRu>g3q>{Eo)FTD9u4kUM^GRTZlp>^em)|@rt$MHrCKeGjPF*oYW^HnQ}HO zT2KpuU-lY8@KXHi_4Mt8GN_0xHx8NYn5ut7oeXXRxJ6#7z2i@65=W`S7vZ?9(7oLS z)f>#kdcP`ce;GSuygLTXxt$jc7CG^x6QAJA)Wd~h(PfmPe!+4JduL;F4TN#p2qIt_ zr-p{Jq9B*tWqk5=VA|ug&wd3Q%GeYX3Hm9$3|u&Uqxjy`re4pxVFIcWWTd;&%K%+_ z&ZbPjL*5^0MtBaX>D=f5?0WfcD<+)AE`W^&fh23Mgo1jfN1#UzLIzgO?V_+}=men% zFIdE(D*n}Bg<3Pnfczq`_8%}A^SL3}Tph=7S-aLBp69c+n?a&>H04C!F+)|?@?mIx z_s4m@SYw|TUB!-gnwjg-pFjE$Fq<5>H9ZZ6BTlj}Cg`K@iA+UCjOtV=OSUn9P7okK z;k3r-3<;tFp;B1ffmXDoZlPQd!JdJ8L zIV*cv{&ybm`_T_DRCVc@QPcR5lJUhjmsiyIIP)@5Jyjz<`Uyst|F2h9Pz$mCRjr^! z*wypw-E-nBa@PcfcX1W!uq|*ywToec8ZU<`ABmPC+^egL*$ui&cBx$Aa}Q08v{NV~ zvGqCR9#P*-8~4sNZ4}&`XtK>*#}+H~!mv7;1?*ol07_2tukNT?sz|v~X=;S~Y|NEA z!)SAo#?E5>0g?w)1T+?utB~+Lt~TL%i+|D6j@iHyA$=ygB-=OD-#B?ErlAf<1z=lKd7;$IuvP5b?FNL}m-KED2=I~ea{l)MSbks27K zRz`gcQ{ZgO{6van`Qn>xI>4sHKW4WCkit=|m1ID|QaB}RSDrMh_&U-8{hY(OaO98> zbwYvA+U93@-#~U27#tJ79l8R4vL58tx48A*behO_aXi_#-k3ig+deLF9AZn@8N^x` zwqU%mv&OB-#U;OBz=N)!Zzo6zYJpj1t=&A&sCz9B2j9!40(si5!CU7C#QpZiYgrI( zZvO!RsiS15tOa#w1EG__1_y$wP!a6UuZ+?$@I72q51?Y7QFqAtuIly#@mqLd4#q~L zUhzr6p=@_Q{@wXn0YJx*Uzct4pbAq8|GV9904C%ATso$jqo8e^%amAm>mX-+FG< zfvv=_elYq@A%S!&-W*DK&E*FiGI%-SZOONXl2nOI%!4B-Gaen+Y_F5DlQOM$!v&%e zJeZv9V<{4eoU|-L!efRfJ^r}aVox@_oze&_!Ol%dK2vkIVdDMLo`1s`z^G|_KQ&i^ zV1(J{pBd*O&o1akFtgUVZvt4{ke_B3&PdF1G1c;nZe)Dvk@-SsAN1r6;Az_Pzt~ik zKt*a@9+JQ~;Sc`CzP@myK_gCP5fniK?umc>u{iOVPNmON5OQTU@9$g4uwK=zPs8gy z6W^{_>_U*Hv-2LqOl}|u61j?P?Ig65vXwgaO$Y=t9X|_J;-WREy%W35LXL$799b`8 z$y8)*2#vKmkwWRG=N;%W16^LET>J?*Lwh1OVNt77J7A2OV>A0wAw{HRrNb)@L7elg_ z=-!M{xaos8M|8c(7{xQJ=U5GAxsRs;MiQC)8KW1O<~}JHXfuy}m#(pc$R9uEH-Z5z zX;rI8mdKU1$$1;oHsmE1X45KjnNAdq#{Zh=Ibx(EXSEJSm?$u~$CyidDK;Xp)~g&(i5ikB zc89FtC{PB3*UdP3hs&?xB^r1kT z3p{>hRE_Wes}Rn``zOJm1iJrTTMKbJq?S+c`a$KD1>D`Rp$H25}Gt zS-_rPrd^<`_=*b72NyIjSf;vFr#pm@_Y8~m2$8i5S0FoXsJ#WH_G+)d3HOmcRz@FN zsoNpKYM%=w5z1SH8kf{#VZwx`B9k^iS;l7JQk&@pDbBeXlw30X?+IdDsp z+)xjgrv+a*tXR4*Wc{1);N3e)Qwl;O#6ho49#(D;sNoS+)3ibK*y+v_qr9FE9xfH=WqURXE5d`5 z?}5@G2>OR{sqxzWPKuAN$`qDiEpNjyjAWj^Yah$*uUwj3NGHz>=`50i4p+z166#f0 z^^pJwRGM9fv*8HWccNKkkl741G15`G)~N*Q-=5?~IOVYxneObFewDe&y4L7>U9G(< z{HEZf8{M_^2Vf_E;2Ux;K@cyXrfYieVkj#@g;RbKBv>Pz!y|UhN4;+XpvF2<0nKOK z=C(48BK2cG#f~;_WQA+sgZ@6SpF^xWcsTiM*)yc%K1lJj`U{{29dPwlynCqGTLAru z+o5f9JlZ%TozZ2ida5w|zUg63S&}p!_?c;uAL2a017EI6d%LnQ48;yati4qJF0|ud${{}0O;NA^ zsw(=gZfUC>i4y)zC>f)|&tmqH##I(RAudC1fF&N`XI@LOqa7LpL}pJ@&xedrF7zUN4|9!yqJ3f&| z+(pC}eNLH}nl;SGhKOE6Ve<?M_VJ}q270=8>t{h zeVMY5sM#dx`2$H#>Wx2lfWkeQK(u0Dx&W-}{CkQx)i-T(UJ`m*Wrr0LsgByx6+tqJ zv5SgOV2EfgUP2G2yZUD5`X+%P^pZP&PFABG(Zk=w~s4xj19 z^eZP#t)b_i{Va3?hb?>?iUkrFrZF}ps!paIpoxi`wZA|dJPp;s*P!o*Q#uq``olGW z9?|14q^7jdVE@)-Qf=yDjp|dH1X#vLCWP>|D*IrL%EpUwRzlY=;T`VH{_F_M3+F1Z zq84NBm6VKH=P7~(~r{1zyYN5W=Cn<#4ee>c;Rv8=o-C) zytormHp==ywin*+~6ME3BTiLF1fTF4SGaFmgrt z5IOPuQLUD(g91TTXs>$^ep$|6dA5(;&%Q_mH4280u3?){-lx3Dz3=U5&gr&4ftACe zMhxBA>)OFg#pn5zj$w*@B|tFwtqa+LL=amRf4PFgzW&-(%3BVnoAh&32>-H zh?0=(wCKJk+uwh`=}kkppEKK-XAqa?mNbagVW=ox*dGIMY50XJ>@|SSB}9yQT0KV> zYi|eNVrW#6dm#-exR)*;kc>BPo@6DXN^?!&awcA9Z$LVdC~V?-Ow00EJz6XJb_ruDYB>4iO`Hs4nB1Bg7uK+T@{^eK@Adovb;%#)^TcM)97bWpC({m% zrSVGY*7p&-V?U~@GqO20)L@fHk{h*~9TA`ZuQp|CF(tdgPF!%TWYFsU)OC+<}hKX$kTTNDyNeLAXkbH$58K9CDnrhdfo0APX;@EkP({y2D95lCgUAeSrT2^4&K*080B zEYpPA@fW{NxpHm}l*;0Zh^-)A)X+!n5+e z$hU<%eCkY8wq2nlX&%iQe}#Pccz6DWt$Mj;*u zJn-o;`U9gvGSsAL*SjyrH{|s_4^Kr0;WW~v%GYOIP+3Zzgz1l9G>@GWXWc!sIl#DO z4KJr*vSxAuSSCKZTpi`0?0fgroxU95?i&@d0svrkyh1-(#rU8~WVThBK^N1uysobmKHLb`OM`KMkJ=24S|33{WM-$`cv zHjhA)pv?Y?kS$dsS?FESyz<(o50|y;PG;4=Mb>%zl?bZoRW$s{@!uQh#2ZhGdLx?l zljXdd9`q~s*04A)zdAD?2k-C@14|U}opA3GgljbQ|4K+r2he9nx7d!m8dKKBJ^=)}Me@LmAIVDPA^MjntvvS*1d*`#oc25##*V>m$(E!}D6 zC+yyji+_ApK=Xz+GpfH?3o}s*t9(+)7L0BTL|00kAb``?Fk)8WkK35Ga1t$_7#TfSA7mx6vdpLh3YTgw2Gfx zjgo34BFP~|6RDBLbK1lweusV*xK=(#p-ttW`|hlPag#Q+P!R(Fxz{CaKXx8M>kKKk z)0M~NL2{iOCT+!~yPntoSZPN4W*xrUo1OV!*D)gnDS3?sD=>eQVR5sAG{&+48JH%o z;XR(-5-5u7QIHrah9bsiQdsel`fsJ#&MNrg?cqPgYQZ1CIhzPDT+N~z zw?cO0E){@Yl4Pf`UW8DI&#U9e0E7KVx*yEd>|iACwF`uHTcNK*Z{*+#0?H5Cv9Dm3 z1*QUmk*rP$$j9!G!*@c{5Mg+J+H9FLZLJcR{>xKKdFyjdYd{3*u34=Ej#`79Hx665 z(cCq61Sc7&ur7PN%8ncY9X!HMa$DaGg9kaSQ`zdcPv_2+HAkr{z`v_&>Wwm;&EgSS zq-Yvyt&v2#zPl(jEL?KT$wu|M!9K7-w!>}Ch_{vQI#c0@<8*9H+<}iqtPo$3*d=SG z%MS-A;`MiCcxq^5^!nr?bvM#gZCR#hO&1sWqTmj1zGV-2jwql!>v!njGRvqXZW+LpyJdivDMONIWYo zHWm*N1``)9G72#cMXANQ&Jm5I2ap53@koFI4lH1I8q%$B~lO{Q&I#(3{nI} zNg_TUQ!GA1Qy3dWB^VG!3{o9KI2av7Q$PenQz8%nNm39)B^U%lB_bO`Q!E5TQ&K(w zQzAY?3>X_mB`h5u3?dsJI3gWGNfD_o-F)}4-OGa!QGQZeS< z^Q-OJ|1pwr3dv1&-RVqRg(8zqD8!@VKEt1`+YZUbJ(9euqHb3Vt7187irowdL!pb8 z0a(meKpKm8C^Gr{X?0*#T9{n&OdK{63hR6!+E5O!BS<9S8IMG4*V|GgbwZ8c$t*rz zq+4c4QI)Tz_KZ|=)TUKb%$oW0}E zs>WdL_w-}BqWc5hQ1cRdgI@ZgbCy}qheZl*(jZ+**r@{2vItmbCG29%;S&)K`}8`UWURIFbR zje-wETqcDfhMb~OyEKup{BLv41hTeGTjht*YRJ)WoIVI3`tZXh$(F7|F6`>MAC}=W zM=s?oYf>fEpMI}}L@CwyajY(r6;Vr>By_sq$5S%vobo2bfxeY2g&eo=HCy0=BOIz{ zBs)+kVF+2quNFhR{yc9)^li>gY<^(UCw13m7a;f|$e v!5-cVGQbI+XCGwH9MKQ$gK2$%") + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt new file mode 100644 index 0000000000..e356683511 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt @@ -0,0 +1,299 @@ +package com.droiddeck.launcher.stores.rockstar + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = android.app.Application::class) +class RockstarTest { + @Test fun launcherAdoptionDoesNotFollowSymbolicLinks() { + val folder = java.nio.file.Files.createTempDirectory("rockstar-launch-link").toFile() + val outside = java.io.File.createTempFile("rockstar-keep", ".txt").apply { writeText("keep") } + val link = java.io.File(folder, com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + try { + try { + java.nio.file.Files.createSymbolicLink(link.toPath(), outside.toPath()) + } catch (e: java.nio.file.FileSystemException) { + org.junit.Assume.assumeNoException(e) + } + java.io.File(folder, "gta3.exe").writeText("game") + val game = com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, "gta3", "GTA III", "gta3.exe", launcher = com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + assertNull(com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, game).launcher) + assertNull(com.droiddeck.launcher.stores.StoreLaunch.writeLauncher(folder, game).launcher) + assertEquals("keep", outside.readText()) + assertTrue(java.nio.file.Files.isSymbolicLink(link.toPath())) + } finally { + java.nio.file.Files.deleteIfExists(link.toPath()) + folder.deleteRecursively() + outside.delete() + } + } + + @Test fun resumeHashingStopsWhenCancelled() { + val file = java.io.File.createTempFile("rockstar-hash", ".bin") + try { + val bytes = ByteArray(1024 * 1024) + file.writeBytes(bytes) + val hash = java.security.MessageDigest.getInstance("SHA-256").digest(bytes).joinToString("") { "%02x".format(it) } + val chunk = RockstarChunk("1", "1", hash, 0, bytes.size.toLong()) + var checks = 0 + assertFalse(RockstarManifest.verified(file, chunk) { ++checks >= 3 }) + assertEquals(3, checks) + assertTrue(RockstarManifest.verified(file, chunk)) + } finally { + file.delete() + } + } + + @Test fun unsupportedGamesKeepTheirFilesWithoutRegisteringALauncher() { + val app = org.robolectric.RuntimeEnvironment.getApplication() + com.droiddeck.launcher.session.SessionPrefs.setGameStorage(app, com.droiddeck.launcher.session.SessionPrefs.GAME_STORAGE_OFF, "") + val folder = java.io.File(com.droiddeck.launcher.stores.StoreInstallRoot.storeDir(com.droiddeck.launcher.stores.StoreInstallRoot.installRoot(app), com.droiddeck.launcher.stores.Store.ROCKSTAR), "RDR2").apply { mkdirs() } + try { + val game = com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, "rdr2", "RDR2", "RDR2.exe") + java.io.File(folder, game.exe).writeText("installed game") + val script = java.io.File(folder, com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + script.writeText("old launcher") + val finished = com.droiddeck.launcher.stores.StoreLaunch.writeLauncher(folder, game) + finished.write(folder) + assertFalse(RockstarLaunch.supports(game.id)) + assertNull(finished.launcher) + assertFalse(script.exists()) + assertTrue(java.io.File(folder, game.exe).isFile) + assertNull(com.droiddeck.launcher.frontend.AddedGames.single(app, folder.path)) + } finally { + folder.deleteRecursively() + } + } + + @Test fun existingRockstarLaunchScriptsAreRefreshed() { + val folder = java.nio.file.Files.createTempDirectory("rockstar-launch").toFile() + try { + java.io.File(folder, "gta3.exe").writeBytes(byteArrayOf(1)) + val game = com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, "gta3", "GTA III", "gta3.exe", launcher = com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + val script = java.io.File(folder, com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) + script.writeText("old launch script") + com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, game) + assertTrue(script.readText().contains("Rockstar Games\\Launcher\\Launcher.exe")) + assertFalse(script.readText().contains("old launch script")) + } finally { + folder.deleteRecursively() + } + } + + @Test + @Config(sdk = [28]) + fun classicLaunchDefaultsAreSetBeforeWineAndKeepExplicitSettings() { + val app = org.robolectric.RuntimeEnvironment.getApplication() + val explicit = com.droiddeck.launcher.core.GameEnvironment.Config(games = mapOf( + "100" to mapOf("FEX_X87REDUCEDPRECISION" to "1"), + "104" to mapOf("PROTON_USE_WINED3D" to "0"), + )) + com.droiddeck.launcher.session.GameEnvironmentStore.save(app, explicit) + RockstarLaunch.applyDefaults(app, "gta3", 100) + RockstarLaunch.applyDefaults(app, "gta3", 101) + RockstarLaunch.applyDefaults(app, "gtasa", 102) + RockstarLaunch.applyDefaults(app, "gtavc", 103) + RockstarLaunch.applyDefaults(app, "gtasa", 104) + val config = com.droiddeck.launcher.session.GameEnvironmentStore.read(app) + assertEquals("1", config.games["100"]?.get("FEX_X87REDUCEDPRECISION")) + assertEquals("0", config.games["101"]?.get("FEX_X87REDUCEDPRECISION")) + assertEquals(mapOf("PROTON_USE_WINED3D" to "1"), config.games["102"]) + assertEquals("0", config.games["104"]?.get("PROTON_USE_WINED3D")) + assertFalse(config.games.containsKey("103")) + } + + @Test fun classicTitlesUseTheirObservedPipeNames() { + assertEquals(mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe"), RockstarLaunch.pipes) + } + + @Test fun signingOutClearsOwnedShelfCards() { + val store = com.droiddeck.launcher.stores.Store.ROCKSTAR + com.droiddeck.launcher.stores.StoresState.library[store] = emptyList() + com.droiddeck.launcher.stores.StoresState.shelves[store] = com.droiddeck.launcher.stores.StoreShelves() + RockstarLibrary.reset() + org.robolectric.shadows.ShadowLooper.idleMainLooper() + assertFalse(com.droiddeck.launcher.stores.StoresState.library.containsKey(store)) + assertFalse(com.droiddeck.launcher.stores.StoresState.shelves.containsKey(store)) + } + + @Test fun resumedChunksMustStillMatchTheirFiles() { + val folder = java.nio.file.Files.createTempDirectory("rockstar-resume").toFile() + try { + val file = java.io.File(folder, "game.bin") + val bytes = "verified chunk".toByteArray() + val hash = java.security.MessageDigest.getInstance("SHA-256").digest(bytes).joinToString("") { "%02x".format(it) } + val chunk = RockstarChunk("1", "2", hash, 2, bytes.size.toLong()) + assertFalse(RockstarManifest.verified(file, chunk)) + file.writeBytes(byteArrayOf(0, 0) + bytes) + assertTrue(RockstarManifest.verified(file, chunk)) + java.io.RandomAccessFile(file, "rw").use { it.setLength(4) } + assertFalse(RockstarManifest.verified(file, chunk)) + file.writeBytes(ByteArray(bytes.size + 2)) + assertFalse(RockstarManifest.verified(file, chunk)) + } finally { + folder.deleteRecursively() + } + } + + @Test fun manifestWritesRejectSymbolicLinks() { + val folder = java.nio.file.Files.createTempDirectory("rockstar-path").toFile() + val outside = java.nio.file.Files.createTempDirectory("rockstar-outside").toFile() + try { + val link = java.io.File(folder, "linked") + try { + java.nio.file.Files.createSymbolicLink(link.toPath(), outside.toPath()) + } catch (e: java.nio.file.FileSystemException) { + org.junit.Assume.assumeNoException(e) + } + assertTrue(runCatching { RockstarManifest.inside(folder, "linked/game.bin") }.isFailure) + assertEquals(java.io.File(folder.canonicalFile, "normal/game.bin"), RockstarManifest.inside(folder, "normal/game.bin")) + java.nio.file.Files.deleteIfExists(link.toPath()) + } finally { + folder.deleteRecursively() + outside.deleteRecursively() + } + } + + @Test + fun classicGamesStartTheirParentLauncherWithoutEmbeddingCredentials() { + val sidecar = com.droiddeck.launcher.stores.StoreGameSidecar( + com.droiddeck.launcher.stores.Store.ROCKSTAR, "gtavc", "Vice City", "gta-vc.exe", + ) + val text = com.droiddeck.launcher.stores.StoreLaunch.launcherText(sidecar) + assertTrue(text.contains("\"C:\\Program Files\\Rockstar Games\\Launcher\\Launcher.exe\"")) + assertTrue(text.contains("exit /b %errorlevel%")) + assertFalse(text.contains("gta-vc.exe")) + assertFalse(text.contains("ticket", true)) + assertFalse(text.contains("rem ", true)) + } + + private val apps = """ +1 + + BRANCHACCESS token="L" + + + + + BRANCHACCESS token="S" + + + BRANCHACCESS token="B" + BRANCHACCESS token="D" + + + + {"title":"gta4","isFeatured":false,"packageType":"title"} + {"title":"rdr2","isFeatured":false,"packageType":"title"} + {"title":"gtatrilogy","isFeatured":true,"packageType":"bundle"} + {"title":"gta5","isFeatured":false,"packageType":"title"} +""" + + private fun account(xml: String = apps) = RockstarRos.parse(xml).let { RockstarAccountApps(RockstarApps.parse(it), RockstarApps.packages(it)) } + + private val manifest = """ +1 + + + Launcher.exe + + FF + + + ThirdParty\Steam\steam_api64.dll + + ee + + false""" + + @Test fun branchesNeedARealBuild() { + val parsed = account().apps + val gta4 = parsed.first { it.name == "gta4" } + assertEquals("31", RockstarApps.branch(gta4)!!.id) + assertNull(RockstarApps.branch(parsed.first { it.name == "rdr2_sp_steam" })) + assertNull(RockstarApps.branch(parsed.first { it.name == "gta5" })) + } + + @Test fun ownedTitlesAreTheAccountsOwnPackagesNotTheFeaturedOnes() { + assertEquals(listOf("gta4", "rdr2", "gta5"), RockstarLibrary.owned(account()).map { it.id }) + } + + @Test fun libraryListsOnlyOwnedTitlesRockstarDelivers() { + val games = RockstarLibrary.games(account()) + assertEquals(listOf("gta4"), games.map { it.id }) + assertEquals("gta4", games[0].extra["app"]) + assertTrue(games.all { it.owned }) + } + + @Test fun anOwnedTrilogyBundleIsAllThreeDefinitiveEditions() { + val owned = RockstarLibrary.owned(account(apps.replace("\"isFeatured\":true,\"packageType\":\"bundle\"", "\"isFeatured\":false,\"packageType\":\"bundle\""))) + assertTrue(owned.map { it.id }.containsAll(listOf("gta3unreal", "gtavcunreal", "gtasaunreal"))) + } + + @Test fun manifestFilesCarryTheirChunksAndWindowsPathsBecomeRelative() { + val build = RockstarManifest.parse(RockstarRos.parse(manifest)) + assertEquals("1311", build.buildId) + assertFalse(build.preload) + assertEquals(34L, build.bytes) + val exe = build.files[0] + assertEquals(listOf("46859", "46860"), exe.chunks.map { it.chunkId }) + assertEquals("ab", exe.chunks[0].sha256) + assertEquals("ff", exe.sha256) + assertEquals("ThirdParty/Steam/steam_api64.dll", build.files[1].path) + } + + @Test fun pathsThatLeaveTheInstallAreRefused() { + assertNull(RockstarManifest.safePath("..\\..\\Windows\\x.dll")) + assertNull(RockstarManifest.safePath("C:\\x.dll")) + assertEquals("a/b.rpf", RockstarManifest.safePath("\\a\\.\\b.rpf")) + } + + @Test fun urlBatchesStayWithinTheirByteAndCountLimits() { + val chunks = (1..5).map { RockstarChunk("1", "$it", "", 0, if (it == 3) 100 else 10) } + val batches = RockstarManifest.batches(chunks, maxBytes = 30, maxCount = 2) + assertEquals(listOf(listOf("1", "2"), listOf("3"), listOf("4", "5")), batches.map { b -> b.map { it.chunkId } }) + } + + @Test fun rosErrorsNameTheirCode() { + val root = RockstarRos.parse("0") + assertEquals("AuthenticationFailed", RockstarRos.first(root, "Error")!!.getAttribute("Code")) + } + + @Test fun ticketAnswerGivesTheAccountAndExpiry() { + val root = RockstarRos.parse("""1TK + S86399 + 42player""") + val t = RockstarAuth.parseTicket(root, now = 1000L)!! + assertEquals("T", t.ticket) + assertEquals("42", t.rockstarId) + assertEquals("player", t.nickname) + assertEquals(1000L + 86_399_000L, t.expiresAt) + } + + @Test fun gatewayStateIsWrittenAsThePageWritesIt() { + val fp = RockstarAuth.fingerprintOf("DROIDDECK-DUO", "0a0b0c0d", "0011223344556677") + assertEquals("{\"fp\": {\"device_name\":\"DROIDDECK-DUO\",\"machine_name\":\"DROIDDECK-DUO\",\"os_version\":\"10.0.19045\",\"volume_serial\":\"0a0b0c0d\",\"cpu_info\":\"0011223344556677\"}}", + RockstarAuth.state(fp)) + } + + @Test fun bridgeAnswersTheLauncherQueriesAndHandsBackTheCode() { + val js = RockstarAuth.bridgeScript(RockstarAuth.fingerprintOf("D", "1", "2"), "launcher") + for (m in listOf("GetWindowConfig", "GetDeviceId", "GetVersionInfo", "GetProfileList", "OnStartAuth", "CallAuthResult", "rgscQueryCancel", "/signin/user-form?cid=launcher")) + assertTrue(m, m in js) + assertTrue(RockstarAuth.isCodeUrl(RockstarAuth.CODE_URL + "?code=abc")) + assertEquals("a+b/c", RockstarAuth.codeFrom(RockstarAuth.CODE_URL + "?code=a%2Bb%2Fc")) + } + + @Test fun subAppsResolveToTheirGame() { + assertEquals("rdr2", RockstarTitles.byId("rdr2_sp_rgl")!!.id) + assertEquals("gtasaunreal", RockstarTitles.byId("gtatrilogy")!!.id) + assertNull(RockstarTitles.byId("launcher")) + } +} diff --git a/tools/build_local.sh b/tools/build_local.sh index d564f1e3c0..ee891aee97 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -433,6 +433,13 @@ if [[ "${DROIDDECK_SKIP_RUST:-0}" != 1 ]]; then CARGO_TARGET_DIR="${cache_dir}/ubisoft-target" bash tools/ubisoft-launcher/build.sh "${upc_out}" save_step ubisoft "${upc_key}" "${upc_out}" fi + rockstar_out="${repo_root}/app/src/main/resources/rockstar/helpers" + rockstar_key=$(inputs_hash "windows-gnu" tools/rockstar-launcher/src tools/rockstar-launcher/Cargo.toml tools/rockstar-launcher/Cargo.lock tools/rockstar-launcher/build.sh) + if ! restore_step rockstar "${rockstar_key}" "${rockstar_out}"; then + command -v i686-w64-mingw32-gcc >/dev/null 2>&1 || { echo "i686-w64-mingw32-gcc is required for the Rockstar launcher service." >&2; exit 1; } + CARGO_TARGET_DIR="${cache_dir}/rockstar-target" bash tools/rockstar-launcher/build.sh "${rockstar_out}" + save_step rockstar "${rockstar_key}" "${rockstar_out}" + fi fi python3 tools/powervr/fetch.py bash tools/packs/build.sh app/build/packs diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 939504835c..ebb9718942 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -286,6 +286,12 @@ def cloud_on(sidecar): def exited(argv, code=0): found = find_store_game(argv) launch_dir = os.environ.get("BL_LAUNCH_DIR", "") + if found is not None and launch_dir and str(found[1].get("store")) == "rockstar": + ask(Path(launch_dir) / "stores", {"op": "rockstar-exited", "store": "rockstar", "id": str(found[1].get("id"))}, timeout=1.0) + compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH") + if compat_data: + (Path(compat_data) / "pfx" / ROCKSTAR_FOLDER / "launch.json").unlink(missing_ok=True) + return 0 if found is not None and str(found[1].get("store")) == "epic" and os.environ.get(EPIC_HANDLED) != "1" \ and os.access(EPIC_CLIENT, os.X_OK): try: @@ -307,6 +313,104 @@ def exited(argv, code=0): UBISOFT_DIR = "drive_c/Program Files (x86)/Ubisoft/Ubisoft Game Launcher" UBISOFT_WINDOWS_DIR = "C:\\Program Files (x86)\\Ubisoft\\Ubisoft Game Launcher\\" UBISOFT_INSTALLER_URL = "https://static3.cdn.ubi.com/orbit/launcher_installer/UbisoftConnectInstaller.exe" +ROCKSTAR_SERVICE = Path("/usr/local/lib/droiddeck-rockstar") +ROCKSTAR_FOLDER = "drive_c/Program Files/Rockstar Games/Launcher" +ROCKSTAR_TITLES = {"gta3": "Grand Theft Auto III", "gtavc": "Grand Theft Auto: Vice City", "gtasa": "GTA: San Andreas"} + + +def rockstar_registry(folder, title, compat_data, proton): + pfx = Path(compat_data) / "pfx" + launcher = r"C:\Program Files\Rockstar Games\Launcher" + values = [(r"Rockstar Games\Launcher", launcher), ("Rockstar Games\\" + title, windows_path(str(folder)))] + entries = [("Software\\" + view + key, value) for view in ("", "Wow6432Node\\") for key, value in values] + reg = pfx / "system.reg" + if all(has_value(reg, "[" + key.replace("\\", "\\\\") + "]", "InstallFolder", value) for key, value in entries): + return True + if wait_for_server(pfx, 2): + return all(set_value(reg, "[" + key.replace("\\", "\\\\") + "]", "InstallFolder", value) for key, value in entries) + with tempfile.TemporaryDirectory(prefix="droiddeck-rockstar-") as temp: + path = Path(temp) / "install.reg" + text = "Windows Registry Editor Version 5.00\r\n\r\n" + text += "\r\n".join('[HKEY_LOCAL_MACHINE\\%s]\r\n"InstallFolder"="%s"\r\n' % (key, reg_escape(value)) for key, value in entries) + path.write_text(text, encoding="utf-16") + result = subprocess.run([proton, "run", "reg.exe", "import", windows_path(str(path))], + stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=45) + return result.returncode == 0 + + +def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_app=None): + if not compat_data: + return "no-prefix" + target = Path(compat_data) / "pfx" / ROCKSTAR_FOLDER + config = target / "launch.json" + config.unlink(missing_ok=True) + title = ROCKSTAR_TITLES.get(str(sidecar.get("id"))) + if not title: + return "unsupported-title" + if not launch_dir: + return "no-channel" + root = folder.resolve() + exe = (folder / str(sidecar.get("exe") or "").replace("\\", "/")).resolve() + if not exe.is_relative_to(root): + return "invalid-game-path" + workdir = (folder / str(sidecar["workdir"])).resolve() if sidecar.get("workdir") is not None else exe.parent + if not workdir.is_relative_to(root) or not exe.is_file() or not (folder / "MTLX.dll").is_file(): + return "invalid-game-path" + args = sidecar.get("args") or [] + if not isinstance(args, list) or any(not isinstance(arg, str) or "\0" in arg for arg in args): + return "invalid-game-arguments" + with exe.open("rb") as source: + if source.read(2) != b"MZ": + return "invalid-game-exe" + source.seek(0x3c) + raw = source.read(4) + if len(raw) != 4: + return "invalid-game-exe" + source.seek(int.from_bytes(raw, "little")) + signature = source.read(6) + if len(signature) != 6 or signature[:4] != b"PE\0\0" or signature[4:] not in (b"\x4c\x01", b"\x64\x86"): + return "invalid-game-exe" + service = ROCKSTAR_SERVICE / ("Launcher32.exe" if signature[4:] == b"\x4c\x01" else "Launcher64.exe") + if not service.is_file(): + return "no-service" + made = "present" if (Path(compat_data) / "pfx/user.reg").is_file() else create_prefix(compat_data, proton) + if made not in ("created", "present"): + return "prefix-" + made + if not rockstar_registry(folder, title, compat_data, proton): + return "registry-unavailable" + target.mkdir(parents=True, exist_ok=True) + with tempfile.NamedTemporaryFile(prefix="Launcher-", suffix=".exe", dir=target, delete=False) as temporary: + temporary_path = Path(temporary.name) + try: + with service.open("rb") as source: + shutil.copyfileobj(source, temporary) + except BaseException: + temporary_path.unlink(missing_ok=True) + raise + os.replace(temporary_path, target / "Launcher.exe") + answer = (ask_app or ask)(Path(launch_dir) / "stores", {"op": "rockstar-launch", "store": "rockstar", "id": str(sidecar.get("id"))}, timeout=120.0) + if not isinstance(answer, dict) or not answer.get("ok"): + return "session-" + (str(answer.get("reason") or "refused") if isinstance(answer, dict) else "timeout") + if not isinstance(answer.get("material"), str) or not re.fullmatch(r"[0-9A-Fa-f]{640}", answer["material"]): + return "invalid-material" + expires = answer.get("expiresAt") + if not isinstance(expires, int) or not time.time() * 1000 < expires <= time.time() * 1000 + 120_000: + return "invalid-expiry" + launch = {"folder": windows_path(str(root)), "exe": windows_path(str(exe)), "workdir": windows_path(str(workdir)), + "args": args, "pipe": answer.get("pipe"), "material": answer["material"], "expiresAt": expires} + if len(json.dumps(launch).encode("utf-8")) > 16384: + return "handoff-too-large" + with tempfile.NamedTemporaryFile(mode="w", prefix="launch-", suffix=".json", dir=target, delete=False) as temporary: + temporary_path = Path(temporary.name) + try: + json.dump(launch, temporary) + except BaseException: + temporary_path.unlink(missing_ok=True) + raise + os.replace(temporary_path, config) + return "ready" + + UBISOFT_CACHE = Path("/root/.cache/droiddeck/ubisoft") UBISOFT_LAUNCH = ".droiddeck-ubisoft.json" UBISOFT_SERVICE = Path("/usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe") @@ -1341,6 +1445,15 @@ def main(argv): prepare_gog(sidecar, compat_data, launch_dir) log("gog registry: " + apply_gog_registry(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) log("gog support data: " + gog_support_data(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) + if store == "rockstar": + try: + state = prepare_rockstar(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")) + except (OSError, ValueError, subprocess.TimeoutExpired): + state = "preparation-failed" + log("rockstar %s: %s" % (game, state)) + if state != "ready" and launch_dir: + ask(Path(launch_dir) / "stores", {"op": "rockstar-exited", "store": "rockstar", "id": game}, timeout=1.0) + return STORE_GAME if state == "ready" else RAN_FAILED if store == "ubisoft": try: log("ubisoft %s: %s" % (game, prepare_ubisoft(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")))) diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 57fe792465..12ac22eabb 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -23,11 +23,11 @@ PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'po SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', - 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/ubisoft-launcher', 'tools/components', 'tools/ci', 'tools/build_local.sh', + 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/ubisoft-launcher', 'tools/rockstar-launcher', 'tools/components', 'tools/ci', 'tools/build_local.sh', 'tools/powervr', 'tools/hybris', 'tools/dxvk', 'tools/vulkan-wsi', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', 'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh', - 'tools/gpuload', + 'tools/gpuload', 'app/src/main/resources/rockstar/legacy-cipher.bin', 'app/src/main/cpp/waylandcomp/src/headpose_shm.h', 'app/src/main/cpp/venc/venc_proto.h', 'app/src/main/cpp/waylandcomp/src/spatialpose_shm.h', diff --git a/tools/rockstar-launcher/.gitignore b/tools/rockstar-launcher/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/tools/rockstar-launcher/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/tools/rockstar-launcher/Cargo.lock b/tools/rockstar-launcher/Cargo.lock new file mode 100644 index 0000000000..f73866571d --- /dev/null +++ b/tools/rockstar-launcher/Cargo.lock @@ -0,0 +1,105 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "droiddeck-rockstar-launcher" +version = "0.1.0" +dependencies = [ + "serde_json", +] + +[[package]] +name = "itoa" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" + +[[package]] +name = "memchr" +version = "2.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" + +[[package]] +name = "proc-macro2" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "serde" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" +dependencies = [ + "itoa", + "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "syn" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954" + +[[package]] +name = "zmij" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/tools/rockstar-launcher/Cargo.toml b/tools/rockstar-launcher/Cargo.toml new file mode 100644 index 0000000000..4b5ec1f37b --- /dev/null +++ b/tools/rockstar-launcher/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "droiddeck-rockstar-launcher" +version = "0.1.0" +edition = "2021" +license = "GPL-3.0-only" +publish = false + +[[bin]] +name = "Launcher" +path = "src/main.rs" + +[dependencies] +serde_json = "1" + +[profile.release] +opt-level = "s" +lto = true +panic = "abort" +strip = true diff --git a/tools/rockstar-launcher/README.md b/tools/rockstar-launcher/README.md new file mode 100644 index 0000000000..e22a4183c8 --- /dev/null +++ b/tools/rockstar-launcher/README.md @@ -0,0 +1,30 @@ +# Rockstar launcher service + +`Launcher.exe` starts the selected installed game and serves its launcher pipe. The Android app checks ownership and retrieves the launch response from Rockstar. Account credentials and ROS tickets stay in the app. + +The handoff is deleted before starting the game. It expires after 90 seconds. The pipe accepts the child process's greeting and returns the server-issued launch material. No game files are patched. + +GTA III defaults to full x87 precision for FEX before Wine starts, because reduced precision crashed new-game initialization on the test device. San Andreas defaults to WineD3D, because DXVK intermittently corrupted its textures; full precision and conservative memory ordering did not prevent that corruption. These defaults use DroidDeck's per-game settings and preserve explicit per-game overrides. + +`build.sh` builds 32-bit and 64-bit executables with the GNU Windows targets and stages them as APK resources. `legacy-cipher.bin` contains the fixed client protocol tables, not account credentials or APK signing keys. + +Run the protocol tests with: + +```sh +cargo test --locked --manifest-path tools/rockstar-launcher/Cargo.toml +``` + +The optional `capture` example records a first-party launcher reply to a new local file. Run it on Windows or Wine while launching the corresponding game in Rockstar's launcher: + +```powershell +cargo run --release --example capture --manifest-path tools/rockstar-launcher/Cargo.toml -- --pipe GTA-VC_Pipe --output 'C:\captures\reply.bin' +``` + +On Linux, cross-compile the example and run it in the same Wine prefix as Rockstar's launcher: + +```sh +cargo build --release --locked --example capture --target x86_64-pc-windows-gnu --manifest-path tools/rockstar-launcher/Cargo.toml +WINEPREFIX=/path/to/launcher-prefix wine tools/rockstar-launcher/target/x86_64-pc-windows-gnu/release/examples/capture.exe --pipe GTA-VC_Pipe --output 'Z:\tmp\reply.bin' +``` + +Captures contain live launch material. Keep them outside source control; the tool prints only the message tag and payload length. diff --git a/tools/rockstar-launcher/build.sh b/tools/rockstar-launcher/build.sh new file mode 100644 index 0000000000..1f7360f741 --- /dev/null +++ b/tools/rockstar-launcher/build.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +out=${1:-"$here/../../app/src/main/resources/rockstar/helpers"} +mkdir -p "$out" +for target in i686-pc-windows-gnu x86_64-pc-windows-gnu; do + rustup target add "$target" >/dev/null 2>&1 || true + cargo build --manifest-path "$here/Cargo.toml" --release --locked --target "$target" + name=Launcher64.exe + [[ "$target" == i686-* ]] && name=Launcher32.exe + install -m644 "${CARGO_TARGET_DIR:-$here/target}/$target/release/Launcher.exe" "$out/$name" +done diff --git a/tools/rockstar-launcher/examples/capture.rs b/tools/rockstar-launcher/examples/capture.rs new file mode 100644 index 0000000000..8516cbca17 --- /dev/null +++ b/tools/rockstar-launcher/examples/capture.rs @@ -0,0 +1,65 @@ +#[cfg(windows)] +fn main() -> std::io::Result<()> { + use droiddeck_rockstar_launcher::{pipe::Pipe, Frame, Length}; + use std::fs::OpenOptions; + use std::io::{self, Read, Write}; + use std::time::Duration; + + struct Recording<'a> { + source: &'a mut Pipe, + output: &'a mut std::fs::File, + } + + impl Read for Recording<'_> { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + let size = self.source.read(buffer)?; + self.output.write_all(&buffer[..size])?; + Ok(size) + } + } + + let args: Vec<_> = std::env::args_os().collect(); + let output = args + .windows(2) + .find(|pair| pair[0] == "--output") + .map(|pair| pair[1].clone()) + .map(std::path::PathBuf::from) + .unwrap_or(std::env::current_exe()?.with_file_name("reference-reply.bin")); + let mut file = OpenOptions::new() + .create_new(true) + .write(true) + .open(output)?; + let pipe_name = args + .windows(2) + .find(|pair| pair[0] == "--pipe") + .map(|pair| pair[1].to_string_lossy().into_owned()) + .unwrap_or_else(|| "GTA-VC_Pipe".to_owned()); + let mut pipe = Pipe::connect(&pipe_name, Duration::from_secs(90))?; + Frame { + tag: *b"COLE", + payload: Vec::new(), + nul_terminated: true, + } + .write(&mut pipe, Length::Total)?; + let reply = Frame::read( + &mut Recording { + source: &mut pipe, + output: &mut file, + }, + Length::Body, + ); + file.sync_all()?; + let reply = reply?; + println!( + "Received {} ({} payload bytes)", + String::from_utf8_lossy(&reply.tag), + reply.payload.len() + ); + Ok(()) +} + +#[cfg(not(windows))] +fn main() { + eprintln!("The reference pipe client runs on Windows or Wine."); + std::process::exit(1); +} diff --git a/tools/rockstar-launcher/src/lib.rs b/tools/rockstar-launcher/src/lib.rs new file mode 100644 index 0000000000..e08b2bc92b --- /dev/null +++ b/tools/rockstar-launcher/src/lib.rs @@ -0,0 +1,333 @@ +use std::io::{self, Read, Write}; + +#[cfg(windows)] +pub mod pipe; + +pub const MAX_FRAME_BYTES: usize = 64 * 1024; +const OVERHEAD: usize = 4 + 4 + 1; + +pub fn wait_for_game( + child: &mut std::process::Child, + handshake: std::sync::mpsc::Receiver>, +) -> io::Result { + use std::sync::mpsc::RecvTimeoutError; + loop { + match handshake.recv_timeout(std::time::Duration::from_millis(10)) { + Ok(Ok(())) => return child.wait(), + result @ (Ok(Err(_)) | Err(RecvTimeoutError::Disconnected)) => { + let error = match result { + Ok(Err(error)) => error, + _ => io::Error::new( + io::ErrorKind::BrokenPipe, + "Rockstar handshake worker stopped", + ), + }; + let _ = child.kill(); + child.wait()?; + return Err(error); + } + Err(RecvTimeoutError::Timeout) => { + if let Some(status) = child.try_wait()? { + return Ok(status); + } + } + } + } +} + +#[derive(Clone, Copy)] +pub enum Length { + Total, + Body, +} + +impl Length { + fn header_bytes(self) -> usize { + match self { + Self::Total => 0, + Self::Body => 4, + } + } +} + +#[derive(Debug, PartialEq, Eq)] +pub struct Frame { + pub tag: [u8; 4], + pub payload: Vec, + pub nul_terminated: bool, +} + +fn invalid(message: &'static str) -> io::Error { + io::Error::new(io::ErrorKind::InvalidData, message) +} + +impl Frame { + pub fn read(reader: &mut impl Read, length: Length) -> io::Result { + let mut header = [0; 4]; + reader.read_exact(&mut header)?; + let size = (u32::from_le_bytes(header) as usize) + .checked_add(length.header_bytes()) + .ok_or_else(|| invalid("invalid Rockstar pipe frame length"))?; + if !(OVERHEAD..=MAX_FRAME_BYTES).contains(&size) { + return Err(invalid("invalid Rockstar pipe frame length")); + } + let mut body = vec![0; size - header.len()]; + reader.read_exact(&mut body)?; + let nul_terminated = body.last() == Some(&0); + let end = body.len() - usize::from(nul_terminated); + if body[4] != b':' || body[..4].contains(&b':') || body[..end].contains(&0) { + return Err(invalid("invalid Rockstar pipe frame envelope")); + } + Ok(Self { + tag: body[..4].try_into().unwrap(), + payload: body[5..end].to_vec(), + nul_terminated, + }) + } + + pub fn write(&self, writer: &mut impl Write, length: Length) -> io::Result<()> { + let size = self + .payload + .len() + .checked_add(OVERHEAD + usize::from(self.nul_terminated)) + .filter(|size| *size <= MAX_FRAME_BYTES) + .ok_or_else(|| invalid("Rockstar pipe frame exceeds size limit"))?; + if self.tag.contains(&0) || self.tag.contains(&b':') || self.payload.contains(&0) { + return Err(invalid("Rockstar pipe frame contains a delimiter")); + } + let mut encoded = Vec::with_capacity(size); + encoded.extend_from_slice(&((size - length.header_bytes()) as u32).to_le_bytes()); + encoded.extend_from_slice(&self.tag); + encoded.push(b':'); + encoded.extend_from_slice(&self.payload); + if self.nul_terminated { + encoded.push(0); + } + writer.write_all(&encoded)?; + writer.flush() + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::io::Cursor; + + #[test] + #[ignore] + fn sleeping_game() { + std::thread::sleep(std::time::Duration::from_secs(30)); + } + + fn sleeping_child() -> std::process::Child { + std::process::Command::new(std::env::current_exe().unwrap()) + .args(["--exact", "tests::sleeping_game", "--ignored"]) + .stdout(std::process::Stdio::null()) + .stderr(std::process::Stdio::null()) + .spawn() + .unwrap() + } + + #[test] + fn failed_handshake_terminates_and_reaps_the_game() { + let mut child = sleeping_child(); + let (sender, receiver) = std::sync::mpsc::channel(); + sender + .send(Err(io::Error::new(io::ErrorKind::TimedOut, "test timeout"))) + .unwrap(); + let start = std::time::Instant::now(); + assert_eq!( + wait_for_game(&mut child, receiver).unwrap_err().kind(), + io::ErrorKind::TimedOut + ); + assert!(start.elapsed() < std::time::Duration::from_secs(3)); + assert!(child.try_wait().unwrap().is_some()); + } + + #[test] + fn stopped_handshake_worker_terminates_and_reaps_the_game() { + let mut child = sleeping_child(); + let (sender, receiver) = std::sync::mpsc::channel(); + drop(sender); + assert_eq!( + wait_for_game(&mut child, receiver).unwrap_err().kind(), + io::ErrorKind::BrokenPipe + ); + assert!(child.try_wait().unwrap().is_some()); + } + + #[test] + fn an_exited_game_does_not_wait_for_its_handshake() { + let mut child = std::process::Command::new(std::env::current_exe().unwrap()) + .args(["--exact", "no_test_with_this_name"]) + .stdout(std::process::Stdio::null()) + .stderr(std::process::Stdio::null()) + .spawn() + .unwrap(); + let (_sender, receiver) = std::sync::mpsc::channel(); + assert!(wait_for_game(&mut child, receiver).unwrap().success()); + } + + struct Fragmented(T); + + impl Read for Fragmented { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + let size = buffer.len().min(1); + self.0.read(&mut buffer[..size]) + } + } + + impl Write for Fragmented { + fn write(&mut self, buffer: &[u8]) -> io::Result { + self.0.write(&buffer[..buffer.len().min(1)]) + } + + fn flush(&mut self) -> io::Result<()> { + self.0.flush() + } + } + + #[test] + fn reads_observed_greeting_across_partial_reads() { + let bytes = b"\x0a\0\0\0COLE:\0"; + assert_eq!( + Frame::read(&mut Fragmented(&bytes[..]), Length::Total).unwrap(), + Frame { + tag: *b"COLE", + payload: Vec::new(), + nul_terminated: true, + } + ); + } + + #[test] + fn writes_the_observed_total_length_even_with_partial_writes() { + let mut bytes = Fragmented(Vec::new()); + Frame { + tag: *b"COLE", + payload: Vec::new(), + nul_terminated: true, + } + .write(&mut bytes, Length::Total) + .unwrap(); + assert_eq!(bytes.0, b"\x0a\0\0\0COLE:\0"); + } + + #[test] + fn keeps_colons_in_payload_and_leaves_the_next_frame_unread() { + let frame = Frame { + tag: *b"DUNN", + payload: b"one:two".to_vec(), + nul_terminated: false, + }; + let mut bytes = Vec::new(); + frame.write(&mut bytes, Length::Total).unwrap(); + bytes.extend_from_slice(b"\x0a\0\0\0COLE:\0"); + let mut reader = Cursor::new(bytes); + assert_eq!(Frame::read(&mut reader, Length::Total).unwrap(), frame); + assert_eq!( + Frame::read(&mut reader, Length::Total).unwrap().tag, + *b"COLE" + ); + } + + #[test] + fn rejects_invalid_lengths_before_reading_a_body() { + for size in [0u32, 4, 8, MAX_FRAME_BYTES as u32 + 1, u32::MAX] { + let mut reader = Cursor::new(size.to_le_bytes()); + assert_eq!( + Frame::read(&mut reader, Length::Total).unwrap_err().kind(), + io::ErrorKind::InvalidData + ); + assert_eq!(reader.position(), 4); + } + } + + #[test] + fn rejects_truncated_or_malformed_frames() { + for bytes in [&b"\x0a\0\0"[..], &b"\x0a\0\0\0COLE:"[..]] { + assert_eq!( + Frame::read(&mut &bytes[..], Length::Total) + .unwrap_err() + .kind(), + io::ErrorKind::UnexpectedEof + ); + } + for bytes in [ + b"\x0a\0\0\0COLE=\0", + b"\x0a\0\0\0CO:E:x", + b"\x0a\0\0\0CO\0E:\0", + ] { + assert_eq!( + Frame::read(&mut &bytes[..], Length::Total) + .unwrap_err() + .kind(), + io::ErrorKind::InvalidData + ); + } + } + + #[test] + fn rejects_invalid_output_before_writing_any_bytes() { + let mut bytes = Vec::new(); + for frame in [ + Frame { + tag: *b"DUNN", + payload: vec![b'x'; MAX_FRAME_BYTES], + nul_terminated: false, + }, + Frame { + tag: *b"DUNN", + payload: b"one\0two".to_vec(), + nul_terminated: false, + }, + Frame { + tag: *b"CO:E", + payload: Vec::new(), + nul_terminated: false, + }, + ] { + assert!(frame.write(&mut bytes, Length::Total).is_err()); + assert!(bytes.is_empty()); + } + } + + #[test] + fn accepts_the_observed_unterminated_launch_reply_shape() { + let payload = vec![b'A'; 640]; + let mut bytes = 645u32.to_le_bytes().to_vec(); + bytes.extend_from_slice(b"DUNN:"); + bytes.extend_from_slice(&payload); + let frame = Frame::read(&mut Fragmented(&bytes[..]), Length::Body).unwrap(); + assert_eq!(bytes.len(), 649); + assert_eq!(frame.tag, *b"DUNN"); + assert_eq!(frame.payload, payload); + assert!(!frame.nul_terminated); + let mut encoded = Vec::new(); + frame.write(&mut encoded, Length::Body).unwrap(); + assert_eq!(encoded, bytes); + } + + #[test] + fn presents_a_complete_reply_to_the_pipe_in_one_write() { + struct Writes(Vec); + impl Write for Writes { + fn write(&mut self, bytes: &[u8]) -> io::Result { + self.0.push(bytes.len()); + Ok(bytes.len()) + } + fn flush(&mut self) -> io::Result<()> { + Ok(()) + } + } + let mut writer = Writes(Vec::new()); + Frame { + tag: *b"DUNN", + payload: vec![b'A'; 640], + nul_terminated: false, + } + .write(&mut writer, Length::Body) + .unwrap(); + assert_eq!(writer.0, vec![649]); + } +} diff --git a/tools/rockstar-launcher/src/main.rs b/tools/rockstar-launcher/src/main.rs new file mode 100644 index 0000000000..fe5923ab37 --- /dev/null +++ b/tools/rockstar-launcher/src/main.rs @@ -0,0 +1,152 @@ +#![cfg_attr(windows, windows_subsystem = "windows")] + +#[cfg(windows)] +fn log(message: &str) { + use std::io::Write; + let Ok(exe) = std::env::current_exe() else { + return; + }; + let path = exe.with_file_name("launcher.log"); + if let Ok(metadata) = std::fs::symlink_metadata(&path) { + if !metadata.is_file() || metadata.len() > 65536 { + return; + } + } + if let Ok(mut file) = std::fs::OpenOptions::new() + .create(true) + .append(true) + .open(path) + { + let _ = writeln!(file, "{message}"); + } +} + +#[cfg(windows)] +fn run() -> Result> { + use droiddeck_rockstar_launcher::{pipe::Listener, wait_for_game, Frame, Length}; + use std::io::Read; + use std::time::{Duration, SystemTime, UNIX_EPOCH}; + + let config_path = std::env::current_exe()?.with_file_name("launch.json"); + let mut data = Vec::new(); + std::fs::File::open(&config_path)? + .take(16385) + .read_to_end(&mut data)?; + std::fs::remove_file(&config_path)?; + if data.len() > 16384 { + return Err("launch handoff exceeds size limit".into()); + } + let config: serde_json::Value = serde_json::from_slice(&data)?; + let text = |key| { + config + .get(key) + .and_then(|value| value.as_str()) + .ok_or("missing launch field") + }; + let expires = config + .get("expiresAt") + .and_then(|value| value.as_u64()) + .ok_or("missing launch expiry")?; + let now = SystemTime::now().duration_since(UNIX_EPOCH)?.as_millis() as u64; + if expires <= now || expires - now > 120_000 { + return Err("launch handoff expired".into()); + } + let material = text("material")?.as_bytes().to_vec(); + if material.len() != 640 || !material.iter().all(u8::is_ascii_hexdigit) { + return Err("invalid launch material".into()); + } + let pipe_name = text("pipe")?.to_owned(); + if !matches!( + pipe_name.as_str(), + "GTA3_Pipe" | "GTA-VC_Pipe" | "GTA_SA_Pipe" + ) { + return Err("unsupported Rockstar launch pipe".into()); + } + let root = std::fs::canonicalize(text("folder")?)?; + let exe = std::fs::canonicalize(text("exe")?)?; + let workdir = std::fs::canonicalize(text("workdir")?)?; + if !exe.is_file() + || !exe.starts_with(&root) + || !workdir.starts_with(&root) + || !root.join("MTLX.dll").is_file() + { + return Err("invalid Rockstar game path".into()); + } + if let Some(index) = + std::env::args().position(|arg| arg.eq_ignore_ascii_case("-launchTitleInFolder")) + { + let folder = std::env::args() + .nth(index + 1) + .ok_or("missing game folder")?; + if std::fs::canonicalize(folder)? != root { + return Err("Rockstar launch folder mismatch".into()); + } + } + let args = config + .get("args") + .and_then(|value| value.as_array()) + .ok_or("missing game arguments")?; + let args: Result, _> = args + .iter() + .map(|value| value.as_str().ok_or("invalid game argument")) + .collect(); + log("launch handoff accepted"); + let listener = Listener::new(&pipe_name, Duration::from_secs(30))?; + log("launcher pipe created"); + let mut child = std::process::Command::new(exe) + .current_dir(workdir) + .args(args?) + .spawn()?; + let pid = child.id(); + log("game process started"); + let (result, handshake) = std::sync::mpsc::sync_channel(1); + std::thread::spawn(move || { + let serve = || -> std::io::Result<()> { + let mut pipe = listener.accept()?; + log("launcher pipe connected"); + if pipe.client_pid()? != pid { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "unexpected Rockstar pipe client", + )); + } + let request = Frame::read(&mut pipe, Length::Total)?; + log("game greeting received"); + if request.tag != *b"COLE" || !request.payload.is_empty() { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidData, + "unexpected Rockstar greeting", + )); + } + Frame { + tag: *b"DUNN", + payload: material, + nul_terminated: false, + } + .write(&mut pipe, Length::Body)?; + log("launcher handshake complete"); + Ok(()) + }; + let outcome = serve(); + if let Err(error) = &outcome { + log(&format!("launcher handshake failed: {error}")); + } + let _ = result.send(outcome); + }); + Ok(wait_for_game(&mut child, handshake)?.code().unwrap_or(1)) +} + +fn main() { + #[cfg(windows)] + let code = match run() { + Ok(code) => code, + Err(error) => { + log(&format!("launch failed: {error}")); + eprintln!("Rockstar launch failed: {error}"); + 1 + } + }; + #[cfg(not(windows))] + let code = 1; + std::process::exit(code); +} diff --git a/tools/rockstar-launcher/src/pipe.rs b/tools/rockstar-launcher/src/pipe.rs new file mode 100644 index 0000000000..79ab4d9e42 --- /dev/null +++ b/tools/rockstar-launcher/src/pipe.rs @@ -0,0 +1,403 @@ +use std::ffi::c_void; +use std::io::{self, Read, Write}; +use std::os::windows::ffi::OsStrExt; +use std::ptr::{null, null_mut}; +use std::time::{Duration, Instant}; + +type Handle = *mut c_void; +const INVALID_HANDLE: Handle = -1isize as Handle; +const ERROR_IO_PENDING: i32 = 997; +const ERROR_MORE_DATA: i32 = 234; + +#[repr(C)] +struct Overlapped { + internal: usize, + internal_high: usize, + offset: u32, + offset_high: u32, + event: Handle, +} + +#[link(name = "kernel32")] +extern "system" { + fn CreateNamedPipeW( + name: *const u16, + open: u32, + mode: u32, + max: u32, + output: u32, + input: u32, + timeout: u32, + security: *const c_void, + ) -> Handle; + fn ConnectNamedPipe(handle: Handle, overlapped: *mut Overlapped) -> i32; + fn GetNamedPipeClientProcessId(handle: Handle, pid: *mut u32) -> i32; + fn CreateFileW( + name: *const u16, + access: u32, + share: u32, + security: *const c_void, + creation: u32, + flags: u32, + template: Handle, + ) -> Handle; + fn WaitNamedPipeW(name: *const u16, timeout: u32) -> i32; + fn CreateEventW(security: *const c_void, manual: i32, initial: i32, name: *const u16) + -> Handle; + fn CloseHandle(handle: Handle) -> i32; + fn ReadFile( + handle: Handle, + buffer: *mut u8, + size: u32, + read: *mut u32, + overlapped: *mut Overlapped, + ) -> i32; + fn WriteFile( + handle: Handle, + buffer: *const u8, + size: u32, + written: *mut u32, + overlapped: *mut Overlapped, + ) -> i32; + fn WaitForSingleObject(handle: Handle, timeout: u32) -> u32; + fn CancelIoEx(handle: Handle, overlapped: *mut Overlapped) -> i32; + fn GetOverlappedResult( + handle: Handle, + overlapped: *mut Overlapped, + transferred: *mut u32, + wait: i32, + ) -> i32; +} + +struct OwnedHandle(Handle); + +unsafe impl Send for OwnedHandle {} + +impl Drop for OwnedHandle { + fn drop(&mut self) { + unsafe { + CloseHandle(self.0); + } + } +} + +pub struct Pipe { + handle: OwnedHandle, + timeout: Duration, +} + +pub struct Listener(Pipe); + +impl Listener { + pub fn new(name: &str, timeout: Duration) -> io::Result { + if name.is_empty() || name.contains(['\\', '/', '\0']) { + return Err(io::Error::new( + io::ErrorKind::InvalidInput, + "invalid pipe name", + )); + } + let path = format!(r"\\.\pipe\{name}"); + let wide: Vec<_> = std::ffi::OsStr::new(&path) + .encode_wide() + .chain(Some(0)) + .collect(); + let handle = unsafe { + CreateNamedPipeW( + wide.as_ptr(), + 3 | 0x4000_0000 | 0x0008_0000, + 8, + 1, + 65536, + 65536, + 0, + null(), + ) + }; + if handle == INVALID_HANDLE { + return Err(io::Error::last_os_error()); + } + Ok(Self(Pipe { + handle: OwnedHandle(handle), + timeout, + })) + } + + pub fn accept(self) -> io::Result { + let event = unsafe { CreateEventW(null(), 1, 0, null()) }; + if event.is_null() { + return Err(io::Error::last_os_error()); + } + let event = OwnedHandle(event); + let mut overlapped = Overlapped { + internal: 0, + internal_high: 0, + offset: 0, + offset_high: 0, + event: event.0, + }; + if unsafe { ConnectNamedPipe(self.0.handle.0, &mut overlapped) } != 0 { + return Ok(self.0); + } + let error = io::Error::last_os_error(); + if error.raw_os_error() == Some(535) { + return Ok(self.0); + } + if error.raw_os_error() != Some(ERROR_IO_PENDING) { + return Err(error); + } + let wait = unsafe { + WaitForSingleObject( + event.0, + self.0.timeout.as_millis().min(u32::MAX as u128 - 1) as u32, + ) + }; + let mut transferred = 0; + if wait != 0 { + let error = if wait == 258 { + io::Error::new(io::ErrorKind::TimedOut, "waiting for Rockstar game") + } else { + io::Error::last_os_error() + }; + unsafe { + CancelIoEx(self.0.handle.0, &mut overlapped); + GetOverlappedResult(self.0.handle.0, &mut overlapped, &mut transferred, 1); + } + return Err(error); + } + if unsafe { GetOverlappedResult(self.0.handle.0, &mut overlapped, &mut transferred, 0) } + == 0 + { + return Err(io::Error::last_os_error()); + } + Ok(self.0) + } +} + +impl Pipe { + pub fn client_pid(&self) -> io::Result { + let mut pid = 0; + if unsafe { GetNamedPipeClientProcessId(self.handle.0, &mut pid) } == 0 || pid == 0 { + return Err(io::Error::last_os_error()); + } + Ok(pid) + } + pub fn connect(name: &str, timeout: Duration) -> io::Result { + if name.is_empty() || name.contains(['\\', '/', '\0']) { + return Err(io::Error::new( + io::ErrorKind::InvalidInput, + "invalid pipe name", + )); + } + let path = format!(r"\\.\pipe\{name}"); + let wide: Vec<_> = std::ffi::OsStr::new(&path) + .encode_wide() + .chain(Some(0)) + .collect(); + let deadline = Instant::now() + timeout; + loop { + let handle = unsafe { + CreateFileW( + wide.as_ptr(), + 0xc000_0000, + 0, + null(), + 3, + 0x4000_0000, + null_mut(), + ) + }; + if handle != INVALID_HANDLE { + return Ok(Self { + handle: OwnedHandle(handle), + timeout, + }); + } + let error = io::Error::last_os_error(); + if !matches!(error.raw_os_error(), Some(2 | 231)) { + return Err(error); + } + let remaining = deadline.saturating_duration_since(Instant::now()); + if remaining.is_zero() { + return Err(io::Error::new( + io::ErrorKind::TimedOut, + "waiting for Rockstar pipe", + )); + } + unsafe { + WaitNamedPipeW(wide.as_ptr(), remaining.as_millis().min(50) as u32); + } + std::thread::sleep(remaining.min(Duration::from_millis(2))); + } + } + + fn transfer(&self, buffer: *mut u8, size: usize, writing: bool) -> io::Result { + if size == 0 { + return Ok(0); + } + let event = unsafe { CreateEventW(null(), 1, 0, null()) }; + if event.is_null() { + return Err(io::Error::last_os_error()); + } + let event = OwnedHandle(event); + let mut overlapped = Overlapped { + internal: 0, + internal_high: 0, + offset: 0, + offset_high: 0, + event: event.0, + }; + let mut transferred = 0; + let size = size.min(u32::MAX as usize) as u32; + let ok = unsafe { + if writing { + WriteFile( + self.handle.0, + buffer, + size, + &mut transferred, + &mut overlapped, + ) + } else { + ReadFile( + self.handle.0, + buffer, + size, + &mut transferred, + &mut overlapped, + ) + } + }; + if ok != 0 { + return Ok(transferred as usize); + } + let error = io::Error::last_os_error(); + if error.raw_os_error() == Some(ERROR_MORE_DATA) && !writing && transferred > 0 { + return Ok(transferred as usize); + } + if error.raw_os_error() != Some(ERROR_IO_PENDING) { + return Err(error); + } + let wait = unsafe { + WaitForSingleObject( + event.0, + self.timeout.as_millis().min(u32::MAX as u128 - 1) as u32, + ) + }; + if wait != 0 { + let error = if wait == 258 { + io::Error::new(io::ErrorKind::TimedOut, "Rockstar pipe operation timed out") + } else { + io::Error::last_os_error() + }; + unsafe { + CancelIoEx(self.handle.0, &mut overlapped); + GetOverlappedResult(self.handle.0, &mut overlapped, &mut transferred, 1); + } + return Err(error); + } + let ok = + unsafe { GetOverlappedResult(self.handle.0, &mut overlapped, &mut transferred, 0) }; + if ok != 0 { + return Ok(transferred as usize); + } + let error = io::Error::last_os_error(); + if error.raw_os_error() == Some(ERROR_MORE_DATA) && !writing && transferred > 0 { + return Ok(transferred as usize); + } + Err(error) + } +} + +impl Read for Pipe { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + self.transfer(buffer.as_mut_ptr(), buffer.len(), false) + } +} + +impl Write for Pipe { + fn write(&mut self, buffer: &[u8]) -> io::Result { + self.transfer(buffer.as_ptr() as *mut u8, buffer.len(), true) + } + + fn flush(&mut self) -> io::Result<()> { + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{Frame, Length}; + use std::sync::mpsc; + use std::time::{SystemTime, UNIX_EPOCH}; + + fn name() -> String { + format!( + "dd-rockstar-test-{}-{}", + std::process::id(), + SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_nanos() + ) + } + + #[test] + fn real_pipe_exchanges_both_framing_modes_and_identifies_the_client() { + let name = name(); + let listener = Listener::new(&name, Duration::from_secs(2)).unwrap(); + let worker = std::thread::spawn(move || { + let mut server = listener.accept().unwrap(); + assert_eq!(server.client_pid().unwrap(), std::process::id()); + assert_eq!( + Frame::read(&mut server, Length::Total).unwrap().tag, + *b"COLE" + ); + Frame { + tag: *b"DUNN", + payload: vec![b'A'; 640], + nul_terminated: false, + } + .write(&mut server, Length::Body) + .unwrap(); + }); + let mut client = Pipe::connect(&name, Duration::from_secs(2)).unwrap(); + Frame { + tag: *b"COLE", + payload: Vec::new(), + nul_terminated: true, + } + .write(&mut client, Length::Total) + .unwrap(); + let response = Frame::read(&mut client, Length::Body).unwrap(); + assert_eq!(response.payload.len(), 640); + assert!(!response.nul_terminated); + worker.join().unwrap(); + } + + #[test] + fn timed_out_accept_releases_the_first_pipe_instance() { + let name = name(); + let listener = Listener::new(&name, Duration::from_millis(20)).unwrap(); + assert!(matches!(listener.accept(), Err(error) if error.kind() == io::ErrorKind::TimedOut)); + assert!(Listener::new(&name, Duration::from_millis(20)).is_ok()); + } + + #[test] + fn timed_out_read_cancels_the_pending_operation() { + let name = name(); + let listener = Listener::new(&name, Duration::from_secs(2)).unwrap(); + let (done, wait) = mpsc::channel(); + let worker = std::thread::spawn(move || { + let _server = listener.accept().unwrap(); + wait.recv_timeout(Duration::from_secs(2)).unwrap(); + }); + let mut client = Pipe::connect(&name, Duration::from_millis(30)).unwrap(); + assert_eq!( + client.read(&mut [0u8; 4]).unwrap_err().kind(), + io::ErrorKind::TimedOut + ); + done.send(()).unwrap(); + worker.join().unwrap(); + } +} diff --git a/tools/tests/test_store_launch_rockstar.py b/tools/tests/test_store_launch_rockstar.py new file mode 100644 index 0000000000..68f4401544 --- /dev/null +++ b/tools/tests/test_store_launch_rockstar.py @@ -0,0 +1,90 @@ +import json +from pathlib import Path +import tempfile +import time +import unittest +from unittest.mock import patch + +from test_store_launch import store + + +class RockstarLaunch(unittest.TestCase): + def setup_game(self, root): + folder = Path(root) / 'game' + folder.mkdir() + exe = bytearray(128) + exe[:2] = b'MZ' + exe[0x3c:0x40] = (64).to_bytes(4, 'little') + exe[64:70] = b'PE\0\0\x4c\x01' + (folder / 'gta-vc.exe').write_bytes(exe) + (folder / 'MTLX.dll').write_bytes(b'vendor') + prefix = Path(root) / 'prefix' + (prefix / 'pfx').mkdir(parents=True) + (prefix / 'pfx/user.reg').write_text('WINE REGISTRY Version 2\n') + (prefix / 'pfx/system.reg').write_text('WINE REGISTRY Version 2\n') + service = Path(root) / 'service' + service.mkdir() + (service / 'Launcher32.exe').write_bytes(b'compiled-helper') + sidecar = {'store': 'rockstar', 'id': 'gtavc', 'exe': 'gta-vc.exe', 'args': ['one argument', '&literal']} + answer = {'ok': True, 'pipe': 'GTA-VC_Pipe', 'material': 'A' * 640, + 'expiresAt': int(time.time() * 1000) + 90000, 'ticket': 'must-not-be-exported'} + return folder, sidecar, prefix, service, answer + + def prepare(self, root, modify=lambda values: None): + values = self.setup_game(root) + modify(values) + folder, sidecar, prefix, service, answer = values + config = prefix / 'pfx' / store.ROCKSTAR_FOLDER / 'launch.json' + config.parent.mkdir(parents=True) + config.write_text('stale') + requests = [] + + def ask(channel, request, timeout): + requests.append(request) + return answer + + with patch.object(store, 'ROCKSTAR_SERVICE', service), patch.object(store, 'rockstar_registry', return_value=True): + result = store.prepare_rockstar(folder, sidecar, str(prefix), str(Path(root) / 'channel'), ask_app=ask) + return result, config, requests + + def test_handoff_contains_only_launch_fields_and_preserves_argument_boundaries(self): + with tempfile.TemporaryDirectory() as root: + result, path, requests = self.prepare(root) + self.assertEqual('ready', result) + data = json.loads(path.read_text()) + self.assertEqual({'folder', 'exe', 'workdir', 'args', 'pipe', 'material', 'expiresAt'}, set(data)) + self.assertEqual(['one argument', '&literal'], data['args']) + self.assertNotIn('must-not-be-exported', path.read_text()) + self.assertEqual('rockstar-launch', requests[0]['op']) + self.assertEqual(b'compiled-helper', path.with_name('Launcher.exe').read_bytes()) + + def test_rejected_or_expired_sessions_cannot_reuse_stale_material(self): + for update in ({'ok': False, 'reason': 'not-owned'}, {'material': 'A' * 641}, {'expiresAt': 1}): + with self.subTest(update=update), tempfile.TemporaryDirectory() as root: + result, config, _ = self.prepare(root, lambda values: values[4].update(update)) + self.assertNotEqual('ready', result) + self.assertFalse(config.exists()) + + def test_path_escape_does_not_request_account_data(self): + with tempfile.TemporaryDirectory() as root: + def change(values): + (Path(root) / 'outside.exe').write_bytes(b'MZ') + values[1]['exe'] = '../outside.exe' + result, config, requests = self.prepare(root, change) + self.assertEqual('invalid-game-path', result) + self.assertEqual([], requests) + self.assertFalse(config.exists()) + + def test_writes_both_registry_views_and_escapes_values(self): + with tempfile.TemporaryDirectory() as root: + folder, _, prefix, _, _ = self.setup_game(root) + with patch.object(store, 'wait_for_server', return_value=True): + self.assertTrue(store.rockstar_registry(folder, 'Grand Theft Auto: Vice City', prefix, '')) + text = (prefix / 'pfx/system.reg').read_text() + self.assertIn(r'[Software\\Rockstar Games\\Launcher]', text) + self.assertIn(r'[Software\\Wow6432Node\\Rockstar Games\\Launcher]', text) + self.assertIn('Grand Theft Auto: Vice City', text) + + +if __name__ == '__main__': + unittest.main() From d63193393d9747f225e1560911e5d005d565af71 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 21:36:32 -0500 Subject: [PATCH 062/101] feat(ui): agent features start off and live in Setup > Developer (#2550) --- .../droiddeck/launcher/agent/AgentAccess.kt | 2 +- .../com/droiddeck/launcher/agent/AgentTab.kt | 2 +- .../launcher/session/SessionPrefs.kt | 2 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 25 ++++++++++--------- 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 +- docs/agent-control.md | 2 +- docs/development/game-environment.md | 4 +-- docs/development/proot-performance.md | 2 +- tools/droiddeckctl | 2 +- tools/tests/test_droiddeckctl.py | 2 +- 42 files changed, 55 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentAccess.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentAccess.kt index b755ca6466..2113161467 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentAccess.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentAccess.kt @@ -23,7 +23,7 @@ object AgentAccess { fun requireCommands(context: Context) { if (!commandsAllowed(context)) throw AgentException( "AGENT_COMMANDS_DISABLED", - "Debugging tools are off: turn on Setup > Diagnostics > Debugging tools on the device", + "Debugging tools are off: turn on Setup > Developer > Debugging tools on the device", ) } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt index 7392473c72..b779288f3e 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.SessionPrefs object AgentTab { - var shown by mutableStateOf(true) + var shown by mutableStateOf(false) private set val visible: Boolean get() = shown && AgentHost.available 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 a14490bb8d..e47f9194bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -253,7 +253,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } - fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", true) + fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", false) fun setAgentTab(context: Context, show: Boolean) { prefs(context).edit().putBoolean("agentTab", show).apply() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index c3a5bb3784..0e22804a63 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -455,18 +455,6 @@ internal fun SetupPanel( val railContext = androidx.compose.ui.platform.LocalContext.current remember { RailLabels.load(railContext) } ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } - if (com.droiddeck.launcher.agent.AgentHost.available) { - ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { - com.droiddeck.launcher.agent.AgentTab.set(railContext, it) - } - ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { - AgentPet.set(railContext, it) - } - if (AgentPet.enabled && !AgentPet.allowed) ActionRow( - stringResource(R.string.setup_agent_pet_float), stringResource(R.string.setup_agent_pet_float_hint), - stringResource(R.string.setup_agent_pet_allow), onClick = { AgentPet.requestFloating(railContext) }, - ) - } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) } @@ -606,6 +594,19 @@ internal fun SetupPanel( ) { a.onGameDebugLogs() } ToggleRow(host, "vacdiag", stringResource(R.string.setup_vac_diag), stringResource(R.string.setup_vac_diag_hint), s.vacDiagnostics) { a.onVacDiagnostics() } ToggleRow(host, "agent-commands", stringResource(R.string.setup_agent_commands), null, s.agentCommands) { a.onAgentCommands() } + if (com.droiddeck.launcher.agent.AgentHost.available) { + val agentContext = androidx.compose.ui.platform.LocalContext.current + ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { + com.droiddeck.launcher.agent.AgentTab.set(agentContext, it) + } + ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { + AgentPet.set(agentContext, it) + } + if (AgentPet.enabled && !AgentPet.allowed) ActionRow( + stringResource(R.string.setup_agent_pet_float), stringResource(R.string.setup_agent_pet_float_hint), + stringResource(R.string.setup_agent_pet_allow), onClick = { AgentPet.requestFloating(agentContext) }, + ) + } ToggleRow(host, "graphics-logs", stringResource(R.string.setup_graphics_logs), stringResource(R.string.setup_graphics_logs_hint), s.graphicsLogs) { a.onGraphicsLogs() } if (!s.adreno && com.droiddeck.launcher.session.SessionPrefs.steamGpuCompositingAllowed()) ToggleRow(host, "steam-gpu-drawing", stringResource(R.string.setup_steam_gpu_drawing), stringResource(R.string.setup_steam_gpu_drawing_hint), s.steamGpuDrawing) { a.onSteamGpuDrawing() } ActionRow(stringResource(R.string.setup_latest_logs), stringResource(R.string.drawer_logs_hint), stringResource(R.string.drawer_share_logs), a.onShareLogs, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e6cb1ab87c..7c2811030a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2676,7 +2676,7 @@ %1$s · يلزم إعادة تشغيل هذا الجهاز إزالة %1$s؟ - التشخيص + المطوّر علامة مائية لاسم الإصدار عرض اسم إصدار الاختبار أو Lab على الشاشة. مفعّل افتراضيًا. جاهز للّعب 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 6f98b6bff0..078d972636 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2613,7 +2613,7 @@ %1$s · reinicio pendiente Este dispositivo ¿Quitar %1$s? - Diagnóstico + Desarrollador Marca de agua de compilación Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. Listo para jugar diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5aeb1e2e9a..dc02c0948f 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2568,7 +2568,7 @@ %1$s · нужен е рестарт Това устройство Премахване на %1$s? - Диагностика + Разработчик Воден знак с етикет на компилацията Показва етикета на тестовата или Lab компилация на екрана. Включено по подразбиране. Готово за игра diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6011f2fe39..691da1a73c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2622,7 +2622,7 @@ %1$s · čeká na restart Toto zařízení Odstranit %1$s? - Diagnostika + Vývojář Vodoznak s označením sestavení Zobrazit na obrazovce označení testovacího sestavení nebo sestavení Lab. Ve výchozím nastavení zapnuté. Připraveno ke hraní diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f443c3346e..f1b55c9650 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2568,7 +2568,7 @@ %1$s · kræver genstart Denne enhed Fjern %1$s? - Diagnostik + Udvikler Vandmærke med buildmærkat Vis mærkatet for test- eller Lab-builden på skærmen. Aktiveret som standard. Klar til at spille diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d16437026e..7d5ded3548 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2557,7 +2557,7 @@ %1$s · Neustart ausstehend Dieses Gerät %1$s entfernen? - Diagnose + Entwickler Build-Kennzeichnung als Wasserzeichen Kennzeichnung des Test- oder Lab-Builds auf dem Bildschirm anzeigen. Standardmäßig aktiviert. Bereit zum Spielen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index e64a289085..e31df6b602 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2568,7 +2568,7 @@ %1$s · απαιτείται επανεκκίνηση Αυτή η συσκευή Κατάργηση %1$s; - Διαγνωστικά + Προγραμματιστής Υδατογράφημα ετικέτας έκδοσης Εμφάνιση της ετικέτας δοκιμαστικής έκδοσης ή έκδοσης Lab στην οθόνη. Ενεργό από προεπιλογή. Έτοιμο για παιχνίδι diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c9fbd09fa9..c4639709ad 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2592,7 +2592,7 @@ %1$s · reinicio pendiente Este dispositivo ¿Quitar %1$s? - Diagnóstico + Desarrollador Marca de agua de compilación Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. Listo para jugar diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 27acadee4a..9dcb88f402 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2568,7 +2568,7 @@ %1$s · vaatii uudelleenkäynnistyksen Tämä laite Poistetaanko %1$s? - Diagnostiikka + Kehittäjä Koontiversion vesileima Näytä testi- tai Lab-version tunniste näytöllä. Käytössä oletusarvoisesti. Valmis pelattavaksi diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fd6bd7a654..412575e608 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2592,7 +2592,7 @@ %1$s · redémarrage en attente Cet appareil Supprimer %1$s ? - Diagnostic + Développeur Filigrane de version Afficher le libellé de la version de test ou Lab à l’écran. Activé par défaut. Prêt à jouer diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1f48a5adef..c6042223f0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2568,7 +2568,7 @@ %1$s · रीस्टार्ट बाकी यह डिवाइस %1$s हटाएं? - डायग्नोस्टिक्स + डेवलपर बिल्ड लेबल वॉटरमार्क स्क्रीन पर टेस्ट या Lab बिल्ड लेबल दिखाएँ। डिफ़ॉल्ट रूप से चालू। खेलने के लिए तैयार diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b855f4a1ca..4d86e51f7e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2568,7 +2568,7 @@ %1$s · újraindítás szükséges Ez a készülék Eltávolítja a %1$s-t? - Diagnosztika + Fejlesztő Buildcímke vízjelként A tesztbuild vagy Lab-build címkéjének megjelenítése a képernyőn. Alapértelmezés szerint bekapcsolva. Készen áll a játékra diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7920ebc122..cecc8289f0 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2541,7 +2541,7 @@ %1$s · perlu mulai ulang Perangkat ini Hapus %1$s? - Diagnostik + Developer Tanda air label build Tampilkan label build pengujian atau Lab di layar. Aktif secara default. Siap bermain diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dfcf569d61..58b65563ea 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2584,7 +2584,7 @@ %1$s · riavvio in attesa Questo dispositivo Rimuovere %1$s? - Diagnostica + Sviluppatore Filigrana con etichetta build Mostra sullo schermo l’etichetta della build di test o Lab. Attiva per impostazione predefinita. Pronto per giocare diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3dee08d37a..0cdcc111bd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2541,7 +2541,7 @@ %1$s · 再起動待ち このデバイス %1$sを削除しますか? - 診断 + 開発者 ビルドラベルの透かし テストビルドまたはLabビルドのラベルを画面に表示します。デフォルトで有効です。 プレイの準備完了 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b0b023b482..fc352bcc37 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2541,7 +2541,7 @@ %1$s · 재시작 대기 이 기기 %1$s을(를) 제거하시겠습니까? - 진단 + 개발자 빌드 라벨 워터마크 테스트 또는 Lab 빌드 라벨을 화면에 표시합니다. 기본적으로 켜져 있습니다. 플레이 준비 완료 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 89a213972f..7135bd5457 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2541,7 +2541,7 @@ %1$s · perlu mula semula Peranti ini Alih keluar %1$s? - Diagnostik + Pembangun Tera air label binaan Paparkan label binaan ujian atau Lab pada skrin. Dihidupkan secara lalai. Sedia untuk bermain diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 7a67d2317b..f1a5b47fae 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2568,7 +2568,7 @@ %1$s · krever omstart Denne enheten Fjerne %1$s? - Diagnostikk + Utvikler Vannmerke for byggetikett Vis etiketten for test- eller Lab-bygget på skjermen. På som standard. Klar til å spille diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2aa326714f..eff91dd724 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2568,7 +2568,7 @@ %1$s · herstart nodig Dit apparaat %1$s verwijderen? - Diagnostiek + Ontwikkelaar Buildlabel als watermerk Toon het label van de testbuild of Lab-build op het scherm. Standaard ingeschakeld. Klaar om te spelen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fbca1d88dd..1267e54be9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2622,7 +2622,7 @@ %1$s · wymaga restartu To urządzenie Usunąć %1$s? - Diagnostyka + Programista Znak wodny z etykietą kompilacji Pokazuj na ekranie etykietę kompilacji testowej lub Lab. Domyślnie włączone. Gotowe do gry diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 2d09f7127a..2db4dbb6ec 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2584,7 +2584,7 @@ %1$s · reinício pendente Este dispositivo Remover %1$s? - Diagnóstico + Programador Marca de água da compilação Mostrar no ecrã a etiqueta da compilação de teste ou Lab. Ativada por predefinição. Pronto para jogar diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 768753c6e6..643b20e847 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2584,7 +2584,7 @@ %1$s · reinício pendente Este aparelho Remover %1$s? - Diagnóstico + Desenvolvedor Marca de água da compilação Mostrar na tela a etiqueta da compilação de teste ou Lab. Ativada por padrão. Pronto para jogar diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fac1699e94..3838347619 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2595,7 +2595,7 @@ %1$s · necesită repornire Acest dispozitiv Elimini %1$s? - Diagnosticare + Dezvoltator Filigrană cu eticheta versiunii Afișează pe ecran eticheta versiunii de testare sau Lab. Activată implicit. Pregătit de joc diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index cf3266525b..41cbd27d7c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2702,7 +2702,7 @@ %1$s · нужен перезапуск Это устройство Удалить %1$s? - Диагностика + Разработчик Водяной знак с меткой сборки Показывать на экране метку тестовой сборки или сборки Lab. Включено по умолчанию. Готово к игре diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e64a59dc88..5a6c222004 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2568,7 +2568,7 @@ %1$s · kräver omstart Den här enheten Ta bort %1$s? - Diagnostik + Utvecklare Vattenstämpel med byggetikett Visa testbyggets eller Lab-byggets etikett på skärmen. Aktiverad som standard. Redo att spela diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1a778803c1..1e4d92cbf1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2541,7 +2541,7 @@ %1$s · ต้องรีสตาร์ต อุปกรณ์นี้ ลบ %1$s? - การวินิจฉัย + นักพัฒนา ลายน้ำป้ายชื่อบิลด์ แสดงป้ายชื่อบิลด์ทดสอบหรือบิลด์ Lab บนหน้าจอ เปิดไว้โดยค่าเริ่มต้น พร้อมเล่นแล้ว diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d4495911e0..906d04d13b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2557,7 +2557,7 @@ %1$s · yeniden başlatma bekliyor Bu cihaz %1$s kaldırılsın mı? - Tanılama + Geliştirici Derleme etiketi filigranı Test veya Lab derlemesinin etiketini ekranda gösterir. Varsayılan olarak açıktır. Oynamaya hazır diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 77c5b4067e..5767ee73a2 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2622,7 +2622,7 @@ %1$s · потрібен перезапуск Цей пристрій Видалити %1$s? - Діагностика + Розробник Водяний знак із міткою збірки Показувати на екрані мітку тестової збірки або збірки Lab. Увімкнено за замовчуванням. Готово до гри diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 2ebccba807..c21f685321 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2541,7 +2541,7 @@ %1$s · cần khởi động lại Thiết bị này Xóa %1$s? - Chẩn đoán + Nhà phát triển Hình mờ nhãn bản dựng Hiển thị nhãn bản dựng thử nghiệm hoặc Lab trên màn hình. Được bật theo mặc định. Sẵn sàng để chơi diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 358546b076..5e9acd782f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2554,7 +2554,7 @@ 分别设置运行时驱动和显示驱动 使用 %1$s? 移除 %1$s? - 诊断 + 开发者 构建标签水印 在屏幕上显示测试版或 Lab 构建标签。默认启用。 可以游玩了 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8510ce17d0..64f8133583 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2541,7 +2541,7 @@ %1$s · 等待重新啟動 此裝置 移除 %1$s? - 診斷 + 開發人員 建置標籤浮水印 在畫面上顯示測試版或 Lab 建置標籤。預設啟用。 可以開始遊戲 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dc2ebfe803..30ef0996e5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2541,7 +2541,7 @@ %1$s · 等待重新啟動 此裝置 要移除 %1$s 嗎? - 診斷 + 開發人員 組建標籤浮水印 在畫面上顯示測試版或 Lab 組建標籤。預設啟用。 已可開始遊戲 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b543ff3d78..e4611630b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2991,7 +2991,7 @@ %1$s · restart pending This device Remove %1$s? - Diagnostics + Developer Smart glasses Display and head-tracking settings are shared across DroidDeck menus, games and desktop sessions. Connect smart glasses to change their display and tracking settings. Your saved settings are kept when you disconnect. diff --git a/docs/agent-control.md b/docs/agent-control.md index 7a1fed1d0e..4ac8706706 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -28,7 +28,7 @@ Player controls and observations work over authorized ADB on any build: `state`, `resume`, `wait`, `launch`, `quit`, `focus`, `input`, `ui`, `logs`, `screenshot`, `record`, `pacing`, `thermal`, `displays`, `wake`, `glasses` (except `glasses raw`), and `access`. -**Setup > Diagnostics > Debugging tools** is off by default in every build, including debug builds. +**Setup > Developer > Debugging tools** is off by default in every build, including debug builds. It enables `run`, `guest`, `cdp`, all `env` operations, `override`, `prefs`, and `glasses raw`. The toggle switches directly without a confirmation dialog. The bridge refuses to change it through `ui` or preference writes. The existing preference key, `setting-agent-commands` test tag, JSON command diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index 79206aa03a..766a565a55 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -104,7 +104,7 @@ Run the batch/reference and work-budget regressions with ## Game debug logs -Under **Setup > Diagnostics**, enable **Session logs** and **Game debug logs** +Under **Setup > Developer**, enable **Session logs** and **Game debug logs** before reproducing a Windows game problem. Game debug logs is off by default and is available when Session logs is enabled. It applies to the next game launch through DroidDeck's Valve or third-party Proton wrapper, including added games and store shortcuts. @@ -142,7 +142,7 @@ that diagnostics were skipped instead of writing uncollected files elsewhere. ## Enhanced diagnostics -Use **Setup > Diagnostics > Enhanced diagnostics for next session** when normal +Use **Setup > Developer > Enhanced diagnostics for next session** when normal session logs are not enough. The setting is one-shot: DroidDeck creates and retains the next session's log directory, records the diagnostic profile, then turns the setting off. It also enables the existing game diagnostic environment diff --git a/docs/development/proot-performance.md b/docs/development/proot-performance.md index bcf3424c1e..1cddb33976 100644 --- a/docs/development/proot-performance.md +++ b/docs/development/proot-performance.md @@ -325,7 +325,7 @@ or repeatedly hit a path the wrappers cannot resolve. ### Opt-in tracer profiling -With **Setup > Diagnostics > Debugging tools** enabled, queue profiling for one session: +With **Setup > Developer > Debugging tools** enabled, queue profiling for one session: ```sh tools/droiddeckctl proot-profile enable --slow-us 1000 diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 3e37811d28..ea82343888 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -571,7 +571,7 @@ def unpack_logs(archive: Path, destination: Path, session_id: str) -> None: def require_commands(adb: str, serial: str) -> dict: access = checked(provider_call(adb, serial, "access"), "ACCESS_FAILED") if access.get("commands") is not True: - raise ControlError("Debugging tools are off: turn on Setup > Diagnostics > Debugging tools on the device", + raise ControlError("Debugging tools are off: turn on Setup > Developer > Debugging tools on the device", "AGENT_COMMANDS_DISABLED") return access diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index ab929de931..1f7e32cdff 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -303,7 +303,7 @@ class DroiddeckctlTest(FakeAdbTest): code, out = self.run_ctl("run", "/usr/bin/sh", "--", "-c", "true") self.assertEqual(7, code) self.assertEqual("AGENT_COMMANDS_DISABLED", out["error"]["code"]) - self.assertIn("Setup > Diagnostics > Debugging tools", out["error"]["message"]) + self.assertIn("Setup > Developer > Debugging tools", out["error"]["message"]) self.assertEqual(["access"], [c.get("method") for c in self.calls()]) def test_override_checks_names_before_pushing_any_file(self): From 827ab2d4856305f81a26e767d62e280f52c844e7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 22:18:39 -0500 Subject: [PATCH 063/101] fix(hud): FPS and clocks read right after sleep and wake (#2552) * fix(hud): frame times follow the paused session's clock shift * fix(hud): core clocks show their average over each sample --- .../launcher/hud/DroidDeckHudHost.kt | 2 +- .../com/droiddeck/launcher/hud/GameFrames.kt | 27 +++++++- .../droiddeck/launcher/hud/HudMetrics.java | 66 ++++++++++++++----- .../com/droiddeck/launcher/ui/BottomStrip.kt | 3 +- .../launcher/ui/BottomTelemetryPage.kt | 3 +- .../launcher/hud/CoreClockAverageTest.kt | 26 ++++++++ .../droiddeck/launcher/hud/FrameStatsTest.kt | 15 +++++ 7 files changed, 120 insertions(+), 22 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/hud/CoreClockAverageTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index 492d626c5b..e2ddefc692 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -22,7 +22,7 @@ import kotlin.math.roundToInt class DroidDeckHudHost(context: Context) { private val context = context.applicationContext private val handler = Handler(Looper.getMainLooper()) - private val feed = GameFrameFeed(File(LinuxRuntime.rootDir(this.context), HudFrames.PATH)) + private val feed = GameFrameFeed.forRoot(LinuxRuntime.rootDir(this.context)) private val readings = MangoReadings(File(this.context.filesDir, "session"), LinuxRuntime.rootDir(this.context)) private var view: DroidDeckHudView? = null private var parent: ViewGroup? = null diff --git a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt index 2aba209ded..db5f74e4cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.hud import java.io.File +import java.io.RandomAccessFile import kotlin.math.roundToInt internal class FrameStats { @@ -159,7 +160,11 @@ internal class FrameStats { } } -internal class GameFrameFeed(private val file: File, val stats: FrameStats = FrameStats()) { +internal class GameFrameFeed( + private val file: File, + val stats: FrameStats = FrameStats(), + private val clockControl: File? = null, +) { private var handle = 0L private var nextOpenNs = 0L private var lastRingFrameNs = 0L @@ -171,6 +176,8 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra private var lastCompositorNs = 0L @Volatile private var compositorFrames = 0L private var seenCompositorFrames = 0L + private var clockShiftNs = 0L + private var clockShiftReadNs = Long.MIN_VALUE @Volatile var engine = "" private set @@ -199,6 +206,9 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra } val n = HudFrames.nativePoll(handle, frametimes, times) if (n > 0) { + var shift = guestClockShift(nowNs, SHIFT_NS) + if (nowNs - (times[n - 1] + shift) > LIVE_NS) shift = guestClockShift(nowNs, SHIFT_RECHECK_NS) + for (i in 0 until n) times[i] += shift if (!fromGamescope) { stats.reset() fromGamescope = true @@ -216,6 +226,16 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra return n > 0 || compositorAdded } + internal fun guestClockShift(nowNs: Long, maxAgeNs: Long): Long { + val control = clockControl ?: return 0L + if (clockShiftReadNs != Long.MIN_VALUE && nowNs - clockShiftReadNs < maxAgeNs) return clockShiftNs + clockShiftReadNs = nowNs + clockShiftNs = runCatching { + RandomAccessFile(control, "r").use { if (it.length() < Long.SIZE_BYTES) 0L else java.lang.Long.reverseBytes(it.readLong()) } + }.getOrDefault(0L).coerceAtLeast(0L) + return clockShiftNs + } + fun onCompositorFrame(nowNs: Long) { if (fromGamescope) { lastCompositorNs = 0L @@ -253,6 +273,11 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra private const val LIVE_NS = 2_000_000_000L private const val STALE_NS = 5_000_000_000L private const val INFO_NS = 500_000_000L + private const val SHIFT_NS = 1_000_000_000L + private const val SHIFT_RECHECK_NS = 100_000_000L + private const val CLOCK_CONTROL_PATH = "tmp/.bl-clock" + + fun forRoot(root: File) = GameFrameFeed(File(root, HudFrames.PATH), clockControl = File(root, CLOCK_CONTROL_PATH)) fun engineLabel(name: String): String = when (name) { "DXVK" -> "DXVK" diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java index 51a4e42608..1dc5a39bcd 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java @@ -651,15 +651,10 @@ public class HudMetrics { return currentRawToAmps(raw); } - public Integer getCpuClockMhz() { - int cores = Runtime.getRuntime().availableProcessors(); - long maxKhz = 0; - for (int i = 0; i < cores; i++) { - Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); - if (cur != null && cur > maxKhz) maxKhz = cur; - } - if (maxKhz <= 0) return null; - return (int) (maxKhz / 1000L); + static Integer fastestCoreMhz(int[] perCoreMhz) { + int max = 0; + for (int mhz : perCoreMhz) max = Math.max(max, mhz); + return max > 0 ? max : null; } private List gpuClockPathsCache = null; @@ -809,7 +804,8 @@ public class HudMetrics { if (mango != null) return mangoSnapshot(mango); Integer cpu = getCpuUsagePercent(); Integer gpu = getGpuUsagePercent(); - Integer cpuClk = getCpuClockMhz(); + int[] perCoreClk = getPerCoreClockMhz(); + Integer cpuClk = fastestCoreMhz(perCoreClk); Integer gpuClk = getGpuClockMhz(); Integer cpuTemp = getCpuTempC(); Integer gpuTemp = getGpuTempC(); @@ -829,7 +825,6 @@ public class HudMetrics { Battery battery = collectBattery(); int[] perCorePct = readPerCorePercent(); - int[] perCoreClk = getPerCoreClockMhz(); long[] swap = getSwapBytes(); long[] net = readNetRateBps(); @@ -850,24 +845,63 @@ public class HudMetrics { Battery battery = bat == null ? android : new Battery(bat.getWatts(), bat.getCharging(), bat.getPercent() != null ? bat.getPercent() : android.percent, android.tempC, android.runtimeText); long[] net = readNetRateBps(); - return new Snapshot(cpu != null ? cpu.getPercent() : null, m.gpuPercent(), getCpuClockMhz(), m.gpuClockMhz(), + int[] perCoreClk = getPerCoreClockMhz(); + return new Snapshot(cpu != null ? cpu.getPercent() : null, m.gpuPercent(), fastestCoreMhz(perCoreClk), m.gpuClockMhz(), m.cpuTempC(), m.gpuTempC(), used, total, total > 0 ? used * 100f / total : 0f, m.vramBytes(), battery, - cpu != null ? cpu.getPerCore() : new int[0], getPerCoreClockMhz(), + cpu != null ? cpu.getPerCore() : new int[0], perCoreClk, mem != null && mem.getSwapTotalBytes() > 0 ? mem.getSwapUsedBytes() : null, mem != null && mem.getSwapTotalBytes() > 0 ? mem.getSwapTotalBytes() : null, net == null ? null : net[0], net == null ? null : net[1]); } - public int[] getPerCoreClockMhz() { + private final java.util.Map lastTimeInState = new java.util.HashMap<>(); + + public synchronized int[] getPerCoreClockMhz() { int cores = Runtime.getRuntime().availableProcessors(); int[] out = new int[Math.max(0, cores)]; for (int i = 0; i < out.length; i++) { - Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); - out[i] = (cur != null && cur > 0) ? (int) (cur / 1000L) : 0; + long[][] table = readTimeInState("/sys/devices/system/cpu/cpu" + i + "/cpufreq/stats/time_in_state"); + long khz = table == null ? -1L : averageKhz(lastTimeInState.put(i, table), table); + if (khz <= 0L) { + Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); + khz = cur != null ? cur : 0L; + } + out[i] = khz > 0L ? (int) (khz / 1000L) : 0; } return out; } + static long averageKhz(long[][] before, long[][] after) { + if (before == null || after == null || !java.util.Arrays.equals(before[0], after[0])) return -1L; + long weighted = 0L, time = 0L; + for (int i = 0; i < after[0].length; i++) { + long dt = after[1][i] - before[1][i]; + if (dt <= 0L) continue; + weighted += after[0][i] * dt; + time += dt; + } + return time > 0L ? weighted / time : -1L; + } + + private static long[][] readTimeInState(String path) { + List rows = new ArrayList<>(); + try (BufferedReader r = new BufferedReader(new FileReader(path))) { + String line; + while ((line = r.readLine()) != null) { + String[] parts = line.trim().split("\\s+"); + if (parts.length < 2) continue; + try { rows.add(new long[] { Long.parseLong(parts[0]), Long.parseLong(parts[1]) }); } + catch (NumberFormatException ignored) {} + } + } catch (Exception e) { + return null; + } + if (rows.isEmpty()) return null; + long[][] table = new long[2][rows.size()]; + for (int i = 0; i < rows.size(); i++) { table[0][i] = rows.get(i)[0]; table[1][i] = rows.get(i)[1]; } + return table; + } + private long[] lastCoreTotal = null; private long[] lastCoreIdle = null; private static final int PER_CORE_STAT = 1, PER_CORE_ESTIMATE = 2; diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt index 3df2090bc4..60844df4de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt @@ -14,7 +14,6 @@ import androidx.compose.ui.platform.LocalContext import com.droiddeck.launcher.hud.DroidDeckHudConfig import com.droiddeck.launcher.hud.FrameStats import com.droiddeck.launcher.hud.GameFrameFeed -import com.droiddeck.launcher.hud.HudFrames import com.droiddeck.launcher.hud.HudMetrics import com.droiddeck.launcher.hud.KeyValueSet import com.droiddeck.launcher.hud.MangoReadings @@ -34,7 +33,7 @@ private const val STRIP_TEMP_PLAIN = 0xFFF2F5F9.toInt() @Composable internal fun SessionBottomStrip(pageId: String?, fps: () -> Float?) { val context = LocalContext.current - val frames = remember { GameFrameFeed(File(LinuxRuntime.rootDir(context), HudFrames.PATH)) } + val frames = remember { GameFrameFeed.forRoot(LinuxRuntime.rootDir(context)) } DisposableEffect(frames) { onDispose { frames.close() } } val page by rememberUpdatedState(pageId) var frameTick by remember { mutableIntStateOf(0) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt index 08b4ae8ada..4c454b52d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -55,7 +55,6 @@ import com.droiddeck.launcher.hud.DroidDeckHudConfig import com.droiddeck.launcher.hud.DroidDeckHudHost import com.droiddeck.launcher.hud.FrameStats import com.droiddeck.launcher.hud.GameFrameFeed -import com.droiddeck.launcher.hud.HudFrames import com.droiddeck.launcher.hud.HudMetrics import com.droiddeck.launcher.hud.KeyValueSet import com.droiddeck.launcher.hud.MangoReadings @@ -144,7 +143,7 @@ fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null } var perfTick by remember { mutableIntStateOf(0) } var traceTick by remember { mutableIntStateOf(0) } var clock by remember { mutableStateOf("") } - val frames = remember { GameFrameFeed(File(LinuxRuntime.rootDir(context), HudFrames.PATH)) } + val frames = remember { GameFrameFeed.forRoot(LinuxRuntime.rootDir(context)) } DisposableEffect(frames) { onDispose { frames.close() } } val currentFps = { if (frames.live) frames.stats.fps else fps() } var hud by remember { mutableStateOf(StatsHud.from(SessionPrefs.statsHud(context))) } diff --git a/app/src/test/java/com/droiddeck/launcher/hud/CoreClockAverageTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/CoreClockAverageTest.kt new file mode 100644 index 0000000000..80c1c7121c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/hud/CoreClockAverageTest.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.hud + +import org.junit.Assert.assertEquals +import org.junit.Test + +class CoreClockAverageTest { + private val freqs = longArrayOf(902_400L, 1_459_200L, 2_803_200L) + + @Test fun aCoreShowsTheClockItRanAtThroughTheSample() { + val before = arrayOf(freqs, longArrayOf(100L, 50L, 10L)) + val after = arrayOf(freqs, longArrayOf(125L, 50L, 35L)) + assertEquals(1_852_800L, HudMetrics.averageKhz(before, after)) + } + + @Test fun theFirstSampleOrAChangedTableFallsBack() { + val after = arrayOf(freqs, longArrayOf(1L, 2L, 3L)) + assertEquals(-1L, HudMetrics.averageKhz(null, after)) + assertEquals(-1L, HudMetrics.averageKhz(arrayOf(longArrayOf(1L), longArrayOf(0L)), after)) + assertEquals(-1L, HudMetrics.averageKhz(after, after)) + } + + @Test fun theCpuClockIsTheFastestCore() { + assertEquals(2_803, HudMetrics.fastestCoreMhz(intArrayOf(902, 2_803, 1_459))) + assertEquals(null, HudMetrics.fastestCoreMhz(intArrayOf(0, 0))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt index 724275fd35..20e83499e8 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt @@ -81,6 +81,21 @@ class FrameStatsTest { assertEquals(0, stats.slowFrames(now, 60_000_000_000L)) } + @Test fun guestFrameTimesMoveByThePausedSessionsClockShift() { + val control = java.io.File.createTempFile("bl-clock", null) + try { + control.writeBytes(java.nio.ByteBuffer.allocate(8).order(java.nio.ByteOrder.LITTLE_ENDIAN).putLong(62_283_930_706L).array()) + val feed = GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames"), clockControl = control) + assertEquals(62_283_930_706L, feed.guestClockShift(1_000_000_000L, 1_000_000_000L)) + control.writeBytes(java.nio.ByteBuffer.allocate(8).order(java.nio.ByteOrder.LITTLE_ENDIAN).putLong(70_000_000_000L).array()) + assertEquals(62_283_930_706L, feed.guestClockShift(1_050_000_000L, 1_000_000_000L)) + assertEquals(70_000_000_000L, feed.guestClockShift(1_200_000_000L, 100_000_000L)) + assertEquals(0L, GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames")).guestClockShift(0L, 0L)) + } finally { + control.delete() + } + } + @Test fun compositorFramesDoNotCountAsLiveGamescopeFrames() { val feed = GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames")) var now = 1_000_000_000L From 1b732c1b652a3bd44979f343436d5d0dba2c84dd Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 22:38:22 -0500 Subject: [PATCH 064/101] Fix agent pet overlay permission and GitHub setup (#2548) --- app/src/main/assets/agent/dd-gh-login | 26 ++++++------------- .../launcher/agent/AgentHostService.kt | 3 +++ .../droiddeck/launcher/agent/AgentSetup.kt | 5 +++- .../com/droiddeck/launcher/ui/AgentPet.kt | 4 +++ tools/agent/dd-gh-login | 25 +++++++----------- 5 files changed, 28 insertions(+), 35 deletions(-) diff --git a/app/src/main/assets/agent/dd-gh-login b/app/src/main/assets/agent/dd-gh-login index 86ff4707e0..d3c7517e55 100644 --- a/app/src/main/assets/agent/dd-gh-login +++ b/app/src/main/assets/agent/dd-gh-login @@ -1,27 +1,17 @@ #!/bin/bash -# GitHub sign-in through Android's browser, with the one-time code typed in for the person. -serial=${ADB_SERIAL:-127.0.0.1:5555} -display=${DD_BROWSER_DISPLAY:-0} -adb connect "$serial" >/dev/null 2>&1 +# Starts GitHub's device login and opens its approval page in Android. coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } -# bash drops GH and GH_PID once gh exits, which can be before the loop reads its last line. -ghpid=$GH_PID +gh_pid=$GH_PID exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" -typed= +shown= while IFS= read -r line <&"$ghout"; do printf '%s\n' "$line" code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) - if [ -n "$code" ] && [ -z "$typed" ]; then - typed=1 + if [ -n "$code" ] && [ -z "$shown" ]; then + shown=1 echo >&"$ghin" - adb -s "$serial" shell "am start --display $display -a android.intent.action.VIEW -d https://github.com/login/device" >/dev/null 2>&1 - # Chrome drops characters from `input text` and from fast key events on this page. - keys= - for ((i = 0; i < ${#code}; i++)); do - c=${code:i:1} - [ "$c" = - ] || keys+="input -d $display keyevent KEYCODE_$c; sleep 0.4; " - done - (sleep 7; adb -s "$serial" shell "$keys" >/dev/null 2>&1) & + printf 'GitHub device code: %s · github.com/login/device\n' "$code" + android-open https://github.com/login/device fi done -wait "$ghpid" +wait "$gh_pid" diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt index e8f3036d16..66fed326ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHostService.kt @@ -77,6 +77,9 @@ class AgentHostService : Service() { private fun describe(context: Context): String { val lab = AgentHost.lab?.takeIf { it.running } if (lab != null) return context.getString(R.string.agent_lab_progress, lab.permille / 10, minutes(lab.etaSeconds.toLong().coerceAtLeast(0))) + AgentSetup.detail[AgentSetup.Step.GITHUB]?.takeIf { + AgentSetup.status[AgentSetup.Step.GITHUB] == AgentSetup.Status.WORKING && it.startsWith("GitHub device code:") + }?.let { return it } if (AgentHost.state != AgentHost.State.WORKING) return context.getString(R.string.agent_setting_up) val tool = AgentHost.running() val elapsed = minutes((SystemClock.elapsedRealtime() - AgentHost.turnStarted) / 1000) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index f5c080a060..754dfa2ea9 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -106,7 +106,10 @@ object AgentSetup { child.inputStream.bufferedReader().forEachLine { line -> log.appendLine(line) val text = line.trim() - if (text.isNotEmpty() && !noise(text)) main.post { detail[step] = text.take(160) } + if (text.isNotEmpty() && !noise(text)) main.post { + detail[step] = text.take(160) + if (step == Step.GITHUB && text.startsWith("GitHub device code:")) AgentHostService.update(app) + } } child.waitFor().also { log.appendLine("exit $it") } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt index f154295450..8adadcab9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPet.kt @@ -116,6 +116,10 @@ internal object AgentPet { fun set(context: Context, on: Boolean) { enabled = on AgentHost.prefs(context).edit().putBoolean(KEY, on).apply() + if (on) { + allowed = PetWindows.allowed(context) + if (!allowed) requestFloating(context) + } } /** Opens the system page where the user lets DroidDeck draw over other apps. */ diff --git a/tools/agent/dd-gh-login b/tools/agent/dd-gh-login index adf816a247..d3c7517e55 100755 --- a/tools/agent/dd-gh-login +++ b/tools/agent/dd-gh-login @@ -1,24 +1,17 @@ #!/bin/bash -# GitHub sign-in through Android's browser on the bottom screen, with the one-time code typed in. -serial=${ADB_SERIAL:-127.0.0.1:5555} -adb connect "$serial" >/dev/null 2>&1 +# Starts GitHub's device login and opens its approval page in Android. coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } gh_pid=$GH_PID -typed= -while IFS= read -r line <&"${GH[0]}"; do +exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" +shown= +while IFS= read -r line <&"$ghout"; do printf '%s\n' "$line" code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) - if [ -n "$code" ] && [ -z "$typed" ]; then - typed=1 - echo >&"${GH[1]}" - adb -s "$serial" shell "am start --display 2 -a android.intent.action.VIEW -d https://github.com/login/device" >/dev/null 2>&1 - # Chrome drops characters from `input text` and from fast key events on this page. - keys= - for ((i = 0; i < ${#code}; i++)); do - c=${code:i:1} - [ "$c" = - ] || keys+="input -d 2 keyevent KEYCODE_$c; sleep 0.4; " - done - (sleep 7; adb -s "$serial" shell "$keys" >/dev/null 2>&1) & + if [ -n "$code" ] && [ -z "$shown" ]; then + shown=1 + echo >&"$ghin" + printf 'GitHub device code: %s · github.com/login/device\n' "$code" + android-open https://github.com/login/device fi done wait "$gh_pid" From bb05e20d1b72ea288d45270fbebb7774f383cc3c Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 12 Nov 2026 22:39:06 -0500 Subject: [PATCH 065/101] feat(library): pick the game resolution for games started without Steam (#2520) --- .../launcher/core/GameEnvironment.kt | 10 +++ .../droiddeck/launcher/core/GameResolution.kt | 70 +++++++++++++++++++ .../launcher/session/GameEnvironmentStore.kt | 7 ++ .../launcher/session/NoSteamLaunch.kt | 19 +++++ .../launcher/session/SelectedGameProfile.kt | 2 +- .../launcher/session/SessionService.kt | 8 +++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 64 +++++++++++++++++ app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../launcher/core/GameResolutionTest.kt | 60 ++++++++++++++++ .../overlay/usr/local/bin/droiddeck-session | 8 ++- tools/tests/test_game_resolution.py | 53 ++++++++++++++ 43 files changed, 332 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/core/GameResolution.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/core/GameResolutionTest.kt create mode 100644 tools/tests/test_game_resolution.py diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt index 26ffb499cc..53f152a60b 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt @@ -49,6 +49,16 @@ object GameEnvironment { return withScopeValue(config, scope, NO_STEAM, if (on) "1" else null) } + const val GAME_RESOLUTION = "DROIDDECK_GAME_RESOLUTION" + + fun gameResolution(config: Config, scope: String): GameResolution.Choice? = + if (scope.isEmpty()) null else GameResolution.parse(config.games[scope]?.get(GAME_RESOLUTION)) + + fun withGameResolution(config: Config, scope: String, choice: GameResolution.Choice?): Config { + require(scope.isNotEmpty() && validScope(scope)) + return withScopeValue(config, scope, GAME_RESOLUTION, choice?.let(GameResolution::format)) + } + fun effective(config: Config, preset: String, scope: String, forceSsbs: Boolean = false): Map = defaults(preset, forceSsbs) + config.shared + if (scope.isEmpty()) emptyMap() else config.games[scope].orEmpty() diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameResolution.kt b/app/src/main/java/com/droiddeck/launcher/core/GameResolution.kt new file mode 100644 index 0000000000..0255d9616b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/GameResolution.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.core + +object GameResolution { + sealed interface Choice + data class Fixed(val width: Int, val height: Int) : Choice + data class Scaled(val scale: Float) : Choice + + data class Aspect(val label: String, val sizes: List) + + val aspects = listOf( + Aspect("16:9", listOf(Fixed(960, 540), Fixed(1280, 720), Fixed(1600, 900), Fixed(1920, 1080), Fixed(2560, 1440))), + Aspect("16:10", listOf(Fixed(1280, 800), Fixed(1440, 900), Fixed(1680, 1050), Fixed(1920, 1200), Fixed(2560, 1600))), + Aspect("4:3", listOf(Fixed(640, 480), Fixed(800, 600), Fixed(1024, 768), Fixed(1280, 960), Fixed(1440, 1080))), + ) + + val scales = listOf(1.5f, 2f, 3f) + + const val MIN_WIDTH = 320 + const val MIN_HEIGHT = 240 + const val MAX_SIDE = 7680 + private const val SCALED_PREFIX = "/" + + fun parse(value: String?): Choice? { + val text = value?.trim().orEmpty() + if (text.startsWith(SCALED_PREFIX)) { + return text.removePrefix(SCALED_PREFIX).toFloatOrNull()?.takeIf { it > 1f && it <= 8f }?.let(::Scaled) + } + val parts = text.split('x', 'X', '×').map { it.trim().toIntOrNull() } + if (parts.size != 2) return null + val (w, h) = parts + return if (w != null && h != null && valid(w, h)) Fixed(w and 1.inv(), h and 1.inv()) else null + } + + fun valid(width: Int, height: Int) = width in MIN_WIDTH..MAX_SIDE && height in MIN_HEIGHT..MAX_SIDE + + fun format(choice: Choice): String = when (choice) { + is Fixed -> "${choice.width}x${choice.height}" + is Scaled -> SCALED_PREFIX + formatScale(choice.scale) + } + + fun formatScale(scale: Float): String = + (Math.round(scale * 10) / 10f).let { if (it % 1f == 0f) it.toInt().toString() else it.toString() } + + fun resolve(choice: Choice, output: Pair): Pair = when (choice) { + is Fixed -> choice.width to choice.height + is Scaled -> (Math.round(output.first / choice.scale).coerceAtLeast(MIN_WIDTH) and 1.inv()) to + (Math.round(output.second / choice.scale).coerceAtLeast(MIN_HEIGHT) and 1.inv()) + } + + fun aspectLabel(width: Int, height: Int): String { + if (width <= 0 || height <= 0) return "" + val ratio = width.toFloat() / height + aspects.firstOrNull { a -> + val (w, h) = a.label.split(':').map(String::toFloat) + kotlin.math.abs(ratio - w / h) < 0.02f + }?.let { return it.label } + if (kotlin.math.abs(ratio - 64f / 27f) < 0.04f || kotlin.math.abs(ratio - 21f / 9f) < 0.04f) return "21:9" + val g = gcd(width, height) + return if (width / g <= 32) "${width / g}:${height / g}" else String.format(java.util.Locale.ROOT, "%.2f:1", ratio) + } + + fun sizesFor(aspect: Aspect, panel: Pair): List { + val long = maxOf(panel.first, panel.second) + val short = minOf(panel.first, panel.second) + val fit = aspect.sizes.filter { it.width <= long && it.height <= short } + return fit.ifEmpty { aspect.sizes.take(1) } + } + + private tailrec fun gcd(a: Int, b: Int): Int = if (b == 0) a else gcd(b, a % b) +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt index 2a19f39abc..81dc109d67 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt @@ -79,6 +79,13 @@ object GameEnvironmentStore { return config } + @Synchronized + fun setGameResolution(context: Context, scope: String, choice: com.droiddeck.launcher.core.GameResolution.Choice?): GameEnvironment.Config { + val config = GameEnvironment.withGameResolution(read(context), scope, choice) + save(context, config) + return config + } + @Synchronized fun setDefault(context: Context, scope: String, name: String, value: String): Boolean { val config = read(context) diff --git a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt index 8d8070f875..a1f39ae470 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt @@ -30,6 +30,25 @@ object NoSteamLaunch { GameEnvironment.gameNoSteam(GameEnvironmentStore.read(context), (appId and 0xFFFFFFFFL).toString()) }.getOrDefault(false) + fun scopeOf(program: String?, args: List, battleNetTitle: (String) -> String? = { null }): String? = when (program) { + EPIC -> EpicClient.shortcutAppId.toString() + BATTLENET -> args.getOrNull(args.indexOf("launch") + 1)?.takeIf { args.contains("launch") }?.let(battleNetTitle) + ?: com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString() + PROTON_RUN -> args.getOrNull(args.indexOf("--app") + 1)?.takeIf { args.contains("--app") } + else -> null + }?.takeIf { it.isNotEmpty() && GameEnvironment.validScope(it) } + + fun battleNetTitleScope(context: Context, code: String): String? = + AddedGames.scan(context).firstOrNull { game -> + game.source == com.droiddeck.launcher.stores.Store.BATTLENET.id && + game.storeId?.let(com.droiddeck.launcher.runtime.BattleNet::title)?.code == code + }?.let { settingsId(it).toString() } + + fun resolution(config: GameEnvironment.Config, scope: String?, output: Pair): Pair? { + val choice = scope?.let { GameEnvironment.gameResolution(config, it) } ?: return null + return com.droiddeck.launcher.core.GameResolution.resolve(choice, output) + } + fun command(game: Library.SteamGame, added: AddedGames.Game?): Command? = when { game.library == Library.EPIC_LAUNCHER -> Command(EPIC, listOf("run"), game.name) game.library == Library.ADDED && game.source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> diff --git a/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt b/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt index cdcc617a61..c3df4a97c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SelectedGameProfile.kt @@ -59,7 +59,7 @@ data class SelectedGameProfile( ) } val otherEnvironment = environment.games[game.profileKey].orEmpty().keys - FexPreset.environmentKeys - - GameEnvironment.NO_STEAM + GameEnvironment.NO_STEAM - GameEnvironment.GAME_RESOLUTION return SelectedGameProfile( appId = selectedAppId, name = game.name, 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 232eaf0c6d..3e7f30b15f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -588,6 +588,14 @@ class SessionService : Service() { guest.add("BL_WIDTH=" + size.first) guest.add("BL_HEIGHT=" + size.second) + if (noSteamGame()) runCatching { + val scope = NoSteamLaunch.scopeOf(SessionState.program, SessionState.programArgs) { NoSteamLaunch.battleNetTitleScope(this, it) } + NoSteamLaunch.resolution(GameEnvironmentStore.read(this), scope, size) + }.onFailure { Log.w(TAG, "game resolution", it) }.getOrNull()?.let { (w, h) -> + guest.add("BL_GAME_WIDTH=$w") + guest.add("BL_GAME_HEIGHT=$h") + Log.i(TAG, "game resolution: ${w}x$h on a ${size.first}x${size.second} output") + } if (SessionState.followScreen || size.first < size.second || SessionPrefs.orientation(this) == android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) guest.add("BL_FOLLOW_OUTPUT=1") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 0e22804a63..3655ec0959 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -918,12 +918,37 @@ internal fun GameSettingsMenus(host: MenuHost, game: com.droiddeck.launcher.fron val custom = stringResource(R.string.comp_game_fex_custom) val customSync = stringResource(R.string.game_sync_custom) val resetDone = stringResource(R.string.comp_game_reset_done, game.name) + val resKey = "game-settings-res" + val resolution = current?.let { com.droiddeck.launcher.core.GameEnvironment.gameResolution(it, scope) } + val screen = remember { com.droiddeck.launcher.session.SessionDisplay.screenSize(com.droiddeck.launcher.session.SessionDisplay.panelSize(appContext)) } + val matchScreen = stringResource(R.string.display_match_screen, screen.first, screen.second) + val scaledLabels = com.droiddeck.launcher.core.GameResolution.scales.associateWith { + stringResource(R.string.display_follow_screen_scaled, com.droiddeck.launcher.core.GameResolution.formatScale(it)) + } + fun sizeLabel(size: Pair) = "${size.first}×${size.second} · ${com.droiddeck.launcher.core.GameResolution.aspectLabel(size.first, size.second)}" + fun resolutionLabel(choice: com.droiddeck.launcher.core.GameResolution.Choice?): String = when (choice) { + null -> matchScreen + is com.droiddeck.launcher.core.GameResolution.Scaled -> (scaledLabels[choice.scale] + ?: "÷" + com.droiddeck.launcher.core.GameResolution.formatScale(choice.scale)) + + " · " + sizeLabel(com.droiddeck.launcher.core.GameResolution.resolve(choice, screen)) + is com.droiddeck.launcher.core.GameResolution.Fixed -> sizeLabel(choice.width to choice.height) + } + fun pickResolution(choice: com.droiddeck.launcher.core.GameResolution.Choice?) { + host.open = key + save { com.droiddeck.launcher.session.GameEnvironmentStore.setGameResolution(it, scope, choice) } + } + var editResolution by remember(scope) { mutableStateOf(false) } AnchoredMenu(host.open == key, onDismiss = { if (host.open == key) host.open = null }, title = stringResource(R.string.game_settings_menu_title, game.name)) { first -> MenuItem(stringResource(R.string.game_no_steam_title), checked = noSteam, enabled = ready, detail = stringResource(R.string.game_no_steam_detail), focusRequester = first) { val on = !noSteam save { com.droiddeck.launcher.session.GameEnvironmentStore.setGameNoSteam(it, scope, on) } } + if (noSteam) MenuItem( + stringResource(R.string.game_res_title), checked = false, enabled = ready, + detail = resolutionLabel(resolution), + trailing = { Text("›", fontSize = 16.sp, color = colors.onSurfaceVariant) }, + ) { host.open = resKey } if (!launcher) { val chosen = com.droiddeck.launcher.core.FexPreset.all.firstOrNull { it.id == fex } MenuItem( @@ -960,6 +985,45 @@ internal fun GameSettingsMenus(host: MenuHost, game: com.droiddeck.launcher.fron } } } + AnchoredMenu(host.open == resKey, onDismiss = { if (host.open == resKey) host.open = null }, title = stringResource(R.string.game_res_title)) { first -> + MenuItem(matchScreen, checked = resolution == null, enabled = ready, focusRequester = first) { pickResolution(null) } + com.droiddeck.launcher.core.GameResolution.scales.forEach { scale -> + val choice = com.droiddeck.launcher.core.GameResolution.Scaled(scale) + MenuItem(scaledLabels.getValue(scale), checked = resolution == choice, enabled = ready, + detail = sizeLabel(com.droiddeck.launcher.core.GameResolution.resolve(choice, screen))) { pickResolution(choice) } + } + com.droiddeck.launcher.core.GameResolution.aspects.forEach { aspect -> + val sizes = com.droiddeck.launcher.core.GameResolution.sizesFor(aspect, screen) + MenuItem(aspect.label, checked = resolution in aspect.sizes, enabled = ready, + detail = sizes.joinToString(" · ") { "${it.width}×${it.height}" }, + trailing = { Text("›", fontSize = 16.sp, color = colors.onSurfaceVariant) }, + ) { host.open = "$resKey-${aspect.label}" } + } + val fixed = resolution as? com.droiddeck.launcher.core.GameResolution.Fixed + val customValue = fixed?.takeIf { f -> com.droiddeck.launcher.core.GameResolution.aspects.none { f in it.sizes } } + MenuItem( + if (customValue == null) stringResource(R.string.mode_res_custom) else stringResource(R.string.mode_res_custom_value, customValue.width, customValue.height), + checked = customValue != null, enabled = ready, + detail = customValue?.let { com.droiddeck.launcher.core.GameResolution.aspectLabel(it.width, it.height) }, + ) { editResolution = true } + } + com.droiddeck.launcher.core.GameResolution.aspects.forEach { aspect -> + val aspectKey = "$resKey-${aspect.label}" + AnchoredMenu(host.open == aspectKey, onDismiss = { if (host.open == aspectKey) host.open = null }, title = aspect.label) { first -> + com.droiddeck.launcher.core.GameResolution.sizesFor(aspect, screen).forEachIndexed { index, size -> + MenuItem("${size.width}×${size.height}", checked = resolution == size, enabled = ready, + focusRequester = if (index == 0) first else null) { pickResolution(size) } + } + } + } + if (editResolution) CustomResolutionDialog( + (resolution as? com.droiddeck.launcher.core.GameResolution.Fixed)?.let { it.width to it.height }, + onSave = { value -> + editResolution = false + pickResolution(com.droiddeck.launcher.core.GameResolution.Fixed(value.first, value.second)) + }, + onDismiss = { editResolution = false }, + ) AnchoredMenu(host.open == fexKey, onDismiss = { if (host.open == fexKey) host.open = null }, title = stringResource(R.string.fex_preset_title)) { first -> MenuItem(useDefault, checked = fex == null, enabled = ready, detail = stringResource(generalFex.label), focusRequester = first) { host.open = key diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 7c2811030a..36d31630f5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -488,6 +488,7 @@ تشغيل يبدأ مع Steam يبدأ بدون Steam + دقة اللعبة الإعدادات إعدادات %1$s الافتراضي 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 078d972636..d9ef13c8b1 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -482,6 +482,7 @@ Activado Se inicia con Steam Se inicia sin Steam + Resolución del juego Ajustes Ajustes de %1$s Predeterminado diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index dc02c0948f..55449ac2f4 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -480,6 +480,7 @@ Включено Стартира със Steam Стартира без Steam + Резолюция на играта Настройки Настройки на %1$s По подразбиране diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 691da1a73c..35282822a5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -484,6 +484,7 @@ Zapnuto Spouští se se Steamem Spouští se bez Steamu + Rozlišení hry Nastavení Nastavení %1$s Výchozí diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f1b55c9650..7a5aa072ef 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -480,6 +480,7 @@ Til Starter med Steam Starter uden Steam + Spilopløsning Indstillinger Indstillinger for %1$s Standard diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7d5ded3548..1d15db3d88 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -480,6 +480,7 @@ An Startet mit Steam Startet ohne Steam + Spielauflösung Einstellungen Einstellungen für %1$s Standard diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index e31df6b602..27692a1325 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -480,6 +480,7 @@ Ενεργό Ξεκινά με το Steam Ξεκινά χωρίς το Steam + Ανάλυση παιχνιδιού Ρυθμίσεις Ρυθμίσεις %1$s Προεπιλογή diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c4639709ad..adea64b8f4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -482,6 +482,7 @@ Activado Se inicia con Steam Se inicia sin Steam + Resolución del juego Ajustes Ajustes de %1$s Predeterminado diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9dcb88f402..481ed7ca5c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -480,6 +480,7 @@ Päällä Käynnistyy Steamin kanssa Käynnistyy ilman Steamia + Pelin resoluutio Asetukset %1$s – asetukset Oletus diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 412575e608..61accc73a6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -482,6 +482,7 @@ Activé Démarre avec Steam Démarre sans Steam + Résolution du jeu Paramètres Paramètres de %1$s Par défaut diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c6042223f0..72f0917b03 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -480,6 +480,7 @@ चालू Steam के साथ शुरू होता है Steam के बिना शुरू होता है + गेम रिज़ॉल्यूशन सेटिंग %1$s सेटिंग डिफ़ॉल्ट diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4d86e51f7e..409a9e72f8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -480,6 +480,7 @@ Be Steammel indul Steam nélkül indul + Játék felbontása Beállítások %1$s beállításai Alapértelmezett diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index cecc8289f0..81ded51384 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -478,6 +478,7 @@ Aktif Dimulai dengan Steam Dimulai tanpa Steam + Resolusi game Setelan Setelan %1$s Default diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 58b65563ea..f8f6c7866c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -482,6 +482,7 @@ Attivo Si avvia con Steam Si avvia senza Steam + Risoluzione del gioco Impostazioni Impostazioni di %1$s Predefinito diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0cdcc111bd..fe43ef5ee0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -478,6 +478,7 @@ オン Steam と一緒に起動 Steam なしで起動 + ゲームの解像度 設定 %1$s の設定 デフォルト diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index fc352bcc37..e00a044135 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -478,6 +478,7 @@ 켜짐 Steam과 함께 시작 Steam 없이 시작 + 게임 해상도 설정 %1$s 설정 기본값 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 7135bd5457..58caf14b83 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -478,6 +478,7 @@ Hidup Bermula dengan Steam Bermula tanpa Steam + Resolusi permainan Tetapan Tetapan %1$s Lalai diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f1a5b47fae..f56b734f56 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -480,6 +480,7 @@ På Starter med Steam Starter uten Steam + Spilloppløsning Innstillinger Innstillinger for %1$s Standard diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index eff91dd724..4240b47aee 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -480,6 +480,7 @@ Aan Start met Steam Start zonder Steam + Spelresolutie Instellingen Instellingen voor %1$s Standaard diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 1267e54be9..2c789b65d2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -484,6 +484,7 @@ Wł. Uruchamia się ze Steam Uruchamia się bez Steam + Rozdzielczość gry Ustawienia Ustawienia: %1$s Domyślne diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 2db4dbb6ec..dde7bf233f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -482,6 +482,7 @@ Ativado Inicia com o Steam Inicia sem o Steam + Resolução do jogo Definições Definições de %1$s Predefinição diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 643b20e847..1bf1feb07a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -482,6 +482,7 @@ Ativado Inicia com o Steam Inicia sem o Steam + Resolução do jogo Configurações Configurações de %1$s Padrão diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 3838347619..a2e10057d6 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -482,6 +482,7 @@ Activat Pornește cu Steam Pornește fără Steam + Rezoluția jocului Setări Setări %1$s Implicit diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 41cbd27d7c..88dbfbc2fd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -503,6 +503,7 @@ Включено Запускается со Steam Запускается без Steam + Разрешение игры Настройки Настройки %1$s По умолчанию diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5a6c222004..e0754fe02b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -480,6 +480,7 @@ På Startar med Steam Startar utan Steam + Spelupplösning Inställningar Inställningar för %1$s Standard diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1e4d92cbf1..e483bfead0 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -478,6 +478,7 @@ เปิด เริ่มพร้อม Steam เริ่มโดยไม่ใช้ Steam + ความละเอียดของเกม การตั้งค่า การตั้งค่า %1$s ค่าเริ่มต้น diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 906d04d13b..479e767c1b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -480,6 +480,7 @@ Açık Steam ile başlar Steam olmadan başlar + Oyun çözünürlüğü Ayarlar %1$s Ayarları Varsayılan diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5767ee73a2..ea4e958377 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -484,6 +484,7 @@ Увімкнено Запускається зі Steam Запускається без Steam + Роздільна здатність гри Налаштування Налаштування %1$s За замовчуванням diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c21f685321..e6b9a21732 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -478,6 +478,7 @@ Bật Khởi động cùng Steam Khởi động không cần Steam + Độ phân giải trò chơi Thiết lập Thiết lập %1$s Mặc định diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5e9acd782f..67e815130d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -478,6 +478,7 @@ 开 随 Steam 启动 不通过 Steam 启动 + 游戏分辨率 设置 %1$s 设置 默认 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 64f8133583..f97f66c3a1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -478,6 +478,7 @@ 開 隨 Steam 啟動 不經 Steam 啟動 + 遊戲解像度 設定 %1$s 設定 預設 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 30ef0996e5..ee48c655e2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -478,6 +478,7 @@ 開 隨 Steam 啟動 不經 Steam 啟動 + 遊戲解析度 設定 %1$s 設定 預設 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e4611630b9..f1a5dcf3f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -528,6 +528,7 @@ On Starts with Steam Starts without Steam + Game resolution Settings %1$s Settings Default diff --git a/app/src/test/java/com/droiddeck/launcher/core/GameResolutionTest.kt b/app/src/test/java/com/droiddeck/launcher/core/GameResolutionTest.kt new file mode 100644 index 0000000000..5a76e0525e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/GameResolutionTest.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.core + +import com.droiddeck.launcher.session.NoSteamLaunch +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class GameResolutionTest { + @Test + fun choicesRoundTripThroughTheStoredValue() { + for (choice in listOf(GameResolution.Fixed(1280, 720), GameResolution.Scaled(1.5f), GameResolution.Scaled(2f))) { + assertEquals(choice, GameResolution.parse(GameResolution.format(choice))) + } + assertEquals("1280x720", GameResolution.format(GameResolution.Fixed(1280, 720))) + assertEquals("/1.5", GameResolution.format(GameResolution.Scaled(1.5f))) + } + + @Test + fun invalidValuesAreIgnored() { + for (value in listOf(null, "", "abc", "100x100", "1280", "1280x720x2", "/1", "/0.5", "/9")) { + assertNull(value, GameResolution.parse(value)) + } + } + + @Test + fun aScaleDividesTheOutputToEvenSides() { + assertEquals(1706 to 1066, GameResolution.resolve(GameResolution.Scaled(1.5f), 2560 to 1600)) + assertEquals(1280 to 800, GameResolution.resolve(GameResolution.Scaled(2f), 2560 to 1600)) + assertEquals(1280 to 720, GameResolution.resolve(GameResolution.Fixed(1280, 720), 2560 to 1600)) + } + + @Test + fun aspectRatiosAreNamed() { + assertEquals("16:9", GameResolution.aspectLabel(1920, 1080)) + assertEquals("16:10", GameResolution.aspectLabel(2560, 1600)) + assertEquals("4:3", GameResolution.aspectLabel(1024, 768)) + assertEquals("21:9", GameResolution.aspectLabel(2560, 1080)) + assertEquals("20:9", GameResolution.aspectLabel(2400, 1080)) + } + + @Test + fun presetsLargerThanThePanelAreLeftOut() { + val wide = GameResolution.aspects.first { it.label == "16:9" } + assertEquals(listOf(960 to 540, 1280 to 720, 1600 to 900, 1920 to 1080), + GameResolution.sizesFor(wide, 1920 to 1200).map { it.width to it.height }) + } + + @Test + fun theSessionFindsTheResolutionOfTheGameItStarts() { + val config = GameEnvironment.withGameResolution(GameEnvironment.Config(), "570", GameResolution.Fixed(1280, 800)) + val scope = NoSteamLaunch.scopeOf(NoSteamLaunch.PROTON_RUN, listOf("--app", "570")) + assertEquals("570", scope) + assertEquals(1280 to 800, NoSteamLaunch.resolution(config, scope, 2560 to 1600)) + assertNull(NoSteamLaunch.resolution(config, "440", 2560 to 1600)) + assertEquals("123", NoSteamLaunch.scopeOf(NoSteamLaunch.BATTLENET, listOf("launch", "WTCG")) { if (it == "WTCG") "123" else null }) + assertEquals(com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString(), + NoSteamLaunch.scopeOf(NoSteamLaunch.BATTLENET, listOf("launch", "Pro"))) + assertNull(GameEnvironment.withGameResolution(config, "570", null).games["570"]) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 8bb519db52..fbea003241 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -511,6 +511,12 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: games at ${nested}x${nested_h} stretched to the ${width}x${height} output" fi fi + if [ "$mode" = run ] && [ "${BL_GAME_WIDTH:-0}" -gt 0 ] && [ "${BL_GAME_HEIGHT:-0}" -gt 0 ]; then + nested=$BL_GAME_WIDTH + nested_h=$BL_GAME_HEIGHT + game_size=1 + echo "== gamescope: the game runs at ${nested}x${nested_h}, scaled to the ${width}x${height} output with its proportions kept" + fi backend=${BL_GAMESCOPE_BACKEND:-wayland} case "$backend" in wayland) ;; @@ -528,7 +534,7 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: composites every frame (Mali bridge: the Steam UI flickers on separate planes)" fi args=(--backend "$backend" --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$nested_h") - if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then + if [ "${game_size:-0}" != 1 ] && { [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; }; then args+=(-S stretch) export BL_STRETCHED=1 fi diff --git a/tools/tests/test_game_resolution.py b/tools/tests/test_game_resolution.py new file mode 100644 index 0000000000..78c5fb3d98 --- /dev/null +++ b/tools/tests/test_game_resolution.py @@ -0,0 +1,53 @@ +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' + + +class GameResolutionTest(unittest.TestCase): + def launch(self, mode, **overrides): + source = SESSION.read_text() + start = source.index(' width=${BL_WIDTH:-1280}') + end = source.index('\nfi\n\nbl_displays()', start) + block = source[start:end].replace('/usr/local/bin/droiddeck-pipewire', 'pipewire_stub') + with tempfile.TemporaryDirectory() as directory: + env = dict(os.environ, XDG_RUNTIME_DIR=directory, BL_REFRESH='60', BL_MANGOAPP='0', + BL_WIDTH='2560', BL_HEIGHT='1600') + for name in ('BL_GAME_WIDTH', 'BL_GAME_HEIGHT', 'BL_FOLLOW_OUTPUT', 'BL_GAMESCOPE_STRETCH_16X9'): + env.pop(name, None) + env.update(overrides) + fake = Path(directory) / 'gamescope' + fake.write_text('#!/bin/bash\nprintf "ARG:%s\\n" "$@"\n') + fake.chmod(0o755) + env['PATH'] = directory + os.pathsep + env['PATH'] + script = f''' +set -u +mode={mode} +pipewire_stub() {{ return 1; }} +run_gamescope() {{ printf 'ARG:%s\n' "$@"; }} +''' + block + result = subprocess.run(['bash', '-c', script], env=env, capture_output=True, text=True, timeout=5) + self.assertEqual(0, result.returncode, result.stderr) + return [line.removeprefix('ARG:') for line in result.stdout.splitlines() if line.startswith('ARG:')] + + def test_a_game_started_without_steam_runs_at_its_resolution_with_proportions_kept(self): + args = self.launch('run', BL_GAME_WIDTH='1280', BL_GAME_HEIGHT='720') + self.assertEqual(['2560', '1600'], [args[args.index('-W') + 1], args[args.index('-H') + 1]]) + self.assertEqual(['1280', '720'], [args[args.index('-w') + 1], args[args.index('-h') + 1]]) + self.assertNotIn('-S', args) + + def test_without_a_game_resolution_the_game_matches_the_output(self): + args = self.launch('run') + self.assertEqual(['2560', '1600'], [args[args.index('-w') + 1], args[args.index('-h') + 1]]) + + def test_steam_ignores_the_game_resolution(self): + args = self.launch('steam', BL_GAME_WIDTH='1280', BL_GAME_HEIGHT='720') + self.assertEqual(['2560', '1600'], [args[args.index('-w') + 1], args[args.index('-h') + 1]]) + + +if __name__ == '__main__': + unittest.main() From f33181e430ac3009c29c918428fec6769cfcf07a Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 00:55:18 -0500 Subject: [PATCH 066/101] fix(proot): fchdir takes the open directory's path instead of walking it again (#2553) * fix(proot): fchdir takes the open directory's path instead of walking it again * fix(proot): fchdir keeps trailing-period names and rechecks the binding's parent The descriptor path now carries the same final marker the walk produced, so a directory whose name ends with a period is not truncated. The parent of the matching binding is resolved again, so a binding whose ancestor was replaced by a symlink takes the full walk as before. The check script gains a trailing-period directory. * fix(proot): fchdir requires the binding's parent to be a directory --- docs/development/proot-performance.md | 2 +- tools/proot/PATCHES.md | 12 ++ tools/proot/bench/fchdir.py | 105 +++++++++++++++++ .../patches/0028-fchdir-open-directory.patch | 108 ++++++++++++++++++ 4 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 tools/proot/bench/fchdir.py create mode 100644 tools/proot/patches/0028-fchdir-open-directory.patch diff --git a/docs/development/proot-performance.md b/docs/development/proot-performance.md index 1cddb33976..634b7bc63a 100644 --- a/docs/development/proot-performance.md +++ b/docs/development/proot-performance.md @@ -204,7 +204,7 @@ call can be answered in-process with the 0014 design. | syscalls | why proot traps them | can it bypass proot? | |---|---|---| | `openat`/`open`/`creat`, `newfstatat`/`stat`/`lstat`, `statx`, `faccessat`/`access`, `readlinkat` (exit), `mkdirat`, `unlinkat`, `renameat(2)`, `symlinkat`, `linkat`, `fchmodat`, `fchownat`, `utimensat`, `truncate`, `*xattr`, `inotify_add_watch`, `name_to_handle_at` | path translation (guest → host), plus exit fixups for `readlink` and `rename` | **Yes, through libc wrappers.** The prototype covers open, stat, statx, access, readlink, opendir and fopen; the write family is next. Raw `svc` and glibc's internal callers (ld.so, fts, realpath, nss) still go to proot. | -| `chdir`/`fchdir`, `getcwd` (exit) | proot emulates the cwd; until 0014 the kernel's cwd never moved | With 0014 the kernel's cwd follows the guest's. `getcwd` stays in proot (cheap, rare). | +| `chdir`/`fchdir`, `getcwd` (exit) | proot emulates the cwd; until 0014 the kernel's cwd never moved | With 0014 the kernel's cwd follows the guest's. With 0028 `fchdir` takes the path of the open directory from `/proc//fd` instead of walking it again. `getcwd` stays in proot (cheap, rare). | | `execve`/`execveat` | runs the loader, maps `PT_INTERP` inside the rootfs, shebangs, tracks `/proc/self/exe` | **No.** This is the core of what proot is for. Costs 0.4–0.8 ms per exec; the session scripts already avoid exec-heavy loops (`nap`). | | `brk` (entry and exit) | heap emulation: programs are mapped by proot's loader, so the kernel's brk area is the loader's | No (`PR_SET_MM` needs `CAP_SYS_RESOURCE`). **Fewer calls:** `GLIBC_TUNABLES=glibc.malloc.top_pad=…` grows the heap in larger steps. | | `bind`, `connect`, `accept(4)`, `getsockname`, `getpeername` | `sun_path` of Unix sockets | Same-path binds (runtime dir, files dir) need no translation, but the filter can't see the address. Possible fast-path candidate. | diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index 3099009c57..6347023473 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -170,6 +170,18 @@ Prototype (inert unless `PROOT_FASTPATH` is set; see `docs/development/proot-per Old kernel fixes: +- `0028-fchdir-open-directory.patch` - `fchdir` resolved the directory again from its guest path, + one `lstat` per path component, then an `lstat` and an `O_PATH` open of the result. The + descriptor is already open, so `/proc//fd/` gives its host path and one `stat` through + that link confirms it is a live directory. The guest path it maps to is checked to map back to + the same host path, and the parent of the binding it falls under is checked to still resolve + to itself, so the cwd PRoot records is the one the old walk produced; a deleted directory, a + path outside the guest, a binding whose ancestor became a symlink, or anything else that does + not round-trip takes the old walk. Listing a directory in Wine does `fchdir` there and back: on a memory card behind + Android's FUSE daemon the old walk cost about 4 ms per call in the single tracer thread, 8.4 s + of an 8.8 s tracer total across one program start, and is now under 0.1 ms. + `bench/fchdir.py [directory...]` checks the cwd after `fchdir` to plain, bound, symlinked, + renamed and deleted directories and prints the per-call cost. - `0015-lost-fork-events.patch` - works around a problem reported on Xiaomi's msm 4.14 kernel: the kernel sometimes reports a new process or thread but gives its ID as zero. Without that ID, PRoot cannot finish setting it up, which can leave the session stuck. The patch searches `/proc` diff --git a/tools/proot/bench/fchdir.py b/tools/proot/bench/fchdir.py new file mode 100644 index 0000000000..e8d5c9141f --- /dev/null +++ b/tools/proot/bench/fchdir.py @@ -0,0 +1,105 @@ +import errno +import os +import sys +import tempfile +import time + + +def report(label, check): + try: + print(label, check()) + except OSError as error: + print(label, "ERR", errno.errorcode.get(error.errno, error.errno)) + + +def enter(path): + fd = os.open(path, os.O_RDONLY | os.O_DIRECTORY) + try: + os.fchdir(fd) + return os.getcwd(), os.readlink("/proc/self/cwd"), os.path.samefile(".", path) + finally: + os.close(fd) + + +def enter_file(base): + fd = os.open(base + "/real/file", os.O_RDONLY) + try: + os.fchdir(fd) + finally: + os.close(fd) + + +def enter_deleted(base): + os.mkdir(base + "/gone") + fd = os.open(base + "/gone", os.O_RDONLY) + os.rmdir(base + "/gone") + try: + os.fchdir(fd) + return "ok" + finally: + os.close(fd) + os.chdir("/") + + +def enter_renamed(base): + os.mkdir(base + "/before") + fd = os.open(base + "/before", os.O_RDONLY) + os.rename(base + "/before", base + "/after") + try: + os.fchdir(fd) + return os.getcwd() == base + "/after" + finally: + os.close(fd) + os.chdir("/") + os.rmdir(base + "/after") + + +def relative(base): + fd = os.open(base, os.O_RDONLY) + os.fchdir(fd) + os.close(fd) + seen = os.path.exists("real/file"), os.path.exists("link/file") + os.chdir("real") + inside = os.getcwd() == base + "/real" + os.chdir("..") + return seen + (inside, os.getcwd() == base) + + +def cost(path, rounds=300): + fd = os.open(path, os.O_RDONLY) + back = os.open("/", os.O_RDONLY) + start = time.perf_counter() + for _ in range(rounds): + os.fchdir(fd) + os.fchdir(back) + elapsed = time.perf_counter() - start + os.close(fd) + os.close(back) + return round(elapsed / rounds / 2 * 1e6, 1) + + +def main(): + extra = sys.argv[1:] + base = tempfile.mkdtemp(prefix="fchdir-") + os.mkdir(base + "/real") + os.symlink(base + "/real", base + "/link") + os.mkdir(base + "/dot.") + open(base + "/real/file", "w").close() + for path in ["/", "/tmp", "/usr/lib", "/proc/self", "/dev", base + "/real", base + "/link", base + "/dot."] + extra: + report(path, lambda: enter(path)) + report("file", lambda: enter_file(base)) + report("deleted", lambda: enter_deleted(base)) + report("renamed", lambda: enter_renamed(base)) + report("badfd", lambda: os.fchdir(987)) + report("relative", lambda: relative(base)) + os.chdir("/") + for path in ["/usr/lib"] + extra: + print("fchdir_us", path, cost(path)) + os.unlink(base + "/real/file") + os.unlink(base + "/link") + os.rmdir(base + "/dot.") + os.rmdir(base + "/real") + os.rmdir(base) + + +main() diff --git a/tools/proot/patches/0028-fchdir-open-directory.patch b/tools/proot/patches/0028-fchdir-open-directory.patch new file mode 100644 index 0000000000..8e1a494386 --- /dev/null +++ b/tools/proot/patches/0028-fchdir-open-directory.patch @@ -0,0 +1,108 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Thu, 12 Nov 2026 22:00:00 -0500 +Subject: [PATCH] fchdir: take the path of the open directory instead of resolving + it again component by component + +--- +--- a/src/syscall/enter.c ++++ b/src/syscall/enter.c +@@ -46,8 +46,66 @@ + #include "tracee/abi.h" + #include "path/path.h" + #include "path/canon.h" ++#include "path/binding.h" + #include "arch.h" + ++static int translate_open_directory(Tracee *tracee, char path[PATH_MAX], int fd, struct stat *statl) ++{ ++ char guest[PATH_MAX]; ++ char mount[PATH_MAX]; ++ char parent[PATH_MAX]; ++ char link[32]; ++ char *slash; ++ const Binding *binding; ++ size_t length; ++ int status; ++ ++ status = readlink_proc_pid_fd(tracee->pid, fd, path); ++ if (status < 0 || path[0] != '/') ++ return 1; ++ ++ strcpy(guest, path); ++ status = detranslate_path(tracee, guest, NULL); ++ if (status < 0) ++ return 1; ++ ++ binding = get_binding(tracee, GUEST, guest); ++ if (binding == NULL) ++ return 1; ++ ++ strcpy(parent, binding->guest.path); ++ slash = strrchr(parent, '/'); ++ if (slash != NULL && slash != parent) { ++ if ((size_t) (slash - parent) + 3 > PATH_MAX) ++ return 1; ++ ++ strcpy(slash, "/."); ++ strcpy(mount, "/"); ++ status = canonicalize(tracee, parent, true, mount, 0); ++ if (status < 0 || strcmp(mount, parent) != 0) ++ return 1; ++ } ++ ++ status = substitute_binding(tracee, GUEST, guest); ++ if (status < 0 || strcmp(guest, path) != 0) ++ return 1; ++ ++ status = snprintf(link, sizeof(link), "/proc/%d/fd/%d", tracee->pid, fd); ++ if (status < 0 || (size_t) status >= sizeof(link)) ++ return 1; ++ ++ status = stat(link, statl); ++ if (status < 0 || !S_ISDIR(statl->st_mode) || statl->st_nlink == 0) ++ return 1; ++ ++ length = strlen(path); ++ if (length + 2 >= PATH_MAX) ++ return 1; ++ ++ strcpy(path + (length == 1 ? 0 : length), "/."); ++ return 0; ++} ++ + /** + * Translate @path and put the result in the @tracee's memory address + * space pointed to by the @reg argument of the current syscall. See +@@ -193,13 +251,16 @@ + dirfd = peek_reg(tracee, CURRENT, SYSARG_1); + } + +- status = translate_path(tracee, path, dirfd, oldpath, true); +- if (status < 0) +- break; ++ if (syscall_number == PR_chdir ++ || translate_open_directory(tracee, path, dirfd, &statl) != 0) { ++ status = translate_path(tracee, path, dirfd, oldpath, true); ++ if (status < 0) ++ break; + +- status = lstat(path, &statl); +- if (status < 0) +- break; ++ status = lstat(path, &statl); ++ if (status < 0) ++ break; ++ } + + /* Check this directory is accessible. */ + if ((statl.st_mode & S_IXUSR) == 0) +@@ -208,7 +269,7 @@ + + + +- if (getenv("PROOT_FASTPATH") != NULL) { ++ if (syscall_number == PR_chdir && getenv("PROOT_FASTPATH") != NULL) { + int fd = open(path, O_PATH | O_DIRECTORY | O_CLOEXEC); + + From 83de0e7f8c42df885c8fbcdd97629ab9957739ea Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 06:17:12 -0500 Subject: [PATCH 067/101] feat(rockstar): broaden launcher protocol compatibility (#2547) --- .../droiddeck/launcher/frontend/AddedGames.kt | 2 +- .../droiddeck/launcher/stores/StoreLaunch.kt | 32 +- .../launcher/stores/rockstar/RockstarAuth.kt | 47 ++- .../stores/rockstar/RockstarBackend.kt | 3 + .../stores/rockstar/RockstarLaunch.kt | 31 +- .../stores/rockstar/RockstarMetadata.kt | 53 +++ .../com/droiddeck/launcher/ui/GameDetail.kt | 5 +- .../droiddeck/launcher/ui/StoresDownloads.kt | 4 +- app/src/main/res/values/strings.xml | 1 - .../stores/rockstar/RockstarMetadataTest.kt | 78 +++++ .../launcher/stores/rockstar/RockstarTest.kt | 82 ++++- .../usr/local/bin/droiddeck-store-launch | 151 +++++++- tools/rockstar-launcher/README.md | 10 +- tools/rockstar-launcher/examples/sdk_probe.rs | 80 +++++ tools/rockstar-launcher/src/identity.rs | 170 +++++++++ tools/rockstar-launcher/src/lib.rs | 18 + tools/rockstar-launcher/src/main.rs | 207 ++++++++--- tools/rockstar-launcher/src/pipe.rs | 49 ++- tools/rockstar-launcher/src/sdk.rs | 328 ++++++++++++++++++ tools/tests/test_store_launch_rockstar.py | 107 ++++++ 20 files changed, 1368 insertions(+), 90 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadata.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadataTest.kt create mode 100644 tools/rockstar-launcher/examples/sdk_probe.rs create mode 100644 tools/rockstar-launcher/src/identity.rs create mode 100644 tools/rockstar-launcher/src/sdk.rs diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index d9db3374e9..d0f4ea80a0 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -418,7 +418,7 @@ object AddedGames { private fun scanGame(context: Context, folder: File, out: MutableList, single: AddedExes.Entry? = null, reuse: Boolean = false) { run { val sidecar = StoreGameSidecar.read(folder)?.let { com.droiddeck.launcher.stores.StoreLaunch.adopt(folder, it) } - if (sidecar?.store == Store.ROCKSTAR && (!com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id) || sidecar.launcher != com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER)) return + if (sidecar?.store == Store.ROCKSTAR && sidecar.launcher != com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER) return sidecar?.takeIf { it.id.isNotEmpty() }?.let { SessionPrefs.followStoreGame(context, "${it.store.id}:${it.id}", folder.path) { old -> !File(old).exists() } } val ranking = rank(folder, reuse) val candidates = ranking.exes diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt index 37d731a2f7..f45a23c654 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt @@ -21,10 +21,6 @@ object StoreLaunch { val needs = sidecar.args.isNotEmpty() || sidecar.env.isNotEmpty() || sidecar.store == Store.EPIC || sidecar.store == Store.EA || sidecar.store == Store.UBISOFT || sidecar.store == Store.ROCKSTAR val file = File(folder, LAUNCHER) if (sidecar.store == Store.ROCKSTAR && java.nio.file.Files.isSymbolicLink(file.toPath())) return sidecar.copy(launcher = null) - if (sidecar.store == Store.ROCKSTAR && !com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id)) { - file.delete() - return sidecar.copy(launcher = null) - } if (!needs) { file.delete(); return sidecar.copy(launcher = null) } file.writeText(launcherText(sidecar)) return sidecar.copy(launcher = LAUNCHER) @@ -36,11 +32,11 @@ object StoreLaunch { ?: exe.substringBeforeLast('\\', "") val lines = ArrayList() lines += "@echo off" - lines += "setlocal" + lines += if (sidecar.store == Store.ROCKSTAR) "setlocal DisableDelayedExpansion" else "setlocal" if (sidecar.store != Store.ROCKSTAR) lines += "rem Written by DroidDeck for ${sidecar.store.label}: ${sidecar.title}. Steam's shortcut runs this file." lines += "cd /d \"%~dp0$dir\"" for ((k, v) in sidecar.env) if (ENV_NAME.matches(k)) lines += "set \"$k=${v.replace("\"", "")}\"" - val args = sidecar.args.joinToString(" ") { quoteArg(it) } + val args = sidecar.args.joinToString(" ") { if (sidecar.store == Store.ROCKSTAR) batchArg(it) else quoteArg(it) } val run = "\"%~dp0$exe\"" + (if (args.isNotEmpty()) " $args" else "") if (sidecar.store == Store.EPIC) { lines += "if exist \"%~dp0$EPIC_ARGS\" goto client" @@ -60,8 +56,11 @@ object StoreLaunch { lines += "if exist \"%~dp0$EPIC_CODE\" del \"%~dp0$EPIC_CODE\"" lines += "set \"$CLIENT_VAR=\" & \"%~dp0$exe\" %$CLIENT_VAR%" } else if (sidecar.store == Store.ROCKSTAR) { + lines += "if not exist \"C:\\Program Files\\Rockstar Games\\Launcher\\launch.json\" goto direct" lines += "\"C:\\Program Files\\Rockstar Games\\Launcher\\Launcher.exe\"" lines += "exit /b %errorlevel%" + lines += ":direct" + lines += run } else if (sidecar.store == Store.UBISOFT) { lines += "if not exist \"%~dp0$UBISOFT_LAUNCH\" goto direct" lines += "if not exist \"$UBISOFT_SERVICE\" goto direct" @@ -85,6 +84,22 @@ object StoreLaunch { private val ENV_NAME = Regex("[A-Za-z_][A-Za-z0-9_]*") + private fun batchArg(arg: String): String { + val quoted = StringBuilder("\"") + var slashes = 0 + for (c in arg.filter { it >= ' ' && it != '\u007f' }) { + if (c == '\\') { slashes++; continue } + quoted.append("\\".repeat(if (c == '"') slashes * 2 + 1 else slashes)).append(c) + slashes = 0 + } + quoted.append("\\".repeat(slashes * 2)).append('"') + return quoted.toString().map { c -> when (c) { + '%' -> "%%" + in "^&|<>()\"" -> "^$c" + else -> c.toString() + } }.joinToString("") + } + fun quoteArg(arg: String): String { val clean = arg.filter { it >= ' ' && it != '\u007f' } return if (' ' in clean && !clean.contains('"')) "\"$clean\"" else clean @@ -103,11 +118,12 @@ object StoreLaunch { fun adopt(folder: File, sidecar: StoreGameSidecar): StoreGameSidecar { if (sidecar.store !in listOf(Store.UBISOFT, Store.ROCKSTAR) || !sidecar.isInstalled) return sidecar - if (sidecar.store == Store.ROCKSTAR && !com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(sidecar.id)) return sidecar if (sidecar.store == Store.ROCKSTAR && java.nio.file.Files.isSymbolicLink(File(folder, LAUNCHER).toPath())) return sidecar.copy(launcher = null) val wrongExe = !sidecar.exeFile(folder).isFile || sidecar.exe.contains("installer", ignoreCase = true) || sidecar.exe.contains("autorun", ignoreCase = true) if (sidecar.store == Store.UBISOFT && sidecar.launcher == LAUNCHER && !wrongExe) return sidecar - val exe = if (wrongExe) StoreExe.pick(folder, null, sidecar.title).ifEmpty { sidecar.exe } else sidecar.exe + val metadataExe = if (sidecar.store == Store.ROCKSTAR) com.droiddeck.launcher.stores.rockstar.RockstarMetadata.find(folder)?.exe + ?.takeIf { File(folder, it).isFile && File(folder, it).canonicalPath.startsWith(folder.canonicalPath + File.separator) } else null + val exe = metadataExe ?: if (wrongExe) StoreExe.pick(folder, null, sidecar.title).ifEmpty { sidecar.exe } else sidecar.exe if (exe == sidecar.exe && sidecar.launcher == LAUNCHER && runCatching { File(folder, LAUNCHER).readText() }.getOrNull() == launcherText(sidecar)) return sidecar return runCatching { writeLauncher(folder, sidecar.copy(exe = exe)).also { it.write(folder) } }.getOrDefault(sidecar) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt index 781eddbe3f..b6c90cb41f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarAuth.kt @@ -29,7 +29,7 @@ object RockstarAuth { private const val TICKET_MARGIN_MS = 15 * 60 * 1000L private val lock = Any() - class Ticket(val ticket: String, val sessionKey: String, val sessionTicket: String, val rockstarId: String, val nickname: String, val expiresAt: Long) + class Ticket(val ticket: String, val sessionKey: String, val sessionTicket: String, val rockstarId: String, val nickname: String, val expiresAt: Long, val email: String = "", val sdkTicket: String = "") internal fun fingerprint(context: Context): JSONObject { val p = context.applicationContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE) @@ -159,7 +159,7 @@ object RockstarAuth { private fun stored(o: JSONObject): Ticket? { val t = o.optString("ticket").takeIf { it.isNotEmpty() } ?: return null - return Ticket(t, o.optString("session_key"), o.optString("session_ticket"), o.optString("rockstar_id"), o.optString("display_name"), o.optLong("ticket_expires_at")) + return Ticket(t, o.optString("session_key"), o.optString("session_ticket"), o.optString("rockstar_id"), o.optString("display_name"), o.optLong("ticket_expires_at"), o.optString("email"), o.optString("sdk_ticket").takeIf { o.optInt("sdk_ticket_version") == 1 }.orEmpty()) } private fun mint(context: Context): Ticket { @@ -176,7 +176,7 @@ object RockstarAuth { } val t = parseTicket(root) ?: throw IllegalStateException("no ticket in the answer") o.put("ticket", t.ticket).put("session_key", t.sessionKey).put("session_ticket", t.sessionTicket) - .put("rockstar_id", t.rockstarId).put("ticket_expires_at", t.expiresAt) + .put("rockstar_id", t.rockstarId).put("ticket_expires_at", t.expiresAt).put("email", t.email).put("sdk_ticket", t.sdkTicket).put("sdk_ticket_version", 1) if (t.nickname.isNotEmpty()) o.put("display_name", t.nickname) StoreAccounts.write(app, Store.ROCKSTAR, o) return t @@ -191,8 +191,49 @@ object RockstarAuth { (account?.let { RockstarRos.text(it, "RockstarId") } ?: RockstarRos.text(root, "RockstarId")).orEmpty(), account?.let { RockstarRos.text(it, "Nickname") }.orEmpty(), now + secs * 1000L, + account?.let { RockstarRos.text(it, "Email") }.orEmpty(), + sdkTicket(root), ) } + internal fun sdkTicket(root: org.w3c.dom.Element): String { + val document = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument() + val response = document.createElement("Response").also { document.appendChild(it) } + val fields = setOf("Status", "Ticket", "SessionKey", "SessionTicket", "SecsUntilExpiration", "PlayerAccountId", "PlayerAccountRuid", + "Region", "Privileges", "Privs", "Services", "SslServices", "Hosts", "DisabledSecurityFlags", "SessionId", "CloudKey", "PublicIp", "PosixTime", "IsSubAccount") + val blocked = setOf("scauthtoken", "accesstoken", "refreshtoken", "rememberedmachinetoken", "loginguid", "password") + fun copy(source: org.w3c.dom.Element): org.w3c.dom.Element { + val target = document.createElement(source.tagName) + for (i in 0 until source.attributes.length) { + val attribute = source.attributes.item(i) + if (attribute.nodeName.lowercase() !in blocked) target.setAttribute(attribute.nodeName, attribute.nodeValue) + } + var child = source.firstChild + while (child != null) { + if (child is org.w3c.dom.Element) { + if (child.tagName.lowercase() !in blocked) target.appendChild(copy(child)) + } else if (child.nodeType == org.w3c.dom.Node.TEXT_NODE || child.nodeType == org.w3c.dom.Node.CDATA_SECTION_NODE) { + target.appendChild(document.createTextNode(child.nodeValue)) + } + child = child.nextSibling + } + return target + } + for (field in fields) RockstarRos.first(root, field)?.let { response.appendChild(copy(it)) } + RockstarRos.first(root, "RockstarAccount")?.let { account -> + val target = document.createElement("RockstarAccount") + for (field in setOf("RockstarId", "Nickname", "Email", "Age", "CountryCode", "LanguageCode", "AvatarUrl", "ZipCode", "Ruid")) { + RockstarRos.first(account, field)?.let { target.appendChild(copy(it)) } + } + response.appendChild(target) + } + val output = java.io.StringWriter() + javax.xml.transform.TransformerFactory.newInstance().newTransformer().apply { + setOutputProperty(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes") + transform(javax.xml.transform.dom.DOMSource(document), javax.xml.transform.stream.StreamResult(output)) + } + return output.toString() + } + fun signOut(context: Context) = synchronized(lock) { StoreAccounts.clear(context.applicationContext, Store.ROCKSTAR) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt index 3e878d3290..f816ed8ef1 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt @@ -147,6 +147,9 @@ object RockstarLibrary { internal fun owned(account: RockstarAccountApps): List = account.packages.filter { !it.featured }.flatMap { RockstarTitles.forName(it.title) }.distinct() + internal fun owns(account: RockstarAccountApps, rosId: Int, id: String): Boolean = + owned(account).any { it.rosTitleId == rosId } || account.packages.any { !it.featured && it.title == id } + internal fun games(account: RockstarAccountApps): List = owned(account).mapNotNull { t -> RockstarApps.deliverer(account.apps, t)?.let { RockstarTitles.item(t, owned = true, extra = mapOf("app" to it.name, "appId" to it.id)) } }.sortedBy { it.title.lowercase() } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt index c83b6548d8..52f1119f90 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarLaunch.kt @@ -10,9 +10,9 @@ import java.security.MessageDigest import java.util.Base64 object RockstarLaunch { - internal val pipes = mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe") + internal val pipes = mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe", "gta4" to "GTAIV_Pipe", "lanoire" to "LANOIRE_Pipe") - fun supports(id: String?) = id != null && id in pipes + fun usesClassicLauncher(id: String) = id in pipes fun applyDefaults(app: Context, id: String, appId: Long) { val scope = (appId and 0xffffffffL).toString() @@ -23,16 +23,22 @@ object RockstarLaunch { } fun prepare(app: Context, id: String): JSONObject { - val pipe = pipes[id] ?: return failure("unsupported-title") - val title = RockstarTitles.byId(id) ?: return failure("unknown-title") val folder = StoreInstallRoot.gameFolders(app).firstOrNull { folder -> StoreGameSidecar.read(folder)?.let { it.store == Store.ROCKSTAR && it.id == id && it.isInstalled } == true } ?: return failure("not-installed") val installed = StoreGameSidecar.read(folder) ?: return failure("not-installed") val exe = installed.exeFile(folder).canonicalFile - if (!exe.path.startsWith(folder.canonicalPath + java.io.File.separator) || !exe.isFile || - !java.io.File(folder, "MTLX.dll").isFile) return failure("missing-game-files") + if (!exe.path.startsWith(folder.canonicalPath + java.io.File.separator) || !exe.isFile) return failure("missing-game-files") + val metadata = RockstarMetadata.find(folder) + val pipe = pipes[id] + val sdk = (pipe == null && metadata != null) || id in setOf("gta4", "lanoire") || listOf(folder, exe.parentFile).any { dir -> + dir.listFiles().orEmpty().any { it.isFile && it.name.lowercase() in setOf("socialclub.dll", "socialclub64.dll") } + } + if (pipe == null && !sdk) return failure("no-launcher-protocol") + if (pipe != null && !listOf(folder, exe.parentFile).any { java.io.File(it, "MTLX.dll").isFile }) return failure("missing-game-files") + val rosId = metadata?.rosId ?: RockstarTitles.byId(id)?.rosTitleId ?: return failure("missing-title-metadata") var ticket = RockstarAuth.ticket(app) ?: RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") + if (sdk && ticket.sdkTicket.isEmpty()) ticket = RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") val account = try { RockstarApps.fetch(ticket.ticket) {} } catch (e: RockstarRos.RosException) { @@ -40,16 +46,23 @@ object RockstarLaunch { ticket = RockstarAuth.ticket(app, fresh = true) ?: return failure("signed-out") RockstarApps.fetch(ticket.ticket) {} } - if (RockstarLibrary.owned(account).none { it.id == id } || RockstarApps.deliverer(account.apps, title) == null) return failure("not-owned") - val tokenRoot = RockstarRos.result("app.asmx/GetTitleAccessToken2", listOf("ticket" to ticket.ticket, "titleId" to title.rosTitleId.toString(), "platformId" to "8")) + if (metadata != null && account.apps.none { it.titleId.toIntOrNull() == rosId && (it.name == metadata.id || it.name.startsWith(metadata.id + "_")) }) return failure("title-metadata-mismatch") + val tokenRoot = RockstarRos.result("app.asmx/GetTitleAccessToken2", listOf("ticket" to ticket.ticket, "titleId" to rosId.toString(), "platformId" to "8")) val token = RockstarRos.text(tokenRoot, "Result")?.takeIf { it.isNotEmpty() } ?: return failure("no-title-token") + val result = JSONObject().put("ok", true).put("expiresAt", System.currentTimeMillis() + 90_000) + if (sdk) { + val session = JSONObject().put("accountId", ticket.rockstarId).put("identity", ticket.email.ifEmpty { ticket.nickname }).put("ticket", ticket.sdkTicket) + if (RockstarLibrary.owns(account, rosId, metadata?.id ?: id)) session.put("titleId", metadata?.id ?: id) + result.put("session", session) + } + if (pipe == null) return result val hash = MessageDigest.getInstance("SHA-256").digest(RockstarAuth.fingerprint(app).toString().toByteArray()).copyOf(16) val launch = RockstarRos.result("app.asmx/GetTitleLaunchData", listOf("ticket" to ticket.ticket, "titleAccessToken" to token, "machineHash" to Base64.getEncoder().encodeToString(hash))) val encoded = RockstarRos.text(launch, "Data") ?: return failure("no-launch-data") val iv = RockstarRos.text(launch, "EndpointIV") ?: return failure("no-launch-iv") val material = RockstarLaunchCipher.decode(encoded, iv) - return JSONObject().put("ok", true).put("pipe", pipe).put("material", material).put("expiresAt", System.currentTimeMillis() + 90_000) + return result.put("pipe", pipe).put("material", material) } private fun failure(reason: String) = JSONObject().put("ok", false).put("reason", reason) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadata.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadata.kt new file mode 100644 index 0000000000..5a7e052946 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadata.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.stores.rockstar + +import org.json.JSONObject +import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.nio.charset.CodingErrorAction +import javax.crypto.Cipher +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.SecretKeySpec + +internal object RockstarMetadata { + data class Title(val id: String, val rosId: Int, val exe: String) + + fun find(folder: File): Title? { + val root = folder.canonicalFile + var level = listOf(root) + repeat(4) { + val entries = level.map { it.listFiles().orEmpty() } + val metadata = entries.flatMap { files -> files.filter { it.name.equals("title.rgl", true) } } + for (file in metadata.filter { it.isFile && !java.nio.file.Files.isSymbolicLink(it.toPath()) && it.canonicalPath.startsWith(root.path + File.separator) }) { + if (file.length() in 112..1_048_576) runCatching { decode(file.readBytes()) }.getOrNull()?.let { + return it.copy(exe = File(file.parentFile, it.exe).relativeTo(root).invariantSeparatorsPath) + } + } + level = entries.flatMap { files -> files.asSequence().filter { + it.isDirectory && !java.nio.file.Files.isSymbolicLink(it.toPath()) && it.canonicalPath.startsWith(root.path + File.separator) + }.take(256).toList() }.take(256) + } + return null + } + + fun decode(bytes: ByteArray): Title? = runCatching { + require(bytes.size in 112..1_048_576 && bytes.copyOfRange(0, 4).contentEquals(byteArrayOf(82, 71, 76, 77))) + val header = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN) + require(header.getInt(4) == 1 && header.getInt(8) == bytes.size - 80 && (bytes.size - 80) % 16 == 0) + val cipher = Cipher.getInstance("AES/CBC/NoPadding") + cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(ByteArray(32), "AES"), IvParameterSpec(bytes.copyOfRange(80, 96))) + val clear = cipher.doFinal(bytes, 96, bytes.size - 96) + val pad = clear.last().toInt() and 255 + val size = if (pad in 1..16 && clear.takeLast(pad).all { (it.toInt() and 255) == pad }) clear.size - pad + else clear.indexOfLast { it != 0.toByte() } + 1 + val text = Charsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPORT) + .onUnmappableCharacter(CodingErrorAction.REPORT).decode(ByteBuffer.wrap(clear, 0, size)).toString().removePrefix("\uFEFF") + val json = JSONObject(text) + val id = json.getString("titleId") + val rosId = json.get("rosTitleId").toString().takeIf { Regex("[1-9][0-9]{0,4}").matches(it) }?.toInt() ?: return null + val exe = json.getString("principalFileName").replace('\\', '/') + require(Regex("[a-z][a-z0-9_]{0,63}").matches(id) && rosId in 1..65535) + require(exe.isNotEmpty() && !exe.startsWith('/') && ':' !in exe && '\u0000' !in exe && exe.split('/').none { it == ".." }) + Title(id, rosId, exe) + }.getOrNull() +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 729fc5ad19..bee82bbd2c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -400,7 +400,6 @@ internal fun GameActions( val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } val cloud = game?.library == Library.XBOX_CLOUD && installed == null val downloadBytes = catalogSize(item) - val launchSupported = store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(id) Actions { when { s.shortcutPicker && game != null -> { @@ -412,8 +411,8 @@ internal fun GameActions( val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id) val preparing = (game?.launchKey ?: storeKey)?.let { it in s.preparingGames } == true PrimaryButton( - stringResource(if (!launchSupported) R.string.stores_rockstar_launch_unavailable else if (preparing) R.string.store_starting else R.string.stores_play), - enabled = launchSupported && !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), + stringResource(if (preparing) R.string.store_starting else R.string.stores_play), + enabled = !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn, ) { if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(store, id, s, a) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index d8daa53d58..0b1000e6e3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -221,7 +221,7 @@ private fun FinishedRow(d: DownloadEntry, s: FrontEndState, a: FrontEndActions, val ctx = LocalContext.current ArtStrip(d.cover, d.name) { StripLabel(d.name, d.store.id, stringResource(if (d.state == DownloadState.INSTALLED) R.string.stores_installed_chip else R.string.stores_dl_cancelled), Color.White.copy(alpha = 0.72f)) - if (d.state == DownloadState.INSTALLED && (d.store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(d.id))) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { + if (d.state == DownloadState.INSTALLED) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } } @@ -374,7 +374,7 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) RoundAction(Icons.Filled.Refresh, stringResource(R.string.stores_dl_resume), primary = true) { DownloadQueue.retry(ctx, d.key) } CancelAction { DownloadQueue.clear(ctx, d.key) } } - DownloadState.INSTALLED -> if (d.store != Store.ROCKSTAR || com.droiddeck.launcher.stores.rockstar.RockstarLaunch.supports(d.id)) Box(Modifier.bloomIn(true, 420)) { + DownloadState.INSTALLED -> Box(Modifier.bloomIn(true, 420)) { RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } DownloadState.CANCELLED -> {} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f1a5dcf3f3..734bfbb25e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3999,6 +3999,5 @@ Scarlet Snow White surfaces with red accents. - Launch unavailable No web browser is available to open this link. diff --git a/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadataTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadataTest.kt new file mode 100644 index 0000000000..cb07f0914e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarMetadataTest.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.stores.rockstar + +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.nio.ByteBuffer +import java.nio.ByteOrder +import javax.crypto.Cipher +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.SecretKeySpec + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = android.app.Application::class) +class RockstarMetadataTest { + @Test fun findsRootMetadataAfterManyOtherFiles() { + val root = java.nio.file.Files.createTempDirectory("rockstar-many-files").toFile() + try { + repeat(300) { java.io.File(root, "asset-$it.dat").writeText("asset") } + java.io.File(root, "title.rgl").writeBytes(container("""{"titleId":"game","rosTitleId":123,"principalFileName":"Game.exe"}""")) + assertEquals("game", RockstarMetadata.find(root)?.id) + java.io.File(root, "title.rgl").delete() + java.io.File(root, "Title.RGL").writeBytes(container("""{"titleId":"game","rosTitleId":123,"principalFileName":"Game.exe"}""")) + assertEquals("game", RockstarMetadata.find(root)?.id) + } finally { + root.deleteRecursively() + } + } + + private fun container(json: String): ByteArray { + val iv = ByteArray(16) { it.toByte() } + val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding") + cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(ByteArray(32), "AES"), IvParameterSpec(iv)) + val payload = iv + cipher.doFinal(json.toByteArray()) + val header = ByteBuffer.allocate(80).order(ByteOrder.LITTLE_ENDIAN) + header.put(byteArrayOf(82, 71, 76, 77)).putInt(1).putInt(payload.size) + return header.array() + payload + } + + @Test fun decodesInstalledTitleWithoutAnAppIdAllowlist() { + val title = RockstarMetadata.decode(container("""{"titleId":"new_title","rosTitleId":123,"principalFileName":"Game/Binaries/Win64/Game.exe"}"""))!! + assertEquals("new_title", title.id) + assertEquals(123, title.rosId) + assertEquals("Game/Binaries/Win64/Game.exe", title.exe) + } + + @Test fun rejectsBrokenContainersAndEscapingExecutables() { + val valid = container("""{"titleId":"game","rosTitleId":123,"principalFileName":"Game.exe"}""") + assertNull(RockstarMetadata.decode(valid.copyOf(90))) + assertNull(RockstarMetadata.decode(valid.copyOf().also { it[4] = 2 })) + assertNull(RockstarMetadata.decode(valid + byteArrayOf(0))) + assertNull(RockstarMetadata.decode(container("""{"titleId":"game","rosTitleId":1.5,"principalFileName":"Game.exe"}"""))) + for (exe in listOf("../outside.exe", "C:/outside.exe", "/outside.exe")) { + assertNull(RockstarMetadata.decode(container("""{"titleId":"game","rosTitleId":123,"principalFileName":"$exe"}"""))) + } + } + + @Test fun doesNotFollowMetadataSymlinksOutsideTheGame() { + val root = java.nio.file.Files.createTempDirectory("rockstar-metadata").toFile() + val outside = java.io.File.createTempFile("rockstar-external", ".rgl") + try { + outside.writeBytes(container("""{"titleId":"game","rosTitleId":123,"principalFileName":"Game.exe"}""")) + val link = java.io.File(root, "title.rgl").toPath() + try { java.nio.file.Files.createSymbolicLink(link, outside.toPath()) } + catch (e: java.nio.file.FileSystemException) { org.junit.Assume.assumeNoException(e) } + assertNull(RockstarMetadata.find(root)) + java.nio.file.Files.delete(link) + java.io.File(root, "nested").mkdir() + outside.copyTo(java.io.File(root, "nested/title.rgl")) + assertEquals("game", RockstarMetadata.find(root)?.id) + assertEquals("nested/Game.exe", RockstarMetadata.find(root)?.exe) + } finally { + root.deleteRecursively() + outside.delete() + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt index e356683511..755bd7320c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/rockstar/RockstarTest.kt @@ -12,6 +12,54 @@ import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [33], application = android.app.Application::class) class RockstarTest { + @Test fun sdkTicketExportsOnlyTheShortLivedServerResponse() { + val root = RockstarRos.parse("""1opaque-game-ticket456session-keysession-ticketexample.invalidservice-refresh-secretrefresh-secret123Playerplayer@example.invalidnested-refresh-secret""") + val sdk = RockstarRos.parse(RockstarAuth.sdkTicket(root)) + assertEquals("opaque-game-ticket", RockstarRos.text(sdk, "Ticket")) + assertEquals("session-key", RockstarRos.text(sdk, "SessionKey")) + assertEquals("123", RockstarRos.text(sdk, "RockstarId")) + assertEquals("456", RockstarRos.text(sdk, "PlayerAccountId")) + assertEquals("1", RockstarRos.first(sdk, "Services")?.getAttribute("Count")) + assertEquals("example.invalid", RockstarRos.text(sdk, "Host")) + assertNull(RockstarRos.first(sdk, "ScAuthToken")) + assertFalse(RockstarAuth.sdkTicket(root).contains("refresh-secret")) + } + + @Test fun sdkTitleStateRequiresAnOwnedPackageInsteadOfCatalogVisibility() { + val visible = RockstarApp("1", "future_title", "123", emptyList()) + val featured = RockstarAccountApps(listOf(visible), listOf(RockstarPackage("future_title", true))) + assertFalse(RockstarLibrary.owns(featured, 123, "future_title")) + val owned = RockstarAccountApps(listOf(visible), listOf(RockstarPackage("future_title", false))) + assertTrue(RockstarLibrary.owns(owned, 123, "future_title")) + assertFalse(RockstarLibrary.owns(owned, 124, "other_title")) + } + + @Test fun directLaunchPreservesArgumentsThroughTheWindowsBatchInterpreter() { + org.junit.Assume.assumeTrue(java.io.File.separatorChar == '\\') + val root = java.nio.file.Files.createTempDirectory("rockstar-batch").toFile() + try { + java.io.File(System.getenv("SystemRoot"), "System32/cscript.exe").copyTo(java.io.File(root, "Game.exe")) + java.io.File(root, "probe.vbs").writeText(""" + Set output = CreateObject("Scripting.FileSystemObject").CreateTextFile("args.txt", True) + For Each arg In WScript.Arguments + output.WriteLine(arg) + Next + output.Close + """.trimIndent()) + val args = listOf("", "&literal", "one argument", "%PATH%", "!PATH!", "^&|<>()") + val game = com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, + "future_title", "Game", "Game.exe", args = listOf("//nologo", "probe.vbs") + args) + com.droiddeck.launcher.stores.StoreLaunch.writeLauncher(root, game) + val process = ProcessBuilder("cmd.exe", "/d", "/c", java.io.File(root, com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER).path) + .directory(root).redirectErrorStream(true).start() + assertTrue(process.waitFor(10, java.util.concurrent.TimeUnit.SECONDS)) + assertEquals(process.inputStream.bufferedReader().readText(), 0, process.exitValue()) + assertEquals(args, java.io.File(root, "args.txt").readLines()) + } finally { + root.deleteRecursively() + } + } + @Test fun launcherAdoptionDoesNotFollowSymbolicLinks() { val folder = java.nio.file.Files.createTempDirectory("rockstar-launch-link").toFile() val outside = java.io.File.createTempFile("rockstar-keep", ".txt").apply { writeText("keep") } @@ -51,7 +99,7 @@ class RockstarTest { } } - @Test fun unsupportedGamesKeepTheirFilesWithoutRegisteringALauncher() { + @Test fun otherRockstarGamesRegisterAndLaunchTheirInstalledExecutable() { val app = org.robolectric.RuntimeEnvironment.getApplication() com.droiddeck.launcher.session.SessionPrefs.setGameStorage(app, com.droiddeck.launcher.session.SessionPrefs.GAME_STORAGE_OFF, "") val folder = java.io.File(com.droiddeck.launcher.stores.StoreInstallRoot.storeDir(com.droiddeck.launcher.stores.StoreInstallRoot.installRoot(app), com.droiddeck.launcher.stores.Store.ROCKSTAR), "RDR2").apply { mkdirs() } @@ -62,11 +110,27 @@ class RockstarTest { script.writeText("old launcher") val finished = com.droiddeck.launcher.stores.StoreLaunch.writeLauncher(folder, game) finished.write(folder) - assertFalse(RockstarLaunch.supports(game.id)) - assertNull(finished.launcher) - assertFalse(script.exists()) + assertFalse(RockstarLaunch.usesClassicLauncher(game.id)) + assertEquals(com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER, finished.launcher) + assertTrue(script.readText().contains("\"%~dp0RDR2.exe\"")) + assertTrue(script.readText().contains("if not exist \"C:\\Program Files\\Rockstar Games\\Launcher\\launch.json\" goto direct")) assertTrue(java.io.File(folder, game.exe).isFile) - assertNull(com.droiddeck.launcher.frontend.AddedGames.single(app, folder.path)) + } finally { + folder.deleteRecursively() + } + } + + @Test fun otherRockstarGamesCanRegisterShortcuts() { + org.junit.Assume.assumeTrue(java.io.File.separatorChar == '/') + val app = org.robolectric.RuntimeEnvironment.getApplication() + com.droiddeck.launcher.session.SessionPrefs.setGameStorage(app, com.droiddeck.launcher.session.SessionPrefs.GAME_STORAGE_OFF, "") + val folder = java.io.File(com.droiddeck.launcher.stores.StoreInstallRoot.storeDir(com.droiddeck.launcher.stores.StoreInstallRoot.installRoot(app), com.droiddeck.launcher.stores.Store.ROCKSTAR), "RDR2").apply { mkdirs() } + try { + java.io.File(folder, "RDR2.exe").writeText("installed game") + com.droiddeck.launcher.stores.StoreGameSidecar(com.droiddeck.launcher.stores.Store.ROCKSTAR, "rdr2", "RDR2", "RDR2.exe").write(folder) + val game = com.droiddeck.launcher.frontend.AddedGames.single(app, folder.path) + assertTrue(game != null) + assertTrue(game!!.guestExe.endsWith("/" + com.droiddeck.launcher.stores.StoreLaunch.LAUNCHER)) } finally { folder.deleteRecursively() } @@ -110,7 +174,8 @@ class RockstarTest { } @Test fun classicTitlesUseTheirObservedPipeNames() { - assertEquals(mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe"), RockstarLaunch.pipes) + assertEquals(mapOf("gta3" to "GTA3_Pipe", "gtavc" to "GTA-VC_Pipe", "gtasa" to "GTA_SA_Pipe", "gta4" to "GTAIV_Pipe", "lanoire" to "LANOIRE_Pipe"), RockstarLaunch.pipes) + for (id in RockstarLaunch.pipes.keys) assertTrue(RockstarLaunch.usesClassicLauncher(id)) } @Test fun signingOutClearsOwnedShelfCards() { @@ -162,14 +227,15 @@ class RockstarTest { } @Test - fun classicGamesStartTheirParentLauncherWithoutEmbeddingCredentials() { + fun rockstarLaunchScriptsContainNoCredentials() { val sidecar = com.droiddeck.launcher.stores.StoreGameSidecar( com.droiddeck.launcher.stores.Store.ROCKSTAR, "gtavc", "Vice City", "gta-vc.exe", ) val text = com.droiddeck.launcher.stores.StoreLaunch.launcherText(sidecar) assertTrue(text.contains("\"C:\\Program Files\\Rockstar Games\\Launcher\\Launcher.exe\"")) assertTrue(text.contains("exit /b %errorlevel%")) - assertFalse(text.contains("gta-vc.exe")) + assertTrue(text.contains("goto direct")) + assertTrue(text.contains("\"%~dp0gta-vc.exe\"")) assertFalse(text.contains("ticket", true)) assertFalse(text.contains("rem ", true)) } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index ebb9718942..3d07aaba6a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -315,14 +315,51 @@ UBISOFT_WINDOWS_DIR = "C:\\Program Files (x86)\\Ubisoft\\Ubisoft Game Launcher\\ UBISOFT_INSTALLER_URL = "https://static3.cdn.ubi.com/orbit/launcher_installer/UbisoftConnectInstaller.exe" ROCKSTAR_SERVICE = Path("/usr/local/lib/droiddeck-rockstar") ROCKSTAR_FOLDER = "drive_c/Program Files/Rockstar Games/Launcher" -ROCKSTAR_TITLES = {"gta3": "Grand Theft Auto III", "gtavc": "Grand Theft Auto: Vice City", "gtasa": "GTA: San Andreas"} +ROCKSTAR_TITLES = {"gta3": "Grand Theft Auto III", "gtavc": "Grand Theft Auto: Vice City", "gtasa": "GTA: San Andreas", + "gta4": "Grand Theft Auto IV", "lanoire": "LANoireMTL"} -def rockstar_registry(folder, title, compat_data, proton): +def rockstar_sdk(folder, sidecar): + if str(sidecar.get("id")) in ("gta4", "lanoire"): + return True + root = folder.resolve() + exe = (folder / str(sidecar.get("exe") or "").replace("\\", "/")).resolve() + if not exe.is_relative_to(root): + return False + for directory in {root, exe.parent}: + if directory.is_dir() and any(p.is_file() and not p.is_symlink() and p.name.lower() in ("socialclub.dll", "socialclub64.dll") + for p in directory.iterdir()): + return True + if str(sidecar.get("id")) in ROCKSTAR_TITLES: + return False + level = [root] + for _ in range(4): + children = [] + for directory in level: + for path in directory.iterdir(): + if path.is_symlink(): + continue + if path.name.lower() == "title.rgl" and path.is_file() and path.resolve().is_relative_to(root) and 112 <= path.stat().st_size <= 1048576: + with path.open("rb") as source: + if source.read(4) == b"RGLM": + return True + if len(children) < 256 and path.is_dir() and path.resolve().is_relative_to(root): + children.append(path) + level = children + return False + + +def rockstar_registry(folder, title, compat_data, proton, sdk_arch=None): pfx = Path(compat_data) / "pfx" launcher = r"C:\Program Files\Rockstar Games\Launcher" - values = [(r"Rockstar Games\Launcher", launcher), ("Rockstar Games\\" + title, windows_path(str(folder)))] + values = [(r"Rockstar Games\Launcher", launcher)] + if title: + values.append(("Rockstar Games\\" + title, windows_path(str(folder)))) entries = [("Software\\" + view + key, value) for view in ("", "Wow6432Node\\") for key, value in values] + if sdk_arch: + entries.append((r"Software\Rockstar Games\Rockstar Games Social Club", r"C:\Program Files\Rockstar Games\Social Club")) + program = "Program Files (x86)" if sdk_arch == "x86" else "Program Files" + entries.append((r"Software\Wow6432Node\Rockstar Games\Rockstar Games Social Club", "C:\\" + program + r"\Rockstar Games\Social Club")) reg = pfx / "system.reg" if all(has_value(reg, "[" + key.replace("\\", "\\\\") + "]", "InstallFolder", value) for key, value in entries): return True @@ -338,15 +375,88 @@ def rockstar_registry(folder, title, compat_data, proton): return result.returncode == 0 +def rockstar_runtime(folder, exe, compat_data, arch): + if arch == "x86": + rockstar_runtime(folder, exe, compat_data, "x64") + pfx = Path(compat_data) / "pfx" + target = pfx / "drive_c" / ("Program Files (x86)" if arch == "x86" else "Program Files") / "Rockstar Games/Social Club" + if not target.resolve().is_relative_to(pfx.resolve()): + raise ValueError("invalid Social Club destination") + required = ("socialclub.dll", "socialclub.pak") + (("SocialClubHelper.exe",) if arch == "x64" else ()) + marker = target / ".droiddeck-installing" + if all((target / name).is_file() for name in required) and not marker.exists(): + return "present" + root = folder.resolve() + installers = [base / sub / "Social-Club-Setup.exe" for base in (root, exe.parent) + for sub in ("Redistributables", "Installers")] + installer = next((p for p in installers if p.is_file() and p.resolve().is_relative_to(root) and p.stat().st_size <= 256 * 1024 * 1024), None) + if installer is None: + return "game-runtime" + tool = shutil.which("7z") + if not tool: + return "no-unpacker" + listing = subprocess.run([tool, "l", "-t7z", "-slt", "-ba", str(installer)], capture_output=True, + stdin=subprocess.DEVNULL, timeout=30) + if listing.returncode: + return "installer-unreadable" + entries, size = [], 0 + for block in listing.stdout.decode("utf-8", "replace").split("\n\n"): + fields = dict(line.split(" = ", 1) for line in block.splitlines() if " = " in line) + name = fields.get("Path", "").replace("\\", "/") + if not name.startswith(arch + "/"): + continue + if ".." in name.split("/") or ":" in name or fields.get("Symbolic Link") or fields.get("Hard Link"): + raise ValueError("invalid Social Club archive path") + entry_size = int(fields.get("Size", "0")) + if entry_size < 0: + raise ValueError("invalid Social Club member size") + size += entry_size + entries.append(name) + if not entries or len(entries) > 2048 or size > 768 * 1024 * 1024: + raise ValueError("invalid Social Club archive size") + with tempfile.TemporaryDirectory(prefix="droiddeck-socialclub-") as temporary: + result = subprocess.run([tool, "x", "-t7z", "-y", "-o" + temporary, str(installer), arch + "/*"], + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL, timeout=180) + source = Path(temporary) / arch + if result.returncode or not all((source / name).is_file() for name in required): + return "installer-incomplete" + target.mkdir(parents=True, exist_ok=True) + if marker.is_symlink(): + raise ValueError("invalid Social Club install marker") + marker.touch() + for path in source.rglob("*"): + if path.is_symlink() or not path.resolve().is_relative_to(source.resolve()): + raise ValueError("invalid Social Club archive member") + if not path.is_file(): + continue + output = target / path.relative_to(source) + if not output.resolve().is_relative_to(pfx.resolve()): + raise ValueError("invalid Social Club output path") + output.parent.mkdir(parents=True, exist_ok=True) + with tempfile.NamedTemporaryFile(dir=output.parent, delete=False) as stage: + stage_path = Path(stage.name) + try: + with path.open("rb") as stream: + shutil.copyfileobj(stream, stage) + except BaseException: + stage_path.unlink(missing_ok=True) + raise + os.replace(stage_path, output) + marker.unlink() + return "installed" + + def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_app=None): if not compat_data: return "no-prefix" target = Path(compat_data) / "pfx" / ROCKSTAR_FOLDER + if not target.resolve().is_relative_to((Path(compat_data) / "pfx").resolve()): + return "invalid-service-path" config = target / "launch.json" config.unlink(missing_ok=True) + legacy = str(sidecar.get("id")) in ROCKSTAR_TITLES + sdk = rockstar_sdk(folder, sidecar) title = ROCKSTAR_TITLES.get(str(sidecar.get("id"))) - if not title: - return "unsupported-title" if not launch_dir: return "no-channel" root = folder.resolve() @@ -354,7 +464,7 @@ def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_ap if not exe.is_relative_to(root): return "invalid-game-path" workdir = (folder / str(sidecar["workdir"])).resolve() if sidecar.get("workdir") is not None else exe.parent - if not workdir.is_relative_to(root) or not exe.is_file() or not (folder / "MTLX.dll").is_file(): + if not workdir.is_relative_to(root) or not exe.is_file() or legacy and not any((p / "MTLX.dll").is_file() for p in (root, exe.parent)): return "invalid-game-path" args = sidecar.get("args") or [] if not isinstance(args, list) or any(not isinstance(arg, str) or "\0" in arg for arg in args): @@ -376,7 +486,10 @@ def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_ap made = "present" if (Path(compat_data) / "pfx/user.reg").is_file() else create_prefix(compat_data, proton) if made not in ("created", "present"): return "prefix-" + made - if not rockstar_registry(folder, title, compat_data, proton): + arch = "x86" if signature[4:] == b"\x4c\x01" else "x64" + if sdk: + log("rockstar runtime: " + rockstar_runtime(folder, exe, compat_data, arch)) + if not rockstar_registry(folder, title, compat_data, proton, sdk_arch=arch if sdk else None): return "registry-unavailable" target.mkdir(parents=True, exist_ok=True) with tempfile.NamedTemporaryFile(prefix="Launcher-", suffix=".exe", dir=target, delete=False) as temporary: @@ -391,14 +504,28 @@ def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_ap answer = (ask_app or ask)(Path(launch_dir) / "stores", {"op": "rockstar-launch", "store": "rockstar", "id": str(sidecar.get("id"))}, timeout=120.0) if not isinstance(answer, dict) or not answer.get("ok"): return "session-" + (str(answer.get("reason") or "refused") if isinstance(answer, dict) else "timeout") - if not isinstance(answer.get("material"), str) or not re.fullmatch(r"[0-9A-Fa-f]{640}", answer["material"]): + if legacy and (not isinstance(answer.get("material"), str) or not re.fullmatch(r"[0-9A-Fa-f]{640}", answer["material"])): return "invalid-material" expires = answer.get("expiresAt") if not isinstance(expires, int) or not time.time() * 1000 < expires <= time.time() * 1000 + 120_000: return "invalid-expiry" launch = {"folder": windows_path(str(root)), "exe": windows_path(str(exe)), "workdir": windows_path(str(workdir)), - "args": args, "pipe": answer.get("pipe"), "material": answer["material"], "expiresAt": expires} - if len(json.dumps(launch).encode("utf-8")) > 16384: + "args": args, "expiresAt": expires} + if legacy: + launch.update(pipe=answer.get("pipe"), material=answer["material"]) + if sdk: + session = answer.get("session") + if not isinstance(session, dict) or not isinstance(session.get("accountId"), str) \ + or not re.fullmatch(r"[1-9][0-9]{0,19}", session["accountId"]) or int(session["accountId"]) > 2**64 - 1 \ + or any(not isinstance(session.get(key), str) or not session[key] or "\0" in session[key] + or len(session[key].encode("utf-8")) > limit for key, limit in (("identity", 512), ("ticket", 49152))): + return "invalid-sdk-session" + launch["session"] = {key: session[key] for key in ("accountId", "identity", "ticket")} + if "titleId" in session: + if not isinstance(session["titleId"], str) or not re.fullmatch(r"[a-z][a-z0-9_]{0,63}", session["titleId"]): + return "invalid-sdk-title" + launch["session"]["titleId"] = session["titleId"] + if len(json.dumps(launch).encode("utf-8")) > 65536: return "handoff-too-large" with tempfile.NamedTemporaryFile(mode="w", prefix="launch-", suffix=".json", dir=target, delete=False) as temporary: temporary_path = Path(temporary.name) @@ -1446,6 +1573,10 @@ def main(argv): log("gog registry: " + apply_gog_registry(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) log("gog support data: " + gog_support_data(folder, compat_data, os.environ.get("BL_STORE_PROTON", ""))) if store == "rockstar": + if game not in ROCKSTAR_TITLES and not rockstar_sdk(folder, sidecar): + if compat_data: + (Path(compat_data) / "pfx" / ROCKSTAR_FOLDER / "launch.json").unlink(missing_ok=True) + return STORE_GAME try: state = prepare_rockstar(folder, sidecar, compat_data, launch_dir, os.environ.get("BL_STORE_PROTON", "")) except (OSError, ValueError, subprocess.TimeoutExpired): diff --git a/tools/rockstar-launcher/README.md b/tools/rockstar-launcher/README.md index e22a4183c8..2965084713 100644 --- a/tools/rockstar-launcher/README.md +++ b/tools/rockstar-launcher/README.md @@ -1,11 +1,17 @@ # Rockstar launcher service -`Launcher.exe` starts the selected installed game and serves its launcher pipe. The Android app checks ownership and retrieves the launch response from Rockstar. Account credentials and ROS tickets stay in the app. +`Launcher.exe` starts the selected installed game and serves its launcher pipes. The Android app obtains title authorization from Rockstar. Refresh credentials stay in Android Keystore-backed storage. -The handoff is deleted before starting the game. It expires after 90 seconds. The pipe accepts the child process's greeting and returns the server-issued launch material. No game files are patched. +The handoff is mode 0600, expires after 90 seconds and is deleted before starting the game. Legacy launches carry server-issued launch material. SDK launches also carry a short-lived ROS ticket and account identity; those values are kept in memory after the handoff is consumed and are not logged. Pipes reject remote clients and check the client process against the launched child. No game files are patched. + +GTA III, Vice City and San Andreas use body-length MTLX replies. GTA IV and L.A. Noire use total-length, terminated replies. Titles with installed Social Club metadata or SDK binaries use the SDK IPC adapter, including user-info, login, ticket, initialization and authorized title-state synchronization. The title metadata supplies the ROS identity and principal executable; it is checked against Rockstar's catalog before title authorization. Other titles retain Play and Steam shortcuts and attempt the normal executable launch path. + +The SDK runtime is extracted from the game's own Social-Club-Setup.exe when present. Architecture-specific payloads are staged into the prefix, archive paths and sizes are checked, interrupted copies are retried, and both registry views are registered. The helper discovers launcher identity pipe names in the game executable and answers bounded INIT challenges from the launched process. No vendor executables or runtime files are bundled with this tool. SDK initialization has a 90-second deadline. SDK wire tests and fixture clients do not establish gameplay compatibility for every title; per-title ROS ticket exchange and secondary SDK channels remain unverified. GTA III defaults to full x87 precision for FEX before Wine starts, because reduced precision crashed new-game initialization on the test device. San Andreas defaults to WineD3D, because DXVK intermittently corrupted its textures; full precision and conservative memory ordering did not prevent that corruption. These defaults use DroidDeck's per-game settings and preserve explicit per-game overrides. +Raw launcher identity requests use `INIT::` with a terminating colon. Framed requests carry their payload length. The reply echoes the complete challenge after `TINI:launcher:`; partial reads do not complete a raw request. + `build.sh` builds 32-bit and 64-bit executables with the GNU Windows targets and stages them as APK resources. `legacy-cipher.bin` contains the fixed client protocol tables, not account credentials or APK signing keys. Run the protocol tests with: diff --git a/tools/rockstar-launcher/examples/sdk_probe.rs b/tools/rockstar-launcher/examples/sdk_probe.rs new file mode 100644 index 0000000000..b280ce0409 --- /dev/null +++ b/tools/rockstar-launcher/examples/sdk_probe.rs @@ -0,0 +1,80 @@ +#[cfg(windows)] +fn run() -> Result<(), Box> { + use droiddeck_rockstar_launcher::{pipe::Pipe, sdk::Message, Frame, Length}; + use std::io::{Read, Write}; + for (path, framed) in [ + (b"\\\\.\\pipe\\ProbeLauncherPipe\0".as_slice(), true), + (b"\\\\.\\pipe\\RawProbeLauncher_Pipe\0".as_slice(), false), + ] { + let name = std::str::from_utf8(&path[9..path.len() - 1])?; + let mut pipe = Pipe::connect(name, std::time::Duration::from_secs(10))?; + let request = b"INIT:42:"; + if framed { + let mut bytes = (request.len() as u32).to_le_bytes().to_vec(); + bytes.extend_from_slice(request); + pipe.write_all(&bytes)?; + let response = Frame::read(&mut pipe, Length::Body)?; + if response.tag != *b"TINI" || response.payload != b"launcher:42:" { + return Err("invalid framed launcher identity reply".into()); + } + } else { + pipe.write_all(b"INIT:4")?; + std::thread::sleep(std::time::Duration::from_millis(20)); + pipe.write_all(b"2:")?; + let mut response = vec![0; b"TINI:launcher:42:".len()]; + pipe.read_exact(&mut response)?; + if response != b"TINI:launcher:42:" { + return Err("invalid raw launcher identity reply".into()); + } + } + } + let args: Vec<_> = std::env::args().collect(); + let instance: u32 = args + .iter() + .find_map(|arg| arg.strip_prefix("-processInstance=")) + .ok_or("missing instance")? + .parse()?; + let output = args + .windows(2) + .find(|pair| pair[0] == "--result") + .map(|pair| &pair[1]) + .ok_or("missing result path")?; + let mut pipe = Pipe::connect( + &format!("chrome.rgsc_gameinst_{instance}"), + std::time::Duration::from_secs(10), + )?; + if Message::read(&mut pipe)?.kind != 0xffff { + return Err("missing transport hello".into()); + } + Message { + routing: i32::MAX, + kind: 0x40000, + flags: 2, + payload: 4u32.to_le_bytes().to_vec(), + } + .write(&mut pipe)?; + let expected = [0x30002, 0x30003, 0x30004, 0x30000]; + for kind in expected { + let message = Message::read(&mut pipe)?; + if message.kind != kind || message.routing != i32::MAX || message.flags != 2 { + return Err("unexpected SDK message envelope".into()); + } + if kind == 0x30002 && message.payload != [3, 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + { + return Err("unexpected fixture account".into()); + } + if kind == 0x30000 && message.payload != 4u32.to_le_bytes() { + return Err("launcher hello lost its context".into()); + } + } + std::fs::write(output, "SDK handshake accepted")?; + Ok(()) +} + +fn main() { + #[cfg(windows)] + if let Err(error) = run() { + eprintln!("SDK probe failed: {error}"); + std::process::exit(1); + } +} diff --git a/tools/rockstar-launcher/src/identity.rs b/tools/rockstar-launcher/src/identity.rs new file mode 100644 index 0000000000..795d56da1a --- /dev/null +++ b/tools/rockstar-launcher/src/identity.rs @@ -0,0 +1,170 @@ +use std::collections::BTreeSet; +use std::io::{self, Read}; + +const LIMIT: usize = 4096; + +fn invalid() -> io::Error { + io::Error::new( + io::ErrorKind::InvalidData, + "invalid launcher identity request", + ) +} + +fn collect(bytes: &[u8], names: &mut BTreeSet) { + let prefix = br"\\.\pipe\"; + for (index, window) in bytes.windows(prefix.len()).enumerate() { + if window != prefix { + continue; + } + let tail = &bytes[index + prefix.len()..]; + let Some(end) = tail.iter().take(97).position(|byte| *byte == 0) else { + continue; + }; + let name = &tail[..end]; + if !name.is_empty() + && name + .iter() + .all(|byte| byte.is_ascii_alphanumeric() || b"_-".contains(byte)) + { + let name = std::str::from_utf8(name).unwrap(); + if name.ends_with("LauncherPipe") || name.ends_with("Launcher_Pipe") { + names.insert(name.to_owned()); + } + } + } +} + +pub fn pipe_names(reader: &mut impl Read) -> io::Result> { + let mut names = BTreeSet::new(); + let mut carry = Vec::new(); + let mut chunk = [0; 65536]; + let mut total = 0usize; + loop { + let count = reader.read(&mut chunk)?; + if count == 0 { + break; + } + total += count; + if total > 256 * 1024 * 1024 { + return Err(invalid()); + } + carry.extend_from_slice(&chunk[..count]); + collect(&carry, &mut names); + for offset in 0..2 { + let ascii: Vec<_> = carry[offset..] + .chunks_exact(2) + .map(|pair| if pair[1] == 0 { pair[0] } else { 0 }) + .collect(); + collect(&ascii, &mut names); + } + if names.len() > 4 { + return Err(invalid()); + } + carry.drain(..carry.len().saturating_sub(256)); + } + Ok(names.into_iter().collect()) +} + +pub fn exchange(reader: &mut impl Read) -> io::Result> { + let mut header = [0; 4]; + reader.read_exact(&mut header)?; + let framed = header != *b"INIT"; + let mut request = if framed { + let size = u32::from_le_bytes(header) as usize; + if !(6..=LIMIT).contains(&size) { + return Err(invalid()); + } + let mut bytes = vec![0; size]; + reader.read_exact(&mut bytes)?; + bytes + } else { + let mut bytes = header.to_vec(); + let mut byte = [0]; + reader.read_exact(&mut byte)?; + if byte[0] != b':' { + return Err(invalid()); + } + bytes.push(b':'); + loop { + reader.read_exact(&mut byte)?; + if !(32..127).contains(&byte[0]) || bytes.len() >= 261 { + return Err(invalid()); + } + bytes.push(byte[0]); + if byte[0] == b':' { + break; + } + } + bytes + }; + if request.last() == Some(&0) { + request.pop(); + } + let challenge = request.strip_prefix(b"INIT:").ok_or_else(invalid)?; + if challenge.is_empty() + || !framed && challenge == b":" + || challenge.len() > 256 + || !challenge.iter().all(|byte| (32..127).contains(byte)) + { + return Err(invalid()); + } + let mut reply = b"TINI:launcher:".to_vec(); + reply.extend_from_slice(challenge); + if framed { + let mut bytes = (reply.len() as u32).to_le_bytes().to_vec(); + bytes.extend_from_slice(&reply); + Ok(bytes) + } else { + Ok(reply) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::io::Cursor; + + #[test] + fn discovers_ascii_and_wide_pipe_names_across_chunks() { + let mut bytes = vec![0; 65530]; + bytes.extend_from_slice(br"\\.\pipe\GameLauncherPipe"); + bytes.push(0); + for value in "\\\\.\\pipe\\OtherLauncher_Pipe\0".encode_utf16() { + bytes.extend_from_slice(&value.to_le_bytes()); + } + bytes.extend_from_slice(br"\\.\pipe\..\outsideLauncherPipe"); + bytes.push(0); + assert_eq!( + pipe_names(&mut Cursor::new(bytes)).unwrap(), + ["GameLauncherPipe", "OtherLauncher_Pipe"] + ); + } + + #[test] + fn identity_replies_echo_only_a_valid_challenge() { + struct Split(R); + impl Read for Split { + fn read(&mut self, buffer: &mut [u8]) -> io::Result { + let size = buffer.len().min(2); + self.0.read(&mut buffer[..size]) + } + } + assert_eq!( + exchange(&mut Split(Cursor::new(b"INIT:123456789:\0"))).unwrap(), + b"TINI:launcher:123456789:" + ); + let request = b"INIT:nonce:123:"; + let mut bytes = (request.len() as u32).to_le_bytes().to_vec(); + bytes.extend_from_slice(request); + let reply = exchange(&mut Cursor::new(bytes)).unwrap(); + assert_eq!( + u32::from_le_bytes(reply[..4].try_into().unwrap()) as usize, + reply.len() - 4 + ); + assert_eq!(&reply[4..], b"TINI:launcher:nonce:123:"); + assert!(exchange(&mut Cursor::new(b"INIT:")).is_err()); + assert!(exchange(&mut Cursor::new(b"INIT:a\0b")).is_err()); + assert!(exchange(&mut Cursor::new(b"INIT:unterminated")).is_err()); + assert!(exchange(&mut Cursor::new([255; 4])).is_err()); + } +} diff --git a/tools/rockstar-launcher/src/lib.rs b/tools/rockstar-launcher/src/lib.rs index e08b2bc92b..e37ff76d85 100644 --- a/tools/rockstar-launcher/src/lib.rs +++ b/tools/rockstar-launcher/src/lib.rs @@ -3,6 +3,9 @@ use std::io::{self, Read, Write}; #[cfg(windows)] pub mod pipe; +pub mod identity; +pub mod sdk; + pub const MAX_FRAME_BYTES: usize = 64 * 1024; const OVERHEAD: usize = 4 + 4 + 1; @@ -111,6 +114,21 @@ impl Frame { #[cfg(test)] mod tests { use super::*; + + #[test] + fn launcher_era_reply_uses_total_length_and_a_terminator() { + let mut bytes = Vec::new(); + Frame { + tag: *b"DUNN", + payload: vec![b'A'; 640], + nul_terminated: true, + } + .write(&mut bytes, Length::Total) + .unwrap(); + assert_eq!(bytes.len(), 650); + assert_eq!(&bytes[..9], &[138, 2, 0, 0, b'D', b'U', b'N', b'N', b':']); + assert_eq!(bytes[649], 0); + } use std::io::Cursor; #[test] diff --git a/tools/rockstar-launcher/src/main.rs b/tools/rockstar-launcher/src/main.rs index fe5923ab37..0913c6d548 100644 --- a/tools/rockstar-launcher/src/main.rs +++ b/tools/rockstar-launcher/src/main.rs @@ -23,17 +23,21 @@ fn log(message: &str) { #[cfg(windows)] fn run() -> Result> { - use droiddeck_rockstar_launcher::{pipe::Listener, wait_for_game, Frame, Length}; - use std::io::Read; + use droiddeck_rockstar_launcher::{ + pipe::Listener, + sdk::{Message, Session}, + wait_for_game, Frame, Length, + }; + use std::io::{Read, Write}; use std::time::{Duration, SystemTime, UNIX_EPOCH}; let config_path = std::env::current_exe()?.with_file_name("launch.json"); let mut data = Vec::new(); std::fs::File::open(&config_path)? - .take(16385) + .take(65537) .read_to_end(&mut data)?; std::fs::remove_file(&config_path)?; - if data.len() > 16384 { + if data.len() > 65536 { return Err("launch handoff exceeds size limit".into()); } let config: serde_json::Value = serde_json::from_slice(&data)?; @@ -51,16 +55,48 @@ fn run() -> Result> { if expires <= now || expires - now > 120_000 { return Err("launch handoff expired".into()); } - let material = text("material")?.as_bytes().to_vec(); - if material.len() != 640 || !material.iter().all(u8::is_ascii_hexdigit) { - return Err("invalid launch material".into()); - } - let pipe_name = text("pipe")?.to_owned(); - if !matches!( - pipe_name.as_str(), - "GTA3_Pipe" | "GTA-VC_Pipe" | "GTA_SA_Pipe" - ) { - return Err("unsupported Rockstar launch pipe".into()); + let legacy = if config.get("pipe").is_some() { + let pipe_name = text("pipe")?.to_owned(); + if !matches!( + pipe_name.as_str(), + "GTA3_Pipe" | "GTA-VC_Pipe" | "GTA_SA_Pipe" | "GTAIV_Pipe" | "LANOIRE_Pipe" + ) { + return Err("invalid Rockstar launch pipe".into()); + } + let material = text("material")?.as_bytes().to_vec(); + if material.len() != 640 || !material.iter().all(u8::is_ascii_hexdigit) { + return Err("invalid launch material".into()); + } + Some((pipe_name, material)) + } else { + None + }; + let session = config + .get("session") + .map(|value| -> Result> { + let account = value + .get("accountId") + .and_then(|v| v.as_str()) + .ok_or("missing SDK account")? + .parse::()?; + let identity = value + .get("identity") + .and_then(|v| v.as_str()) + .ok_or("missing SDK identity")?; + let ticket = value + .get("ticket") + .and_then(|v| v.as_str()) + .ok_or("missing SDK ticket")?; + let session = Session::new(account, identity.to_owned(), ticket.to_owned())?; + Ok(if let Some(title) = value.get("titleId") { + session.with_title(title.as_str().ok_or("invalid SDK title")?.to_owned())? + } else { + session + }) + }) + .transpose()?; + if legacy.is_none() && session.is_none() { + return Err("missing launch protocol".into()); } let root = std::fs::canonicalize(text("folder")?)?; let exe = std::fs::canonicalize(text("exe")?)?; @@ -68,7 +104,9 @@ fn run() -> Result> { if !exe.is_file() || !exe.starts_with(&root) || !workdir.starts_with(&root) - || !root.join("MTLX.dll").is_file() + || legacy.is_some() + && !root.join("MTLX.dll").is_file() + && !exe.parent().unwrap_or(&root).join("MTLX.dll").is_file() { return Err("invalid Rockstar game path".into()); } @@ -91,40 +129,125 @@ fn run() -> Result> { .map(|value| value.as_str().ok_or("invalid game argument")) .collect(); log("launch handoff accepted"); - let listener = Listener::new(&pipe_name, Duration::from_secs(30))?; - log("launcher pipe created"); - let mut child = std::process::Command::new(exe) - .current_dir(workdir) - .args(args?) - .spawn()?; + let legacy = legacy + .map(|(name, material)| { + let terminated = matches!(name.as_str(), "GTAIV_Pipe" | "LANOIRE_Pipe"); + Listener::new(&name, Duration::from_secs(90)) + .map(|listener| (listener, material, terminated)) + }) + .transpose()?; + let instance = std::process::id(); + let sdk_listener = if session.is_some() { + Some(Listener::new( + &format!("chrome.rgsc_gameinst_{instance}"), + Duration::from_secs(90), + )?) + } else { + None + }; + let mut identity_listeners = Vec::new(); + if session.is_some() { + for name in + droiddeck_rockstar_launcher::identity::pipe_names(&mut std::fs::File::open(&exe)?)? + { + identity_listeners.push(Listener::new(&name, Duration::from_secs(90))?); + } + } + log("launcher pipes created"); + let mut command = std::process::Command::new(exe); + command.current_dir(workdir).args(args?); + if session.is_some() { + command.arg(format!("-processInstance={instance}")); + } + let mut child = command.spawn()?; let pid = child.id(); log("game process started"); + for listener in identity_listeners { + std::thread::spawn(move || { + let serve = || -> std::io::Result<()> { + let mut pipe = listener.accept()?.with_deadline(Duration::from_secs(90)); + if pipe.client_pid()? != pid { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "unexpected launcher identity client", + )); + } + let reply = droiddeck_rockstar_launcher::identity::exchange(&mut pipe)?; + pipe.write_all(&reply)?; + log("launcher identity challenge complete"); + pipe = pipe.with_timeout(Duration::from_secs(86400)); + let mut progress = [0; 4096]; + while matches!(pipe.read(&mut progress), Ok(size) if size > 0) {} + Ok(()) + }; + if let Err(error) = serve() { + log(&format!("launcher identity exchange ended: {error}")); + } + }); + } let (result, handshake) = std::sync::mpsc::sync_channel(1); std::thread::spawn(move || { let serve = || -> std::io::Result<()> { - let mut pipe = listener.accept()?; - log("launcher pipe connected"); - if pipe.client_pid()? != pid { - return Err(std::io::Error::new( - std::io::ErrorKind::PermissionDenied, - "unexpected Rockstar pipe client", - )); + if let Some((listener, material, terminated)) = legacy { + let mut pipe = listener.accept()?; + log("legacy launcher pipe connected"); + if pipe.client_pid()? != pid { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "unexpected Rockstar pipe client", + )); + } + let request = Frame::read(&mut pipe, Length::Total)?; + if request.tag != *b"COLE" || !request.payload.is_empty() { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidData, + "unexpected Rockstar greeting", + )); + } + Frame { + tag: *b"DUNN", + payload: material, + nul_terminated: terminated, + } + .write( + &mut pipe, + if terminated { + Length::Total + } else { + Length::Body + }, + )?; + log("legacy launcher handshake complete"); } - let request = Frame::read(&mut pipe, Length::Total)?; - log("game greeting received"); - if request.tag != *b"COLE" || !request.payload.is_empty() { - return Err(std::io::Error::new( - std::io::ErrorKind::InvalidData, - "unexpected Rockstar greeting", - )); + if let (Some(listener), Some(session)) = (sdk_listener, session) { + let mut pipe = listener.accept()?.with_deadline(Duration::from_secs(90)); + if pipe.client_pid()? != pid { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "unexpected Rockstar SDK client", + )); + } + Message::hello(instance).write(&mut pipe)?; + let mut authenticated = false; + loop { + let request = match Message::read(&mut pipe) { + Ok(request) => request, + Err(_) if authenticated => return Ok(()), + Err(error) => return Err(error), + }; + let responses = session.respond(&request)?; + let sends_login = request.kind == 0x40000; + for response in responses { + response.write(&mut pipe)?; + } + if sends_login && !authenticated { + authenticated = true; + pipe = pipe.with_timeout(Duration::from_secs(86400)); + log("SDK login sent"); + let _ = result.send(Ok(())); + } + } } - Frame { - tag: *b"DUNN", - payload: material, - nul_terminated: false, - } - .write(&mut pipe, Length::Body)?; - log("launcher handshake complete"); Ok(()) }; let outcome = serve(); diff --git a/tools/rockstar-launcher/src/pipe.rs b/tools/rockstar-launcher/src/pipe.rs index 79ab4d9e42..9bffedde38 100644 --- a/tools/rockstar-launcher/src/pipe.rs +++ b/tools/rockstar-launcher/src/pipe.rs @@ -84,6 +84,7 @@ impl Drop for OwnedHandle { pub struct Pipe { handle: OwnedHandle, timeout: Duration, + deadline: Option, } pub struct Listener(Pipe); @@ -119,6 +120,7 @@ impl Listener { Ok(Self(Pipe { handle: OwnedHandle(handle), timeout, + deadline: None, })) } @@ -174,6 +176,18 @@ impl Listener { } impl Pipe { + pub fn with_timeout(mut self, timeout: Duration) -> Self { + self.timeout = timeout; + self.deadline = None; + self + } + + pub fn with_deadline(mut self, timeout: Duration) -> Self { + self.timeout = timeout; + self.deadline = Some(Instant::now() + timeout); + self + } + pub fn client_pid(&self) -> io::Result { let mut pid = 0; if unsafe { GetNamedPipeClientProcessId(self.handle.0, &mut pid) } == 0 || pid == 0 { @@ -210,6 +224,7 @@ impl Pipe { return Ok(Self { handle: OwnedHandle(handle), timeout, + deadline: None, }); } let error = io::Error::last_os_error(); @@ -234,6 +249,16 @@ impl Pipe { if size == 0 { return Ok(0); } + let timeout = self + .deadline + .map(|deadline| deadline.saturating_duration_since(Instant::now())) + .unwrap_or(self.timeout); + if timeout.is_zero() { + return Err(io::Error::new( + io::ErrorKind::TimedOut, + "Rockstar pipe deadline exceeded", + )); + } let event = unsafe { CreateEventW(null(), 1, 0, null()) }; if event.is_null() { return Err(io::Error::last_os_error()); @@ -280,7 +305,7 @@ impl Pipe { let wait = unsafe { WaitForSingleObject( event.0, - self.timeout.as_millis().min(u32::MAX as u128 - 1) as u32, + timeout.as_millis().min(u32::MAX as u128 - 1) as u32, ) }; if wait != 0 { @@ -342,6 +367,28 @@ mod tests { ) } + #[test] + fn initialization_deadline_survives_partial_reads() { + let name = name(); + let listener = Listener::new(&name, Duration::from_secs(2)).unwrap(); + let worker = std::thread::spawn(move || { + let mut server = listener + .accept() + .unwrap() + .with_deadline(Duration::from_millis(150)); + let mut byte = [0]; + server.read_exact(&mut byte).unwrap(); + std::thread::sleep(Duration::from_millis(180)); + assert_eq!( + server.read(&mut byte).unwrap_err().kind(), + io::ErrorKind::TimedOut + ); + }); + let mut client = Pipe::connect(&name, Duration::from_secs(2)).unwrap(); + client.write_all(&[1]).unwrap(); + worker.join().unwrap(); + } + #[test] fn real_pipe_exchanges_both_framing_modes_and_identifies_the_client() { let name = name(); diff --git a/tools/rockstar-launcher/src/sdk.rs b/tools/rockstar-launcher/src/sdk.rs new file mode 100644 index 0000000000..9361ad54c2 --- /dev/null +++ b/tools/rockstar-launcher/src/sdk.rs @@ -0,0 +1,328 @@ +use std::io::{self, Read, Write}; + +const HEADER: usize = 16; +const MAX_BYTES: usize = 64 * 1024; +const CONTROL: i32 = i32::MAX; + +#[derive(PartialEq, Eq)] +pub struct Message { + pub routing: i32, + pub kind: u32, + pub flags: u32, + pub payload: Vec, +} + +impl std::fmt::Debug for Message { + fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter + .debug_struct("Message") + .field("routing", &self.routing) + .field("kind", &self.kind) + .field("flags", &self.flags) + .field("payload_bytes", &self.payload.len()) + .finish() + } +} + +fn invalid() -> io::Error { + io::Error::new(io::ErrorKind::InvalidData, "invalid Rockstar SDK message") +} + +impl Message { + pub fn read(reader: &mut impl Read) -> io::Result { + let mut header = [0; HEADER]; + reader.read_exact(&mut header)?; + let size = u32::from_le_bytes(header[..4].try_into().unwrap()) as usize; + if size > MAX_BYTES - HEADER { + return Err(invalid()); + } + let mut payload = vec![0; size]; + reader.read_exact(&mut payload)?; + Ok(Self { + routing: i32::from_le_bytes(header[4..8].try_into().unwrap()), + kind: u32::from_le_bytes(header[8..12].try_into().unwrap()), + flags: u32::from_le_bytes(header[12..16].try_into().unwrap()), + payload, + }) + } + + pub fn write(&self, writer: &mut impl Write) -> io::Result<()> { + if self.payload.len() > MAX_BYTES - HEADER { + return Err(invalid()); + } + let mut bytes = Vec::with_capacity(HEADER + self.payload.len()); + bytes.extend_from_slice(&(self.payload.len() as u32).to_le_bytes()); + bytes.extend_from_slice(&self.routing.to_le_bytes()); + bytes.extend_from_slice(&self.kind.to_le_bytes()); + bytes.extend_from_slice(&self.flags.to_le_bytes()); + bytes.extend_from_slice(&self.payload); + writer.write_all(&bytes) + } + + fn control(kind: u32, payload: Payload) -> Self { + Self { + routing: CONTROL, + kind, + flags: 2, + payload: payload.0, + } + } + + pub fn hello(pid: u32) -> Self { + Self { + routing: -2, + kind: 0xffff, + flags: 2, + payload: pid.to_le_bytes().to_vec(), + } + } +} + +#[derive(Default)] +struct Payload(Vec); + +impl Payload { + fn raw(mut self, bytes: &[u8]) -> Self { + self.0.resize((self.0.len() + 3) & !3, 0); + self.0.extend_from_slice(bytes); + self + } + + fn u32(self, value: u32) -> Self { + self.raw(&value.to_le_bytes()) + } + fn u64(self, value: u64) -> Self { + self.raw(&value.to_le_bytes()) + } + fn string(self, value: &str) -> Self { + self.u32(value.len() as u32).raw(value.as_bytes()) + } +} + +pub struct Session { + account: u64, + identity: String, + ticket: String, + title: Option, + api: std::cell::Cell, +} + +impl Session { + pub fn new(account: u64, identity: String, ticket: String) -> io::Result { + if account == 0 + || identity.is_empty() + || identity.len() > 512 + || ticket.is_empty() + || ticket.len() > 48 * 1024 + || identity.contains('\0') + || ticket.contains('\0') + { + return Err(invalid()); + } + Ok(Self { + account, + identity, + ticket, + title: None, + api: std::cell::Cell::new(3), + }) + } + + pub fn with_title(mut self, title: String) -> io::Result { + if title.is_empty() + || title.len() > 64 + || !title.as_bytes()[0].is_ascii_lowercase() + || !title + .bytes() + .all(|value| value.is_ascii_lowercase() || value.is_ascii_digit() || value == b'_') + { + return Err(invalid()); + } + self.title = Some(title); + Ok(self) + } + + fn app_sync(&self, challenge: u64) -> io::Result { + let mut payload = Payload::default().u32(u32::from(self.title.is_some())); + if let Some(title) = &self.title { + payload = payload + .u64(u64::MAX) + .u64(0) + .u64(0) + .string(title) + .u32(1) + .u32(1) + .string(""); + } + let mut inner = Vec::new(); + Message::control(0x80006, payload).write(&mut inner)?; + Ok(Message::control( + 0x80002, + Payload::default().u64(challenge).string(&base64(&inner)), + )) + } + + pub fn login(&self) -> Vec { + let offset = u32::from(self.api.get() >= 4); + vec![ + Message::control( + 0x30001 + offset, + Payload::default().u32(3).u64(self.account).u32(0), + ), + Message::control( + 0x30002 + offset, + Payload::default() + .u64(self.account) + .u32(0) + .string(&self.identity), + ), + Message::control( + 0x30003 + offset, + Payload::default() + .string(&self.identity) + .string(&self.ticket), + ), + ] + } + + pub fn respond(&self, message: &Message) -> io::Result> { + match message.kind { + 0x80000 => { + if message.payload.len() != 8 { + return Err(invalid()); + } + let challenge = u64::from_le_bytes(message.payload[..8].try_into().unwrap()); + Ok(vec![self.app_sync(challenge)?]) + } + 0x40000 => { + if message.payload.len() < 4 { + return Err(invalid()); + } + let context = u32::from_le_bytes(message.payload[..4].try_into().unwrap()); + self.api.set(context); + let mut result = self.login(); + result.push(Message::control(0x30000, Payload::default().u32(context))); + Ok(result) + } + 0x40005 | 0x40007 => Ok(vec![Message::control( + 0x30004 + u32::from(self.api.get() >= 4), + Payload::default(), + )]), + _ => Ok(Vec::new()), + } + } +} + +fn base64(bytes: &[u8]) -> String { + const ALPHABET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + let mut output = String::with_capacity(bytes.len().div_ceil(3) * 4); + for part in bytes.chunks(3) { + let value = ((part[0] as u32) << 16) + | ((part.get(1).copied().unwrap_or(0) as u32) << 8) + | part.get(2).copied().unwrap_or(0) as u32; + output.push(ALPHABET[(value >> 18) as usize] as char); + output.push(ALPHABET[((value >> 12) & 63) as usize] as char); + output.push(if part.len() > 1 { + ALPHABET[((value >> 6) & 63) as usize] as char + } else { + '=' + }); + output.push(if part.len() > 2 { + ALPHABET[(value & 63) as usize] as char + } else { + '=' + }); + } + output +} + +#[cfg(test)] +mod tests { + use super::*; + use std::io::Cursor; + + #[test] + fn app_sync_echoes_challenge_without_inventing_owned_titles() { + let session = Session::new(123, "name".into(), "ticket".into()).unwrap(); + let request = Message::control(0x80000, Payload::default().u64(42)); + let response = session.respond(&request).unwrap().remove(0); + assert_eq!(response.kind, 0x80002); + assert_eq!(&response.payload[..8], &42u64.to_le_bytes()); + assert_eq!(&response.payload[12..], b"BAAAAP///38GAAgAAgAAAAAAAAA="); + assert_eq!(base64(b"f"), "Zg=="); + assert_eq!(base64(b"fo"), "Zm8="); + assert_eq!(base64(b"foo"), "Zm9v"); + assert!(session.with_title("../game".into()).is_err()); + } + + #[test] + fn transport_hello_matches_wire_layout() { + let mut bytes = Vec::new(); + Message::hello(0x1234).write(&mut bytes).unwrap(); + assert_eq!( + bytes, + [4, 0, 0, 0, 254, 255, 255, 255, 255, 255, 0, 0, 2, 0, 0, 0, 52, 18, 0, 0] + ); + } + + #[test] + fn login_preserves_string_lengths_and_alignment() { + let session = Session::new(0x1122334455667788, "a@b".into(), "ticket".into()).unwrap(); + let login = session.login(); + assert_eq!( + login[0].payload, + [3, 0, 0, 0, 136, 119, 102, 85, 68, 51, 34, 17, 0, 0, 0, 0] + ); + assert_eq!( + login[1].payload, + [136, 119, 102, 85, 68, 51, 34, 17, 0, 0, 0, 0, 3, 0, 0, 0, 97, 64, 98] + ); + assert_eq!( + login[2].payload, + [3, 0, 0, 0, 97, 64, 98, 0, 6, 0, 0, 0, 116, 105, 99, 107, 101, 116] + ); + } + + #[test] + fn init_sends_authenticated_state_before_launcher_hello() { + let session = Session::new(123, "name".into(), "ticket".into()).unwrap(); + for (api, expected) in [ + (3, [0x30001, 0x30002, 0x30003, 0x30000]), + (4, [0x30002, 0x30003, 0x30004, 0x30000]), + ] { + let request = Message::control(0x40000, Payload::default().u32(api)); + let result = session.respond(&request).unwrap(); + assert_eq!(result.iter().map(|m| m.kind).collect::>(), expected); + assert_eq!( + result[0].payload, + [3, 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + ); + assert_eq!(result[3].payload, api.to_le_bytes()); + } + } + + #[test] + fn malformed_frames_and_sessions_are_rejected() { + assert!(Session::new(0, "name".into(), "ticket".into()).is_err()); + assert!(Session::new(123, "name".into(), "".into()).is_err()); + let session = Session::new(123, "name".into(), "ticket".into()).unwrap(); + assert!(session + .respond(&Message::control(0x40000, Payload::default())) + .is_err()); + assert!(Message::read(&mut Cursor::new(vec![255; 16])).is_err()); + assert!(Message::read(&mut Cursor::new(vec![0; 15])).is_err()); + } + + #[test] + fn concatenated_messages_remain_separate() { + let session = Session::new(123, "name".into(), "ticket".into()).unwrap(); + let mut bytes = Vec::new(); + for message in session.login() { + message.write(&mut bytes).unwrap(); + } + let mut reader = Cursor::new(bytes); + for message in session.login() { + assert_eq!(Message::read(&mut reader).unwrap(), message); + } + } +} diff --git a/tools/tests/test_store_launch_rockstar.py b/tools/tests/test_store_launch_rockstar.py index 68f4401544..23cd6ae632 100644 --- a/tools/tests/test_store_launch_rockstar.py +++ b/tools/tests/test_store_launch_rockstar.py @@ -1,4 +1,5 @@ import json +import os from pathlib import Path import tempfile import time @@ -9,6 +10,112 @@ from test_store_launch import store class RockstarLaunch(unittest.TestCase): + def test_service_directory_cannot_export_sessions_outside_the_prefix(self): + with tempfile.TemporaryDirectory() as root: + folder, sidecar, prefix, _, _ = self.setup_game(root) + outside = Path(root) / 'outside' + outside.mkdir() + target = prefix / 'pfx' / store.ROCKSTAR_FOLDER + target.parent.mkdir(parents=True) + target.symlink_to(outside, target_is_directory=True) + sentinel = outside / 'launch.json' + sentinel.write_text('keep') + with patch.object(store, 'ask') as ask: + self.assertEqual('invalid-service-path', store.prepare_rockstar(folder, sidecar, prefix, 'channel')) + ask.assert_not_called() + self.assertEqual('keep', sentinel.read_text()) + + def test_sdk_registration_does_not_use_an_untrusted_display_name_as_a_key(self): + with tempfile.TemporaryDirectory() as root: + folder, _, prefix, _, _ = self.setup_game(root) + with patch.object(store, 'wait_for_server', return_value=True): + self.assertTrue(store.rockstar_registry(folder, None, prefix, '', sdk_arch='x64')) + text = (prefix / 'pfx/system.reg').read_text() + self.assertIn(r'[Software\\Rockstar Games\\Rockstar Games Social Club]', text) + self.assertNotIn('Grand Theft Auto', text) + + def test_root_metadata_is_found_after_many_assets(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) + for index in range(300): + (folder / ('asset-%s.dat' % index)).write_bytes(b'asset') + (folder / 'title.rgl').write_bytes(b'RGLM' + bytes(108)) + self.assertTrue(store.rockstar_sdk(folder, {'id': 'future_title', 'exe': 'Game.exe'})) + (folder / 'title.rgl').unlink() + (folder / 'Title.RGL').write_bytes(b'RGLM' + bytes(108)) + self.assertTrue(store.rockstar_sdk(folder, {'id': 'future_title', 'exe': 'Game.exe'})) + + def test_sdk_titles_receive_only_their_short_lived_game_session(self): + with tempfile.TemporaryDirectory() as root: + def change(values): + folder, sidecar, _, _, answer = values + sidecar['id'] = 'future_title' + (folder / 'socialclub.dll').write_bytes(b'game-runtime') + answer['session'] = {'accountId': '123', 'identity': 'player@example.invalid', 'ticket': 'game-session', + 'ScAuthToken': 'never-export-refresh-token'} + result, path, _ = self.prepare(root, change) + self.assertEqual('ready', result) + data = json.loads(path.read_text()) + self.assertEqual({'accountId', 'identity', 'ticket'}, set(data['session'])) + self.assertNotIn('pipe', data) + self.assertNotIn('material', data) + self.assertNotIn('never-export-refresh-token', path.read_text()) + self.assertEqual(0o600, path.stat().st_mode & 0o777) + + def test_invalid_sdk_sessions_cannot_reuse_an_old_handoff(self): + for session in (None, {'accountId': '0', 'identity': 'player', 'ticket': 'session'}, + {'accountId': '123', 'identity': 'player', 'ticket': 'bad\0session'}): + with self.subTest(session=session), tempfile.TemporaryDirectory() as root: + def change(values): + folder, sidecar, _, _, answer = values + sidecar['id'] = 'future_title' + (folder / 'socialclub.dll').write_bytes(b'game-runtime') + answer['session'] = session + result, path, _ = self.prepare(root, change) + self.assertEqual('invalid-sdk-session', result) + self.assertFalse(path.exists()) + + def test_sdk_detection_does_not_follow_external_metadata(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) / 'game' + folder.mkdir() + metadata = Path(root) / 'outside.rgl' + metadata.write_bytes(b'RGLM' + bytes(108)) + (folder / 'title.rgl').symlink_to(metadata) + self.assertFalse(store.rockstar_sdk(folder, {'id': 'future_title', 'exe': 'Game.exe'})) + + def test_sdk_installer_cannot_escape_its_architecture_folder(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) / 'game' + installer = folder / 'Installers/Social-Club-Setup.exe' + installer.parent.mkdir(parents=True) + installer.write_bytes(b'installer') + listing = type('Listing', (), {'returncode': 0, 'stdout': b'Path = x64/../../outside.dll\nSize = 1\n'})() + with patch.object(store.shutil, 'which', return_value='/bin/7z'), patch.object(store.subprocess, 'run', return_value=listing): + with self.assertRaises(ValueError): + store.rockstar_runtime(folder, folder / 'Game.exe', str(Path(root) / 'prefix'), 'x64') + self.assertFalse((Path(root) / 'outside.dll').exists()) + + def test_other_titles_can_launch_without_the_classic_pipe_service(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) + sidecar = {'store': 'rockstar', 'id': 'rdr2', 'exe': 'RDR2.exe'} + with patch.object(store, 'find_store_game', return_value=(folder, sidecar)), \ + patch.object(store, 'prepare_rockstar') as prepare, \ + patch.object(store, 'ask') as ask, patch.dict(os.environ, {}, clear=True): + self.assertEqual(store.STORE_GAME, store.main([str(folder / 'RDR2.exe')])) + prepare.assert_not_called() + ask.assert_not_called() + + def test_classic_authentication_failure_still_stops_launch(self): + with tempfile.TemporaryDirectory() as root: + folder = Path(root) + sidecar = {'store': 'rockstar', 'id': 'gtavc', 'exe': 'gta-vc.exe'} + with patch.object(store, 'find_store_game', return_value=(folder, sidecar)), \ + patch.object(store, 'prepare_rockstar', return_value='session-not-owned'), \ + patch.dict(os.environ, {}, clear=True): + self.assertEqual(store.RAN_FAILED, store.main([str(folder / 'gta-vc.exe')])) + def setup_game(self, root): folder = Path(root) / 'game' folder.mkdir() From c57cc3312525ae3723f6d34a4b3b8922ef29b76d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 07:31:18 -0500 Subject: [PATCH 068/101] fix(ui): the portrait bottom bar follows the sidebar labels setting (#2558) --- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 5 ++++- .../droiddeck/launcher/ui/PortraitLayoutTest.kt | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 351eded54c..599968d9f7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -105,13 +105,16 @@ internal fun BottomBar( val bounds = remember { androidx.compose.runtime.mutableStateMapOf() } val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) val content = remember { arrayOfNulls(1) } + val barContext = LocalContext.current + remember { RailLabels.load(barContext) } + val iconOnly = !RailLabels.shown Row(modifier.fillMaxWidth().background(MaterialTheme.colorScheme.surface), verticalAlignment = Alignment.CenterVertically) { BoxWithConstraints(Modifier.weight(1f)) { val itemWidth = (maxWidth / keys.size).coerceIn(56.dp, 88.dp) Box(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).onPlaced { content[0] = it }) { if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown], tint, GlideAxis.Horizontal, corner = 14.dp, fill = 0.14f, outline = 0f) Row(Modifier.selectableGroup().padding(vertical = 4.dp), horizontalArrangement = Arrangement.Center) { - NavigationItems(s, shown, compact = true, iconOnly = false, height = 56.dp, width = itemWidth, + NavigationItems(s, shown, compact = true, iconOnly = iconOnly, height = if (iconOnly) 48.dp else 56.dp, width = itemWidth, place = { key -> Modifier.onGloballyPositioned { item -> content[0]?.let { bounds[key] = it.localBoundingBoxOf(item) }; Hops.railBounds[key] = item.boundsInRoot() } }, onSelect = onSelect, onFocusSelect = onFocusSelect) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt index e1210893f0..25ba697759 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt @@ -93,6 +93,21 @@ class PortraitLayoutTest { compose.onNodeWithContentDescription("Resume Steam").assertIsDisplayed() } + @Test fun bottomBarFollowsSidebarLabelsSetting() { + val context = org.robolectric.RuntimeEnvironment.getApplication() + RailLabels.set(context, false) + compose.setContent { + DroidDeckTheme { BottomBar(state, "steam", {}, {}, actions, Modifier.size(480.dp, 64.dp)) } + } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Library").assertDoesNotExist() + compose.onNodeWithContentDescription("Library").assertIsDisplayed() + compose.runOnIdle { RailLabels.set(context, true) } + androidx.compose.runtime.snapshots.Snapshot.sendApplyNotifications() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Library").assertIsDisplayed() + } + @Test fun compactHeaderKeepsAllActionsReachable() { compose.setContent { DroidDeckTheme { From d058bab64fface8d35d2ee174e94e911496a0fd4 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 07:40:20 -0500 Subject: [PATCH 069/101] fix(session): picture in picture keeps the DroidDeck front end behind the game (#2559) --- .../java/com/droiddeck/launcher/HomeActivity.kt | 6 ++++-- app/src/main/java/com/droiddeck/launcher/HomeApp.kt | 13 +++++++++++++ .../launcher/session/SessionPipController.kt | 9 +++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt index 3947263c03..0f3a37e83e 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState class HomeActivity : Activity() { override fun attachBaseContext(newBase: android.content.Context) { @@ -18,7 +19,7 @@ class HomeActivity : Activity() { } private fun routeHome() { - val destination = if (HomeApp.isActiveSteamSession()) { + val destination = if (HomeApp.isActiveSteamSession() && !SessionState.pipActive) { Intent(this, SessionActivity::class.java) .setAction(SessionService.ACTION_HOME_GUIDE) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) @@ -32,7 +33,8 @@ class HomeActivity : Activity() { } } } - startActivity(destination) + if (SessionState.pipActive && destination.component?.className == FrontEndActivity::class.java.name) HomeApp.showFrontEnd(this, destination) + else startActivity(destination) finish() } } diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 8d3c7dc54c..789af4ec49 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -258,6 +258,19 @@ object HomeApp { fun isActiveSteamSession(): Boolean = SessionState.running && SessionState.mode == SessionService.MODE_STEAM + fun showFrontEnd(context: Context, intent: Intent = Intent(context, FrontEndActivity::class.java)) { + val frontEnd = FrontEndActivity::class.java.name + val tasks = runCatching { context.getSystemService(android.app.ActivityManager::class.java)?.appTasks }.getOrNull().orEmpty() + val own = tasks.firstOrNull { task -> + runCatching { task.taskInfo.let { it.baseIntent.component?.className == frontEnd && it.topActivity?.className == frontEnd } } + .getOrDefault(false) + } + val launch = Intent(intent).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + if (own != null && runCatching { own.startActivity(context, launch, null) }.isSuccess) return + // The session task shares the front end's affinity, so without MULTIPLE_TASK the front end lands inside the session's PiP window. + context.startActivity(launch.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)) + } + fun openSystemHomeSettings(context: Context) { try { context.startActivity(settingsIntent()) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt index 1b26e7de29..f32fe2abbf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt @@ -21,6 +21,7 @@ class SessionPipController( private set private var suppressAuto = false private var visit = false + private var requested = false private var lastParams = "" val floating get() = transitioning || activity.isInPictureInPictureMode @@ -47,7 +48,7 @@ class SessionPipController( return builder.build() } - fun enter() { + fun enter(explicit: Boolean = true) { if (!eligible()) { Toast.makeText(activity, R.string.pip_not_ready, Toast.LENGTH_SHORT).show() return @@ -59,8 +60,10 @@ class SessionPipController( return } prepare() + requested = explicit val entered = runCatching { activity.enterPictureInPictureMode(params(bounds())) }.getOrDefault(false) if (!entered) { + requested = false restore() Toast.makeText(activity, R.string.pip_unavailable, Toast.LENGTH_SHORT).show() } @@ -68,7 +71,7 @@ class SessionPipController( fun leaving() { if (!automatic() || !allowed()) return - if (Build.VERSION.SDK_INT < 31) enter() else prepare() + if (Build.VERSION.SDK_INT < 31) enter(explicit = false) else prepare() } private fun prepare() { @@ -85,6 +88,8 @@ class SessionPipController( showPipUi(true) SessionService.beginPip(activity) SessionService.setActivityVisible(activity, true) + if (requested) runCatching { com.droiddeck.launcher.HomeApp.showFrontEnd(activity) } + requested = false } else restore() refresh(true) } From 33dbd8755fba83be48ad0cbd9b1cb2d359abf0ee Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 08:48:23 -0500 Subject: [PATCH 070/101] fix(agent): run the setup package install as fake root (#2539) --- .../com/droiddeck/launcher/agent/AgentHost.kt | 7 +-- .../droiddeck/launcher/agent/AgentSetup.kt | 6 ++- .../launcher/runtime/LinuxRuntime.java | 21 +++++++- .../droiddeck/launcher/runtime/RootSpawner.kt | 3 +- .../launcher/agent/AgentGuestPathTest.kt | 18 +++++++ .../launcher/agent/AgentSetupRootTest.kt | 10 ++++ .../runtime/LinuxRuntimeRootPrefixTest.kt | 54 +++++++++++++++++++ 7 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index aa369a6883..1f78672f4a 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -52,6 +52,7 @@ object AgentHost { private const val TAG = "AgentHost" private const val WORKSPACE = "/root/DroidDeck" + internal const val GUEST_PATH = "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" private const val TICK_MS = 1_000L private const val IDLE_TICK_MS = 5_000L @@ -377,10 +378,10 @@ object AgentHost { * proot over the installed rootfs, without a session. Loopback adb is connected first so * droiddeckctl reaches the app. */ - fun guest(app: Context, command: List, workdir: String = "/root", connectAdb: Boolean = true): ProcessBuilder { + fun guest(app: Context, command: List, workdir: String = "/root", connectAdb: Boolean = true, fakeRoot: Boolean = false): ProcessBuilder { val adb = AgentAdb.prepare(app) val env = listOf( - "/usr/bin/env", "HOME=/root", "PATH=/root/.local/bin:/usr/local/bin:/usr/bin:/bin", "LANG=C.UTF-8", + "/usr/bin/env", "HOME=/root", "PATH=$GUEST_PATH", "LANG=C.UTF-8", "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", "DD_AGENT=1", "DD_AGENT_INBOX=${File(app.filesDir, "agent").path}", "BROWSER=/root/.local/bin/android-open", "DD_BROWSER_DISPLAY=${AgentAdb.browserDisplay}", ) @@ -390,7 +391,7 @@ object AgentHost { (if (connectAdb) "adb start-server >/dev/null 2>&1; adb connect \"\$ADB_SERIAL\" >/dev/null 2>&1; " else "") + "cd \"$1\" 2>/dev/null; shift; exec \"$@\"", "sh", workdir, ) - val proot = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), env + shell + command) + val proot = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), null, env + shell + command, fakeRoot) return ProcessBuilder(proot).redirectErrorStream(true).apply { environment().apply { remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index 754dfa2ea9..a5f900d6f5 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -73,6 +73,8 @@ object AgentSetup { Thread({ for ((step, command) in probes) probe(app, harness, step, command) }, "agent-checks").start() } + fun runsAsRoot(step: Step) = step == Step.INSTALL + /** Runs [step]'s action. [CONNECTION] is the app's own pairing flow, so the caller opens it. */ fun run(context: Context, step: Step) { val app = context.applicationContext @@ -81,7 +83,7 @@ object AgentSetup { Step.CONNECTION -> return Step.INSTALL -> { listOf("sh", "-c", "set -e; export DEBIAN_FRONTEND=noninteractive; " + - "dpkg --configure -a; apt-get update; apt-get -f install -y; " + + "dpkg --configure -a; apt-get update || echo 'Some package sources could not be refreshed; continuing'; apt-get -f install -y; " + "apt-get install -y --no-install-recommends git gh adb curl ca-certificates python3; ${harness.install}") } Step.SIGN_IN -> harness.signIn @@ -97,7 +99,7 @@ object AgentSetup { val result = runCatching { installHelpers(app) runCatching { harness.prepare(LinuxRuntime.rootDir(app)) } - val child = AgentHost.guest(app, command).start() + val child = AgentHost.guest(app, command, fakeRoot = runsAsRoot(step)).start() val pid = AgentProcesses.pidOf(child) OrphanReaper.keep(pid) try { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 0253604021..0e5c2d6715 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -139,15 +139,26 @@ public final class LinuxRuntime { public static List command(Context context, File sessionRoot, File runtimeDir, File externalStorage, List extraBinds, List guestCommand) { + return command(context, sessionRoot, runtimeDir, externalStorage, extraBinds, guestCommand, false); + } + + public static List command(Context context, File sessionRoot, File runtimeDir, + File externalStorage, List extraBinds, + List guestCommand, boolean fakeRoot) { File root = rootDir(context); List binds = binds(context, sessionRoot, runtimeDir, externalStorage, extraBinds); if (sessionRoot != null) lastBinds = binds; - return commandWithBinds(context, root, binds, guestCommand); + return commandWithBinds(context, root, binds, guestCommand, fakeRoot); } public static List commandWithBinds(Context context, File root, List binds, List guestCommand) { - List cmd = prootPrefix(context, root, "/root"); + return commandWithBinds(context, root, binds, guestCommand, false); + } + + public static List commandWithBinds(Context context, File root, List binds, + List guestCommand, boolean fakeRoot) { + List cmd = fakeRoot ? rootPrefix(context, root, "/root") : prootPrefix(context, root, "/root"); for (String spec : binds) bind(cmd, spec); cmd.addAll(guestCommand); return cmd; @@ -170,6 +181,12 @@ public final class LinuxRuntime { return prootPrefix(context, root, cwd, false); } + public static List rootPrefix(Context context, File root, String cwd) { + List cmd = prootPrefix(context, root, cwd, true); + cmd.add(1, "--link2symlink"); + return cmd; + } + public static List prootPrefix(Context context, File root, String cwd, boolean fakeRoot) { List cmd = new ArrayList<>(); cmd.add(prootBinary(context).getPath()); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt index a96ff46f38..16228be728 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt @@ -120,8 +120,7 @@ object RootSpawner { val builder = if (NativeGuest.forSession(context)) { NativeGuest.processBuilder(context, root, binds, guest, cwd) } else { - val cmd = LinuxRuntime.prootPrefix(context, root, cwd, true) - cmd.add(1, "--link2symlink") + val cmd = LinuxRuntime.rootPrefix(context, root, cwd) binds.forEach { cmd.add("-b"); cmd.add(it) } cmd.addAll(guest) ProcessBuilder(cmd).directory(root).also { b -> diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt new file mode 100644 index 0000000000..794a0e95f4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentGuestPathTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class AgentGuestPathTest { + private val dirs = AgentHost.GUEST_PATH.split(':') + + @Test fun includesTheSystemBinariesDpkgNeedsAsRoot() { + assertTrue(dirs.containsAll(listOf("/usr/local/sbin", "/usr/sbin", "/sbin"))) + } + + @Test fun keepsUserBinariesFirstAndTheStandardDirs() { + assertEquals("/root/.local/bin", dirs.first()) + assertTrue(dirs.containsAll(listOf("/usr/local/bin", "/usr/bin", "/bin"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt new file mode 100644 index 0000000000..5e5c1656c2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentSetupRootTest.kt @@ -0,0 +1,10 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Test + +class AgentSetupRootTest { + @Test fun onlyThePackageInstallRunsAsRoot() { + assertEquals(listOf(AgentSetup.Step.INSTALL), AgentSetup.Step.values().filter { AgentSetup.runsAsRoot(it) }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt new file mode 100644 index 0000000000..e956781db9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/LinuxRuntimeRootPrefixTest.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import android.system.Os +import android.system.StructUtsname +import androidx.test.core.app.ApplicationProvider +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.annotation.Implementation +import org.robolectric.annotation.Implements +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE, application = Application::class, shadows = [LinuxRuntimeRootPrefixTest.Uname::class]) +class LinuxRuntimeRootPrefixTest { + private val context: Application = ApplicationProvider.getApplicationContext() + private val root = File(context.filesDir, "rootfs") + private val guest = listOf("/usr/bin/dpkg", "--configure", "-a") + + @Test fun fakeRootEmulatesHardLinksForPackageManagers() { + val cmd = LinuxRuntime.commandWithBinds(context, root, emptyList(), guest, true) + assertTrue("-0" in cmd) + assertTrue("--link2symlink" in cmd) + assertFalse("-i" in cmd) + assertEquals(guest, cmd.takeLast(guest.size)) + } + + @Test fun rootSpawnerAndFakeRootCommandsShareOnePrefix() { + assertEquals(LinuxRuntime.rootPrefix(context, root, "/root"), + LinuxRuntime.commandWithBinds(context, root, emptyList(), emptyList(), true)) + } + + @Test fun userCommandsKeepTheAppUidAndRealLinks() { + val cmd = LinuxRuntime.commandWithBinds(context, root, emptyList(), guest) + val uid = android.os.Process.myUid() + assertFalse("-0" in cmd) + assertFalse("--link2symlink" in cmd) + assertEquals("$uid:$uid", cmd[cmd.indexOf("-i") + 1]) + assertEquals(LinuxRuntime.prootPrefix(context, root, "/root"), cmd.dropLast(guest.size)) + } + + @Implements(Os::class) + class Uname { + companion object { + @JvmStatic @Implementation + fun uname() = StructUtsname("Linux", "localhost", "6.1.0", "#1 SMP", "aarch64") + } + } +} From d33f4b4896cdd51cebe539dcde0b5a400b7cf8b2 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Fri, 13 Nov 2026 16:49:48 +0300 Subject: [PATCH 071/101] feat: Add Soundtracks tab and music player (#2389) --- app/build.gradle | 2 + app/src/main/AndroidManifest.xml | 9 + .../droiddeck/launcher/FrontEndActivity.kt | 139 ++++++- .../launcher/frontend/AddedSoundtracks.kt | 69 ++++ .../launcher/frontend/GameRemoval.kt | 2 +- .../droiddeck/launcher/frontend/Library.kt | 23 +- .../droiddeck/launcher/frontend/Soundtrack.kt | 308 ++++++++++++++ .../frontend/SoundtrackCollectionArt.kt | 50 +++ .../frontend/SoundtrackCollections.kt | 191 +++++++++ .../launcher/frontend/SoundtrackIndex.kt | 32 ++ .../launcher/frontend/SoundtrackOrder.kt | 67 +++ .../launcher/frontend/SoundtrackShortcuts.kt | 41 ++ .../launcher/frontend/SoundtrackTracks.kt | 30 ++ .../launcher/frontend/SteamGameArt.kt | 6 +- .../launcher/playback/SoundtrackController.kt | 288 +++++++++++++ .../launcher/playback/SoundtrackService.kt | 282 +++++++++++++ .../launcher/playback/SoundtrackSettings.kt | 78 ++++ .../launcher/session/SessionPrefs.kt | 12 + .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/AddedGameEditor.kt | 23 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 9 +- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 2 + .../droiddeck/launcher/ui/FrontEndScreen.kt | 22 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 2 + .../com/droiddeck/launcher/ui/GameDetail.kt | 14 +- .../com/droiddeck/launcher/ui/GameGlass.kt | 8 +- .../com/droiddeck/launcher/ui/LibraryPage.kt | 155 +++++-- .../launcher/ui/SoundtrackCollectionsUi.kt | 295 +++++++++++++ .../droiddeck/launcher/ui/SoundtrackDetail.kt | 391 ++++++++++++++++++ .../droiddeck/launcher/ui/SoundtrackIcon.kt | 15 + .../launcher/ui/SoundtrackOptions.kt | 217 ++++++++++ .../launcher/ui/SoundtrackTrackPanel.kt | 391 ++++++++++++++++++ .../com/droiddeck/launcher/ui/StoreChips.kt | 10 +- app/src/main/res/drawable/ic_repeat_all.xml | 10 + app/src/main/res/drawable/ic_repeat_off.xml | 11 + app/src/main/res/drawable/ic_repeat_one.xml | 10 + app/src/main/res/drawable/ic_shuffle_off.xml | 11 + app/src/main/res/drawable/ic_shuffle_on.xml | 10 + app/src/main/res/drawable/ic_soundtrack.xml | 10 + app/src/main/res/values-ar/strings.xml | 63 +++ app/src/main/res/values-b+es+419/strings.xml | 63 +++ app/src/main/res/values-bg/strings.xml | 63 +++ app/src/main/res/values-cs/strings.xml | 63 +++ app/src/main/res/values-da/strings.xml | 63 +++ app/src/main/res/values-de/strings.xml | 63 +++ app/src/main/res/values-el/strings.xml | 63 +++ app/src/main/res/values-es/strings.xml | 63 +++ app/src/main/res/values-fi/strings.xml | 63 +++ app/src/main/res/values-fr/strings.xml | 63 +++ app/src/main/res/values-hi/strings.xml | 63 +++ app/src/main/res/values-hu/strings.xml | 63 +++ app/src/main/res/values-in/strings.xml | 63 +++ app/src/main/res/values-it/strings.xml | 63 +++ app/src/main/res/values-ja/strings.xml | 63 +++ app/src/main/res/values-ko/strings.xml | 63 +++ app/src/main/res/values-ms/strings.xml | 63 +++ app/src/main/res/values-nb/strings.xml | 63 +++ app/src/main/res/values-nl/strings.xml | 63 +++ app/src/main/res/values-pl/strings.xml | 63 +++ app/src/main/res/values-pt-rPT/strings.xml | 63 +++ app/src/main/res/values-pt/strings.xml | 63 +++ app/src/main/res/values-ro/strings.xml | 63 +++ app/src/main/res/values-ru/strings.xml | 63 +++ app/src/main/res/values-sv/strings.xml | 63 +++ app/src/main/res/values-th/strings.xml | 63 +++ app/src/main/res/values-tr/strings.xml | 63 +++ app/src/main/res/values-uk/strings.xml | 63 +++ app/src/main/res/values-vi/strings.xml | 63 +++ app/src/main/res/values-zh-rCN/strings.xml | 63 +++ app/src/main/res/values-zh-rHK/strings.xml | 63 +++ app/src/main/res/values-zh-rTW/strings.xml | 63 +++ app/src/main/res/values/strings.xml | 64 +++ .../frontend/SoundtrackCollectionsTest.kt | 43 ++ .../launcher/frontend/SoundtrackOrderTest.kt | 34 ++ .../launcher/frontend/SoundtrackTest.kt | 151 +++++++ .../launcher/frontend/SoundtrackTracksTest.kt | 29 ++ .../droiddeck/launcher/ui/DragTargetTest.kt | 20 + docs/development/soundtracks.md | 78 ++++ 78 files changed, 5618 insertions(+), 64 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/AddedSoundtracks.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/Soundtrack.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollectionArt.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackIndex.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackOrder.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackShortcuts.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackTracks.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/playback/SoundtrackController.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/playback/SoundtrackService.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/playback/SoundtrackSettings.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackCollectionsUi.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackDetail.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackIcon.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackOptions.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SoundtrackTrackPanel.kt create mode 100644 app/src/main/res/drawable/ic_repeat_all.xml create mode 100644 app/src/main/res/drawable/ic_repeat_off.xml create mode 100644 app/src/main/res/drawable/ic_repeat_one.xml create mode 100644 app/src/main/res/drawable/ic_shuffle_off.xml create mode 100644 app/src/main/res/drawable/ic_shuffle_on.xml create mode 100644 app/src/main/res/drawable/ic_soundtrack.xml create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackOrderTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTracksTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/DragTargetTest.kt create mode 100644 docs/development/soundtracks.md diff --git a/app/build.gradle b/app/build.gradle index 57b14a87fc..bb0b7132e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -400,6 +400,8 @@ dependencies { exclude group: 'com.google.auto.value', module: 'auto-value' } implementation 'com.google.zxing:core:3.5.3' + implementation 'androidx.media3:media3-exoplayer:1.3.1' + implementation 'androidx.media3:media3-session:1.3.1' testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.16.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80c9312fe6..1264c8211a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -141,6 +141,7 @@ + @@ -334,6 +335,14 @@ android:name=".sync.SyncthingService" android:exported="false" android:foregroundServiceType="dataSync" /> + + + + + >(emptyList()) + private var soundtracksLoaded by mutableStateOf(false) private var gameStoresSpeedTier by mutableStateOf("fast") private var navRequest by mutableStateOf(null) private val gameLaunchRequest = java.util.concurrent.atomic.AtomicLong() @@ -785,6 +789,11 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private var shortcutPicker by mutableStateOf(false) private var shortcutLibraryScanning by mutableStateOf(false) @Volatile private var libraryScanGeneration = 0 + private class SoundtrackRemoval(val op: Int, var scan: Int, var settled: Boolean) + private val soundtrackRemovals = HashMap() + private var soundtrackOp = 0 + private var soundtrackAddScan = -1 + private val soundtrackWork = java.util.concurrent.Executors.newSingleThreadExecutor { r -> Thread(r, "soundtrack-work").apply { isDaemon = true } } @Volatile private var lastComponentRestore = 0L @Volatile private var componentRestoreRetry = false private val componentRestoreLock = Any() @@ -847,6 +856,15 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet pendingGameLink = null gameLinkReading = false gameLinkTried = false + soundtrackLaunch = false + val soundtrackId = com.droiddeck.launcher.frontend.SoundtrackShortcuts.read(request) + if (soundtrackId != null) { + soundtrackLaunch = true + navRequest = if (SessionPrefs.soundtracksEnabled(this)) "sound:$soundtrackId" else "app:$soundtrackId" + request.data = null + request.action = Intent.ACTION_MAIN + return + } if (GameLaunchIntent.accepts(request.action)) { gameLinkReading = true com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) @@ -871,6 +889,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false): Boolean { + if (!SessionPrefs.soundtracksIngame(this)) com.droiddeck.launcher.playback.SoundtrackController.pause(this) if (pkgStage != null) { android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return false @@ -1144,6 +1163,8 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet LauncherIcon.repair(this, intent?.component) launcherIcon = LauncherIcon.current(this) gameStoresEnabled = SessionPrefs.gameStoresEnabled(this) + soundtracksEnabled = SessionPrefs.soundtracksEnabled(this) + soundtracksIngame = SessionPrefs.soundtracksIngame(this) gameStoresSpeedTier = SessionPrefs.gameStoresSpeedTier(this) storesShowMature = SessionPrefs.storesShowMature(this) storesSort = SessionPrefs.storesSort(this) @@ -1239,6 +1260,10 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet lowStorageWarning = lowStorageWarning, launcherIcon = launcherIcon, gameStoresEnabled = gameStoresEnabled, + soundtracksEnabled = soundtracksEnabled, + soundtracksIngame = soundtracksIngame, + soundtracks = soundtracks, + soundtracksLoaded = soundtracksLoaded, gameStoresSpeedTier = gameStoresSpeedTier, navigate = navRequest, addedGamesArt = addedGamesArt, @@ -1287,7 +1312,10 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, onEpicLauncher = { openEpicLauncher() }, onUninstallEpicLauncher = { uninstallEpicLauncher() }, - onGameShortcut = { g -> com.droiddeck.launcher.frontend.GameShortcuts.pin(this, g) }, + onGameShortcut = { g -> + if (g.soundtrack) com.droiddeck.launcher.frontend.SoundtrackShortcuts.pin(this, g) + else com.droiddeck.launcher.frontend.GameShortcuts.pin(this, g) + }, onExportGameFile = { g -> pickGameExport(g) }, onSyncGameFiles = { pickGameExport(null) }, onAddGameExe = { path -> addGameExe(path) }, @@ -1312,8 +1340,9 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, "game-file-stop-sync").start() }, onCopyGameLink = { g -> - (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip( - ClipData.newPlainText(g.name, com.droiddeck.launcher.frontend.GameLaunchLink.uri(g.gameIdString))) + val link = if (g.soundtrack) com.droiddeck.launcher.frontend.SoundtrackShortcuts.uri(g.appId) + else com.droiddeck.launcher.frontend.GameLaunchLink.uri(g.gameIdString) + (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText(g.name, link)) android.widget.Toast.makeText(this, R.string.game_link_copied, android.widget.Toast.LENGTH_SHORT).show() }, onDesktop = { @@ -1338,6 +1367,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, onRom = { g -> val e = emulatorList.first { it.id == g.emulatorId } + if (!SessionPrefs.soundtracksIngame(this)) com.droiddeck.launcher.playback.SoundtrackController.pause(this) startActivity(Intent(this, SessionActivity::class.java) .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) .putExtra(SessionService.EXTRA_PROGRAM, e.program) @@ -1506,6 +1536,15 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, onPageBack = { showPerformance = false; showComponents = false; showMapping = false }, onGameStoresEnabled = { on -> SessionPrefs.setGameStoresEnabled(this, on); gameStoresEnabled = on }, + onSoundtracksEnabled = { on -> SessionPrefs.setSoundtracksEnabled(this, on); soundtracksEnabled = on }, + onSoundtracksIngame = { on -> + SessionPrefs.setSoundtracksIngame(this, on) + soundtracksIngame = on + com.droiddeck.launcher.playback.SoundtrackController.setIngame(this, on) + }, + onSoundtrackAdded = { folder -> addSoundtrack(folder) }, + onSoundtracksChanged = { refreshAddedSoundtracks() }, + onSoundtrackRemoved = { g -> removeSoundtrack(g) }, onTheme = { id -> SessionPrefs.setTheme(this, id); theme = id }, onLauncherIcon = { style -> switchLauncherIcon(style) }, onLanguage = { tag -> @@ -1799,7 +1838,10 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet startSteamAtStartupIfEnabled() } + private var soundtrackLaunch = false + private fun startSteamAtStartupIfEnabled(cold: Boolean = false) { + if (soundtrackLaunch) return if (intent.action != Intent.ACTION_MAIN && !(cold && intent.action == null)) return if (isFinishing || isDestroyed) return when (SessionPrefs.startupSession(this)) { @@ -2644,15 +2686,89 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet val version = (steamArtRefreshes[appId] ?: 0) + 1 steamArtRefreshes[appId] = version Thread({ - val fresh = com.droiddeck.launcher.frontend.Library.steamGames(this).firstOrNull { it.appId == appId } ?: return@Thread + val fresh = com.droiddeck.launcher.frontend.Library.steamGames(this, soundtracks = true).firstOrNull { it.appId == appId } ?: return@Thread ui.post { if (steamArtRefreshes[appId] != version) return@post - steamGames = steamGames.map { if (it.appId == appId && it.library != Library.ADDED) fresh else it } + if (fresh.soundtrack) soundtracks = soundtracks.map { if (it.appId == appId && it.library != Library.ADDED) fresh else it } + else steamGames = steamGames.map { if (it.appId == appId && it.library != Library.ADDED) fresh else it } } }, "steam-art-update").start() } + private fun addSoundtrack(folder: java.io.File) { + val op = ++soundtrackOp + soundtrackAddScan = libraryScanGeneration + soundtrackWork.execute { + val added = com.droiddeck.launcher.frontend.AddedSoundtracks.add(this, folder) + val list = com.droiddeck.launcher.frontend.AddedSoundtracks.games(this) + ui.post { + if (added) { + soundtrackRemovals[folder.path]?.takeIf { it.op < op }?.let { + soundtrackRemovals.remove(folder.path) + com.droiddeck.launcher.playback.SoundtrackController.allow(listOf(folder.path)) + } + val visible = list.filterNot { s -> s.gameFiles?.path?.let { soundtrackRemovals[it] }?.let { it.op > op } == true } + soundtracks = soundtracks.filter { it.library != Library.ADDED } + visible + } else android.widget.Toast.makeText(this, R.string.soundtracks_add_empty, android.widget.Toast.LENGTH_SHORT).show() + } + } + } + + private fun refreshAddedSoundtracks() { + val op = soundtrackOp + soundtrackWork.execute { + val list = com.droiddeck.launcher.frontend.AddedSoundtracks.games(this) + ui.post { + if (op != soundtrackOp) return@post + val visible = list.filterNot { s -> s.gameFiles?.path?.let { soundtrackRemovals[it] } != null } + soundtracks = soundtracks.filter { it.library != Library.ADDED } + visible + } + } + } + + private fun removeSoundtrack(g: Library.SteamGame) { + val path = g.gameFiles?.path + val added = g.library == Library.ADDED + val target = if (added) null else com.droiddeck.launcher.frontend.GameRemoval.steamFiles(g) ?: return + com.droiddeck.launcher.playback.SoundtrackController.stopIf(this, g.gameFiles) + val marker = SoundtrackRemoval(++soundtrackOp, libraryScanGeneration, added) + path?.let { soundtrackRemovals[it] = marker } + if (target == null) { + soundtracks = soundtracks.filterNot { it.appId == g.appId && it.library == Library.ADDED } + soundtrackWork.execute { + val removed = com.droiddeck.launcher.frontend.AddedSoundtracks.remove(this, path.orEmpty()) + val list = if (removed) emptyList() else com.droiddeck.launcher.frontend.AddedSoundtracks.games(this) + if (!removed) ui.post { + if (path != null && soundtrackRemovals[path] === marker) { + soundtrackRemovals.remove(path) + com.droiddeck.launcher.playback.SoundtrackController.allow(listOf(path)) + } + soundtracks = soundtracks.filter { it.library != Library.ADDED } + list.filterNot { s -> s.gameFiles?.path?.let { soundtrackRemovals[it] } != null } + android.widget.Toast.makeText(this, getString(R.string.gfiles_remove_failed, g.name), android.widget.Toast.LENGTH_SHORT).show() + } + } + return + } + soundtrackWork.execute { + val deleted = com.droiddeck.launcher.frontend.GameRemoval.delete(target) + ui.post { + if (deleted) { + marker.scan = libraryScanGeneration + marker.settled = true + } else { + if (path != null && soundtrackRemovals[path] === marker) { + soundtrackRemovals.remove(path) + com.droiddeck.launcher.playback.SoundtrackController.allow(listOf(path)) + } + android.widget.Toast.makeText(this, getString(R.string.gfiles_remove_failed, g.name), android.widget.Toast.LENGTH_SHORT).show() + } + refresh() + } + } + } + private fun removeGame(g: Library.SteamGame) { + if (g.soundtrack) { removeSoundtrack(g); return } val folder = g.gameFiles ?: return when (com.droiddeck.launcher.frontend.GameRemoval.kind(g)) { com.droiddeck.launcher.frontend.GameRemoval.Kind.LAUNCHER -> Unit @@ -2936,6 +3052,19 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } val scannedArch = SessionPrefs.activeSteamClientArch(this) val scannedX64 = scannedArch == "x86_64" + val scannedSoundtracks = runCatching { + (if (ready || com.droiddeck.launcher.runtime.LinuxRuntime.hasRootfs(this)) Library.soundtracks(this, scannedArch) else emptyList()) + + com.droiddeck.launcher.frontend.AddedSoundtracks.games(this) + }.getOrDefault(emptyList()) + ui.post { + if (scanGeneration == libraryScanGeneration) { + val scanned = if (scanGeneration <= soundtrackAddScan) scannedSoundtracks + soundtracks.filter { cur -> cur.library == Library.ADDED && scannedSoundtracks.none { it.library == Library.ADDED && it.appId == cur.appId } } else scannedSoundtracks + val kept = scanned.filterNot { s -> s.gameFiles?.path?.let { p -> soundtrackRemovals[p]?.let { m -> !m.settled || s.library == Library.ADDED || scanGeneration <= m.scan } } == true } + com.droiddeck.launcher.playback.SoundtrackController.allow(kept.mapNotNull { it.gameFiles?.path }) + soundtracks = kept + soundtracksLoaded = true + } + } val games = if (ready || com.droiddeck.launcher.runtime.LinuxRuntime.hasRootfs(this)) Library.launchableGames(this, arch = scannedArch) else emptyList() val all = games.distinctBy { it.gameId } if (ready && scanGeneration == libraryScanGeneration) com.droiddeck.launcher.frontend.LibraryCache.save(this, all, scannedX64) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedSoundtracks.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedSoundtracks.kt new file mode 100644 index 0000000000..635941cb7a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedSoundtracks.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +object AddedSoundtracks { + private fun file(context: Context) = File(context.filesDir, "added-soundtracks.json") + + class Entry(val path: String, val name: String, val id: Int = 0) + + internal fun assignIds(list: List): List { + val used = list.filter { it.id != 0 }.map { it.id }.toMutableSet() + return list.map { e -> + if (e.id != 0) e else { + var id = idOf(e.path) + while (id == 0 || !used.add(id)) id = (id + 1) or Int.MIN_VALUE + Entry(e.path, e.name, id) + } + } + } + + @Synchronized + fun entries(context: Context): List = runCatching { + val f = file(context).takeIf { it.isFile } ?: return emptyList() + val array = JSONArray(f.readText()) + val raw = List(array.length()) { i -> array.getJSONObject(i).let { Entry(it.getString("path"), it.getString("name"), it.optInt("id", 0)) } } + val ready = assignIds(raw) + if (raw.any { it.id == 0 }) save(context, ready) + ready + }.getOrDefault(emptyList()) + + @Synchronized + private fun save(context: Context, list: List): Boolean = + runCatching { + val array = JSONArray() + list.forEach { array.put(JSONObject().put("path", it.path).put("name", it.name).put("id", it.id)) } + val f = file(context) + val tmp = File(f.path + ".tmp") + tmp.writeText(array.toString()) + if (tmp.renameTo(f)) true else { tmp.delete(); false } + }.getOrDefault(false) + + fun add(context: Context, folder: File): Boolean { + if (!folder.isDirectory || Soundtrack.audioFiles(folder).isEmpty()) return false + return synchronized(this) { + val list = entries(context) + list.any { it.path == folder.path } || save(context, assignIds(list + Entry(folder.path, folder.name))) + } + } + + fun remove(context: Context, path: String): Boolean = + synchronized(this) { save(context, entries(context).filterNot { it.path == path }) } + + internal fun idOf(path: String): Int = path.hashCode() or Int.MIN_VALUE + + fun games(context: Context): List = entries(context).mapNotNull { e -> + val dir = File(e.path).takeIf { it.isDirectory } ?: return@mapNotNull null + game(context, e, dir, e.id) + } + + private fun game(context: Context, e: Entry, dir: File, id: Int): Library.SteamGame { + return Library.SteamGame( + appId = id, name = e.name, art = SoundtrackCollectionArt.chosen(context, id) ?: Soundtrack.firstCover(context, dir), library = Library.ADDED, gameId = id.toLong() and 0xFFFFFFFFL, + gameFiles = dir, source = Library.ADDED, soundtrack = true, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt index 388448e184..a35c71342b 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt @@ -21,7 +21,7 @@ object GameRemoval { fun steamFiles(game: Library.SteamGame): SteamFiles? { val dir = game.gameFiles ?: return null val common = dir.parentFile ?: return null - if (common.name != "common") return null + if (common.name != (if (game.soundtrack) "music" else "common")) return null val steamapps = common.parentFile ?: return null if (steamapps.name != "steamapps") return null val manifest = File(steamapps, "appmanifest_${game.appId}.acf") diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 99732653b6..8acbbe18b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -19,9 +19,10 @@ object Library { val storeId: String? = null, val logo: File? = null, val installedAt: Long = 0L, + val soundtrack: Boolean = false, ) { fun withArt(art: File?, hero: File?, icon: File?, logo: File? = this.logo) = - SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo, installedAt) + SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo, installedAt, soundtrack) val gameIdString: String get() = java.lang.Long.toUnsignedString(gameId) val launchKey: String get() = if (storeId != null) "$source:$storeId" else gameIdString @@ -38,6 +39,7 @@ object Library { const val BATTLENET_LAUNCHER = "battlenet-launcher" const val XBOX_CLOUD = "xbox-cloud" const val SOURCE_STEAM = "steam" + const val SOURCE_COLLECTION = "collection" class Rom(val name: String, val hostPath: File, val guestPath: String, val emulatorId: String, val art: File? = null) class Emulator(val id: String, val name: String, val system: String, val program: String, val installed: Boolean, val games: List) { @@ -123,9 +125,12 @@ object Library { .distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.absolutePath) } } + fun soundtracks(context: Context, arch: String = SessionPrefs.activeSteamClientArch(context)): List = + steamGames(context, arch = arch, withShared = false, soundtracks = true, soundtracksOnly = true) + fun steamGames( context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context), - withShared: Boolean = true, + withShared: Boolean = true, soundtracks: Boolean = false, soundtracksOnly: Boolean = false, onlyAppIds: Set? = null, ): List { val root = SessionPrefs.steamRoot(context, arch) @@ -146,16 +151,19 @@ object Library { val name = NAME.find(text)?.groupValues?.get(1)?.trim().orEmpty() val flags = STATE.find(text)?.groupValues?.get(1)?.toIntOrNull() ?: 0 if (name.isEmpty() || flags and 4 == 0) return@forEach + val installDir = INSTALL_DIR.find(text)?.groupValues?.get(1)?.trim() + ?.takeIf { it.isNotEmpty() && it != "." && it != ".." && '/' !in it && '\\' !in it } + val gameFiles = installDir?.let { File(steamapps, "common/$it").takeIf(File::isDirectory) } + val musicFiles = if (gameFiles == null) installDir?.let { File(steamapps, "music/$it").takeIf(File::isDirectory) } else null + if (musicFiles != null && !soundtracks) return@forEach + if (soundtracksOnly && musicFiles == null) return@forEach val images = SteamCacheImages(File(cache, appId.toString())) val art = images.find(STEAM_CAPSULES) val hero = images.find(STEAM_HEROES) val lastPlayed = LAST_PLAYED.find(text)?.groupValues?.get(1)?.toLongOrNull() ?: 0L - val installDir = INSTALL_DIR.find(text)?.groupValues?.get(1)?.trim() - ?.takeIf { it.isNotEmpty() && it != "." && it != ".." && '/' !in it && '\\' !in it } - val gameFiles = installDir?.let { File(steamapps, "common/$it").takeIf(File::isDirectory) } out[appId] = SteamGameArt.withOverrides(context, SteamGame( - appId, name, art, label, hero = hero, lastPlayed = lastPlayed, - gameFiles = gameFiles, + appId, name, art ?: musicFiles?.let { Soundtrack.firstCover(context, it) }, label, hero = hero, lastPlayed = lastPlayed, + gameFiles = gameFiles ?: musicFiles, soundtrack = musicFiles != null, protonPrefix = protonPrefix(context, appId.toLong(), library, roots), icon = images.icon(), logo = images.find(STEAM_LOGOS), @@ -177,6 +185,7 @@ object Library { strictRead = strictRead, arch = other, withShared = false, + soundtracks = soundtracks, onlyAppIds = shared, ) } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Soundtrack.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Soundtrack.kt new file mode 100644 index 0000000000..7f66f20962 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Soundtrack.kt @@ -0,0 +1,308 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import android.media.MediaMetadataRetriever +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +object Soundtrack { + class Track( + val file: File, val title: String, val disc: Int, val number: Int, val durationMs: Long, val artist: String = "", + val discLabel: String = disc.toString(), + ) { + val id: String get() = file.path + } + + class Album(val disc: Map>, val artist: String, val cover: File?) { + val tracks: List get() = disc.values.flatten() + val discs: List get() = disc.keys.toList() + val multiDisc: Boolean get() = disc.size > 1 + val totalMs: Long get() = tracks.sumOf { it.durationMs } + } + + class Raw( + val file: File, val folder: String, val tagDisc: Int?, val tagTrack: Int?, val tagTitle: String?, val tagArtist: String?, + val durationMs: Long, val size: Long = file.length(), + ) + + val EXTENSIONS = setOf("mp3", "flac", "ogg", "oga", "opus", "wav", "m4a", "aac") + private val LOSSLESS = setOf("flac", "wav") + private val COVERS = listOf("AlbumArtwork", "albumartwork", "cover", "Cover", "folder", "Folder", "front", "Front", "artwork", "Artwork") + internal val COVER_EXT = listOf("png", "jpg", "jpeg", "webp") + private val LEADING = Regex("^\\s*\\d+\\s*[.\\-_)]*\\s+") + private val DIGITS = Regex("^\\s*(\\d+)") + + fun isAudio(file: File): Boolean = file.isFile && file.extension.lowercase() in EXTENSIONS + + fun cleanTitle(fileName: String): String { + val base = fileName.substringBeforeLast('.', fileName).trim() + val tail = if (" - " in base) base.substringAfterLast(" - ") else base + val stripped = tail.replace(LEADING, "").trim() + return stripped.ifEmpty { tail.ifEmpty { base } } + } + + internal fun leadingNumber(fileName: String): Int? = DIGITS.find(fileName.substringAfterLast(" - "))?.groupValues?.get(1)?.toIntOrNull() + + private fun identity(r: Raw): String { + val d = r.tagDisc + val t = r.tagTrack + if (d != null && t != null) return "n:$d:$t" + val title = (r.tagTitle?.takeIf { it.isNotBlank() } ?: cleanTitle(r.file.name)).lowercase().filter { it.isLetterOrDigit() } + return "t:$title:${leadingNumber(r.file.name)}" + } + + private fun better(a: Raw, b: Raw): Raw { + val la = a.file.extension.lowercase() in LOSSLESS + val lb = b.file.extension.lowercase() in LOSSLESS + return when { + la != lb -> if (la) a else b + a.size != b.size -> if (a.size > b.size) a else b + else -> if (a.file.path <= b.file.path) a else b + } + } + + fun group(raws: List): Map> { + if (raws.isEmpty()) return emptyMap() + val unique = LinkedHashMap() + val home = HashMap() + val disc = HashMap() + val track = HashMap() + val title = HashMap() + for (r in raws) { + val id = identity(r) + unique[id] = unique[id]?.let { better(it, r) } ?: r + if (r.folder.isNotEmpty() && home[id].isNullOrEmpty()) home[id] = r.folder + r.tagDisc?.let { disc.putIfAbsent(id, it) } + r.tagTrack?.let { track.putIfAbsent(id, it) } + r.tagTitle?.takeIf { it.isNotBlank() }?.let { title.putIfAbsent(id, it) } + } + val kept = unique.map { (id, r) -> + Raw( + r.file, home[id] ?: r.folder, disc[id] ?: r.tagDisc, track[id] ?: r.tagTrack, title[id] ?: r.tagTitle, r.tagArtist, + r.durationMs, r.size, + ) + } + val folders = kept.filter { it.tagDisc == null }.map { it.folder }.distinct().sortedWith(naturalOrder) + val discs = kept.groupBy { r -> + r.tagDisc ?: if (folders.size <= 1 && kept.none { it.tagDisc != null }) 0 else folders.indexOf(r.folder) + 1 + } + return discs.toSortedMap().mapValues { (disc, list) -> + list.sortedWith( + compareBy({ leadingNumber(it.file.name) ?: it.tagTrack ?: Int.MAX_VALUE }, { it.tagTrack ?: Int.MAX_VALUE }, { it.file.name.lowercase() }), + ).mapIndexed { i, r -> + Track( + r.file, r.tagTitle?.takeIf { it.isNotBlank() } ?: cleanTitle(r.file.name), disc, i + 1, + r.durationMs, r.tagArtist.orEmpty(), labelOf(r, disc), + ) + } + } + } + + private val FOLDER_LABEL = Regex("[0-9][0-9 +&,.\\-]*") + + private fun labelOf(r: Raw, disc: Int): String { + if (r.tagDisc != null) return disc.toString() + val name = r.folder.substringAfterLast('/') + return if (FOLDER_LABEL.matches(name)) name else disc.toString() + } + + private val naturalOrder = Comparator { a, b -> + val x = Regex("\\d+|\\D+").findAll(a.lowercase()).map { it.value }.toList() + val y = Regex("\\d+|\\D+").findAll(b.lowercase()).map { it.value }.toList() + var i = 0 + var out = 0 + while (out == 0 && i < minOf(x.size, y.size)) { + val nx = x[i].toBigIntegerOrNull() + val ny = y[i].toBigIntegerOrNull() + out = if (nx != null && ny != null) nx.compareTo(ny) else x[i].compareTo(y[i]) + i++ + } + if (out != 0) out else x.size.compareTo(y.size) + } + + fun cover(dir: File): File? { + for (name in COVERS) for (ext in COVER_EXT) File(dir, "$name.$ext").takeIf { it.isFile }?.let { return it } + return dir.listFiles()?.filter { it.isFile && it.extension.lowercase() in COVER_EXT }?.minByOrNull { it.name.lowercase() } + } + + private fun parseNumber(value: String?): Int? = value?.substringBefore('/')?.trim()?.toIntOrNull() + + private fun read(file: File, root: File): Raw { + val folder = file.parentFile?.let { parent -> + if (parent.path == root.path) "" else parent.path.removePrefix(root.path).trimStart('/') + }.orEmpty() + val retriever = MediaMetadataRetriever() + return try { + retriever.setDataSource(file.path) + Raw( + file, folder, + parseNumber(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DISC_NUMBER)), + parseNumber(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER)), + retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE), + retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ARTIST) + ?: retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUMARTIST), + retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLongOrNull() ?: 0L, + ) + } catch (e: Exception) { + Raw(file, folder, null, null, null, null, 0L) + } finally { + runCatching { retriever.release() } + } + } + + private fun cacheFile(context: Context, root: File) = File(context.filesDir, "soundtrack-index/${root.path.hashCode().toUInt()}.json") + + private fun fromCache(context: Context, root: File, files: List): List? = runCatching { + val f = cacheFile(context, root).takeIf { it.isFile } ?: return null + val json = JSONObject(f.readText()) + if (json.optString("root") != root.path) return null + val rows = json.getJSONArray("rows") + val byPath = HashMap() + for (i in 0 until rows.length()) rows.getJSONObject(i).let { byPath[it.getString("p")] = it } + if (byPath.size != files.size) return null + files.map { file -> + val row = byPath[file.path] ?: return null + if (row.getLong("s") != file.length() || row.getLong("m") != file.lastModified()) return null + Raw( + file, row.getString("f"), row.optInt("d", -1).takeIf { it >= 0 }, row.optInt("n", -1).takeIf { it >= 0 }, + row.optString("t").takeIf { it.isNotEmpty() }, row.optString("a").takeIf { it.isNotEmpty() }, row.optLong("l"), + ) + } + }.getOrNull() + + private fun toCache(context: Context, root: File, raws: List) { + runCatching { + val rows = JSONArray() + for (r in raws) rows.put( + JSONObject().put("p", r.file.path).put("s", r.file.length()).put("m", r.file.lastModified()).put("f", r.folder) + .put("d", r.tagDisc ?: -1).put("n", r.tagTrack ?: -1).put("t", r.tagTitle.orEmpty()).put("a", r.tagArtist.orEmpty()) + .put("l", r.durationMs), + ) + val f = cacheFile(context, root) + f.parentFile?.mkdirs() + val tmp = File(f.path + ".tmp") + tmp.writeText(JSONObject().put("root", root.path).put("rows", rows).toString()) + if (!tmp.renameTo(f)) tmp.delete() + } + } + + fun audioFiles(root: File): List { + val out = ArrayList() + fun walk(dir: File, depth: Int) { + val children = dir.listFiles() ?: return + for (c in children.sortedBy { it.name.lowercase() }) { + if (c.isDirectory) { if (depth < 4) walk(c, depth + 1) } else if (isAudio(c)) out += c + } + } + walk(root, 0) + return out + } + + private fun coverCache(context: Context, root: File): File { + val digest = java.security.MessageDigest.getInstance("SHA-256").digest(root.path.toByteArray(Charsets.UTF_8)) + val key = digest.take(16).joinToString("") { "%02x".format(it) } + return File(context.filesDir, "soundtrack-index/cover-$key.jpg") + } + + fun cachedCover(context: Context, root: File): File? = coverCache(context, root).takeIf { it.isFile && it.length() > 0L } + + private fun embeddedBytes(file: File): ByteArray? = runCatching { + val retriever = MediaMetadataRetriever() + try { + retriever.setDataSource(file.path) + retriever.embeddedPicture + } finally { + runCatching { retriever.release() } + } + }.getOrNull()?.takeIf { it.isNotEmpty() } + + private fun hashOf(bytes: ByteArray): String = + java.security.MessageDigest.getInstance("SHA-256").digest(bytes).take(16).joinToString("") { "%02x".format(it) } + + private fun embeddedCover(context: Context, root: File, files: List): File? { + cachedCover(context, root)?.let { return it } + val miss = File(coverCache(context, root).path + ".none") + val probed = files.take(8) + val signature = hashOf(probed.joinToString("\n") { "${it.path}|${it.length()}|${it.lastModified()}" }.toByteArray(Charsets.UTF_8)) + if (runCatching { miss.isFile && miss.readText().trim() == signature }.getOrDefault(false)) return null + for (file in probed) { + val bytes = embeddedBytes(file) ?: continue + val out = coverCache(context, root) + runCatching { + out.parentFile?.mkdirs() + out.writeBytes(bytes) + }.onSuccess { return out } + } + runCatching { + miss.parentFile?.mkdirs() + miss.writeText(signature) + } + return null + } + + fun firstCover(context: Context, root: File): File? = cover(root) ?: embeddedCover(context, root, audioFiles(root)) + + @Synchronized + fun trackCover(context: Context, file: File): File? { + val dir = File(context.filesDir, "soundtrack-index/track-covers") + val marker = File(dir, "t-" + hashOf("${file.path}|${file.length()}|${file.lastModified()}".toByteArray(Charsets.UTF_8))) + if (marker.isFile) { + val name = runCatching { marker.readText().trim() }.getOrDefault("") + if (name.isEmpty()) return null + File(dir, name).takeIf { it.isFile && it.length() > 0L }?.let { + val now = System.currentTimeMillis() + marker.setLastModified(now) + it.setLastModified(now) + return it + } + } + val bytes = embeddedBytes(file) + return runCatching { + dir.mkdirs() + if (bytes == null) { + marker.writeText("") + prune(dir, setOf(marker.name)) + null + } else { + val out = File(dir, "c-" + hashOf(bytes) + ".jpg") + if (!out.isFile || out.length() == 0L) out.writeBytes(bytes) + marker.writeText(out.name) + prune(dir, setOf(marker.name, out.name)) + out + } + }.getOrNull() + } + + private const val TRACK_COVER_BYTES = 64L * 1024 * 1024 + private const val TRACK_COVER_FILES = 2000 + + private fun prune(dir: File, keep: Set) { + val all = dir.listFiles()?.filter { it.isFile } ?: return + var bytes = all.sumOf { it.length() } + var count = all.size + for (f in all.sortedBy { it.lastModified() }) { + if (bytes <= TRACK_COVER_BYTES && count <= TRACK_COVER_FILES) break + if (f.name in keep) continue + bytes -= f.length() + count-- + f.delete() + } + } + + fun load(context: Context, root: File, coverHint: File? = null): Album { + val files = audioFiles(root) + val raws = fromCache(context, root, files) ?: files.map { read(it, root) }.also { toCache(context, root, it) } + val disc = SoundtrackOrder.apply(context, root, group(raws)) + val artist = disc.values.flatten().map { it.artist }.filter { it.isNotBlank() }.groupingBy { it }.eachCount().maxByOrNull { it.value }?.key.orEmpty() + return Album(disc, artist, coverHint ?: cover(root) ?: embeddedCover(context, root, files)) + } + + fun formatLength(ms: Long): String { + val total = ms / 1000 + val h = total / 3600 + val m = (total % 3600) / 60 + val s = total % 60 + return if (h > 0) "%d:%02d:%02d".format(h, m, s) else "%d:%02d".format(m, s) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollectionArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollectionArt.kt new file mode 100644 index 0000000000..44274fb55b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollectionArt.kt @@ -0,0 +1,50 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import java.io.File + +object SoundtrackCollectionArt { + internal fun dir(context: Context, id: Int) = File(context.filesDir, "soundtrack-art/$id") + + private fun sourceFile(context: Context, id: Int) = File(dir(context, id), "source") + + fun chosen(context: Context, id: Int): File? = dir(context, id).takeIf { it.isDirectory }?.let { AddedGameArt.chosen(it, AddedGameArt.Slot.COVER) } + + fun source(context: Context, id: Int): String = + sourceFile(context, id).takeIf { it.isFile }?.readText()?.trim().orEmpty().substringAfter('|', "") + + fun options(context: Context, id: Int, root: File?): List { + val paths = if (root != null) { + val images = root.listFiles()?.filter { it.isFile && it.extension.lowercase() in Soundtrack.COVER_EXT }?.sortedBy { it.name.lowercase() }.orEmpty() + (images + listOfNotNull(Soundtrack.firstCover(context, root))).map { it.path } + } else SoundtrackCollections.tracksOf(id).map { it.cover } + return paths.filter { it.isNotEmpty() && File(it).isFile }.distinct().map { AddedGameArt.Option(AddedGameArt.FOLDER, it, it) } + } + + fun choose(context: Context, id: Int, option: AddedGameArt.Option): Boolean { + val folder = dir(context, id) + val fresh = AddedGameArt.storeNew(folder, AddedGameArt.Slot.COVER, option) ?: return false + AddedGameArt.dropOlder(folder, AddedGameArt.Slot.COVER, fresh) + sourceFile(context, id).writeText(option.group + "|" + option.full) + return true + } + + fun reset(context: Context, id: Int) { + chosen(context, id)?.delete() + sourceFile(context, id).delete() + } + + fun describe(context: Context, id: Int, root: File? = null): List { + val own = chosen(context, id) + val state = if (own != null) AddedGameArt.SlotState(AddedGameArt.Slot.COVER, own, AddedGameArt.FILE, true) + else { + val auto = if (root != null) Soundtrack.firstCover(context, root) else SoundtrackCollections.autoCover(id) + AddedGameArt.SlotState(AddedGameArt.Slot.COVER, auto, if (auto != null) AddedGameArt.FOLDER else AddedGameArt.AUTO, false) + } + return listOf(state) + } + + fun clear(context: Context, id: Int) { + dir(context, id).deleteRecursively() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt new file mode 100644 index 0000000000..d680ae0709 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt @@ -0,0 +1,191 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import androidx.compose.runtime.mutableStateOf +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.util.concurrent.Executors + +object SoundtrackCollections { + const val FAVORITES_ID = 2_000_000_000 + + class TrackRef(val path: String, val title: String, val artist: String, val album: String, val durationMs: Long, val cover: String = "") + class Collection(val id: Int, val name: String, val tracks: List) + class Snapshot(val favorites: List, val collections: List) + + private val state = mutableStateOf(Snapshot(emptyList(), emptyList())) + private var loaded = false + private val writer = Executors.newSingleThreadExecutor { r -> Thread(r, "soundtrack-collections").apply { isDaemon = true } } + + val snapshot: Snapshot get() = state.value + + private fun file(context: Context) = File(context.filesDir, "soundtrack-collections.json") + + internal fun toggled(list: List, ref: TrackRef): List = + if (list.any { it.path == ref.path }) list.filterNot { it.path == ref.path } else list + ref + + internal fun merged(list: List, add: List): List { + val have = list.mapTo(HashSet()) { it.path } + return list + add.filter { have.add(it.path) } + } + + internal fun cleanName(raw: String): String = raw.trim().replace(Regex("\\s+"), " ") + + internal fun nameTaken(collections: List, name: String, except: Int? = null): Boolean = + collections.any { it.id != except && it.name.equals(name, ignoreCase = true) } + + internal fun nextId(collections: List): Int = + (collections.maxOfOrNull { it.id } ?: FAVORITES_ID).coerceAtLeast(FAVORITES_ID) + 1 + + private fun encode(s: Snapshot): String { + fun refs(list: List) = JSONArray().also { array -> + list.forEach { + array.put( + JSONObject().put("path", it.path).put("title", it.title).put("artist", it.artist).put("album", it.album) + .put("duration", it.durationMs).put("cover", it.cover), + ) + } + } + val collections = JSONArray() + s.collections.forEach { collections.put(JSONObject().put("id", it.id).put("name", it.name).put("tracks", refs(it.tracks))) } + return JSONObject().put("favorites", refs(s.favorites)).put("collections", collections).toString() + } + + private fun decode(text: String): Snapshot { + fun refs(array: JSONArray?): List = if (array == null) emptyList() else List(array.length()) { i -> + array.getJSONObject(i).let { + TrackRef(it.getString("path"), it.optString("title"), it.optString("artist"), it.optString("album"), it.optLong("duration"), it.optString("cover")) + } + } + val root = JSONObject(text) + val collections = root.optJSONArray("collections") + return Snapshot( + refs(root.optJSONArray("favorites")), + if (collections == null) emptyList() else List(collections.length()) { i -> + collections.getJSONObject(i).let { Collection(it.getInt("id"), it.getString("name"), refs(it.optJSONArray("tracks"))) } + }, + ) + } + + @Synchronized + fun load(context: Context) { + if (loaded) return + loaded = true + val f = file(context) + if (f.isFile) runCatching { state.value = decode(f.readText()) } + } + + private fun commit(context: Context, next: Snapshot) { + state.value = next + val f = file(context) + val json = encode(next) + writer.execute { + runCatching { + val tmp = File(f.path + ".tmp") + tmp.writeText(json) + if (!tmp.renameTo(f)) tmp.delete() + } + } + } + + fun tracksOf(id: Int): List = + if (id == FAVORITES_ID) snapshot.favorites else snapshot.collections.firstOrNull { it.id == id }?.tracks.orEmpty() + + fun isFavorite(path: String): Boolean = snapshot.favorites.any { it.path == path } + + @Synchronized + fun toggleFavorite(context: Context, ref: TrackRef) { + load(context) + val s = snapshot + commit(context, Snapshot(toggled(s.favorites, ref), s.collections)) + } + + @Synchronized + fun create(context: Context, rawName: String, tracks: List): Int? { + load(context) + val s = snapshot + val name = cleanName(rawName) + if (name.isEmpty() || nameTaken(s.collections, name)) return null + val id = nextId(s.collections) + commit(context, Snapshot(s.favorites, s.collections + Collection(id, name, merged(emptyList(), tracks)))) + return id + } + + @Synchronized + fun rename(context: Context, id: Int, rawName: String): Boolean { + load(context) + val s = snapshot + val name = cleanName(rawName) + if (id == FAVORITES_ID || name.isEmpty() || nameTaken(s.collections, name, id)) return false + commit(context, Snapshot(s.favorites, s.collections.map { if (it.id == id) Collection(id, name, it.tracks) else it })) + return true + } + + @Synchronized + fun delete(context: Context, id: Int) { + load(context) + val s = snapshot + if (id == FAVORITES_ID) return + commit(context, Snapshot(s.favorites, s.collections.filterNot { it.id == id })) + SoundtrackCollectionArt.clear(context, id) + } + + @Synchronized + fun add(context: Context, id: Int, tracks: List) { + load(context) + val s = snapshot + if (id == FAVORITES_ID) commit(context, Snapshot(merged(s.favorites, tracks), s.collections)) + else commit(context, Snapshot(s.favorites, s.collections.map { if (it.id == id) Collection(id, it.name, merged(it.tracks, tracks)) else it })) + } + + @Synchronized + fun remove(context: Context, id: Int, paths: Set) { + load(context) + val s = snapshot + if (id == FAVORITES_ID) commit(context, Snapshot(s.favorites.filterNot { it.path in paths }, s.collections)) + else commit(context, Snapshot(s.favorites, s.collections.map { if (it.id == id) Collection(id, it.name, it.tracks.filterNot { t -> t.path in paths }) else it })) + } + + @Synchronized + fun reorder(context: Context, id: Int, ordered: List) { + load(context) + val s = snapshot + fun arrange(list: List): List { + val byPath = list.associateBy { it.path } + val placed = ordered.mapNotNull { byPath[it] } + val named = ordered.toSet() + val rest = list.filter { it.path !in named } + return placed + rest + } + if (id == FAVORITES_ID) commit(context, Snapshot(arrange(s.favorites), s.collections)) + else commit(context, Snapshot(s.favorites, s.collections.map { if (it.id == id) Collection(id, it.name, arrange(it.tracks)) else it })) + } + + @Synchronized + fun refresh() { + state.value = Snapshot(state.value.favorites, state.value.collections) + } + + internal fun autoCover(id: Int): File? = coverOf(tracksOf(id)) + + private fun coverOf(tracks: List): File? = + tracks.firstNotNullOfOrNull { t -> t.cover.takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile } } + + private fun game(context: Context, id: Int, name: String, tracks: List): Library.SteamGame = Library.SteamGame( + appId = id, name = name, art = SoundtrackCollectionArt.chosen(context, id) ?: coverOf(tracks), library = Library.ADDED, gameId = id.toLong(), + source = Library.SOURCE_COLLECTION, soundtrack = true, + ) + + fun games(context: Context, favoritesLabel: String): List { + val s = snapshot + return listOf(game(context, FAVORITES_ID, favoritesLabel, s.favorites)) + s.collections.map { game(context, it.id, it.name, it.tracks) } + } + + fun album(context: Context, id: Int): Soundtrack.Album { + val tracks = tracksOf(id).filter { File(it.path).isFile }.mapIndexed { i, t -> + Soundtrack.Track(File(t.path), t.title, 1, i + 1, t.durationMs, t.artist) + } + return Soundtrack.Album(mapOf(1 to tracks), "", SoundtrackCollectionArt.chosen(context, id)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackIndex.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackIndex.kt new file mode 100644 index 0000000000..8da6a884df --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackIndex.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context + +object SoundtrackIndex { + class Hit(val ref: SoundtrackCollections.TrackRef, val game: Library.SteamGame) + + private var cacheKey = "" + private var cache: List = emptyList() + + private fun fingerprint(dir: java.io.File?): Long = + if (dir == null) 0L else Soundtrack.audioFiles(dir).fold(17L) { h, f -> 31 * (31 * (31 * h + f.path.hashCode()) + f.length()) + f.lastModified() } + + fun build(context: Context, games: List): List { + val roots = games.filter { it.gameFiles != null } + val key = roots.joinToString("|") { "${it.appId}:${it.gameFiles?.path}:${it.art?.path}:${fingerprint(it.gameFiles)}" } + synchronized(this) { if (key == cacheKey) return cache } + val hits = roots.flatMap { g -> + val dir = g.gameFiles ?: return@flatMap emptyList() + val album = Soundtrack.load(context, dir, g.art) + val cover = (g.art ?: album.cover)?.path.orEmpty() + album.tracks.map { t -> + Hit(SoundtrackCollections.TrackRef(t.file.path, t.title, t.artist.ifBlank { album.artist }, g.name, t.durationMs, cover), g) + } + } + synchronized(this) { + cacheKey = key + cache = hits + } + return hits + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackOrder.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackOrder.kt new file mode 100644 index 0000000000..a8018825ce --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackOrder.kt @@ -0,0 +1,67 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import androidx.compose.runtime.mutableIntStateOf +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.util.concurrent.Executors + +object SoundtrackOrder { + private val changes = mutableIntStateOf(0) + private var cache: Map>? = null + private val writer = Executors.newSingleThreadExecutor { r -> Thread(r, "soundtrack-order").apply { isDaemon = true } } + + val version: Int get() = changes.intValue + + private fun file(context: Context) = File(context.filesDir, "soundtrack-order.json") + + @Synchronized + private fun read(context: Context): Map> { + cache?.let { return it } + val out = HashMap>() + val f = file(context) + if (f.isFile) runCatching { + val json = JSONObject(f.readText()) + for (key in json.keys()) { + val array = json.getJSONArray(key) + out[key] = List(array.length()) { array.getString(it) } + } + } + cache = out + return out + } + + @Synchronized + fun set(context: Context, root: File, paths: List) { + val next = HashMap(read(context)) + next[root.path] = paths + cache = next + val body = JSONObject().also { json -> next.forEach { (k, v) -> json.put(k, JSONArray(v)) } }.toString() + val target = file(context) + writer.execute { + val tmp = File(target.path + ".tmp") + runCatching { + tmp.writeText(body) + if (!tmp.renameTo(target)) tmp.delete() + } + } + changes.intValue++ + } + + internal fun ordered(disc: Map>, order: List): Map> { + if (order.isEmpty()) return disc + val index = HashMap() + order.forEachIndexed { i, p -> index.putIfAbsent(p, i) } + return disc.mapValues { (_, list) -> + list.sortedBy { index[it.file.path] ?: Int.MAX_VALUE }.mapIndexed { i, t -> + Soundtrack.Track(t.file, t.title, t.disc, i + 1, t.durationMs, t.artist, t.discLabel) + } + } + } + + fun apply(context: Context, root: File, disc: Map>): Map> { + val order = read(context)[root.path] ?: return disc + return ordered(disc, order) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackShortcuts.kt new file mode 100644 index 0000000000..c85940cd16 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackShortcuts.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.frontend + +import android.app.Activity +import android.content.Context +import android.content.Intent +import android.content.pm.ShortcutInfo +import android.content.pm.ShortcutManager +import android.graphics.drawable.Icon +import android.net.Uri +import android.widget.Toast +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.LauncherIcon +import com.droiddeck.launcher.R + +object SoundtrackShortcuts { + private val linkPattern = Regex("droiddeck://soundtrack/(-?[0-9]{1,11})") + + fun uri(appId: Int): String = "droiddeck://soundtrack/$appId" + + fun parse(link: String?): Int? = link?.let { linkPattern.matchEntire(it)?.groupValues?.get(1)?.toIntOrNull() } + + fun read(intent: Intent): Int? = if (intent.action == Intent.ACTION_VIEW) parse(intent.dataString) else null + + private fun info(context: Context, game: Library.SteamGame): ShortcutInfo { + val name = game.name.ifBlank { context.getString(R.string.app_name) } + val icon = GameShortcuts.iconBitmap(game)?.let(Icon::createWithBitmap) ?: Icon.createWithResource(context, R.mipmap.ic_launcher) + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri(game.appId)), context, FrontEndActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + return ShortcutInfo.Builder(context, "soundtrack:${game.appId}") + .setActivity(LauncherIcon.activity(context)) + .setShortLabel(name.take(40)).setLongLabel(name).setIcon(icon).setIntent(intent).build() + } + + fun pin(activity: Activity, game: Library.SteamGame) { + val manager = activity.getSystemService(ShortcutManager::class.java) + val requested = runCatching { + manager.isRequestPinShortcutSupported && manager.requestPinShortcut(info(activity, game), null) + }.getOrDefault(false) + if (!requested) Toast.makeText(activity, R.string.game_shortcut_unsupported, Toast.LENGTH_LONG).show() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackTracks.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackTracks.kt new file mode 100644 index 0000000000..744614710d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackTracks.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.frontend + +object SoundtrackTracks { + enum class Sort { DEFAULT, TITLE_ASC, TITLE_DESC, LONGEST, SHORTEST } + + fun sort(items: List, sort: Sort, title: (T) -> String, duration: (T) -> Long): List = when (sort) { + Sort.DEFAULT -> items + Sort.TITLE_ASC -> items.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, title)) + Sort.TITLE_DESC -> items.sortedWith(compareByDescending(String.CASE_INSENSITIVE_ORDER, title)) + Sort.LONGEST -> items.sortedByDescending(duration) + Sort.SHORTEST -> items.sortedBy(duration) + } + + fun matches(query: String, vararg fields: String): Boolean { + val words = query.trim().lowercase().split(' ').filter { it.isNotEmpty() } + if (words.isEmpty()) return true + val haystack = fields.map { it.lowercase() } + return words.all { word -> haystack.any { it.contains(word) } } + } + + fun rank(query: String, title: String): Int { + val q = query.trim().lowercase() + val t = title.lowercase() + return when { + t == q -> 0 + t.startsWith(q) -> 1 + else -> 2 + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGameArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGameArt.kt index 25a3cb8fb5..d7a6522742 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGameArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGameArt.kt @@ -24,11 +24,7 @@ object SteamGameArt { val icon = chosenFile(context, game.appId, AddedGameArt.Slot.ICON) val logo = chosenFile(context, game.appId, AddedGameArt.Slot.LOGO) if (cover == null && hero == null && icon == null && logo == null) return game - return Library.SteamGame( - game.appId, game.name, cover ?: game.art, game.library, game.gameId, - hero ?: game.hero, game.lastPlayed, game.gameFiles, game.protonPrefix, icon ?: game.icon, game.source, game.storeId, - logo ?: game.logo, - ) + return game.withArt(cover ?: game.art, hero ?: game.hero, icon ?: game.icon, logo ?: game.logo) } fun chosenSource(context: Context, appId: Int, slot: AddedGameArt.Slot): Pair { diff --git a/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackController.kt b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackController.kt new file mode 100644 index 0000000000..7242fd6615 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackController.kt @@ -0,0 +1,288 @@ +package com.droiddeck.launcher.playback + +import android.content.ComponentName +import android.content.Context +import android.os.Bundle +import android.net.Uri +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.core.content.ContextCompat +import androidx.media3.common.MediaItem +import androidx.media3.common.MediaMetadata +import androidx.media3.common.PlaybackParameters +import androidx.media3.common.Player +import androidx.media3.session.MediaController +import androidx.media3.session.SessionToken +import com.droiddeck.launcher.frontend.Soundtrack +import com.google.common.util.concurrent.ListenableFuture +import java.io.File + +object SoundtrackController { + var playing by mutableStateOf(false) + private set + var currentId by mutableStateOf(null) + private set + var title by mutableStateOf("") + private set + var shuffle by mutableStateOf(false) + private set + var repeat by mutableStateOf(Player.REPEAT_MODE_OFF) + private set + var durationMs by mutableStateOf(0L) + private set + var buffering by mutableStateOf(false) + private set + var volume by mutableStateOf(1f) + private set + + var activeCollection by mutableStateOf(null) + private set + + var sleepEndsAt by mutableLongStateOf(0L) + private set + var sleepTrackEnd by mutableStateOf(false) + private set + + private var app: Context? = null + private val removed: MutableSet = java.util.Collections.synchronizedSet(HashSet()) + private var activeRoot: String? = null + private var savedId: String? = null + private var future: ListenableFuture? = null + private var controller: MediaController? = null + private val pending = ArrayList<(MediaController) -> Unit>() + + private val listener = object : Player.Listener { + override fun onEvents(player: Player, events: Player.Events) = sync(player) + } + + private val disconnect = object : MediaController.Listener { + override fun onDisconnected(controller: MediaController) { + if (this@SoundtrackController.controller === controller) { + this@SoundtrackController.controller = null + future = null + reset() + } + } + } + + private fun reset() { + playing = false + currentId = null + title = "" + durationMs = 0L + buffering = false + volume = 1f + activeCollection = null + } + + private fun sync(player: Player) { + playing = player.isPlaying + buffering = player.playbackState == Player.STATE_BUFFERING + currentId = player.currentMediaItem?.mediaId?.takeIf { player.mediaItemCount > 0 } + title = player.mediaMetadata.title?.toString().orEmpty() + shuffle = player.shuffleModeEnabled + repeat = player.repeatMode + durationMs = player.duration.takeIf { it > 0 } ?: 0L + volume = player.volume + if (!player.playWhenReady) sleepTrackEnd = false + persistResume(player) + } + + private fun persistResume(player: Player) { + val context = app ?: return + val id = currentId ?: return + if (activeCollection != null) return + val root = activeRoot ?: SoundtrackSettings.resume(context)?.root?.takeIf { id.startsWith("$it/") }?.also { activeRoot = it } ?: return + if (id != savedId || !player.isPlaying) { + savedId = id + SoundtrackSettings.saveResume(context, root, id, if (player.playbackState == Player.STATE_ENDED) 0L else player.currentPosition) + } + } + + private fun applySettings(c: MediaController) { + val context = app ?: return + SoundtrackSettings.load(context) + c.setPlaybackParameters(PlaybackParameters(SoundtrackSettings.speed, SoundtrackSettings.pitch)) + c.sendCustomCommand(SoundtrackService.SKIP_SILENCE, Bundle().apply { putBoolean(SoundtrackService.ARG_ON, SoundtrackSettings.skipSilence) }) + sendEqualizer(c) + c.sendCustomCommand(SoundtrackService.INGAME, Bundle().apply { putBoolean(SoundtrackService.ARG_ON, com.droiddeck.launcher.session.SessionPrefs.soundtracksIngame(context)) }) + } + + private fun sendEqualizer(c: MediaController) { + c.sendCustomCommand( + SoundtrackService.EQUALIZER, + Bundle().apply { + putBoolean(SoundtrackService.ARG_ON, SoundtrackSettings.eqOn) + putIntArray(SoundtrackService.ARG_BANDS, SoundtrackSettings.bands.toIntArray()) + putInt(SoundtrackService.ARG_BASS, SoundtrackSettings.bass) + }, + ) + } + + private fun run(context: Context, block: (MediaController) -> Unit) { + app = context.applicationContext + val live = controller + if (live != null) { block(live); return } + pending += block + if (future != null) return + val app = context.applicationContext + val token = SessionToken(app, ComponentName(app, SoundtrackService::class.java)) + val built = MediaController.Builder(app, token).setListener(disconnect) + .setConnectionHints(Bundle().apply { putBoolean(SoundtrackService.HINT_OWNER, true) }).buildAsync() + future = built + built.addListener({ + val ready = runCatching { built.get() }.getOrNull() + if (ready == null) { + future = null + pending.clear() + return@addListener + } + controller = ready + ready.addListener(listener) + applySettings(ready) + sync(ready) + val queued = pending.toList() + pending.clear() + queued.forEach { it(ready) } + }, ContextCompat.getMainExecutor(app)) + } + + fun connect(context: Context) = run(context) { } + + fun position(): Long = controller?.currentPosition ?: 0L + + fun belongsCollection(id: Int): Boolean = activeCollection == id && currentId != null + + fun belongs(root: File?): Boolean { + if (activeCollection != null) return false + val id = currentId ?: return false + return root != null && id.startsWith(root.path + "/") + } + + private fun items(album: Soundtrack.Album, albumTitle: String): List { + val cover = album.cover?.let { Uri.fromFile(it) } + return album.tracks.map { t -> + MediaItem.Builder() + .setMediaId(t.file.path) + .setMediaMetadata( + MediaMetadata.Builder() + .setTitle(t.title) + .setArtist(t.artist.ifBlank { album.artist }.ifBlank { null }) + .setAlbumTitle(albumTitle) + .setTrackNumber(t.number) + .setDiscNumber(t.disc.takeIf { it > 0 }) + .setArtworkUri(cover) + .setIsPlayable(true) + .build(), + ) + .build() + } + } + + fun play( + context: Context, album: Soundtrack.Album, albumTitle: String, startId: String?, shuffled: Boolean? = null, + root: File? = null, startMs: Long = 0L, collection: Int? = null, + ) { + val list = items(album, albumTitle) + if (list.isEmpty()) return + run(context) { c -> + if (root != null && root.path in removed) return@run + val start = list.indexOfFirst { it.mediaId == startId }.coerceAtLeast(0) + root?.let { activeRoot = it.path } + activeCollection = collection + c.setMediaItems(list, start, startMs) + shuffled?.let { c.shuffleModeEnabled = it } + c.prepare() + c.play() + } + } + + fun allow(paths: Collection) { + removed.removeAll(paths.toSet()) + } + + fun toggle(context: Context, album: Soundtrack.Album, albumTitle: String, root: File?, collection: Int? = null) { + run(context) { c -> + if (root != null && root.path in removed) return@run + val mine = if (collection != null) belongsCollection(collection) else belongs(root) + if (mine && c.mediaItemCount > 0) { + if (c.isPlaying) c.pause() else { + if (c.playbackState == Player.STATE_ENDED) c.seekToDefaultPosition(0) + c.play() + } + } else { + val saved = if (collection != null) null else root?.let { r -> SoundtrackSettings.resume(context)?.takeIf { it.root == r.path && album.tracks.any { t -> t.id == it.id } } } + play(context, album, albumTitle, saved?.id ?: album.tracks.firstOrNull()?.id, root = root, startMs = saved?.positionMs ?: 0L, collection = collection) + } + } + } + + fun pause(context: Context) { + val live = controller + if (live != null) live.pause() else if (future != null) pending += { it.pause() } + } + + fun next(context: Context) = run(context) { it.seekToNext() } + fun previous(context: Context) = run(context) { c -> if (c.currentPosition > 3000L) c.seekTo(0) else c.seekToPrevious() } + fun seekTo(context: Context, ms: Long) = run(context) { it.seekTo(ms) } + fun setShuffle(context: Context, on: Boolean) = run(context) { it.shuffleModeEnabled = on } + fun cycleRepeat(context: Context) = run(context) { + it.repeatMode = when (it.repeatMode) { + Player.REPEAT_MODE_OFF -> Player.REPEAT_MODE_ALL + Player.REPEAT_MODE_ALL -> Player.REPEAT_MODE_ONE + else -> Player.REPEAT_MODE_OFF + } + } + fun setVolume(context: Context, volume: Float) = run(context) { it.volume = volume.coerceIn(0f, 1f) } + + fun setSpeed(context: Context, value: Float) { + SoundtrackSettings.load(context) + SoundtrackSettings.setSpeed(context, value) + run(context) { it.setPlaybackParameters(PlaybackParameters(SoundtrackSettings.speed, SoundtrackSettings.pitch)) } + } + + fun setPitch(context: Context, value: Float) { + SoundtrackSettings.load(context) + SoundtrackSettings.setPitch(context, value) + run(context) { it.setPlaybackParameters(PlaybackParameters(SoundtrackSettings.speed, SoundtrackSettings.pitch)) } + } + + fun setSkipSilence(context: Context, on: Boolean) { + SoundtrackSettings.load(context) + SoundtrackSettings.setSkipSilence(context, on) + run(context) { it.sendCustomCommand(SoundtrackService.SKIP_SILENCE, Bundle().apply { putBoolean(SoundtrackService.ARG_ON, on) }) } + } + + fun setEqualizer(context: Context, on: Boolean, bands: List, bass: Int) { + SoundtrackSettings.load(context) + SoundtrackSettings.setEqualizer(context, on, bands, bass) + run(context) { sendEqualizer(it) } + } + + fun setIngame(context: Context, on: Boolean) { + run(context) { it.sendCustomCommand(SoundtrackService.INGAME, Bundle().apply { putBoolean(SoundtrackService.ARG_ON, on) }) } + } + + fun setSleep(context: Context, minutes: Int) { + sleepEndsAt = if (minutes > 0) System.currentTimeMillis() + minutes * 60_000L else 0L + sleepTrackEnd = minutes < 0 + run(context) { it.sendCustomCommand(SoundtrackService.SLEEP, Bundle().apply { putInt(SoundtrackService.ARG_MINUTES, minutes) }) } + } + + fun sleepRemainingMs(): Long { + val left = sleepEndsAt - System.currentTimeMillis() + if (sleepEndsAt > 0L && left <= 0L) sleepEndsAt = 0L + return left.coerceAtLeast(0L) + } + + fun stopIf(context: Context, root: File?) { + root?.let { removed.add(it.path) } + if (root == null || currentId?.startsWith(root.path + "/") != true) return + run(context) { c -> + c.stop() + c.clearMediaItems() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackService.kt b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackService.kt new file mode 100644 index 0000000000..083b935cd5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackService.kt @@ -0,0 +1,282 @@ +package com.droiddeck.launcher.playback + +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.media.audiofx.BassBoost +import android.media.audiofx.Equalizer +import android.net.Uri +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.os.Process +import androidx.media3.common.AudioAttributes +import androidx.media3.common.C +import androidx.media3.common.MediaItem +import androidx.media3.common.Player +import androidx.media3.exoplayer.ExoPlayer +import androidx.media3.session.CommandButton +import androidx.media3.session.DefaultMediaNotificationProvider +import androidx.media3.session.MediaSession +import androidx.media3.session.MediaSessionService +import androidx.media3.session.SessionCommand +import androidx.media3.session.SessionResult +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Soundtrack +import com.google.common.collect.ImmutableList +import com.google.common.util.concurrent.Futures +import com.google.common.util.concurrent.ListenableFuture +import java.io.File + +private class EdgeButtonsProvider(context: Context) : DefaultMediaNotificationProvider(context) { + override fun getMediaButtons( + session: MediaSession, playerCommands: Player.Commands, customLayout: ImmutableList, showPauseButton: Boolean, + ): ImmutableList { + val all = super.getMediaButtons(session, playerCommands, customLayout, showPauseButton) + val custom = all.filter { it.sessionCommand != null } + if (custom.size < 2) return all + return ImmutableList.builder() + .add(custom.first()) + .addAll(all.filter { it.sessionCommand == null }) + .addAll(custom.drop(1)) + .build() + } +} + +class SoundtrackService : MediaSessionService() { + private var session: MediaSession? = null + private var exo: ExoPlayer? = null + private var equalizer: Equalizer? = null + private var bassBoost: BassBoost? = null + private var effectsSession = C.AUDIO_SESSION_ID_UNSET + private var eqOn = false + private var eqBands = IntArray(0) + private var eqBass = 0 + private var sleepAtTrackEnd = false + private val handler = Handler(Looper.getMainLooper()) + private val sleepRunnable = Runnable { session?.player?.pause() } + private val covers = java.util.concurrent.Executors.newSingleThreadExecutor { r -> Thread(r, "soundtrack-cover").apply { isDaemon = true } } + + override fun onCreate() { + super.onCreate() + val player = ExoPlayer.Builder(this) + .setAudioAttributes(mediaAttributes(), !com.droiddeck.launcher.session.SessionPrefs.soundtracksIngame(this)) + .setHandleAudioBecomingNoisy(true) + .setWakeMode(androidx.media3.common.C.WAKE_MODE_LOCAL) + .build() + exo = player + val sessionIntent = packageManager.getLaunchIntentForPackage(packageName)?.let { + PendingIntent.getActivity(this, 0, it, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) + } + player.addListener(object : Player.Listener { + override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) = refreshButtons() + override fun onRepeatModeChanged(repeatMode: Int) = refreshButtons() + override fun onAudioSessionIdChanged(audioSessionId: Int) = applyEffects() + override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) { + if (!playWhenReady) sleepAtTrackEnd = false + } + override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) { + refreshTrackCover(mediaItem) + val ended = reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO || reason == Player.MEDIA_ITEM_TRANSITION_REASON_REPEAT + if (sleepAtTrackEnd && ended) { + sleepAtTrackEnd = false + player.pause() + } + } + }) + session = MediaSession.Builder(this, player).setCallback(Resolver()).apply { sessionIntent?.let { setSessionActivity(it) } }.build() + setMediaNotificationProvider(EdgeButtonsProvider(this).apply { setSmallIcon(R.drawable.ic_soundtrack) }) + } + + private fun mediaAttributes(): AudioAttributes = + AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).setContentType(C.AUDIO_CONTENT_TYPE_MUSIC).build() + + private fun buttons(player: Player): ImmutableList = ImmutableList.of( + CommandButton.Builder() + .setDisplayName(getString(R.string.soundtracks_shuffle)) + .setIconResId(if (player.shuffleModeEnabled) R.drawable.ic_shuffle_on else R.drawable.ic_shuffle_off) + .setSessionCommand(SHUFFLE) + .build(), + CommandButton.Builder() + .setDisplayName( + getString( + when (player.repeatMode) { + Player.REPEAT_MODE_ALL -> R.string.soundtracks_repeat_all + Player.REPEAT_MODE_ONE -> R.string.soundtracks_repeat_one + else -> R.string.soundtracks_repeat_off + }, + ), + ) + .setIconResId( + when (player.repeatMode) { + Player.REPEAT_MODE_ALL -> R.drawable.ic_repeat_all + Player.REPEAT_MODE_ONE -> R.drawable.ic_repeat_one + else -> R.drawable.ic_repeat_off + }, + ) + .setSessionCommand(REPEAT) + .build(), + ) + + private fun hasPinnedArt(item: MediaItem): Boolean = + item.mediaMetadata.artworkUri?.path.orEmpty().let { it.contains("/steam-art/") || it.contains("/soundtrack-art/") } + + private fun refreshTrackCover(item: MediaItem?) { + val current = item ?: return + if (hasPinnedArt(current)) return + val file = File(current.mediaId) + covers.execute { + val art = Soundtrack.trackCover(this, file) ?: return@execute + handler.post { + val player = exo ?: return@post + val live = player.currentMediaItem ?: return@post + val uri = Uri.fromFile(art) + if (live.mediaId != current.mediaId || live.mediaMetadata.artworkUri == uri || hasPinnedArt(live)) return@post + player.replaceMediaItem( + player.currentMediaItemIndex, + live.buildUpon().setMediaMetadata(live.mediaMetadata.buildUpon().setArtworkUri(uri).build()).build(), + ) + } + } + } + + private fun releaseEffects() { + runCatching { equalizer?.release() } + runCatching { bassBoost?.release() } + equalizer = null + bassBoost = null + effectsSession = C.AUDIO_SESSION_ID_UNSET + } + + private fun applyEffects() { + val id = exo?.audioSessionId ?: C.AUDIO_SESSION_ID_UNSET + if (!eqOn || id == C.AUDIO_SESSION_ID_UNSET) { + releaseEffects() + return + } + if (id != effectsSession) { + releaseEffects() + effectsSession = id + equalizer = runCatching { Equalizer(0, id) }.getOrNull() + bassBoost = runCatching { BassBoost(0, id) }.getOrNull() + } + runCatching { + equalizer?.let { eq -> + val range = eq.bandLevelRange + for (band in 0 until minOf(eq.numberOfBands.toInt(), eqBands.size)) { + eq.setBandLevel(band.toShort(), eqBands[band].coerceIn(range[0].toInt(), range[1].toInt()).toShort()) + } + eq.enabled = true + } + } + runCatching { + bassBoost?.let { boost -> + if (boost.strengthSupported) boost.setStrength(eqBass.coerceIn(0, 1000).toShort()) + boost.enabled = eqBass > 0 + } + } + } + + private fun setSleep(minutes: Int) { + handler.removeCallbacks(sleepRunnable) + sleepAtTrackEnd = false + if (minutes > 0) handler.postDelayed(sleepRunnable, minutes * 60_000L) + else if (minutes < 0) sleepAtTrackEnd = true + } + + private fun refreshButtons() { + val live = session ?: return + live.setCustomLayout(buttons(live.player)) + } + + override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? = session + + override fun onTaskRemoved(rootIntent: Intent?) { + val player = session?.player + if (player == null || !player.playWhenReady || player.mediaItemCount == 0 || player.playbackState == Player.STATE_ENDED) stopSelf() + } + + override fun onDestroy() { + handler.removeCallbacks(sleepRunnable) + covers.shutdownNow() + releaseEffects() + session?.let { + it.player.release() + it.release() + } + session = null + super.onDestroy() + } + + companion object { + const val HINT_OWNER = "droiddeck.owner" + private val SHUFFLE = SessionCommand("droiddeck.shuffle", Bundle.EMPTY) + private val REPEAT = SessionCommand("droiddeck.repeat", Bundle.EMPTY) + val SKIP_SILENCE = SessionCommand("droiddeck.skipsilence", Bundle.EMPTY) + val EQUALIZER = SessionCommand("droiddeck.equalizer", Bundle.EMPTY) + val SLEEP = SessionCommand("droiddeck.sleep", Bundle.EMPTY) + val INGAME = SessionCommand("droiddeck.ingame", Bundle.EMPTY) + const val ARG_ON = "on" + const val ARG_BANDS = "bands" + const val ARG_BASS = "bass" + const val ARG_MINUTES = "minutes" + } + + private inner class Resolver : MediaSession.Callback { + private fun isOwner(controller: MediaSession.ControllerInfo) = + controller.uid == Process.myUid() && controller.connectionHints.getBoolean(HINT_OWNER, false) + + override fun onConnect(session: MediaSession, controller: MediaSession.ControllerInfo): MediaSession.ConnectionResult = + if (controller.uid == Process.myUid() || controller.isTrusted) { + MediaSession.ConnectionResult.AcceptedResultBuilder(session) + .setAvailableSessionCommands( + MediaSession.ConnectionResult.DEFAULT_SESSION_COMMANDS.buildUpon().add(SHUFFLE).add(REPEAT).add(SKIP_SILENCE).add(EQUALIZER).add(SLEEP).add(INGAME).build(), + ) + .setCustomLayout(buttons(session.player)) + .build() + } else { + MediaSession.ConnectionResult.reject() + } + + override fun onCustomCommand( + session: MediaSession, controller: MediaSession.ControllerInfo, customCommand: SessionCommand, args: Bundle, + ): ListenableFuture { + val player = session.player + when (customCommand.customAction) { + SHUFFLE.customAction -> player.shuffleModeEnabled = !player.shuffleModeEnabled + REPEAT.customAction -> player.repeatMode = when (player.repeatMode) { + Player.REPEAT_MODE_OFF -> Player.REPEAT_MODE_ALL + Player.REPEAT_MODE_ALL -> Player.REPEAT_MODE_ONE + else -> Player.REPEAT_MODE_OFF + } + SKIP_SILENCE.customAction, EQUALIZER.customAction, SLEEP.customAction, INGAME.customAction -> { + if (!isOwner(controller)) return Futures.immediateFuture(SessionResult(SessionResult.RESULT_ERROR_PERMISSION_DENIED)) + when (customCommand.customAction) { + SKIP_SILENCE.customAction -> exo?.skipSilenceEnabled = args.getBoolean(ARG_ON) + INGAME.customAction -> exo?.setAudioAttributes(mediaAttributes(), !args.getBoolean(ARG_ON)) + EQUALIZER.customAction -> { + eqOn = args.getBoolean(ARG_ON) + eqBands = args.getIntArray(ARG_BANDS) ?: IntArray(0) + eqBass = args.getInt(ARG_BASS) + applyEffects() + } + else -> setSleep(args.getInt(ARG_MINUTES)) + } + } + else -> return Futures.immediateFuture(SessionResult(SessionResult.RESULT_ERROR_NOT_SUPPORTED)) + } + return Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS)) + } + + override fun onAddMediaItems( + mediaSession: MediaSession, controller: MediaSession.ControllerInfo, mediaItems: MutableList, + ): ListenableFuture> { + if (!isOwner(controller)) return Futures.immediateFailedFuture(SecurityException("Only DroidDeck can queue soundtrack files")) + val resolved = mediaItems.mapNotNull { item -> + val file = File(item.mediaId) + if (Soundtrack.isAudio(file)) item.buildUpon().setUri(Uri.fromFile(file)).build() else null + }.toMutableList() + return Futures.immediateFuture(resolved) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackSettings.kt b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackSettings.kt new file mode 100644 index 0000000000..c34af1e32e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/playback/SoundtrackSettings.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.playback + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +object SoundtrackSettings { + const val MIN_RATE = 0.5f + const val MAX_RATE = 2f + + var speed by mutableFloatStateOf(1f) + private set + var pitch by mutableFloatStateOf(1f) + private set + var skipSilence by mutableStateOf(false) + private set + var eqOn by mutableStateOf(false) + private set + var bands by mutableStateOf>(emptyList()) + private set + var bass by mutableIntStateOf(0) + private set + + class Resume(val root: String, val id: String, val positionMs: Long) + + private var loaded = false + + private fun prefs(context: Context) = context.applicationContext.getSharedPreferences("soundtrack_settings", Context.MODE_PRIVATE) + + @Synchronized + fun load(context: Context) { + if (loaded) return + loaded = true + val p = prefs(context) + speed = p.getFloat("speed", 1f).coerceIn(MIN_RATE, MAX_RATE) + pitch = p.getFloat("pitch", 1f).coerceIn(MIN_RATE, MAX_RATE) + skipSilence = p.getBoolean("skipSilence", false) + eqOn = p.getBoolean("eqOn", false) + bands = p.getString("bands", "").orEmpty().split(',').mapNotNull { it.trim().toIntOrNull() } + bass = p.getInt("bass", 0).coerceIn(0, 1000) + } + + fun setSpeed(context: Context, value: Float) { + speed = value.coerceIn(MIN_RATE, MAX_RATE) + prefs(context).edit().putFloat("speed", speed).apply() + } + + fun setPitch(context: Context, value: Float) { + pitch = value.coerceIn(MIN_RATE, MAX_RATE) + prefs(context).edit().putFloat("pitch", pitch).apply() + } + + fun setSkipSilence(context: Context, on: Boolean) { + skipSilence = on + prefs(context).edit().putBoolean("skipSilence", on).apply() + } + + fun setEqualizer(context: Context, on: Boolean, levels: List, bassStrength: Int) { + eqOn = on + bands = levels + bass = bassStrength.coerceIn(0, 1000) + prefs(context).edit().putBoolean("eqOn", on).putString("bands", levels.joinToString(",")).putInt("bass", bass).apply() + } + + fun resume(context: Context): Resume? { + val p = prefs(context) + val root = p.getString("resumeRoot", null) ?: return null + val id = p.getString("resumeId", null) ?: return null + return Resume(root, id, p.getLong("resumePosition", 0L)) + } + + fun saveResume(context: Context, root: String, id: String, positionMs: Long) { + prefs(context).edit().putString("resumeRoot", root).putString("resumeId", id).putLong("resumePosition", positionMs.coerceAtLeast(0L)).apply() + } +} 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 e47f9194bf..f55d994e1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -201,6 +201,18 @@ object SessionPrefs { prefs(context).edit().putBoolean("gameStoresEnabled", on).apply() } + fun soundtracksEnabled(context: Context): Boolean = prefs(context).getBoolean("soundtracksEnabled", true) + + fun setSoundtracksEnabled(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("soundtracksEnabled", on).apply() + } + + fun soundtracksIngame(context: Context): Boolean = prefs(context).getBoolean("soundtracksIngame", false) + + fun setSoundtracksIngame(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("soundtracksIngame", on).apply() + } + fun gameStoresSpeedTier(context: Context): String = prefs(context).getString("gameStoresSpeedTier", "fast") ?: "fast" fun setGameStoresSpeedTier(context: Context, tier: String) { 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 756b05f45f..6849c621c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -14,7 +14,7 @@ object SettingsReset { internal val SESSION_KEYS = setOf( "orientation", "launcherFullscreen", "animations", "lowStorageWarning", "theme", "runSteamAtStartup", "startupSession", "addedGamesArt", "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "androidTextFieldKeyboard", - "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", + "gameStoresEnabled", "soundtracksEnabled", "soundtracksIngame", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", 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 89e1480869..a1b205e64a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -70,6 +70,7 @@ import com.droiddeck.launcher.frontend.AddedGameArt import com.droiddeck.launcher.frontend.AddedGameEdits import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.LogoPosition +import com.droiddeck.launcher.frontend.SoundtrackCollectionArt import com.droiddeck.launcher.frontend.SteamGameArt import com.droiddeck.launcher.frontend.SteamGridDb import com.droiddeck.launcher.frontend.SteamLaunchOptions @@ -179,6 +180,16 @@ internal class ArtTarget( { c, value -> AddedGameEdits.setLogoPosition(c, game.folder.path, value) }, ) + fun ofCollection(id: Int, name: String, root: java.io.File? = null) = ArtTarget( + name, + { c, _ -> SoundtrackCollectionArt.source(c, id) }, + { c, _ -> AddedGameArt.Choices(SoundtrackCollectionArt.options(c, id, root), SteamGridDb.Status.OK) }, + { c, _, option -> SoundtrackCollectionArt.choose(c, id, option) }, + { c, _ -> SoundtrackCollectionArt.reset(c, id) }, + { _ -> null }, + { _, _ -> false }, + ) + fun of(game: com.droiddeck.launcher.frontend.Library.SteamGame) = ArtTarget( game.name, { c, slot -> SteamGameArt.chosenSource(c, game.appId, slot).second }, @@ -199,6 +210,12 @@ internal fun SteamGameArtEditor( ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged) } +@Composable +internal fun CollectionArtEditor(id: Int, name: String, root: java.io.File? = null, onClose: () -> Unit, onChanged: () -> Unit) { + val target = remember(id, root) { ArtTarget.ofCollection(id, name, root) } + ArtOnlyEditor(name, target, id, { SoundtrackCollectionArt.describe(it, id, root) }, onClose, onChanged, listOf(AddedGameArt.Slot.COVER)) +} + @Composable internal fun StoreGameArtEditor(folder: String, name: String, onClose: () -> Unit, onChanged: () -> Unit) { val app = LocalContext.current.applicationContext @@ -212,7 +229,7 @@ internal fun StoreGameArtEditor(folder: String, name: String, onClose: () -> Uni @Composable private fun ArtOnlyEditor( name: String, target: ArtTarget?, refresh: Any?, describe: (Context) -> List, - onClose: () -> Unit, onChanged: () -> Unit, + onClose: () -> Unit, onChanged: () -> Unit, slots: List = AddedGameArt.Slot.values().toList(), ) { val app = LocalContext.current.applicationContext val shown = rememberShown(onClose) @@ -233,7 +250,7 @@ private fun ArtOnlyEditor( modifier = Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()), ) { Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = 2.dp)) - for (slot in AddedGameArt.Slot.values()) key(slot) { + for (slot in slots) key(slot) { val state = arts.firstOrNull { it.slot == slot } FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER) first else null, onClick = { if (target != null) artSlot = slot }) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { @@ -242,7 +259,7 @@ private fun ArtOnlyEditor( } } } - PickerRow(Icons.Outlined.Tune, stringResource(R.string.art_adjust_logo), logoPositionSummary(position?.value), enabled = target != null && position != null) { logoOpen = true } + if (AddedGameArt.Slot.LOGO in slots) PickerRow(Icons.Outlined.Tune, stringResource(R.string.art_adjust_logo), logoPositionSummary(position?.value), enabled = target != null && position != null) { logoOpen = true } } } val chosen = target ?: return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 28b3dc33bb..b99ee02316 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -115,6 +115,7 @@ internal fun Pane( s.pageKey != null && page != null -> null selected.startsWith("app:") -> s.steamGames.firstOrNull { "app:${it.appId}" == selected }?.art selected == "games" -> s.steamGames.maxByOrNull { it.lastPlayed }?.art + selected.startsWith("sound:") -> s.soundtracks.firstOrNull { "sound:${it.appId}" == selected }?.let { it.hero ?: it.art } selected.startsWith("rom:") -> romFor(s, selected)?.second?.art else -> null } @@ -124,10 +125,12 @@ internal fun Pane( val origins = remember { HashMap() } val paneAt = remember { arrayOf(Offset.Zero) } val livePage by rememberUpdatedState(s.pageKey) - val railContent = if (selected.startsWith("app:")) "games" else selected + val railContent = if (selected.startsWith("app:")) "games" else if (selected.startsWith("sound:")) "soundtracks" else selected val target = if (page != null && s.pageKey != null) s.pageKey else railContent val gameShown = remember { arrayOf("games") } if (selected == "games" || selected.startsWith("app:")) gameShown[0] = selected + val soundShown = remember { arrayOf("soundtracks") } + if (selected == "soundtracks" || selected.startsWith("sound:")) soundShown[0] = selected val before = remember { arrayOf(target) } if (page != null && s.pageKey != null) { pages[s.pageKey] = page @@ -171,7 +174,7 @@ internal fun Pane( label = "pane", ) { key -> val drawn = (if (page != null && key == s.pageKey) page else pages[key]) - ?: { Content(s, if (key == "games") gameShown[0] else key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } + ?: { Content(s, if (key == "games") gameShown[0] else if (key == "soundtracks") soundShown[0] else key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } val hopSink by androidx.compose.animation.core.animateFloatAsState( if (Hops.sinking == key) 1f else 0f, Motion.tw(260), label = "hopSink", ) @@ -262,7 +265,7 @@ private fun Content( StoresPage(s, a, modifier) return } - if (selected == "games" || selected.startsWith("app:")) { + if (selected == "games" || selected.startsWith("app:") || selected == "soundtracks" || selected.startsWith("sound:")) { LibraryPage(s, a, selected, onSelect, modifier) return } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 599968d9f7..87d8ac6644 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -126,6 +126,7 @@ internal fun BottomBar( internal fun navigationKeys(s: FrontEndState) = buildList { add("steam"); add("games") + if (s.soundtracksEnabled) add("soundtracks") if (s.gameStoresEnabled) add("stores") add("desktop") if (com.droiddeck.launcher.agent.AgentTab.visible) add("agent") @@ -200,6 +201,7 @@ internal fun SideRail( internal fun railLabelIcon(key: String): Pair = when (key) { "steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports "games" -> R.string.rail_games to Icons.Outlined.VideoLibrary + "soundtracks" -> R.string.rail_music to SoundtrackIcon "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall "desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows "components" -> R.string.rail_components to Icons.Outlined.Layers diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index f9914d5a38..2d2baaff3f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -181,6 +181,10 @@ class FrontEndState( val lowStorageWarning: Boolean = true, val launcherIcon: String = com.droiddeck.launcher.LauncherIcon.DARK, val gameStoresEnabled: Boolean = true, + val soundtracksEnabled: Boolean = true, + val soundtracksIngame: Boolean = false, + val soundtracks: List = emptyList(), + val soundtracksLoaded: Boolean = true, val gameStoresSpeedTier: String = "fast", val navigate: String? = null, val addedGamesArt: Boolean = true, @@ -285,6 +289,11 @@ class FrontEndActions( val onDownloadPrefix: (String) -> Unit = {}, val onDownloadProxy: (String) -> Unit = {}, val onGameStoresEnabled: (Boolean) -> Unit = {}, + val onSoundtracksEnabled: (Boolean) -> Unit = {}, + val onSoundtracksIngame: (Boolean) -> Unit = {}, + val onSoundtrackAdded: (java.io.File) -> Unit = {}, + val onSoundtracksChanged: () -> Unit = {}, + val onSoundtrackRemoved: (Library.SteamGame) -> Unit = {}, val onGameStoresSpeedTier: (String) -> Unit = {}, val onNavigated: () -> Unit = {}, val onStoresShowMature: (Boolean) -> Unit = {}, @@ -567,8 +576,14 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com selected = if (selected.startsWith("rom:")) "emu:" + selected.removePrefix("rom:").substringBefore(':') else "desktop" } LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } - LaunchedEffect(s.steamGames.isEmpty()) { - if (s.steamGames.isEmpty() && selected.startsWith("app:") && GameRef.parse(selected).appId != null) selected = "games" + LaunchedEffect(s.soundtracksEnabled) { + if (!s.soundtracksEnabled && (selected == "soundtracks" || selected.startsWith("sound:"))) selected = "games" + } + LaunchedEffect(s.steamGames.isEmpty(), s.soundtracks, s.soundtracksLoaded) { + if (s.steamGames.isEmpty() && selected.startsWith("app:")) { + val id = GameRef.parse(selected).appId + if (id != null && s.soundtracks.none { it.appId == id } && s.soundtracksLoaded) selected = "games" + } } remember { Motion.refresh(ctx); true } @@ -577,6 +592,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com s.pageKey == "performance" -> "steam" s.pageKey == "controller-mapping" -> "setup" selected.startsWith("app:") -> "games" + selected.startsWith("sound:") -> "soundtracks" selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store" -> "desktop" else -> s.pageKey ?: selected } @@ -688,7 +704,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com val r = Hops.restore ?: return@LaunchedEffect if (r.surface == HOP_SURFACE_SHEET) return@LaunchedEffect Hops.restore = null - if (r.rail != selected && !(r.rail == "games" && selected.startsWith("app:"))) selected = r.rail + if (r.rail != selected && !(r.rail == "games" && selected.startsWith("app:")) && !(r.rail == "soundtracks" && selected.startsWith("sound:"))) selected = r.rail kotlinx.coroutines.delay(Motion.ms(PAGE_EXIT_MS).toLong()) if (inputModeManager.inputMode != InputMode.Keyboard) return@LaunchedEffect frontFocus.last = r.control diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 3655ec0959..fa78998cf4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -457,6 +457,8 @@ internal fun SetupPanel( ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } LanguageRow(host, s.language, a.onLanguage) ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) + ToggleRow(host, "show-soundtracks", stringResource(R.string.setup_soundtracks), null, s.soundtracksEnabled, onChange = a.onSoundtracksEnabled) + if (s.soundtracksEnabled) ToggleRow(host, "soundtracks-ingame", stringResource(R.string.setup_soundtracks_ingame), stringResource(R.string.setup_soundtracks_ingame_hint), s.soundtracksIngame, onChange = a.onSoundtracksIngame) } } val device: @Composable () -> Unit = { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index bee82bbd2c..7aba7feb45 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -148,7 +148,7 @@ internal fun GameDetail( val narrow = LocalNarrowPane.current val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 val ref = remember(key) { GameRef.parse(key) } - val games = s.steamGames + rememberXboxCloudRows(s) + val games = s.steamGames + rememberXboxCloudRows(s) + if (s.soundtracksEnabled) emptyList() else s.soundtracks val found = ref.game(games) val known = remember(key) { arrayOfNulls>(1) } val store = ref.store ?: Store.byId(found?.source) ?: known[0]?.first @@ -280,7 +280,7 @@ internal fun GameDetail( } @Composable -private fun SourceBadge(source: String) { +internal fun SourceBadge(source: String) { val c = sourceColours(source) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp), @@ -574,13 +574,13 @@ private fun buyLabel(item: CatalogItem): String = when { } @Composable -private fun FileButtons(game: Library.SteamGame, a: FrontEndActions) { +internal fun FileButtons(game: Library.SteamGame, a: FrontEndActions) { game.gameFiles?.takeIf { it.isDirectory }?.let { dir -> SecondaryButton(stringResource(R.string.games_files), compact = true) { a.onBrowseFiles(dir) } } game.protonPrefix?.takeIf { it.isDirectory }?.let { dir -> SecondaryButton(stringResource(R.string.games_prefix), compact = true) { a.onBrowseFiles(dir) } } } @Composable -private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { +internal fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { var open by remember(g.gameId) { mutableStateOf(false) } Box { SecondaryButton(stringResource(R.string.game_shortcut), compact = true) { open = !open } @@ -593,7 +593,7 @@ private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { } @Composable -private fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { +internal fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { val ctx = LocalContext.current val folder = g.gameFiles return when { @@ -607,7 +607,7 @@ private fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { } @Composable -private fun EditArtButton(g: Library.SteamGame) { +internal fun EditArtButton(g: Library.SteamGame) { val open = rememberEditArt(g) ?: return IconAction(Icons.Outlined.Edit, stringResource(R.string.game_edit_art), "game:edit", onClick = open) } @@ -664,7 +664,7 @@ internal fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, l } @Composable -private fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) { +internal fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme if ((installed?.sidecar?.store?.id ?: game?.source) == Store.BATTLENET.id && installed?.sidecar?.id?.let(BattleNetInstall::product) == null) return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt index a2660d1b47..e5fd8845bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt @@ -38,6 +38,7 @@ import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.graphics.drawscope.clipRect import androidx.compose.ui.graphics.drawscope.translate +import androidx.compose.ui.draw.blur import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.luminance import androidx.compose.ui.graphics.painter.Painter @@ -147,6 +148,7 @@ internal fun GameBackdrop( fadeTop: Boolean, modifier: Modifier = Modifier, onArtPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit = {}, + artBlur: androidx.compose.ui.unit.Dp = 0.dp, content: @Composable () -> Unit, ) { val ctx = LocalContext.current @@ -178,13 +180,13 @@ internal fun GameBackdrop( glass.fadeBottom(this, size) }, ) - if (art != null) ArtLayer(art, ambient ?: art, fadeTop, onArtPlaced) + if (art != null) ArtLayer(art, ambient ?: art, fadeTop, artBlur, onArtPlaced) CompositionLocalProvider(LocalGlass provides glass) { content() } } } @Composable -private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, onPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit) { +private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, blur: androidx.compose.ui.unit.Dp, onPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit) { val colors = MaterialTheme.colorScheme val light = colors.background.luminance() > 0.5f val pale = ((rememberArtBrightness(sample) - 0.28f) / 0.5f).coerceIn(0f, 1f) @@ -208,7 +210,7 @@ private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, onPlaced: (and model = model, contentDescription = null, contentScale = ContentScale.Crop, alignment = BiasAlignment(0.45f, -0.35f), colorFilter = artFilter, - modifier = Modifier.matchParentSize(), + modifier = Modifier.matchParentSize().then(if (blur > 0.dp) Modifier.blur(blur) else Modifier), ) Box( Modifier.matchParentSize().drawBehind { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 73dad7aa70..e3d76dcd1f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -42,6 +42,7 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.BookmarkBorder import androidx.compose.material.icons.filled.FilterAlt import androidx.compose.material.icons.filled.GridView import androidx.compose.material.icons.filled.PlayArrow @@ -61,6 +62,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.produceState import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -92,6 +94,11 @@ import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.droiddeck.launcher.R import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.frontend.SoundtrackCollections +import com.droiddeck.launcher.frontend.SoundtrackIndex +import com.droiddeck.launcher.frontend.SoundtrackTracks +import com.droiddeck.launcher.playback.SoundtrackController import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store @@ -156,7 +163,7 @@ internal fun installedFirst(entries: List): List = e internal const val LIBRARY_ALL = "all" internal fun librarySources(entries: List, order: List, always: Set = emptySet()): List = - (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED) + (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION) .filter { source -> source in always || entries.any { it.source == source } } internal object LibraryDisplay { @@ -215,14 +222,24 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current LaunchedEffect(Unit) { StoresState.refresh(ctx) } remember { LibraryDisplay.load(ctx) } - val stores = s.gameStoresEnabled && !s.shortcutPicker + val soundMode = selected == "soundtracks" || selected.startsWith("sound:") + val stores = s.gameStoresEnabled && !s.shortcutPicker && !soundMode val signedIn = Store.entries.filter { StoresState.isSignedIn(it) } LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } } val owned = if (stores) signedIn.associateWith { StoresState.library[it].orEmpty() } else emptyMap() val installedStore = StoresState.installed.map { it.key }.toSet() val syncing = if (stores) signedIn.mapNotNull { st -> StoresState.status[st]?.let { st to it } } else emptyList() val cloudRows = rememberXboxCloudRows(s) - val all = remember(s.steamGames, cloudRows, owned, installedStore) { libraryEntries(s.steamGames + cloudRows, owned, installedStore) } + remember { SoundtrackCollections.load(ctx) } + val savedSnapshot = SoundtrackCollections.snapshot + val favoritesLabel = stringResource(R.string.soundtracks_favorites) + val all = remember(soundMode, s.steamGames, s.soundtracks, s.soundtracksEnabled, cloudRows, owned, installedStore, savedSnapshot, favoritesLabel) { + if (soundMode) s.soundtracks.map { LibraryEntry("sound:${it.appId}", it.source, it.name, it, null, true) } + + (if (s.soundtracks.isEmpty() && savedSnapshot.favorites.isEmpty() && savedSnapshot.collections.isEmpty()) emptyList() else SoundtrackCollections.games(ctx, favoritesLabel)) + .map { LibraryEntry("sound:${it.appId}", it.source, it.name, it, null, true) } + else libraryEntries(s.steamGames + cloudRows + if (s.soundtracksEnabled) emptyList() else s.soundtracks.filter { it.library != Library.ADDED }, owned, installedStore) + } + var addingSoundtrack by remember { mutableStateOf(false) } LaunchedEffect(Unit) { XboxLibraryFilter.load(ctx) } var showUninstalled by remember(LibraryView.ownedRequest) { mutableStateOf(SessionPrefs.libraryShowUninstalled(ctx)) } var collectionShows by remember { mutableStateOf?>(null) } @@ -240,7 +257,10 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } val itchSignedIn = owned.containsKey(Store.ITCH) val gameJoltSignedIn = owned.containsKey(Store.GAMEJOLT) - val sources = librarySources(all, SessionPrefs.storesTabOrder(ctx), listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn }).toSet()) + val sources = librarySources( + all, SessionPrefs.storesTabOrder(ctx), + listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }, Library.SOURCE_COLLECTION.takeIf { soundMode }).toSet(), + ) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() val xboxFilter = if (source == Store.XBOX.id) XboxLibraryFilter.current else XboxLibraryFilter.ALL @@ -265,6 +285,30 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } val listUninstalled = if (collectionId == null) showUninstalled else collectionShows?.takeIf { it.first == collectionId }?.second ?: true + val trackHits by produceState>(emptyList(), soundMode, q, source, s.soundtracks) { + if (!soundMode || q.isEmpty()) { + value = emptyList() + return@produceState + } + kotlinx.coroutines.delay(150) + value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { + SoundtrackIndex.build(ctx, s.soundtracks) + .filter { (source == LIBRARY_ALL || it.game.source == source) && SoundtrackTracks.matches(q, it.ref.title, it.ref.artist, it.ref.album) } + .distinctBy { it.ref.path } + .sortedWith(compareBy({ SoundtrackTracks.rank(q, it.ref.title) }, { it.ref.title.lowercase() })) + .take(100) + } + } + val shownHits = trackHits.filter { source == LIBRARY_ALL || it.game.source == source } + val hitScope = rememberCoroutineScope() + val playHit: (SoundtrackIndex.Hit) -> Unit = { hit -> + val dir = hit.game.gameFiles + if (dir != null) hitScope.launch { + val album = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { Soundtrack.load(ctx, dir, hit.game.art) } + SoundtrackController.play(ctx, album, hit.game.name, hit.ref.path, root = dir) + } + } + var savedDialog by remember { mutableStateOf(false) } val candidates = if (listUninstalled) matching else matching.filter { it.installed } val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } val sort = s.storesSort @@ -304,18 +348,20 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, var stable by remember { mutableStateOf(emptyList()) } val ordered = if (sizesPending) retainOrder(candidates, stable) { it.key } else sorted SideEffect { if (!sizesPending) stable = sorted } - val visible = installedFirst(ordered) + val visible = installedFirst(ordered).let { list -> + if (soundMode && source == Library.SOURCE_COLLECTION) list.sortedBy { if (it.game?.appId == SoundtrackCollections.FAVORITES_ID) 0 else 1 } else list + } val split = visible.count { it.installed }.takeIf { it in 1 until visible.size } ?: 0 - val open = selected.takeIf { it.startsWith("app:") } - val back = { onSelect("games") } + val open = selected.takeIf { it.startsWith(if (soundMode) "sound:" else "app:") } + val back = { onSelect(if (soundMode) "soundtracks" else "games") } BackHandler(enabled = open == null && LibraryView.query.isNotEmpty()) { LibraryView.query = "" } BackHandler(enabled = open != null) { back() } val lead = remember { FocusRequester() } var detailFocused by remember { mutableStateOf(false) } var lastOpened by remember { mutableStateOf(null) } val wasOpen = remember { booleanArrayOf(false) } - val backLabel = stringResource(R.string.rail_games) + val backLabel = stringResource(if (soundMode) R.string.rail_soundtracks else R.string.rail_games) LaunchedEffect(open) { val closing = open == null && wasOpen[0] wasOpen[0] = open != null @@ -349,7 +395,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, kotlinx.coroutines.delay(Motion.ms(240).toLong()) focusWithinFrames({ ff.last?.startsWith("card:") == true }) { if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } } - if (all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { + if (!soundMode && all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { LibraryEmpty(s, a, modifier) return } @@ -385,9 +431,26 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, onOpen = { focusManager.clearFocus(force = true); onSelect(it) }, searchCleared = open != null, onFocus = { gridFocused = it }, + soundMode = soundMode, + emptyText = when { + soundMode && all.isEmpty() -> R.string.soundtracks_empty + soundMode && source == Library.SOURCE_COLLECTION && q.isEmpty() -> R.string.soundtracks_collections_empty + else -> R.string.stores_nothing_matches + }, + onAddSoundtrack = { addingSoundtrack = true }, + onCollections = { savedDialog = true }, + trackHits = shownHits, onPlayHit = playHit, ) }, - ) { key -> GameDetail(key, s, a, lead, backLabel, hopRail = "games", onBack = back) } + ) { key -> + if (soundMode || (!s.soundtracksEnabled && s.soundtracks.any { GameRef.key(it) == key })) SoundtrackDetail(key, s, a, lead, backLabel, onBack = back) + else GameDetail(key, s, a, lead, backLabel, hopRail = "games", onBack = back) + } + if (savedDialog) SavedDialog(emptyList(), onOpen = { id -> onSelect("sound:$id") }) { savedDialog = false } + if (addingSoundtrack) SyncFolderPicker(stringResource(R.string.soundtracks_add_title), null, onDismiss = { addingSoundtrack = false }) { dir -> + addingSoundtrack = false + a.onSoundtrackAdded(dir) + } } @Composable @@ -416,6 +479,8 @@ private fun LibraryGrid( sources: List, source: String, sizesPending: Boolean, syncing: List>, showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, hiddenUninstalled: Int, onSource: (String) -> Unit, onCycle: (Int) -> Unit, onOpen: (String) -> Unit, onFocus: (Boolean) -> Unit, searchCleared: Boolean, + soundMode: Boolean = false, emptyText: Int = R.string.stores_nothing_matches, onAddSoundtrack: () -> Unit = {}, + onCollections: () -> Unit = {}, trackHits: List = emptyList(), onPlayHit: (SoundtrackIndex.Hit) -> Unit = {}, ) { val listMode = s.storesView == "list" val capsules = s.storesView == "capsules" @@ -438,7 +503,7 @@ private fun LibraryGrid( val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction, split) when { direction == 0 || index < 0 -> false - next == null -> direction > 0 + next == null -> direction > 0 && trackHits.isEmpty() else -> { if (key.action == KeyEvent.ACTION_DOWN) { val target = "card:${visible[next].key}" @@ -470,7 +535,7 @@ private fun LibraryGrid( contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { item(key = "header", span = { GridItemSpan(maxLineSpan) }) { - Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }) } + Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }, soundMode = soundMode, onAddSoundtrack = onAddSoundtrack, onCollections = onCollections) } } item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { LibraryFilters(sources, source, onSource) } @@ -488,7 +553,7 @@ private fun LibraryGrid( Text(stringResource(R.string.store_section_loading), fontSize = 11.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) } } - val empty = R.string.stores_nothing_matches + val empty = emptyText if (visible.isEmpty() && hiddenUninstalled > 0) item(key = "browse-owned", span = { GridItemSpan(maxLineSpan) }) { Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().padding(vertical = 32.dp)) { Text(stringResource(R.string.library_no_installed_matches), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) @@ -502,6 +567,40 @@ private fun LibraryGrid( item(key = "not-installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_not_installed)) } libraryGrid(visible.drop(split), empty, tile) } + if (trackHits.isNotEmpty()) { + item(key = "tracks-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.soundtracks_tracks_heading)) } + items(trackHits, key = { "track:${it.ref.path}" }, span = { GridItemSpan(maxLineSpan) }, contentType = { "track" }) { hit -> TrackHitRow(hit, onPlayHit) } + } + } +} + +@Composable +private fun TrackHitRow(hit: SoundtrackIndex.Hit, onPlay: (SoundtrackIndex.Hit) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(10.dp) + val cover = hit.ref.cover.takeIf { it.isNotEmpty() }?.let { java.io.File(it) }?.takeIf { it.isFile } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 56.dp).paneItem("trackhit:${hit.ref.path}").testTag("track-hit") + .clip(shape).glideBorder(hot, shape, pal.signal, pal.line) + .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = LocalIndication.current) { onPlay(hit) } + .controllerConfirm { onPlay(hit) } + .padding(horizontal = 10.dp, vertical = 6.dp), + ) { + Box(Modifier.size(44.dp).clip(RoundedCornerShape(8.dp)).background(artBrush(hueOf(hit.ref.album)))) { + if (cover != null) AsyncImage(model = cover, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(hit.ref.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text( + listOf(hit.ref.album, hit.ref.artist).filter { it.isNotBlank() }.joinToString(" · "), + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } + if (hit.ref.durationMs > 0) Text(Soundtrack.formatLength(hit.ref.durationMs), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) } } @@ -532,28 +631,31 @@ private fun LazyGridScope.libraryGrid(entries: List, empty: Int, t private fun LibraryHeader( s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Store?, + soundMode: Boolean = false, onAddSoundtrack: () -> Unit = {}, onCollections: () -> Unit = {}, ) { val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current + val heading = stringResource(if (soundMode) R.string.rail_soundtracks else R.string.rail_games) ModeHeader( - stringResource(R.string.rail_games), LibraryView.query, { LibraryView.query = it }, - placeholder = stringResource(R.string.stores_search_library), + heading, LibraryView.query, { LibraryView.query = it }, + placeholder = stringResource(if (soundMode) R.string.soundtracks_search else R.string.stores_search_library), clearSearchFocus = searchCleared, inlineWhenStacked = true, lead = { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { - Text(stringResource(R.string.rail_games), fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) - Text(pluralStringResource(R.plurals.mode_added_count, total, total), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) + Text(heading, fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) + Text(if (soundMode) total.toString() else pluralStringResource(R.plurals.mode_added_count, total, total), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) if (s.steamGamesX64 && !narrow) ClientTag() } }, ) { + if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onCollections) DisplayButton() - if (showUninstalled != null || xbox) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) + if (!soundMode && (showUninstalled != null || xbox)) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) if (collections != null) CollectionsButton(collections) SortButton(s, a) ViewButton(s, a) - GameFileFolderActions(s, a) - if (!s.shortcutPicker) AddGameButton { GamesDialogState.adding = true } + if (!soundMode) GameFileFolderActions(s, a) + if (!s.shortcutPicker) AddGameButton { if (soundMode) onAddSoundtrack() else GamesDialogState.adding = true } } if (s.steamGamesX64 && narrow) Box(Modifier.padding(top = 4.dp)) { ClientTag() } } @@ -570,7 +672,7 @@ private fun LibraryFilters(sources: List, source: String, onSource: (Str val store = Store.byId(src) val dot = when { store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) - src == Library.SOURCE_STEAM -> sourceColours(src).dot + src == Library.SOURCE_STEAM || src == Library.ADDED || src == Library.SOURCE_COLLECTION -> sourceColours(src).dot else -> null } SourceFilterChip(src, if (src == Library.ADDED) stringResource(R.string.library_filter_added) else store?.shortLabel ?: sourceLabel(src), source == src, dot) { onSource(src) } @@ -649,7 +751,7 @@ private fun LibraryArt(e: LibraryEntry, wide: Any?, tall: Any?, download: Downlo } ArtCard( e.title, wide, tall, download, hot, capsule, chip, - badge = if (showSource) ({ SourceChip(e.source, small = true, modifier = Modifier.align(Alignment.TopStart).padding(6.dp)) }) else null, + badge = if (showSource) ({ SourceChip(e.source, small = true, modifier = Modifier.align(Alignment.TopStart).padding(6.dp), label = favoritesBadge(e), colours = favoritesColours(e)) }) else null, ) { LibrarySize(e) } } @@ -786,7 +888,7 @@ private fun LibraryRow(e: LibraryEntry, first: Boolean, navigation: Modifier, ch Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { Text(e.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { - SourceChip(e.source, small = true) + SourceChip(e.source, small = true, label = favoritesBadge(e), colours = favoritesColours(e)) Text(meta.joinToString(" · "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) } } @@ -1004,3 +1106,10 @@ private fun ViewButton(s: FrontEndState, a: FrontEndActions) { "view", ) { a.onStoresView(next) } } + +@Composable +private fun favoritesBadge(e: LibraryEntry): String? = + if (e.game?.appId == SoundtrackCollections.FAVORITES_ID && e.source == Library.SOURCE_COLLECTION) stringResource(R.string.soundtracks_favorites) else null + +private fun favoritesColours(e: LibraryEntry): SourceColours? = + if (e.game?.appId == SoundtrackCollections.FAVORITES_ID && e.source == Library.SOURCE_COLLECTION) FavoritesColours else null diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackCollectionsUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackCollectionsUi.kt new file mode 100644 index 0000000000..2bf1314621 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackCollectionsUi.kt @@ -0,0 +1,295 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Bookmark +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.Remove +import androidx.compose.material.icons.filled.CheckBox +import androidx.compose.material.icons.filled.CheckBoxOutlineBlank +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.frontend.SoundtrackCollections +import com.droiddeck.launcher.frontend.SoundtrackIndex +import com.droiddeck.launcher.frontend.SoundtrackTracks +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +@Composable +internal fun SavedDialog(pending: List, onOpen: ((Int) -> Unit)?, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + remember { SoundtrackCollections.load(ctx) } + val snapshot = SoundtrackCollections.snapshot + val favoritesLabel = stringResource(R.string.soundtracks_favorites) + var naming by remember { mutableStateOf(false) } + val rows = listOf(Triple(SoundtrackCollections.FAVORITES_ID, favoritesLabel, snapshot.favorites)) + + snapshot.collections.map { Triple(it.id, it.name, it.tracks) } + AlertDialog( + onDismissRequest = onDismiss, + title = { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.soundtracks_saved), modifier = Modifier.weight(1f)) + Icon(Icons.Filled.Bookmark, contentDescription = null, tint = colors.onSurfaceVariant) + } + }, + text = { + Column(Modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(8.dp)) { + SavedRow(stringResource(R.string.soundtracks_create_collection), stringResource(R.string.soundtracks_organise), null, "saved-create", null) { + TextButton(onClick = { naming = true }, modifier = Modifier.focusGlide(CircleShape).testTag("saved-new")) { + Icon(Icons.Filled.Add, contentDescription = null, modifier = Modifier.size(18.dp)) + Text(stringResource(R.string.soundtracks_new)) + } + } + for ((id, name, tracks) in rows) { + val cover = tracks.firstNotNullOfOrNull { t -> t.cover.takeIf { it.isNotEmpty() }?.let { java.io.File(it) }?.takeIf { it.isFile } } + val subtitle = stringResource(R.string.soundtracks_length_value, tracks.size, Soundtrack.formatLength(tracks.sumOf { it.durationMs })) + val added = pending.isNotEmpty() && pending.all { p -> tracks.any { it.path == p.path } } + SavedRow(name, subtitle, cover, "saved-$id", if (pending.isEmpty() && onOpen != null) ({ onDismiss(); onOpen(id) }) else null) { + if (pending.isNotEmpty()) CircleAction(if (added) Icons.Filled.Check else Icons.Filled.Add, name, "saved-add-$id") { + if (added) SoundtrackCollections.remove(ctx, id, pending.map { it.path }.toSet()) + else SoundtrackCollections.add(ctx, id, pending) + } + } + } + } + }, + confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_close)) } }, + ) + if (naming) NameDialog( + stringResource(R.string.soundtracks_create_collection), "", stringResource(R.string.soundtracks_create), + onConfirm = { name -> + val id = SoundtrackCollections.create(ctx, name, pending) + if (id != null && pending.isEmpty() && onOpen != null) { onDismiss(); onOpen(id) } + id != null + }, + onDismiss = { naming = false }, + ) +} + +@Composable +private fun SavedRow(title: String, subtitle: String, cover: Any?, tag: String, onClick: (() -> Unit)?, trailing: @Composable () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) && onClick != null + val shape = RoundedCornerShape(10.dp) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().testTag(tag).clip(shape).background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, Color.Transparent) + .then( + if (onClick != null) Modifier.hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick) + else Modifier, + ) + .padding(vertical = 4.dp), + ) { + Box(Modifier.size(52.dp).clip(RoundedCornerShape(8.dp)).background(Color.White.copy(alpha = 0.08f))) { + if (cover != null) AsyncImage(cover, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(subtitle, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + trailing() + } +} + +@Composable +private fun CircleAction(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, tag: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.testTag(tag).size(40.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.16f) else Color.Transparent) + .border(1.dp, if (hot) pal.signal else colors.onSurface.copy(alpha = 0.7f), CircleShape) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick) + .semantics { contentDescription = label }, + ) { Icon(icon, contentDescription = null, tint = colors.onSurface, modifier = Modifier.size(20.dp)) } +} + +@Composable +internal fun NameDialog(title: String, initial: String, confirm: String, onConfirm: (String) -> Boolean, onDismiss: () -> Unit) { + var text by remember { mutableStateOf(initial) } + var invalid by remember { mutableStateOf(false) } + val submit: () -> Unit = { + val ok = onConfirm(text) + if (ok) onDismiss() + invalid = !ok + } + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(title) }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + AdbTextField( + value = text, onValueChange = { text = it; invalid = false }, label = stringResource(R.string.soundtracks_collection_name), + keyboardType = KeyboardType.Text, imeAction = ImeAction.Done, focusOnShow = true, onDone = submit, + ) + if (invalid) Text(stringResource(R.string.soundtracks_name_invalid), fontSize = 12.sp, color = MaterialTheme.colorScheme.error) + } + }, + confirmButton = { TextButton(onClick = submit, modifier = Modifier.focusGlide(CircleShape).testTag("name-confirm")) { Text(confirm) } }, + dismissButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, + ) +} + +@Composable +internal fun ManageDialog(id: Int, games: List, onRemoveMode: () -> Unit, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val name = SoundtrackCollections.snapshot.collections.firstOrNull { it.id == id }?.name.orEmpty() + val favorites = id == SoundtrackCollections.FAVORITES_ID + var renaming by remember { mutableStateOf(false) } + var adding by remember { mutableStateOf(false) } + var deleting by remember { mutableStateOf(false) } + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + AppDialog(shown, close, "soundtrackManage", wide = false, maxWidth = 420.dp) { + Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) { + DialogTitleRow(stringResource(R.string.soundtracks_manage), onClose = close) + if (!favorites) PickerRow(Icons.Filled.Edit, stringResource(R.string.soundtracks_rename), null) { renaming = true } + PickerRow(Icons.Filled.Add, stringResource(R.string.soundtracks_add_tracks), null) { adding = true } + PickerRow(Icons.Filled.Remove, stringResource(R.string.soundtracks_remove_tracks), null) { onDismiss(); onRemoveMode() } + if (!favorites) PickerRow(Icons.Filled.Delete, stringResource(R.string.soundtracks_delete_collection), null) { deleting = true } + } + } + if (renaming) NameDialog( + stringResource(R.string.soundtracks_rename), name, stringResource(R.string.soundtracks_rename), + onConfirm = { SoundtrackCollections.rename(ctx, id, it) }, onDismiss = { renaming = false }, + ) + if (adding) TrackPickerDialog(id, games) { adding = false } + if (deleting) ConfirmDialog( + title = stringResource(R.string.soundtracks_delete_title, name), text = stringResource(R.string.soundtracks_delete_body), + confirm = stringResource(R.string.common_delete), + onConfirm = { SoundtrackCollections.delete(ctx, id); onDismiss() }, + onDismiss = { deleting = false }, + ) +} + +@Composable +internal fun TrackPickerDialog(id: Int, games: List, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val hits by produceState?>(null, games) { value = withContext(Dispatchers.IO) { SoundtrackIndex.build(ctx, games) } } + var query by remember { mutableStateOf("") } + var picked by remember { mutableStateOf(setOf()) } + val have = SoundtrackCollections.tracksOf(id).mapTo(HashSet()) { it.path } + val list = hits?.distinctBy { it.ref.path }?.filter { it.ref.path !in have && SoundtrackTracks.matches(query, it.ref.title, it.ref.artist, it.ref.album) } + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.soundtracks_add_tracks)) }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + AdbTextField( + value = query, onValueChange = { query = it }, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = stringResource(R.string.soundtracks_search_tracks), compact = true, + ) + Row(horizontalArrangement = Arrangement.spacedBy(4.dp), verticalAlignment = Alignment.CenterVertically) { + TextButton(onClick = { picked = picked + list.orEmpty().map { it.ref.path } }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.soundtracks_select_all)) + } + TextButton(onClick = { picked = emptySet() }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.soundtracks_deselect_all)) + } + } + if (list == null) Text(stringResource(R.string.store_section_loading), fontSize = 13.sp, color = colors.onSurfaceVariant) + else LazyColumn(Modifier.fillMaxWidth().heightIn(max = 340.dp).testTag("track-picker")) { + items(list, key = { it.ref.path }) { hit -> + val on = hit.ref.path in picked + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val toggle = { picked = if (on) picked - hit.ref.path else picked + hit.ref.path } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().clip(RoundedCornerShape(8.dp)).background(if (on) pal.signal.copy(alpha = 0.16f) else if (hot) Color.White.copy(alpha = 0.08f) else Color.Transparent) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Checkbox, onClick = toggle) + .controllerConfirm(onClick = toggle).padding(horizontal = 8.dp, vertical = 8.dp), + ) { + Icon( + if (on) Icons.Filled.CheckBox else Icons.Filled.CheckBoxOutlineBlank, contentDescription = null, + tint = if (on) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp), + ) + Column(Modifier.weight(1f)) { + Text(hit.ref.title, fontSize = 14.sp, color = colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text( + listOf(hit.ref.album, hit.ref.artist).filter { it.isNotBlank() }.joinToString(" · "), + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } + if (hit.ref.durationMs > 0) Text(Soundtrack.formatLength(hit.ref.durationMs), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) + } + } + } + } + }, + confirmButton = { + TextButton( + enabled = picked.isNotEmpty(), + onClick = { + SoundtrackCollections.add(ctx, id, hits.orEmpty().filter { it.ref.path in picked }.map { it.ref }) + onDismiss() + }, + modifier = Modifier.focusGlide(CircleShape).testTag("picker-add"), + ) { Text(stringResource(R.string.soundtracks_add_count, picked.size)) } + }, + dismissButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackDetail.kt new file mode 100644 index 0000000000..896e94c343 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackDetail.kt @@ -0,0 +1,391 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.BookmarkBorder +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.FavoriteBorder +import androidx.compose.material.icons.filled.Pause +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.filled.Repeat +import androidx.compose.material.icons.filled.RepeatOne +import androidx.compose.material.icons.filled.Shuffle +import androidx.compose.material.icons.filled.SkipNext +import androidx.compose.material.icons.filled.SkipPrevious +import androidx.compose.material.icons.filled.VolumeOff +import androidx.compose.material.icons.filled.VolumeUp +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.SliderDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +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.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.media3.common.Player +import coil.compose.AsyncImage +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.frontend.SoundtrackCollections +import com.droiddeck.launcher.frontend.SoundtrackOrder +import com.droiddeck.launcher.playback.SoundtrackController +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +@Composable +internal fun SoundtrackDetail(key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, onBack: () -> Unit) { + val appId = remember(key) { key.removePrefix("sound:").removePrefix("app:").toIntOrNull() } + val ctx = LocalContext.current + remember { SoundtrackCollections.load(ctx) } + val favoritesLabel = stringResource(R.string.soundtracks_favorites) + val snapshot = SoundtrackCollections.snapshot + val saved = remember(snapshot, favoritesLabel) { SoundtrackCollections.games(ctx, favoritesLabel) } + val game = s.soundtracks.firstOrNull { it.appId == appId } ?: saved.firstOrNull { it.appId == appId } + LaunchedEffect(game == null, s.soundtracksLoaded) { if (game == null && s.soundtracksLoaded) onBack() } + if (game == null) return + val narrow = LocalNarrowPane.current + val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 + val root = game.gameFiles + val collectionId = if (game.source == Library.SOURCE_COLLECTION) game.appId else null + val target = remember(root, collectionId) { PlayTarget(root, collectionId) } + val loadedAlbum by produceState(null, root, game.art, SoundtrackOrder.version) { + value = root?.let { dir -> withContext(Dispatchers.IO) { Soundtrack.load(ctx, dir, game.art) } } + } + val collectionAlbum = remember(snapshot, collectionId) { collectionId?.let { SoundtrackCollections.album(ctx, it) } } + val album = collectionAlbum ?: loadedAlbum + LaunchedEffect(Unit) { SoundtrackController.connect(ctx) } + val inset = LocalDetailInset.current + val currentTrack = if (target.belongs) SoundtrackController.currentId else null + val trackArt by produceState(null, currentTrack) { + value = currentTrack?.let { id -> withContext(Dispatchers.IO) { Soundtrack.trackCover(ctx, java.io.File(id)) } } + } + val pinned = game.art?.path.orEmpty().let { it.contains("/steam-art/") || it.contains("/soundtrack-art/") } + val art: Any? = if (pinned) game.art else trackArt ?: game.art ?: album?.cover + val refs = remember(snapshot, collectionId) { collectionId?.let { id -> SoundtrackCollections.tracksOf(id).associateBy { it.path } }.orEmpty() } + val coverPath = (game.art ?: album?.cover)?.path.orEmpty() + val refOf: (Soundtrack.Track) -> SoundtrackCollections.TrackRef = { t -> + refs[t.id] ?: SoundtrackCollections.TrackRef(t.id, t.title, t.artist.ifBlank { album?.artist.orEmpty() }, game.name, t.durationMs, coverPath) + } + var selectRequest by remember { mutableIntStateOf(0) } + val onReorder: ((List) -> Unit)? = when { + collectionId != null -> ({ paths: List -> SoundtrackCollections.reorder(ctx, collectionId, paths) }) + game.library == Library.ADDED && root != null -> ({ paths: List -> SoundtrackOrder.set(ctx, root, paths) }) + else -> null + } + GameBackdrop(art, art, hueOf(game.name), fadeTop = inset.top < 8.dp, artBlur = 24.dp) { + Column(Modifier.fillMaxWidth().padding(horizontal = inset.horizontal).padding(top = inset.top)) { + Rise(0) { + Row(Modifier.fillMaxWidth().padding(bottom = 8.dp), verticalAlignment = Alignment.CenterVertically) { + Box(Modifier.glass(CircleShape)) { BackLink(backLabel, compact = true, onClick = onBack) } + Spacer(Modifier.weight(1f)) + SourceBadge(game.source) + } + } + val loaded = album + if (stacked) Column(verticalArrangement = Arrangement.spacedBy(14.dp)) { + Rise(1) { SoundtrackPlayer(game, loaded, art, lead, s, a, target, refOf, collectionId) { selectRequest++ } } + if (loaded != null) Rise(2) { + TrackPanel(loaded, game.name, target, refOf, collectionId, selectRequest, onReorder, Modifier.fillMaxWidth().height((LocalConfiguration.current.screenHeightDp * 0.55f).dp)) + } + } else Row(horizontalArrangement = Arrangement.spacedBy(28.dp), modifier = Modifier.fillMaxWidth()) { + Rise(1, Modifier.weight(0.42f)) { SoundtrackPlayer(game, loaded, art, lead, s, a, target, refOf, collectionId) { selectRequest++ } } + if (loaded != null) Rise(2, Modifier.weight(0.58f)) { + TrackPanel(loaded, game.name, target, refOf, collectionId, selectRequest, onReorder, Modifier.fillMaxWidth().height((LocalConfiguration.current.screenHeightDp * 0.72f).dp)) + } + } + } + } +} + +@Composable +private fun SoundtrackPlayer( + game: Library.SteamGame, album: Soundtrack.Album?, art: Any?, lead: FocusRequester, s: FrontEndState, a: FrontEndActions, + target: PlayTarget, refOf: (Soundtrack.Track) -> SoundtrackCollections.TrackRef, collectionId: Int?, onRemoveMode: () -> Unit, +) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val belongs = target.belongs + val playing = belongs && SoundtrackController.playing + val shownArt: Any? = art + var saving by remember { mutableStateOf(false) } + Column(verticalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth()) { + Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.Top) { + Box(Modifier.size(120.dp).clip(RoundedCornerShape(10.dp)).background(Color.Black.copy(alpha = 0.35f))) { + if (shownArt != null) AsyncImage(shownArt, contentDescription = game.name, contentScale = ContentScale.Fit, modifier = Modifier.matchParentSize().testTag("soundtrack-cover")) + } + Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.weight(1f)) { + Text( + game.name, fontSize = 22.sp, lineHeight = 26.sp, fontWeight = FontWeight.Black, color = colors.onBackground, + maxLines = 2, overflow = TextOverflow.Ellipsis, + ) + val artist = album?.artist.orEmpty() + if (artist.isNotBlank()) Text(artist, fontSize = 14.sp, color = colors.onBackground.copy(alpha = 0.8f), maxLines = 1, overflow = TextOverflow.Ellipsis) + if (album != null && album.tracks.isNotEmpty()) { + Text( + stringResource(R.string.soundtracks_total_length).uppercase(), fontSize = 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.8.sp, + color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp), + ) + Text( + stringResource(R.string.soundtracks_length_value, album.tracks.size, Soundtrack.formatLength(album.totalMs)), + fontSize = 13.sp, color = colors.onBackground, + ) + } + } + } + Seek(target, album) + val shuffleLabel = stringResource(R.string.soundtracks_shuffle) + val previousLabel = stringResource(R.string.soundtracks_previous) + val playLabel = stringResource(if (playing) R.string.soundtracks_pause else R.string.soundtracks_play) + val nextLabel = stringResource(R.string.soundtracks_next) + val repeatLabel = stringResource( + when (SoundtrackController.repeat) { + Player.REPEAT_MODE_ALL -> R.string.soundtracks_repeat_all + Player.REPEAT_MODE_ONE -> R.string.soundtracks_repeat_one + else -> R.string.soundtracks_repeat_off + }, + ) + val loaded = album?.takeIf { it.tracks.isNotEmpty() } + Row(horizontalArrangement = Arrangement.spacedBy(14.dp, Alignment.CenterHorizontally), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + TransportButton(Icons.Filled.Shuffle, shuffleLabel, "sound:shuffle", on = belongs && SoundtrackController.shuffle, enabled = loaded != null) { + if (loaded == null) return@TransportButton + if (belongs) SoundtrackController.setShuffle(ctx, !SoundtrackController.shuffle) + else SoundtrackController.play(ctx, loaded, game.name, null, shuffled = true, root = target.root, collection = target.collection) + } + TransportButton(Icons.Filled.SkipPrevious, previousLabel, "sound:previous", enabled = loaded != null) { + if (loaded == null) return@TransportButton + if (belongs) SoundtrackController.previous(ctx) else SoundtrackController.play(ctx, loaded, game.name, null, root = target.root, collection = target.collection) + } + TransportButton( + if (playing) Icons.Filled.Pause else Icons.Filled.PlayArrow, playLabel, "sound:play", big = true, enabled = loaded != null, + modifier = Modifier.focusRequester(lead), + ) { + if (loaded != null) SoundtrackController.toggle(ctx, loaded, game.name, target.root, target.collection) + } + TransportButton(Icons.Filled.SkipNext, nextLabel, "sound:next", enabled = loaded != null) { + if (loaded == null) return@TransportButton + if (belongs) SoundtrackController.next(ctx) else SoundtrackController.play(ctx, loaded, game.name, null, root = target.root, collection = target.collection) + } + TransportButton( + if (SoundtrackController.repeat == Player.REPEAT_MODE_ONE) Icons.Filled.RepeatOne else Icons.Filled.Repeat, repeatLabel, "sound:repeat", + on = SoundtrackController.repeat != Player.REPEAT_MODE_OFF, enabled = loaded != null && belongs, + ) { SoundtrackController.cycleRepeat(ctx) } + } + val heartTrack = if (belongs) loaded?.tracks?.firstOrNull { it.id == SoundtrackController.currentId } else null + val liked = heartTrack != null && SoundtrackCollections.snapshot.favorites.any { it.path == heartTrack.id } + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End, verticalAlignment = Alignment.CenterVertically) { + TransportButton( + if (liked) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder, stringResource(R.string.soundtracks_add_favorites), "sound:favorite", + on = liked, enabled = heartTrack != null, + ) { heartTrack?.let { SoundtrackCollections.toggleFavorite(ctx, refOf(it)) } } + TransportButton(Icons.Filled.BookmarkBorder, stringResource(R.string.soundtracks_saved), "sound:saved", enabled = heartTrack != null) { saving = true } + } + if (saving && heartTrack != null) SavedDialog(listOf(refOf(heartTrack)), null) { saving = false } + Volume() + Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(top = 4.dp)) { + SoundtrackActions(game, s, a, collectionId, onRemoveMode) + } + } +} + +@Composable +private fun Seek(target: PlayTarget, album: Soundtrack.Album?) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val belongs = target.belongs + var position by remember { mutableFloatStateOf(0f) } + var dragging by remember { mutableStateOf(false) } + val duration = if (belongs) SoundtrackController.durationMs else 0L + LaunchedEffect(belongs, SoundtrackController.currentId) { + if (!belongs) { + if (!dragging) position = 0f + return@LaunchedEffect + } + while (true) { + if (!dragging) position = SoundtrackController.position().toFloat() + delay(400) + } + } + Column(verticalArrangement = Arrangement.spacedBy(0.dp), modifier = Modifier.fillMaxWidth()) { + Slider( + value = if (duration > 0) (position / duration).coerceIn(0f, 1f) else 0f, + onValueChange = { dragging = true; position = it * duration }, + onValueChangeFinished = { dragging = false; SoundtrackController.seekTo(ctx, position.toLong()) }, + enabled = belongs && duration > 0 && album != null, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onBackground.copy(alpha = 0.18f)), + modifier = Modifier.fillMaxWidth().testTag("soundtrack-seek"), + ) + Row(Modifier.fillMaxWidth().padding(horizontal = 4.dp)) { + Text(Soundtrack.formatLength(position.toLong()), fontSize = 11.sp, color = colors.onSurfaceVariant) + Spacer(Modifier.weight(1f)) + Text(Soundtrack.formatLength(duration), fontSize = 11.sp, color = colors.onSurfaceVariant) + } + } +} + +@Composable +private fun Volume() { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var level by remember { mutableFloatStateOf(SoundtrackController.volume) } + LaunchedEffect(SoundtrackController.volume) { level = SoundtrackController.volume } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth()) { + Icon(if (level <= 0.001f) Icons.Filled.VolumeOff else Icons.Filled.VolumeUp, contentDescription = stringResource(R.string.soundtracks_volume), tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + Slider( + value = level, onValueChange = { level = it; SoundtrackController.setVolume(ctx, it) }, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onBackground.copy(alpha = 0.18f)), + modifier = Modifier.weight(1f).testTag("soundtrack-volume"), + ) + } +} + +@Composable +private fun TransportButton( + icon: ImageVector, label: String, id: String, big: Boolean = false, on: Boolean = false, enabled: Boolean = true, + modifier: Modifier = Modifier, onClick: () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) && enabled + val size = if (big) 60.dp else 44.dp + val fill = when { + big -> pal.signal.copy(alpha = if (hot) 1f else 0.9f) + hot -> pal.signal.copy(alpha = 0.16f) + else -> Color.Transparent + } + Box( + contentAlignment = Alignment.Center, + modifier = modifier.paneItem(id).testTag(id).size(size).clip(CircleShape).background(fill) + .glideBorder(hot, CircleShape, pal.signal, if (big) Color.Transparent else Color.Transparent) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, enabled = enabled, onClick = onClick) + .controllerConfirm(enabled = enabled, onClick = onClick) + .semantics { contentDescription = label }, + ) { + Icon( + icon, contentDescription = null, + tint = when { + big -> colors.background + !enabled -> colors.onSurfaceVariant.copy(alpha = 0.4f) + on -> pal.signal + else -> colors.onBackground + }, + modifier = Modifier.size(if (big) 34.dp else 26.dp), + ) + } +} + +@Composable +private fun SeeMoreButton(label: String, id: String, danger: Boolean = false, modifier: Modifier = Modifier, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(10.dp) + val accent = if (danger) colors.error else pal.signal + Box( + contentAlignment = Alignment.Center, + modifier = modifier.fillMaxWidth().paneItem(id).testTag(id).heightIn(min = 44.dp).clip(shape) + .background(if (hot) accent.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.09f)) + .glideBorder(hot, shape, accent, Color.White.copy(alpha = 0.10f)) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(horizontal = 16.dp, vertical = 10.dp), + ) { + Text( + label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, textAlign = TextAlign.Center, + color = if (danger && hot) colors.error else colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } +} + +@Composable +private fun SoundtrackActions(game: Library.SteamGame, s: FrontEndState, a: FrontEndActions, collectionId: Int?, onRemoveMode: () -> Unit) { + var options by remember { mutableStateOf(false) } + var managing by remember { mutableStateOf(false) } + if (collectionId != null) SeeMoreButton(stringResource(R.string.soundtracks_manage), "sound:manage") { managing = true } + if (managing && collectionId != null) ManageDialog(collectionId, s.soundtracks, onRemoveMode) { managing = false } + SeeMoreButton(stringResource(R.string.soundtracks_options), "sound:options") { options = true } + if (options) SoundtrackOptionsDialog { options = false } + game.gameFiles?.takeIf { it.isDirectory }?.let { dir -> + SeeMoreButton(stringResource(R.string.games_files), "sound:files") { a.onBrowseFiles(dir) } + } + var menu by remember(game.appId) { mutableStateOf(false) } + Box { + SeeMoreButton(stringResource(R.string.game_shortcut), "sound:shortcut") { menu = !menu } + AnchoredMenu(menu, onDismiss = { menu = false }, title = stringResource(R.string.game_shortcut)) { first -> + MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = first) { menu = false; a.onGameShortcut(game) } + MenuItem(stringResource(R.string.game_link_copy), checked = false) { menu = false; a.onCopyGameLink(game) } + } + } + var collectionArt by remember(game.appId) { mutableStateOf(false) } + val ownArt = game.library == Library.ADDED + if (ownArt) SeeMoreButton(stringResource(R.string.game_edit_art), "sound:art") { collectionArt = true } + else SeeMoreButton(stringResource(R.string.game_edit_art), "sound:art") { GamesDialogState.steamArt = game } + if (collectionArt && ownArt) CollectionArtEditor( + game.appId, game.name, game.gameFiles, + onClose = { collectionArt = false }, + onChanged = { if (collectionId != null) SoundtrackCollections.refresh() else a.onSoundtracksChanged() }, + ) + if (collectionId != null) return + var asking by remember(game.appId) { mutableStateOf(false) } + val added = game.library == Library.ADDED + val label = stringResource(if (added) R.string.edit_remove else R.string.common_uninstall) + SeeMoreButton(label, "sound:remove", danger = true) { asking = true } + if (asking) ConfirmDialog( + title = if (added) stringResource(R.string.games_remove_title, game.name) else stringResource(R.string.stores_uninstall_title, game.name), + text = if (added) stringResource(R.string.games_remove_body) else stringResource(R.string.games_uninstall_body), + confirm = label, + onConfirm = { a.onSoundtrackRemoved(game) }, + onDismiss = { asking = false }, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackIcon.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackIcon.kt new file mode 100644 index 0000000000..70c1fd0178 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackIcon.kt @@ -0,0 +1,15 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.unit.dp + +private const val NOTES = "M8.4,4.5 L20,2 V6 L8.4,8.5 Z M8.4,4.5 H10.6 V17.5 H8.4 Z M17.9,2 H20 V15.5 H17.9 Z M7.2,14.7 A3.4,2.8 0 1,0 7.2,20.3 A3.4,2.8 0 1,0 7.2,14.7 Z M16.6,12.7 A3.4,2.8 0 1,0 16.6,18.3 A3.4,2.8 0 1,0 16.6,12.7 Z" + +internal val SoundtrackIcon: ImageVector by lazy { + ImageVector.Builder("Soundtrack", 24.dp, 24.dp, 24f, 24f) + .addPath(addPathNodes(NOTES), fill = SolidColor(Color.Black)) + .build() +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackOptions.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackOptions.kt new file mode 100644 index 0000000000..dc9fadfa28 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackOptions.kt @@ -0,0 +1,217 @@ +package com.droiddeck.launcher.ui + +import android.media.AudioManager +import android.media.audiofx.BassBoost +import android.media.audiofx.Equalizer +import androidx.compose.foundation.background +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.selection.toggleable +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.SliderDefaults +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.playback.SoundtrackController +import com.droiddeck.launcher.playback.SoundtrackSettings +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext +import kotlin.math.roundToInt + +private class EqInfo( + val bands: Int, val min: Int, val max: Int, val freqs: List, val presets: List>>, val bassSupported: Boolean, +) + +private fun readEqInfo(audio: AudioManager): EqInfo? = runCatching { + val id = audio.generateAudioSessionId() + val eq = Equalizer(0, id) + try { + val count = eq.numberOfBands.toInt() + val presets = (0 until eq.numberOfPresets.toInt()).map { preset -> + eq.usePreset(preset.toShort()) + eq.getPresetName(preset.toShort()) to (0 until count).map { eq.getBandLevel(it.toShort()).toInt() } + } + val bass = runCatching { BassBoost(0, id).let { b -> try { b.strengthSupported } finally { b.release() } } }.getOrDefault(false) + EqInfo( + count, eq.bandLevelRange[0].toInt(), eq.bandLevelRange[1].toInt(), + (0 until count).map { eq.getCenterFreq(it.toShort()) / 1000 }, presets, bass, + ) + } finally { + eq.release() + } +}.getOrNull() + +@Composable +internal fun SoundtrackOptionsDialog(onDismiss: () -> Unit) { + val ctx = LocalContext.current + LaunchedEffect(Unit) { SoundtrackSettings.load(ctx) } + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.soundtracks_options)) }, + text = { + Column(Modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(16.dp)) { + RateRow(stringResource(R.string.theme_rgb_speed), SoundtrackSettings.speed, "soundtrack-speed") { SoundtrackController.setSpeed(ctx, it) } + RateRow(stringResource(R.string.soundtracks_pitch), SoundtrackSettings.pitch, "soundtrack-pitch") { SoundtrackController.setPitch(ctx, it) } + SwitchRow(stringResource(R.string.soundtracks_skip_silence), SoundtrackSettings.skipSilence, "soundtrack-skip-silence") { + SoundtrackController.setSkipSilence(ctx, it) + } + SleepSection() + EqualizerSection() + } + }, + confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_close)) } }, + ) +} + +@Composable +private fun RateRow(label: String, value: Float, tag: String, onChange: (Float) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurface, modifier = Modifier.weight(1f)) + Text("%.2f×".format(value), fontSize = 14.sp, color = colors.onSurfaceVariant) + TextButton(onClick = { onChange(1f) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.soundtracks_reset)) } + } + Slider( + value = value, onValueChange = { v -> (v * 20f).roundToInt().div(20f).let { if (it != value) onChange(it) } }, + valueRange = SoundtrackSettings.MIN_RATE..SoundtrackSettings.MAX_RATE, steps = 29, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onSurface.copy(alpha = 0.18f)), + modifier = Modifier.fillMaxWidth().testTag(tag), + ) + } +} + +@Composable +private fun SwitchRow(label: String, checked: Boolean, tag: String, onChange: (Boolean) -> Unit) { + val colors = MaterialTheme.colorScheme + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().focusGlide(RoundedCornerShape(12.dp)).toggleable(checked, role = Role.Switch, onValueChange = onChange).padding(vertical = 4.dp).testTag(tag), + ) { + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurface, modifier = Modifier.weight(1f)) + Switch(checked = checked, onCheckedChange = null) + } +} + +@Composable +private fun OptionChip(label: String, selected: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = RoundedCornerShape(99.dp) + Text( + label, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, + color = if (selected) pal.signal else colors.onSurface, + modifier = Modifier.focusGlide(shape).clip(shape) + .background(if (selected) pal.signal.copy(alpha = 0.18f) else colors.onSurface.copy(alpha = 0.08f)) + .selectable(selected = selected, role = Role.RadioButton, onClick = onClick) + .padding(horizontal = 14.dp, vertical = 8.dp), + ) +} + +@Composable +private fun SleepSection() { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + var left by remember { mutableLongStateOf(0L) } + LaunchedEffect(Unit) { + while (true) { + left = SoundtrackController.sleepRemainingMs() + delay(1000) + } + } + val trackEnd = SoundtrackController.sleepTrackEnd + val timed = left > 0L + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.soundtracks_sleep), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurface, modifier = Modifier.weight(1f)) + if (timed) Text(stringResource(R.string.soundtracks_sleep_left, Soundtrack.formatLength(left)), fontSize = 13.sp, color = colors.onSurfaceVariant) + } + Row(Modifier.horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + OptionChip(stringResource(R.string.perf_cap_off), !timed && !trackEnd) { SoundtrackController.setSleep(ctx, 0) } + for (minutes in listOf(15, 30, 60)) OptionChip(stringResource(R.string.soundtracks_sleep_minutes, minutes), false) { SoundtrackController.setSleep(ctx, minutes) } + OptionChip(stringResource(R.string.soundtracks_sleep_track_end), trackEnd) { SoundtrackController.setSleep(ctx, -1) } + } + } +} + +@Composable +private fun EqualizerSection() { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val info by produceState(null) { + value = withContext(Dispatchers.IO) { readEqInfo(ctx.getSystemService(AudioManager::class.java)) } + } + val ready = info + val on = SoundtrackSettings.eqOn + val levels = ready?.let { i -> SoundtrackSettings.bands.takeIf { it.size == i.bands } ?: List(i.bands) { 0 } }.orEmpty() + val bass = SoundtrackSettings.bass + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + SwitchRow(stringResource(R.string.soundtracks_equalizer), on && ready != null, "soundtrack-eq") { + if (ready != null) SoundtrackController.setEqualizer(ctx, it, levels, bass) + } + if (ready == null || ready.bands == 0) { + if (ready != null) Text(stringResource(R.string.soundtracks_eq_unavailable), fontSize = 13.sp, color = colors.onSurfaceVariant) + return@Column + } + if (ready.presets.isNotEmpty()) Row(Modifier.horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + for ((name, preset) in ready.presets) OptionChip(name, on && preset == levels) { SoundtrackController.setEqualizer(ctx, true, preset, bass) } + } + for (band in 0 until ready.bands) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + val hz = ready.freqs[band] + Text(if (hz >= 1000) "%.1f kHz".format(hz / 1000f) else "$hz Hz", fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(end = 2.dp)) + Slider( + value = levels[band].toFloat(), valueRange = ready.min.toFloat()..ready.max.toFloat(), + onValueChange = { v -> SoundtrackController.setEqualizer(ctx, true, levels.toMutableList().also { it[band] = v.roundToInt() }, bass) }, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onSurface.copy(alpha = 0.18f)), + modifier = Modifier.weight(1f).testTag("soundtrack-eq-$band"), + ) + } + } + if (ready.bassSupported) Column { + Text(stringResource(R.string.soundtracks_bass), fontSize = 13.sp, color = colors.onSurfaceVariant) + Slider( + value = bass.toFloat(), valueRange = 0f..1000f, + onValueChange = { v -> SoundtrackController.setEqualizer(ctx, true, levels, v.roundToInt()) }, + colors = SliderDefaults.colors(thumbColor = pal.signal, activeTrackColor = pal.signal, inactiveTrackColor = colors.onSurface.copy(alpha = 0.18f)), + modifier = Modifier.fillMaxWidth().testTag("soundtrack-bass"), + ) + } + TextButton(onClick = { SoundtrackController.setEqualizer(ctx, on, List(ready.bands) { 0 }, 0) }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.soundtracks_reset)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackTrackPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackTrackPanel.kt new file mode 100644 index 0000000000..c0769536c7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SoundtrackTrackPanel.kt @@ -0,0 +1,391 @@ +package com.droiddeck.launcher.ui + +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CheckBox +import androidx.compose.material.icons.filled.CheckBoxOutlineBlank +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.filled.Sort +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.rememberCoroutineScope +import kotlinx.coroutines.launch +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.zIndex +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Soundtrack +import com.droiddeck.launcher.frontend.SoundtrackCollections +import com.droiddeck.launcher.frontend.SoundtrackTracks +import com.droiddeck.launcher.playback.SoundtrackController + +internal class PlayTarget(val root: java.io.File?, val collection: Int?) { + val belongs: Boolean get() = if (collection != null) SoundtrackController.belongsCollection(collection) else SoundtrackController.belongs(root) +} + +private sealed interface SoundRow { + class Disc(val number: Int, val label: String) : SoundRow + class Item(val track: Soundtrack.Track) : SoundRow +} + +private fun rowsOf(album: Soundtrack.Album): List = buildList { + for ((disc, tracks) in album.disc) { + if (album.multiDisc) add(SoundRow.Disc(disc, tracks.firstOrNull()?.discLabel ?: disc.toString())) + tracks.forEach { add(SoundRow.Item(it)) } + } +} + +@Composable +private fun sortLabel(sort: SoundtrackTracks.Sort): String = stringResource( + when (sort) { + SoundtrackTracks.Sort.DEFAULT -> R.string.soundtracks_sort_default + SoundtrackTracks.Sort.TITLE_ASC -> R.string.stores_sort_title_asc + SoundtrackTracks.Sort.TITLE_DESC -> R.string.stores_sort_title_desc + SoundtrackTracks.Sort.LONGEST -> R.string.soundtracks_sort_longest + SoundtrackTracks.Sort.SHORTEST -> R.string.soundtracks_sort_shortest + }, +) + +@Composable +internal fun TrackPanel( + album: Soundtrack.Album, title: String, target: PlayTarget, refOf: (Soundtrack.Track) -> SoundtrackCollections.TrackRef, + collectionId: Int?, selectRequest: Int, onReorder: ((List) -> Unit)?, modifier: Modifier, +) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + var query by remember { mutableStateOf("") } + var sort by remember { mutableStateOf(SoundtrackTracks.Sort.DEFAULT) } + var sortMenu by remember { mutableStateOf(false) } + var selecting by remember { mutableStateOf(false) } + var picked by remember { mutableStateOf(setOf()) } + var saving by remember { mutableStateOf(false) } + val leave: () -> Unit = { + selecting = false + picked = emptySet() + } + LaunchedEffect(selectRequest) { if (selectRequest > 0) selecting = true } + BackHandler(enabled = selecting) { leave() } + val rows: List = remember(album, query, sort) { + if (sort == SoundtrackTracks.Sort.DEFAULT && query.isBlank()) rowsOf(album) + else SoundtrackTracks.sort( + album.tracks.filter { SoundtrackTracks.matches(query, it.title, it.artist) }, sort, { it.title }, { it.durationMs }, + ).map { SoundRow.Item(it) } + } + val rowIds = rows.filterIsInstance().map { it.track.id } + var working by remember(rowIds) { mutableStateOf?>(null) } + val display = working ?: rows + val canReorder = onReorder != null && sort == SoundtrackTracks.Sort.DEFAULT && query.isBlank() && selecting + var dragId by remember { mutableStateOf(null) } + var dragTotal by remember { mutableFloatStateOf(0f) } + var dragTo by remember { mutableIntStateOf(0) } + val numbers = remember(display) { + val out = HashMap() + var n = 0 + for (row in display) { + if (row is SoundRow.Disc) n = 0 + else if (row is SoundRow.Item) out[row.track.id] = ++n + } + out + } + val state = rememberLazyListState() + val scope = rememberCoroutineScope() + val drag = remember { DragState() } + fun applyDrag() { + drag.total = drag.total.coerceIn((drag.lo - drag.from) * drag.size, (drag.hi - drag.from) * drag.size) + dragTotal = drag.total + dragTo = dragTarget(drag.total, drag.size, drag.from, drag.lo, drag.hi) + } + val finishDrag: () -> Unit = { + if (dragId != null) { + val from = drag.from + val to = dragTo + if (to != from && from in drag.base.indices) { + val moved = drag.base.toMutableList().apply { add(to, removeAt(from)) } + val index = state.firstVisibleItemIndex + val offset = state.firstVisibleItemScrollOffset + working = moved + scope.launch { state.scrollToItem(index, offset) } + onReorder?.invoke(moved.filterIsInstance().map { it.track.id }) + } + dragId = null + dragTotal = 0f + dragTo = from + } + } + val rowsNow by rememberUpdatedState(rows) + val finishNow by rememberUpdatedState(finishDrag) + val current = if (target.belongs) SoundtrackController.currentId else null + var scrolledTo by remember { mutableStateOf(null) } + LaunchedEffect(album, current) { + if (current == null) { + scrolledTo = null + return@LaunchedEffect + } + if (dragId != null || current == scrolledTo) return@LaunchedEffect + val at = rows.indexOfFirst { it is SoundRow.Item && it.track.id == current } + if (at >= 0) { + scrolledTo = current + state.animateScrollToItem(at) + } + } + val chosen = album.tracks.filter { it.id in picked }.map(refOf) + Column(modifier) { + Row(Modifier.fillMaxWidth().padding(bottom = 8.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + Box(Modifier.weight(1f)) { + AdbTextField( + value = query, onValueChange = { query = it }, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = stringResource(R.string.soundtracks_search_tracks), compact = true, + ) + } + Box { + HeaderIconButton(stringResource(R.string.stores_sort), Icons.Filled.Sort, "tracks-sort") { sortMenu = !sortMenu } + AnchoredMenu(sortMenu, onDismiss = { sortMenu = false }, title = stringResource(R.string.stores_sort)) { first -> + SoundtrackTracks.Sort.values().forEachIndexed { i, option -> + MenuItem(sortLabel(option), checked = option == sort, focusRequester = if (i == 0) first else null) { + sort = option + sortMenu = false + } + } + } + } + HeaderIconButton(stringResource(R.string.soundtracks_select), Icons.Filled.CheckBox, "tracks-select") { + if (selecting) leave() else selecting = true + } + } + if (selecting) Row( + Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).padding(bottom = 6.dp), + horizontalArrangement = Arrangement.spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically, + ) { + Text(stringResource(R.string.soundtracks_selected, picked.size), fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 6.dp)) + TextButton(onClick = { picked = rowIds.toSet() }, modifier = Modifier.focusGlide(CircleShape).testTag("tracks-select-all")) { + Text(stringResource(R.string.soundtracks_select_all)) + } + TextButton(onClick = { picked = emptySet() }, modifier = Modifier.focusGlide(CircleShape).testTag("tracks-deselect-all")) { + Text(stringResource(R.string.soundtracks_deselect_all)) + } + TextButton(enabled = picked.isNotEmpty(), onClick = { saving = true }, modifier = Modifier.focusGlide(CircleShape).testTag("tracks-add-collection")) { + Text(stringResource(R.string.soundtracks_add_to_collection)) + } + TextButton( + enabled = picked.isNotEmpty(), + onClick = { + SoundtrackCollections.add(ctx, SoundtrackCollections.FAVORITES_ID, chosen) + leave() + }, + modifier = Modifier.focusGlide(CircleShape).testTag("tracks-add-favorites"), + ) { Text(stringResource(R.string.soundtracks_add_favorites)) } + if (collectionId != null) TextButton( + enabled = picked.isNotEmpty(), + onClick = { + SoundtrackCollections.remove(ctx, collectionId, picked) + leave() + }, + modifier = Modifier.focusGlide(CircleShape).testTag("tracks-remove"), + ) { Text(stringResource(R.string.soundtracks_remove_from_collection)) } + TextButton(onClick = leave, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } + } + if (display.isEmpty()) Text( + stringResource(if (album.tracks.isEmpty()) R.string.soundtracks_no_tracks else R.string.stores_nothing_matches), + fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 12.dp), + ) + else LazyColumn( + state = state, + modifier = Modifier.weight(1f).fillMaxWidth().clip(RoundedCornerShape(10.dp)).background(Color.Black.copy(alpha = 0.28f)).testTag("soundtrack-tracks"), + ) { + items(display, key = { if (it is SoundRow.Item) it.track.id else "disc-${(it as SoundRow.Disc).number}" }) { row -> + when (row) { + is SoundRow.Disc -> Text( + stringResource(R.string.soundtracks_disc, row.label), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, + modifier = Modifier.fillMaxWidth().background(Color.White.copy(alpha = 0.12f)).padding(horizontal = 12.dp, vertical = 8.dp), + ) + is SoundRow.Item -> { + val id = row.track.id + val flip = { picked = if (id in picked) picked - id else picked + id } + val dragging = dragId == id + val draggable = canReorder && id in picked + val shift = if (!canReorder) Modifier else Modifier + .zIndex(if (dragging) 1f else 0f) + .graphicsLayer { + translationY = when { + dragId == null -> 0f + dragId == id -> dragTotal + else -> { + val at = drag.index[id] ?: -1 + val f = drag.from + val t = dragTo + if (at < 0) 0f + else if (f < t && at in (f + 1)..t) -drag.size + else if (t < f && at in t until f) drag.size + else 0f + } + } + } + val dragModifier = if (!draggable) shift else shift + .pointerInput(id) { + detectDragGesturesAfterLongPress( + onDragStart = { + val base = working ?: rowsNow + val from = base.indexOfFirst { it is SoundRow.Item && it.track.id == id } + if (from >= 0) { + val disc = (base[from] as SoundRow.Item).track.disc + var lo = from + while (lo > 0 && (base[lo - 1] as? SoundRow.Item)?.track?.disc == disc) lo-- + var hi = from + while (hi < base.lastIndex && (base[hi + 1] as? SoundRow.Item)?.track?.disc == disc) hi++ + val visible = state.layoutInfo.visibleItemsInfo + val me = visible.firstOrNull { it.key == id } + val next = visible.firstOrNull { it.index == (me?.index ?: -2) + 1 && it.key != "disc-0" && base.getOrNull(from + 1) is SoundRow.Item } + val prev = visible.firstOrNull { it.index == (me?.index ?: -2) - 1 && base.getOrNull(from - 1) is SoundRow.Item } + val pitch = when { + me != null && next != null -> (next.offset - me.offset).toFloat() + me != null && prev != null -> (me.offset - prev.offset).toFloat() + else -> me?.size?.toFloat() ?: 0f + } + drag.base = base + drag.index = HashMap().also { m -> base.forEachIndexed { i, r -> if (r is SoundRow.Item) m[r.track.id] = i } } + drag.from = from + drag.lo = lo + drag.hi = hi + drag.size = if (pitch > 0f) pitch else 1f + drag.total = 0f + dragTotal = 0f + dragTo = from + dragId = id + } + }, + onDrag = { change, amount -> + change.consume() + if (dragId == id) { + drag.total += amount.y + applyDrag() + } + }, + onDragEnd = { finishNow() }, + onDragCancel = { finishNow() }, + ) + } + TrackRow( + row.track, numbers[id] ?: row.track.number, dragging, dragModifier, id == current, selecting, id in picked, + onClick = { + if (selecting) flip() + else if (id == current) SoundtrackController.toggle(ctx, album, title, target.root, target.collection) + else SoundtrackController.play(ctx, album, title, id, root = target.root, collection = target.collection) + }, + onLongClick = if (draggable) null else ({ + if (selecting) flip() + else { + selecting = true + picked = setOf(id) + } + }), + ) + } + } + } + } + } + if (saving) SavedDialog(chosen, null) { + saving = false + leave() + } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +private fun TrackRow( + track: Soundtrack.Track, number: Int, dragging: Boolean, extra: Modifier, current: Boolean, selecting: Boolean, selected: Boolean, + onClick: () -> Unit, onLongClick: (() -> Unit)?, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(8.dp) + val tint = if (current) pal.signal else colors.onBackground + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = extra.fillMaxWidth().padding(horizontal = 4.dp, vertical = 1.dp).clip(shape) + .background(if (dragging) pal.signal.copy(alpha = 0.32f) else if (selected) pal.signal.copy(alpha = 0.24f) else if (current) pal.signal.copy(alpha = 0.14f) else if (hot) Color.White.copy(alpha = 0.08f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, Color.Transparent) + .hoverable(src) + .combinedClickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onLongClick = onLongClick, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(horizontal = 10.dp, vertical = 9.dp), + ) { + Box(Modifier.width(28.dp), contentAlignment = Alignment.CenterEnd) { + when { + selecting -> Icon( + if (selected) Icons.Filled.CheckBox else Icons.Filled.CheckBoxOutlineBlank, contentDescription = null, + tint = if (selected) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp), + ) + current && SoundtrackController.playing -> Icon(Icons.Filled.PlayArrow, contentDescription = null, tint = tint, modifier = Modifier.size(16.dp)) + else -> Text("$number.", fontSize = 13.sp, color = if (current) pal.signal else colors.onSurfaceVariant, maxLines = 1) + } + } + Text( + track.title, fontSize = 14.sp, color = tint, fontWeight = if (current) FontWeight.SemiBold else FontWeight.Normal, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), + ) + if (track.durationMs > 0) Text(Soundtrack.formatLength(track.durationMs), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) + } +} + +private class DragState { + var base: List = emptyList() + var index: Map = emptyMap() + var from = 0 + var lo = 0 + var hi = 0 + var size = 1f + var total = 0f +} + +internal fun dragTarget(total: Float, size: Float, from: Int, lo: Int, hi: Int): Int = + (from + Math.round(total / size)).coerceIn(lo, hi) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index f1afd42c0d..3921df7f32 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -25,6 +25,8 @@ internal const val FLATHUB = "flathub" internal class SourceColours(val fill: Color, val ink: Color, val dot: Color) +internal val FavoritesColours = SourceColours(Color(0xFF3D1A26), Color(0xFFFFB3C8), Color(0xFFFF5C8A)) + internal fun sourceColours(source: String): SourceColours = when (source) { Store.GOG.id -> SourceColours(Color(0xFF3A1A3C), Color(0xFFE6A3EA), Color(0xFFC25BC8)) Store.EPIC.id -> SourceColours(Color(0xFF2A2A2A), Color(0xFFDDDDDD), Color(0xFFBDBDBD)) @@ -37,6 +39,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.EA.id -> SourceColours(Color(0xFF3A0E12), Color(0xFFFF9A9A), Color(0xFFFF4747)) Store.ROCKSTAR.id -> SourceColours(Color(0xFF3A2A06), Color(0xFFFFD780), Color(0xFFFCAF17)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) + Library.SOURCE_COLLECTION -> SourceColours(Color(0xFF2B1A3D), Color(0xFFD2A8FF), Color(0xFFA25BFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) else -> SourceColours(Color(0xFF1A1D22), Color(0xFF9AA3AF), Color(0xFF9AA3AF)) } @@ -44,6 +47,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { @Composable internal fun sourceLabel(source: String): String = when (source) { Library.SOURCE_STEAM -> stringResource(R.string.source_steam) + Library.SOURCE_COLLECTION -> stringResource(R.string.soundtracks_collections) Store.GOG.id -> Store.GOG.label Store.EPIC.id -> Store.EPIC.label Store.AMAZON.id -> Store.AMAZON.label @@ -58,10 +62,10 @@ internal fun sourceLabel(source: String): String = when (source) { } @Composable -internal fun SourceChip(source: String, small: Boolean = false, modifier: Modifier = Modifier) { - val c = sourceColours(source) +internal fun SourceChip(source: String, small: Boolean = false, modifier: Modifier = Modifier, label: String? = null, colours: SourceColours? = null) { + val c = colours ?: sourceColours(source) Text( - sourceLabel(source), fontSize = if (small) 10.sp else 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.4.sp, + label ?: sourceLabel(source), fontSize = if (small) 10.sp else 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.4.sp, color = c.ink, maxLines = 1, modifier = modifier.clip(RoundedCornerShape(6.dp)).background(c.fill) .padding(horizontal = if (small) 6.dp else 8.dp, vertical = if (small) 1.dp else 2.dp), diff --git a/app/src/main/res/drawable/ic_repeat_all.xml b/app/src/main/res/drawable/ic_repeat_all.xml new file mode 100644 index 0000000000..c696a476a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_all.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_repeat_off.xml b/app/src/main/res/drawable/ic_repeat_off.xml new file mode 100644 index 0000000000..e989d57d7b --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_off.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/drawable/ic_repeat_one.xml b/app/src/main/res/drawable/ic_repeat_one.xml new file mode 100644 index 0000000000..fda860fcc2 --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_one.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_shuffle_off.xml b/app/src/main/res/drawable/ic_shuffle_off.xml new file mode 100644 index 0000000000..3ede806a20 --- /dev/null +++ b/app/src/main/res/drawable/ic_shuffle_off.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/drawable/ic_shuffle_on.xml b/app/src/main/res/drawable/ic_shuffle_on.xml new file mode 100644 index 0000000000..8f62d5de55 --- /dev/null +++ b/app/src/main/res/drawable/ic_shuffle_on.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_soundtrack.xml b/app/src/main/res/drawable/ic_soundtrack.xml new file mode 100644 index 0000000000..00839efe01 --- /dev/null +++ b/app/src/main/res/drawable/ic_soundtrack.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 36d31630f5..f92ce94ee7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3839,4 +3839,67 @@ ثلج قرمزي + الموسيقى التصويرية + الموسيقى + خيارات التشغيل + المفضلة + المجموعات + لا توجد مجموعات بعد. اضغط على أيقونة الإشارة المرجعية لإنشاء مجموعة. + المحفوظات + إنشاء مجموعة + نظّم ما حفظته + جديد + إنشاء + اسم المجموعة + أدخل اسمًا لا تستخدمه أي مجموعة أخرى + إدارة + إعادة تسمية + إضافة مقاطع + إضافة (%1$d) + إزالة مقاطع + حذف المجموعة + حذف %1$s؟ + تبقى المقاطع على جهازك. تتم إزالة المجموعة فقط. + تحديد + تحديد الكل + إلغاء تحديد الكل + تم تحديد %1$d + إضافة إلى مجموعة + إضافة إلى المفضلة + إزالة من المجموعة + ابحث في المقاطع + ترتيب الألبوم + الأطول أولًا + الأقصر أولًا + المقاطع + طبقة الصوت + إعادة ضبط + تخطي الصمت + مؤقت النوم + %1$d د + نهاية المقطع + متبقي %1$s + المعادل + تعزيز الجهير + المعادل غير متاح على هذا الجهاز + الموسيقى التصويرية + تفعيل أثناء اللعب + استمر في تشغيل الموسيقى التصويرية أثناء تشغيل اللعبة + لا توجد موسيقى تصويرية مثبّتة بعد. + ابحث في الموسيقى التصويرية + إضافة مجلد موسيقى تصويرية + لا توجد ملفات صوتية في هذا المجلد + المدة الإجمالية + %1$d مقطعًا / %2$s + القرص %1$s + عشوائي + السابق + تشغيل + إيقاف مؤقت + التالي + التكرار متوقف + تكرار الكل + تكرار مقطع واحد + مستوى الصوت + لا توجد ملفات صوتية في هذه الموسيقى التصويرية 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 d9ef13c8b1..5139e4953d 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3694,4 +3694,67 @@ No se pudo importar esta disposición Nieve escarlata Superficies blancas con acentos rojos. + Bandas sonoras + Música + Opciones de reproducción + Favoritos + Colecciones + Aún no hay colecciones. Toca el ícono de marcador para crear una. + Guardados + Crear una colección + Organiza tus guardados + Nueva + Crear + Nombre de la colección + Ingresa un nombre que no use ninguna otra colección + Administrar + Cambiar nombre + Agregar pistas + Agregar (%1$d) + Quitar pistas + Eliminar colección + ¿Eliminar %1$s? + Las pistas permanecen en tu dispositivo. Solo se elimina la colección. + Seleccionar + Seleccionar todo + Deseleccionar todo + %1$d seleccionadas + Agregar a la colección + Agregar a favoritos + Quitar de la colección + Buscar pistas + Orden del álbum + Más largas primero + Más cortas primero + Pistas + Tono + Restablecer + Omitir silencios + Temporizador de sueño + %1$d min + Fin de la pista + Quedan %1$s + Ecualizador + Refuerzo de graves + El ecualizador no está disponible en este dispositivo + Bandas sonoras + Activar en el juego + Mantén la banda sonora sonando mientras se ejecuta un juego + Aún no hay bandas sonoras instaladas. + Buscar bandas sonoras + Añadir una carpeta de banda sonora + No hay archivos de audio en esa carpeta + Duración total + %1$d pistas / %2$s + Disco %1$s + Aleatorio + Anterior + Reproducir + Pausar + Siguiente + Repetición desactivada + Repetir todo + Repetir una + Volumen + No hay archivos de audio en esta banda sonora diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 55449ac2f4..4b446b2140 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3683,4 +3683,67 @@ Ален сняг + Саундтраци + Музика + Опции за възпроизвеждане + Любими + Колекции + Все още няма колекции. Докоснете иконата на отметка, за да създадете. + Запазени + Създаване на колекция + Организирайте запазеното + Нова + Създай + Име на колекцията + Въведете име, което не се използва от друга колекция + Управление + Преименуване + Добавяне на песни + Добави (%1$d) + Премахване на песни + Изтриване на колекция + Да се изтрие ли %1$s? + Песните остават на устройството ви. Премахва се само колекцията. + Избор + Избери всички + Отмени избора на всички + Избрани: %1$d + Добави към колекция + Добави в любими + Премахни от колекцията + Търсене на песни + Като в албума + Най-дългите първо + Най-кратките първо + Песни + Височина на тона + Нулиране + Прескачане на тишина + Таймер за заспиване + %1$d мин + Край на песента + Остават %1$s + Еквалайзер + Усилване на басите + Еквалайзерът не е наличен на това устройство + Саундтраци + Включи в играта + Саундтракът да продължи да свири, докато върви игра + Все още няма инсталирани саундтраци. + Търсене на саундтраци + Добавяне на папка със саундтрак + В тази папка няма аудиофайлове + Обща продължителност + %1$d песни / %2$s + Диск %1$s + Разбъркване + Предишна + Пускане + Пауза + Следваща + Повторението е изключено + Повтаряне на всички + Повтаряне на една + Сила на звука + В този саундтрак няма аудиофайлове diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 35282822a5..365c2f1083 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3761,4 +3761,67 @@ Šarlatový sníh + Soundtracky + Hudba + Možnosti přehrávání + Oblíbené + Kolekce + Zatím žádné kolekce. Klepnutím na ikonu záložky nějakou vytvoříte. + Uloženo + Vytvořit kolekci + Uspořádejte si uložené skladby + Nová + Vytvořit + Název kolekce + Zadejte název, který nepoužívá žádná jiná kolekce + Spravovat + Přejmenovat + Přidat skladby + Přidat (%1$d) + Odebrat skladby + Smazat kolekci + Smazat %1$s? + Skladby zůstanou ve vašem zařízení. Odstraní se pouze kolekce. + Vybrat + Vybrat vše + Zrušit výběr + Vybráno: %1$d + Přidat do kolekce + Přidat do oblíbených + Odebrat z kolekce + Hledat skladby + Pořadí alba + Nejdelší první + Nejkratší první + Skladby + Výška tónu + Obnovit + Přeskakovat ticho + Časovač vypnutí + %1$d min + Konec skladby + Zbývá %1$s + Ekvalizér + Zesílení basů + Ekvalizér není na tomto zařízení k dispozici + Soundtracky + Povolit ve hře + Nechat soundtrack hrát během hry + Zatím nejsou nainstalovány žádné soundtracky. + Hledat soundtracky + Přidat složku se soundtrackem + V této složce nejsou žádné zvukové soubory + Celková délka + Skladeb: %1$d / %2$s + Disk %1$s + Náhodně + Předchozí + Přehrát + Pozastavit + Další + Opakování vypnuto + Opakovat vše + Opakovat jednu + Hlasitost + V tomto soundtracku nejsou žádné zvukové soubory diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7a5aa072ef..83ee1c91f4 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3683,4 +3683,67 @@ Skarlagensne + Soundtracks + Musik + Afspilningsindstillinger + Favoritter + Samlinger + Ingen samlinger endnu. Tryk på bogmærkeikonet for at oprette en. + Gemt + Opret en samling + Organiser dine gemte numre + Ny + Opret + Navn på samling + Angiv et navn, som ingen anden samling bruger + Administrer + Omdøb + Tilføj numre + Tilføj (%1$d) + Fjern numre + Slet samling + Slet %1$s? + Numrene bliver på din enhed. Kun samlingen fjernes. + Vælg + Vælg alle + Fravælg alle + %1$d valgt + Føj til samling + Føj til favoritter + Fjern fra samling + Søg i numre + Albumrækkefølge + Længste først + Korteste først + Numre + Tonehøjde + Nulstil + Spring stilhed over + Sovetimer + %1$d min. + Slut på nummer + %1$s tilbage + Equalizer + Bassforstærkning + Equalizeren er ikke tilgængelig på denne enhed + Soundtracks + Aktivér i spil + Lad soundtracket spille, mens et spil kører + Ingen soundtracks installeret endnu. + Søg i soundtracks + Tilføj en soundtrack-mappe + Ingen lydfiler i den mappe + Samlet længde + %1$d numre / %2$s + Disk %1$s + Bland + Forrige + Afspil + Pause + Næste + Gentag fra + Gentag alle + Gentag én + Lydstyrke + Ingen lydfiler i dette soundtrack diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1d15db3d88..3ed4aa1f1b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3683,4 +3683,67 @@ Scharlachroter Schnee + Soundtracks + Musik + Wiedergabeoptionen + Favoriten + Sammlungen + Noch keine Sammlungen. Tippe auf das Lesezeichen-Symbol, um eine zu erstellen. + Gespeichert + Sammlung erstellen + Ordne deine gespeicherten Titel + Neu + Erstellen + Name der Sammlung + Gib einen Namen ein, den keine andere Sammlung verwendet + Verwalten + Umbenennen + Titel hinzufügen + Hinzufügen (%1$d) + Titel entfernen + Sammlung löschen + %1$s löschen? + Die Titel bleiben auf deinem Gerät. Nur die Sammlung wird entfernt. + Auswählen + Alle auswählen + Alle abwählen + %1$d ausgewählt + Zur Sammlung hinzufügen + Zu Favoriten hinzufügen + Aus Sammlung entfernen + Titel suchen + Albumreihenfolge + Längste zuerst + Kürzeste zuerst + Titel + Tonhöhe + Zurücksetzen + Stille überspringen + Schlaftimer + %1$d Min. + Ende des Titels + Noch %1$s + Equalizer + Bassverstärkung + Der Equalizer ist auf diesem Gerät nicht verfügbar + Soundtracks + Im Spiel aktivieren + Soundtrack während eines Spiels weiterspielen + Noch keine Soundtracks installiert. + Soundtracks durchsuchen + Soundtrack-Ordner hinzufügen + Keine Audiodateien in diesem Ordner + Gesamtlänge + %1$d Titel / %2$s + Disc %1$s + Zufällig + Zurück + Wiedergabe + Pause + Weiter + Wiederholen aus + Alle wiederholen + Titel wiederholen + Lautstärke + Keine Audiodateien in diesem Soundtrack diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 27692a1325..d9e2ac10e8 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3683,4 +3683,67 @@ Κατακόκκινο χιόνι + Soundtrack + Μουσική + Επιλογές αναπαραγωγής + Αγαπημένα + Συλλογές + Δεν υπάρχουν συλλογές ακόμη. Πατήστε το εικονίδιο σελιδοδείκτη για να δημιουργήσετε μία. + Αποθηκευμένα + Δημιουργία συλλογής + Οργανώστε τα αποθηκευμένα σας + Νέα + Δημιουργία + Όνομα συλλογής + Εισαγάγετε ένα όνομα που δεν χρησιμοποιεί άλλη συλλογή + Διαχείριση + Μετονομασία + Προσθήκη κομματιών + Προσθήκη (%1$d) + Κατάργηση κομματιών + Διαγραφή συλλογής + Διαγραφή %1$s; + Τα κομμάτια παραμένουν στη συσκευή σας. Καταργείται μόνο η συλλογή. + Επιλογή + Επιλογή όλων + Αποεπιλογή όλων + %1$d επιλεγμένα + Προσθήκη στη συλλογή + Προσθήκη στα αγαπημένα + Κατάργηση από τη συλλογή + Αναζήτηση κομματιών + Σειρά άλμπουμ + Μεγαλύτερη διάρκεια πρώτα + Μικρότερη διάρκεια πρώτα + Κομμάτια + Τόνος + Επαναφορά + Παράλειψη σιωπής + Χρονοδιακόπτης ύπνου + %1$d λ. + Τέλος κομματιού + Απομένουν %1$s + Ισοσταθμιστής + Ενίσχυση μπάσων + Ο ισοσταθμιστής δεν είναι διαθέσιμος σε αυτή τη συσκευή + Soundtrack + Ενεργοποίηση εντός παιχνιδιού + Η μουσική συνεχίζει να παίζει όσο εκτελείται ένα παιχνίδι + Δεν υπάρχουν εγκατεστημένα soundtrack ακόμη. + Αναζήτηση soundtrack + Προσθήκη φακέλου soundtrack + Δεν υπάρχουν αρχεία ήχου σε αυτόν τον φάκελο + Συνολική διάρκεια + %1$d κομμάτια / %2$s + Δίσκος %1$s + Τυχαία σειρά + Προηγούμενο + Αναπαραγωγή + Παύση + Επόμενο + Επανάληψη ανενεργή + Επανάληψη όλων + Επανάληψη ενός + Ένταση + Δεν υπάρχουν αρχεία ήχου σε αυτό το soundtrack diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index adea64b8f4..7fa671b3ce 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3722,4 +3722,67 @@ Nieve escarlata + Bandas sonoras + Música + Opciones de reproducción + Favoritos + Colecciones + Aún no hay colecciones. Toca el icono de marcador para crear una. + Guardados + Crear una colección + Organiza tus guardados + Nueva + Crear + Nombre de la colección + Introduce un nombre que no use ninguna otra colección + Gestionar + Cambiar nombre + Añadir pistas + Añadir (%1$d) + Quitar pistas + Eliminar colección + ¿Eliminar %1$s? + Las pistas permanecen en tu dispositivo. Solo se elimina la colección. + Seleccionar + Seleccionar todo + Deseleccionar todo + %1$d seleccionadas + Añadir a la colección + Añadir a favoritos + Quitar de la colección + Buscar pistas + Orden del álbum + Más largas primero + Más cortas primero + Pistas + Tono + Restablecer + Omitir silencios + Temporizador de sueño + %1$d min + Fin de la pista + Quedan %1$s + Ecualizador + Refuerzo de graves + El ecualizador no está disponible en este dispositivo + Bandas sonoras + Activar en el juego + Mantén la banda sonora sonando mientras se ejecuta un juego + Aún no hay bandas sonoras instaladas. + Buscar bandas sonoras + Añadir una carpeta de banda sonora + No hay archivos de audio en esa carpeta + Duración total + %1$d pistas / %2$s + Disco %1$s + Aleatorio + Anterior + Reproducir + Pausar + Siguiente + Repetición desactivada + Repetir todo + Repetir una + Volumen + No hay archivos de audio en esta banda sonora diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 481ed7ca5c..222896d3e6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3683,4 +3683,67 @@ Helakanpunainen lumi + Soundtrackit + Musiikki + Toistoasetukset + Suosikit + Kokoelmat + Ei vielä kokoelmia. Luo sellainen napauttamalla kirjanmerkkikuvaketta. + Tallennettu + Luo kokoelma + Järjestä tallennuksesi + Uusi + Luo + Kokoelman nimi + Anna nimi, jota mikään toinen kokoelma ei käytä + Hallitse + Nimeä uudelleen + Lisää kappaleita + Lisää (%1$d) + Poista kappaleita + Poista kokoelma + Poistetaanko %1$s? + Kappaleet säilyvät laitteellasi. Vain kokoelma poistetaan. + Valitse + Valitse kaikki + Poista kaikkien valinta + %1$d valittu + Lisää kokoelmaan + Lisää suosikkeihin + Poista kokoelmasta + Hae kappaleita + Albumin järjestys + Pisin ensin + Lyhin ensin + Kappaleet + Äänenkorkeus + Palauta + Ohita hiljaisuus + Uniajastin + %1$d min + Kappaleen loppu + %1$s jäljellä + Taajuuskorjain + Bassonkorostus + Taajuuskorjain ei ole käytettävissä tällä laitteella + Soundtrackit + Ota käyttöön pelin aikana + Pidä soundtrack soimassa pelin aikana + Soundtrackeja ei ole vielä asennettu. + Hae soundtrackeja + Lisää soundtrack-kansio + Kansiossa ei ole äänitiedostoja + Kokonaiskesto + %1$d kappaletta / %2$s + Levy %1$s + Sekoita + Edellinen + Toista + Tauko + Seuraava + Toisto pois + Toista kaikki + Toista yksi + Äänenvoimakkuus + Tässä soundtrackissa ei ole äänitiedostoja diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 61accc73a6..20c091baca 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3722,4 +3722,67 @@ Neige écarlate + Bandes originales + Musique + Options de lecture + Favoris + Collections + Aucune collection pour le moment. Touchez l\'icône de favori pour en créer une. + Enregistrés + Créer une collection + Organisez vos titres enregistrés + Nouvelle + Créer + Nom de la collection + Saisissez un nom qu\'aucune autre collection n\'utilise + Gérer + Renommer + Ajouter des morceaux + Ajouter (%1$d) + Retirer des morceaux + Supprimer la collection + Supprimer %1$s ? + Les morceaux restent sur votre appareil. Seule la collection est supprimée. + Sélectionner + Tout sélectionner + Tout désélectionner + %1$d sélectionné(s) + Ajouter à une collection + Ajouter aux favoris + Retirer de la collection + Rechercher des morceaux + Ordre de l\'album + Plus longs d\'abord + Plus courts d\'abord + Morceaux + Hauteur + Réinitialiser + Ignorer les silences + Minuteur de veille + %1$d min + Fin du morceau + %1$s restantes + Égaliseur + Renforcement des basses + L\'égaliseur n\'est pas disponible sur cet appareil + Bandes originales + Activer en jeu + Garder la bande originale active pendant une partie + Aucune bande originale installée pour le moment. + Rechercher des bandes originales + Ajouter un dossier de bande originale + Aucun fichier audio dans ce dossier + Durée totale + %1$d pistes / %2$s + Disque %1$s + Aléatoire + Précédent + Lecture + Pause + Suivant + Répétition désactivée + Tout répéter + Répéter une piste + Volume + Aucun fichier audio dans cette bande originale diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 72f0917b03..4046306fe4 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3683,4 +3683,67 @@ किरमिज़ी बर्फ + साउंडट्रैक + संगीत + प्लेबैक विकल्प + पसंदीदा + कलेक्शन + अभी तक कोई कलेक्शन नहीं है। बनाने के लिए बुकमार्क आइकन पर टैप करें। + सहेजे गए + कलेक्शन बनाएं + अपने सेव व्यवस्थित करें + नया + बनाएं + कलेक्शन का नाम + ऐसा नाम दर्ज करें जो किसी अन्य कलेक्शन में उपयोग न हुआ हो + प्रबंधित करें + नाम बदलें + ट्रैक जोड़ें + जोड़ें (%1$d) + ट्रैक हटाएं + कलेक्शन हटाएं + %1$s हटाएं? + ट्रैक आपके डिवाइस पर रहेंगे। केवल कलेक्शन हटाया जाएगा। + चुनें + सभी चुनें + सभी चयन हटाएं + %1$d चुने गए + कलेक्शन में जोड़ें + पसंदीदा में जोड़ें + कलेक्शन से हटाएं + ट्रैक खोजें + एल्बम क्रम + सबसे लंबे पहले + सबसे छोटे पहले + ट्रैक + पिच + रीसेट करें + मौन छोड़ें + स्लीप टाइमर + %1$d मिनट + ट्रैक का अंत + %1$s शेष + इक्वलाइज़र + बास बूस्ट + इस डिवाइस पर इक्वलाइज़र उपलब्ध नहीं है + साउंडट्रैक + गेम के दौरान चालू करें + गेम चलते समय साउंडट्रैक बजता रखें + अभी तक कोई साउंडट्रैक इंस्टॉल नहीं है। + साउंडट्रैक खोजें + साउंडट्रैक फ़ोल्डर जोड़ें + उस फ़ोल्डर में कोई ऑडियो फ़ाइल नहीं है + कुल अवधि + %1$d ट्रैक / %2$s + डिस्क %1$s + शफ़ल + पिछला + चलाएँ + रोकें + अगला + रिपीट बंद + सभी दोहराएँ + एक दोहराएँ + वॉल्यूम + इस साउंडट्रैक में कोई ऑडियो फ़ाइल नहीं है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 409a9e72f8..4a2c408ac7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3683,4 +3683,67 @@ Skarlátvörös hó + Soundtrackek + Zene + Lejátszási beállítások + Kedvencek + Gyűjtemények + Még nincs gyűjtemény. Koppints a könyvjelző ikonra egy létrehozásához. + Mentve + Gyűjtemény létrehozása + Rendezd a mentéseidet + Új + Létrehozás + Gyűjtemény neve + Adj meg egy nevet, amelyet más gyűjtemény nem használ + Kezelés + Átnevezés + Számok hozzáadása + Hozzáadás (%1$d) + Számok eltávolítása + Gyűjtemény törlése + Törlöd ezt: %1$s? + A számok az eszközödön maradnak. Csak a gyűjtemény törlődik. + Kijelölés + Összes kijelölése + Kijelölés törlése + %1$d kijelölve + Hozzáadás gyűjteményhez + Hozzáadás a kedvencekhez + Eltávolítás a gyűjteményből + Számok keresése + Albumsorrend + Leghosszabb elöl + Legrövidebb elöl + Számok + Hangmagasság + Visszaállítás + Csend átugrása + Alvásidőzítő + %1$d perc + Szám vége + %1$s van hátra + Hangszínszabályzó + Mélyhangerősítés + A hangszínszabályzó nem érhető el ezen az eszközön + Soundtrackek + Engedélyezés játék közben + A soundtrack szóljon tovább játék közben + Még nincs telepített soundtrack. + Soundtrackek keresése + Soundtrack mappa hozzáadása + Nincs hangfájl ebben a mappában + Teljes hossz + %1$d szám / %2$s + %1$s. lemez + Keverés + Előző + Lejátszás + Szünet + Következő + Ismétlés kikapcsolva + Összes ismétlése + Egy ismétlése + Hangerő + Nincs hangfájl ebben a soundtrackben diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 81ded51384..d71b8f83f1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3653,4 +3653,67 @@ Salju Kirmizi + Soundtrack + Musik + Opsi pemutaran + Favorit + Koleksi + Belum ada koleksi. Ketuk ikon penanda untuk membuatnya. + Tersimpan + Buat koleksi + Atur simpananmu + Baru + Buat + Nama koleksi + Masukkan nama yang tidak dipakai koleksi lain + Kelola + Ganti nama + Tambah lagu + Tambah (%1$d) + Hapus lagu + Hapus koleksi + Hapus %1$s? + Lagu tetap ada di perangkatmu. Hanya koleksinya yang dihapus. + Pilih + Pilih semua + Batalkan semua pilihan + %1$d dipilih + Tambahkan ke koleksi + Tambahkan ke favorit + Hapus dari koleksi + Cari lagu + Urutan album + Terpanjang dulu + Terpendek dulu + Lagu + Nada + Atur ulang + Lewati keheningan + Timer tidur + %1$d mnt + Akhir lagu + Sisa %1$s + Ekualiser + Penguat bass + Ekualiser tidak tersedia di perangkat ini + Soundtrack + Aktifkan saat bermain + Tetap putar soundtrack saat game berjalan + Belum ada soundtrack yang terpasang. + Cari soundtrack + Tambahkan folder soundtrack + Tidak ada file audio di folder itu + Total durasi + %1$d trek / %2$s + Disk %1$s + Acak + Sebelumnya + Putar + Jeda + Berikutnya + Ulangi mati + Ulangi semua + Ulangi satu + Volume + Tidak ada file audio di soundtrack ini diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f8f6c7866c..e5a9d021e2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3722,4 +3722,67 @@ Neve scarlatta + Colonne sonore + Musica + Opzioni di riproduzione + Preferiti + Raccolte + Nessuna raccolta per ora. Tocca l\'icona del segnalibro per crearne una. + Salvati + Crea una raccolta + Organizza i tuoi salvataggi + Nuova + Crea + Nome della raccolta + Inserisci un nome non usato da altre raccolte + Gestisci + Rinomina + Aggiungi brani + Aggiungi (%1$d) + Rimuovi brani + Elimina raccolta + Eliminare %1$s? + I brani restano sul dispositivo. Viene rimossa solo la raccolta. + Seleziona + Seleziona tutto + Deseleziona tutto + %1$d selezionati + Aggiungi alla raccolta + Aggiungi ai preferiti + Rimuovi dalla raccolta + Cerca brani + Ordine dell\'album + Più lunghi prima + Più brevi prima + Brani + Tonalità + Reimposta + Salta i silenzi + Timer di spegnimento + %1$d min + Fine del brano + Restano %1$s + Equalizzatore + Potenziamento bassi + L\'equalizzatore non è disponibile su questo dispositivo + Colonne sonore + Attiva in gioco + Mantieni la colonna sonora in riproduzione durante una partita + Nessuna colonna sonora installata. + Cerca colonne sonore + Aggiungi una cartella di colonna sonora + Nessun file audio in questa cartella + Durata totale + %1$d brani / %2$s + Disco %1$s + Casuale + Precedente + Riproduci + Pausa + Successivo + Ripetizione disattivata + Ripeti tutto + Ripeti uno + Volume + Nessun file audio in questa colonna sonora diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fe43ef5ee0..bd0e241e4e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3653,4 +3653,67 @@ 緋色の雪 + サウンドトラック + 音楽 + 再生オプション + お気に入り + コレクション + コレクションはまだありません。ブックマークアイコンをタップして作成できます。 + 保存済み + コレクションを作成 + 保存した曲を整理 + 新規 + 作成 + コレクション名 + 他のコレクションで使われていない名前を入力してください + 管理 + 名前を変更 + トラックを追加 + 追加(%1$d) + トラックを削除 + コレクションを削除 + %1$sを削除しますか? + トラックはデバイスに残ります。コレクションのみが削除されます。 + 選択 + すべて選択 + すべて選択解除 + %1$d件選択中 + コレクションに追加 + お気に入りに追加 + コレクションから削除 + トラックを検索 + アルバム順 + 長い順 + 短い順 + トラック + ピッチ + リセット + 無音部分をスキップ + スリープタイマー + %1$d分 + トラックの終わり + 残り %1$s + イコライザー + 低音ブースト + このデバイスではイコライザーを使用できません + サウンドトラック + ゲーム中も有効にする + ゲーム実行中もサウンドトラックを再生し続けます + インストール済みのサウンドトラックはまだありません。 + サウンドトラックを検索 + サウンドトラックのフォルダーを追加 + そのフォルダーに音声ファイルがありません + 合計時間 + %1$d トラック / %2$s + ディスク %1$s + シャッフル + 前へ + 再生 + 一時停止 + 次へ + リピートなし + 全曲リピート + 1曲リピート + 音量 + このサウンドトラックに音声ファイルがありません diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e00a044135..4fadd28078 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3653,4 +3653,67 @@ 진홍빛 눈 + 사운드트랙 + 음악 + 재생 옵션 + 즐겨찾기 + 컬렉션 + 아직 컬렉션이 없습니다. 북마크 아이콘을 눌러 만들어 보세요. + 저장됨 + 컬렉션 만들기 + 저장한 곡을 정리하세요 + 새로 만들기 + 만들기 + 컬렉션 이름 + 다른 컬렉션에서 사용하지 않는 이름을 입력하세요 + 관리 + 이름 변경 + 트랙 추가 + 추가 (%1$d) + 트랙 제거 + 컬렉션 삭제 + %1$s을(를) 삭제할까요? + 트랙은 기기에 그대로 남습니다. 컬렉션만 삭제됩니다. + 선택 + 모두 선택 + 모두 선택 해제 + %1$d개 선택됨 + 컬렉션에 추가 + 즐겨찾기에 추가 + 컬렉션에서 제거 + 트랙 검색 + 앨범 순서 + 긴 순서 + 짧은 순서 + 트랙 + 피치 + 초기화 + 무음 건너뛰기 + 취침 타이머 + %1$d분 + 트랙 끝 + %1$s 남음 + 이퀄라이저 + 베이스 부스트 + 이 기기에서는 이퀄라이저를 사용할 수 없습니다 + 사운드트랙 + 게임 중 사용 + 게임이 실행되는 동안 사운드트랙 계속 재생 + 설치된 사운드트랙이 아직 없습니다. + 사운드트랙 검색 + 사운드트랙 폴더 추가 + 해당 폴더에 오디오 파일이 없습니다 + 총 재생 시간 + %1$d개 트랙 / %2$s + 디스크 %1$s + 셔플 + 이전 + 재생 + 일시정지 + 다음 + 반복 끔 + 전체 반복 + 한 곡 반복 + 볼륨 + 이 사운드트랙에 오디오 파일이 없습니다 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 58caf14b83..cf509abbf8 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3653,4 +3653,67 @@ Salji Merah Skarlet + Runut bunyi + Muzik + Pilihan main balik + Kegemaran + Koleksi + Belum ada koleksi. Ketik ikon penanda buku untuk mencipta satu. + Disimpan + Cipta koleksi + Susun simpanan anda + Baharu + Cipta + Nama koleksi + Masukkan nama yang tidak digunakan oleh koleksi lain + Urus + Namakan semula + Tambah lagu + Tambah (%1$d) + Alih keluar lagu + Padam koleksi + Padam %1$s? + Lagu kekal pada peranti anda. Hanya koleksi dialih keluar. + Pilih + Pilih semua + Nyahpilih semua + %1$d dipilih + Tambah ke koleksi + Tambah ke kegemaran + Alih keluar daripada koleksi + Cari lagu + Susunan album + Terpanjang dahulu + Terpendek dahulu + Lagu + Pic + Tetapkan semula + Langkau senyap + Pemasa tidur + %1$d min + Hujung lagu + %1$s lagi + Penyama + Peningkat bes + Penyama tidak tersedia pada peranti ini + Runut bunyi + Dayakan dalam permainan + Teruskan memainkan runut bunyi semasa permainan berjalan + Belum ada runut bunyi dipasang. + Cari runut bunyi + Tambah folder runut bunyi + Tiada fail audio dalam folder itu + Jumlah tempoh + %1$d trek / %2$s + Cakera %1$s + Rawak + Sebelumnya + Main + Jeda + Seterusnya + Ulang dimatikan + Ulang semua + Ulang satu + Kelantangan + Tiada fail audio dalam runut bunyi ini diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f56b734f56..4605b7306f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3683,4 +3683,67 @@ Skarlagenssnø + Lydspor + Musikk + Avspillingsalternativer + Favoritter + Samlinger + Ingen samlinger ennå. Trykk på bokmerkeikonet for å opprette en. + Lagret + Opprett en samling + Organiser det du lagrer + Ny + Opprett + Navn på samling + Skriv inn et navn som ingen andre samlinger bruker + Administrer + Gi nytt navn + Legg til spor + Legg til (%1$d) + Fjern spor + Slett samling + Slette %1$s? + Sporene blir værende på enheten din. Bare samlingen fjernes. + Velg + Velg alle + Fjern alle valg + %1$d valgt + Legg til i samling + Legg til i favoritter + Fjern fra samling + Søk i spor + Albumrekkefølge + Lengste først + Korteste først + Spor + Tonehøyde + Tilbakestill + Hopp over stillhet + Søvntimer + %1$d min + Slutten av sporet + %1$s igjen + Equalizer + Bassforsterkning + Equalizeren er ikke tilgjengelig på denne enheten + Lydspor + Aktiver i spill + Fortsett å spille lydsporet mens et spill kjører + Ingen lydspor installert ennå. + Søk i lydspor + Legg til en lydspormappe + Ingen lydfiler i denne mappen + Total lengde + %1$d spor / %2$s + Plate %1$s + Tilfeldig rekkefølge + Forrige + Spill av + Pause + Neste + Gjentakelse av + Gjenta alle + Gjenta ett + Volum + Ingen lydfiler i dette lydsporet diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4240b47aee..558e70e934 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3683,4 +3683,67 @@ Scharlakenrode sneeuw + Soundtracks + Muziek + Afspeelopties + Favorieten + Collecties + Nog geen collecties. Tik op het bladwijzericoon om er een te maken. + Opgeslagen + Maak een collectie + Orden je opgeslagen nummers + Nieuw + Maken + Naam van collectie + Voer een naam in die geen andere collectie gebruikt + Beheren + Hernoemen + Nummers toevoegen + Toevoegen (%1$d) + Nummers verwijderen + Collectie verwijderen + %1$s verwijderen? + De nummers blijven op je apparaat. Alleen de collectie wordt verwijderd. + Selecteren + Alles selecteren + Alles deselecteren + %1$d geselecteerd + Toevoegen aan collectie + Toevoegen aan favorieten + Verwijderen uit collectie + Nummers zoeken + Albumvolgorde + Langste eerst + Kortste eerst + Nummers + Toonhoogte + Resetten + Stilte overslaan + Slaaptimer + %1$d min + Einde van het nummer + Nog %1$s + Equalizer + Basversterking + De equalizer is niet beschikbaar op dit apparaat + Soundtracks + In-game inschakelen + Laat de soundtrack doorspelen terwijl een game draait + Nog geen soundtracks geïnstalleerd. + Soundtracks zoeken + Soundtrackmap toevoegen + Geen audiobestanden in deze map + Totale lengte + %1$d nummers / %2$s + Schijf %1$s + Willekeurig + Vorige + Afspelen + Pauzeren + Volgende + Herhalen uit + Alles herhalen + Eén herhalen + Volume + Geen audiobestanden in deze soundtrack diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2c789b65d2..76cf52a264 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3761,4 +3761,67 @@ Szkarłatny śnieg + Ścieżki dźwiękowe + Muzyka + Opcje odtwarzania + Ulubione + Kolekcje + Brak kolekcji. Dotknij ikony zakładki, aby utworzyć nową. + Zapisane + Utwórz kolekcję + Uporządkuj swoje zapisy + Nowa + Utwórz + Nazwa kolekcji + Wpisz nazwę, której nie używa żadna inna kolekcja + Zarządzaj + Zmień nazwę + Dodaj utwory + Dodaj (%1$d) + Usuń utwory + Usuń kolekcję + Usunąć %1$s? + Utwory pozostają na urządzeniu. Usunięta zostanie tylko kolekcja. + Zaznacz + Zaznacz wszystko + Odznacz wszystko + Zaznaczono: %1$d + Dodaj do kolekcji + Dodaj do ulubionych + Usuń z kolekcji + Szukaj utworów + Kolejność z albumu + Najdłuższe najpierw + Najkrótsze najpierw + Utwory + Wysokość dźwięku + Resetuj + Pomijaj ciszę + Wyłącznik czasowy + %1$d min + Koniec utworu + Pozostało %1$s + Korektor + Wzmocnienie basów + Korektor nie jest dostępny na tym urządzeniu + Ścieżki dźwiękowe + Włącz w grze + Odtwarzaj ścieżkę dźwiękową podczas działania gry + Brak zainstalowanych ścieżek dźwiękowych. + Szukaj ścieżek dźwiękowych + Dodaj folder ze ścieżką dźwiękową + Brak plików audio w tym folderze + Całkowity czas + Utworów: %1$d / %2$s + Płyta %1$s + Losowo + Poprzedni + Odtwórz + Wstrzymaj + Następny + Powtarzanie wyłączone + Powtarzaj wszystko + Powtarzaj jeden + Głośność + Brak plików audio w tej ścieżce dźwiękowej diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index dde7bf233f..5df34b54fd 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3722,4 +3722,67 @@ Neve Escarlate + Bandas sonoras + Música + Opções de reprodução + Favoritas + Coleções + Ainda não há coleções. Toque no ícone de marcador para criar uma. + Guardadas + Criar uma coleção + Organize as suas faixas guardadas + Nova + Criar + Nome da coleção + Introduza um nome que nenhuma outra coleção utilize + Gerir + Mudar o nome + Adicionar faixas + Adicionar (%1$d) + Remover faixas + Eliminar coleção + Eliminar %1$s? + As faixas permanecem no seu dispositivo. Apenas a coleção é removida. + Selecionar + Selecionar tudo + Desselecionar tudo + %1$d selecionadas + Adicionar à coleção + Adicionar às favoritas + Remover da coleção + Pesquisar faixas + Ordem do álbum + Mais longas primeiro + Mais curtas primeiro + Faixas + Tom + Repor + Saltar silêncio + Temporizador de suspensão + %1$d min + Fim da faixa + Restam %1$s + Equalizador + Reforço de graves + O equalizador não está disponível neste dispositivo + Bandas sonoras + Ativar durante o jogo + Continuar a reproduzir a banda sonora enquanto um jogo está em execução + Ainda não há bandas sonoras instaladas. + Pesquisar bandas sonoras + Adicionar uma pasta de banda sonora + Nenhum ficheiro de áudio nessa pasta + Duração total + %1$d faixas / %2$s + Disco %1$s + Aleatório + Anterior + Reproduzir + Pausar + Seguinte + Repetição desativada + Repetir tudo + Repetir uma + Volume + Nenhum ficheiro de áudio nesta banda sonora diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1bf1feb07a..be24a67375 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3722,4 +3722,67 @@ Neve Escarlate + Trilhas sonoras + Música + Opções de reprodução + Favoritas + Coleções + Nenhuma coleção ainda. Toque no ícone de marcador para criar uma. + Salvas + Criar uma coleção + Organize suas faixas salvas + Nova + Criar + Nome da coleção + Digite um nome que nenhuma outra coleção use + Gerenciar + Renomear + Adicionar faixas + Adicionar (%1$d) + Remover faixas + Excluir coleção + Excluir %1$s? + As faixas continuam no seu dispositivo. Somente a coleção é removida. + Selecionar + Selecionar tudo + Desmarcar tudo + %1$d selecionadas + Adicionar à coleção + Adicionar às favoritas + Remover da coleção + Pesquisar faixas + Ordem do álbum + Mais longas primeiro + Mais curtas primeiro + Faixas + Tom + Redefinir + Pular silêncio + Timer de sono + %1$d min + Fim da faixa + Restam %1$s + Equalizador + Reforço de graves + O equalizador não está disponível neste dispositivo + Trilhas sonoras + Ativar durante o jogo + Continuar tocando a trilha sonora enquanto um jogo está em execução + Nenhuma trilha sonora instalada ainda. + Pesquisar trilhas sonoras + Adicionar uma pasta de trilha sonora + Nenhum arquivo de áudio nessa pasta + Duração total + %1$d faixas / %2$s + Disco %1$s + Aleatório + Anterior + Reproduzir + Pausar + Próxima + Repetição desativada + Repetir tudo + Repetir uma + Volume + Nenhum arquivo de áudio nesta trilha sonora diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a2e10057d6..059d8c8d45 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3722,4 +3722,67 @@ Zăpadă stacojie + Coloane sonore + Muzică + Opțiuni de redare + Favorite + Colecții + Nicio colecție încă. Atinge pictograma de marcaj pentru a crea una. + Salvate + Creează o colecție + Organizează-ți piesele salvate + Nouă + Creează + Numele colecției + Introdu un nume pe care nu îl folosește nicio altă colecție + Gestionează + Redenumește + Adaugă piese + Adaugă (%1$d) + Elimină piese + Șterge colecția + Ștergi %1$s? + Piesele rămân pe dispozitiv. Se elimină doar colecția. + Selectează + Selectează tot + Deselectează tot + %1$d selectate + Adaugă în colecție + Adaugă la favorite + Elimină din colecție + Caută piese + Ordinea albumului + Cele mai lungi primele + Cele mai scurte primele + Piese + Înălțime + Resetează + Omite tăcerea + Temporizator de somn + %1$d min + Sfârșitul piesei + Mai sunt %1$s + Egalizator + Amplificare bas + Egalizatorul nu este disponibil pe acest dispozitiv + Coloane sonore + Activează în joc + Continuă redarea coloanei sonore cât timp rulează un joc + Nicio coloană sonoră instalată încă. + Caută coloane sonore + Adaugă un dosar de coloană sonoră + Niciun fișier audio în acel dosar + Durată totală + Piese: %1$d · %2$s + Discul %1$s + Amestecare + Anterior + Redare + Pauză + Următor + Repetare dezactivată + Repetă tot + Repetă una + Volum + Niciun fișier audio în această coloană sonoră diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 88dbfbc2fd..34bb4b9cb1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3844,4 +3844,67 @@ Алый снег + Саундтреки + Музыка + Параметры воспроизведения + Избранное + Коллекции + Коллекций пока нет. Нажмите на значок закладки, чтобы создать её. + Сохранено + Создать коллекцию + Упорядочите сохранённое + Новая + Создать + Название коллекции + Введите название, которое не используется в другой коллекции + Управление + Переименовать + Добавить треки + Добавить (%1$d) + Убрать треки + Удалить коллекцию + Удалить %1$s? + Треки останутся на устройстве. Будет удалена только коллекция. + Выбрать + Выбрать все + Снять выбор + Выбрано: %1$d + Добавить в коллекцию + Добавить в избранное + Убрать из коллекции + Поиск треков + Порядок в альбоме + Сначала длинные + Сначала короткие + Треки + Высота тона + Сбросить + Пропускать тишину + Таймер сна + %1$d мин + Конец трека + Осталось %1$s + Эквалайзер + Усиление баса + Эквалайзер недоступен на этом устройстве + Саундтреки + Включить в игре + Продолжать воспроизведение саундтрека во время игры + Саундтреки ещё не установлены. + Поиск саундтреков + Добавить папку саундтрека + В этой папке нет аудиофайлов + Общая длительность + Треков: %1$d / %2$s + Диск %1$s + Перемешать + Назад + Воспроизвести + Пауза + Далее + Повтор выключен + Повторять всё + Повторять один + Громкость + В этом саундтреке нет аудиофайлов diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e0754fe02b..1fcbc9a807 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3683,4 +3683,67 @@ Scharlakansröd snö + Soundtracks + Musik + Uppspelningsalternativ + Favoriter + Samlingar + Inga samlingar än. Tryck på bokmärkesikonen för att skapa en. + Sparade + Skapa en samling + Organisera dina sparade spår + Ny + Skapa + Samlingens namn + Ange ett namn som ingen annan samling använder + Hantera + Byt namn + Lägg till spår + Lägg till (%1$d) + Ta bort spår + Ta bort samling + Ta bort %1$s? + Spåren finns kvar på din enhet. Bara samlingen tas bort. + Välj + Välj alla + Avmarkera alla + %1$d valda + Lägg till i samling + Lägg till i favoriter + Ta bort från samling + Sök spår + Albumordning + Längst först + Kortast först + Spår + Tonhöjd + Återställ + Hoppa över tystnad + Insomningstimer + %1$d min + Slutet av spåret + %1$s kvar + Equalizer + Basförstärkning + Equalizern är inte tillgänglig på den här enheten + Soundtracks + Aktivera i spel + Fortsätt spela soundtracket medan ett spel körs + Inga soundtracks installerade än. + Sök bland soundtracks + Lägg till en soundtrackmapp + Inga ljudfiler i den mappen + Total längd + %1$d spår / %2$s + Skiva %1$s + Blanda + Föregående + Spela + Pausa + Nästa + Upprepning av + Upprepa alla + Upprepa ett + Volym + Inga ljudfiler i detta soundtrack diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e483bfead0..bd7ccd6ad8 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3653,4 +3653,67 @@ หิมะสีแดงชาด + ซาวด์แทร็ก + เพลง + ตัวเลือกการเล่น + รายการโปรด + คอลเลกชัน + ยังไม่มีคอลเลกชัน แตะไอคอนบุ๊กมาร์กเพื่อสร้าง + บันทึกแล้ว + สร้างคอลเลกชัน + จัดระเบียบรายการที่บันทึกไว้ + ใหม่ + สร้าง + ชื่อคอลเลกชัน + ป้อนชื่อที่ไม่ซ้ำกับคอลเลกชันอื่น + จัดการ + เปลี่ยนชื่อ + เพิ่มแทร็ก + เพิ่ม (%1$d) + เอาแทร็กออก + ลบคอลเลกชัน + ลบ %1$s หรือไม่? + แทร็กยังอยู่ในอุปกรณ์ของคุณ จะลบเฉพาะคอลเลกชัน + เลือก + เลือกทั้งหมด + ยกเลิกการเลือกทั้งหมด + เลือกแล้ว %1$d รายการ + เพิ่มในคอลเลกชัน + เพิ่มในรายการโปรด + เอาออกจากคอลเลกชัน + ค้นหาแทร็ก + ลำดับอัลบั้ม + ยาวที่สุดก่อน + สั้นที่สุดก่อน + แทร็ก + ระดับเสียง + รีเซ็ต + ข้ามช่วงเงียบ + ตั้งเวลาปิด + %1$d นาที + จบแทร็ก + เหลือ %1$s + อีควอไลเซอร์ + เพิ่มเสียงเบส + อุปกรณ์นี้ไม่รองรับอีควอไลเซอร์ + ซาวด์แทร็ก + เปิดใช้ขณะเล่นเกม + เล่นซาวด์แทร็กต่อไปขณะที่เกมทำงาน + ยังไม่มีซาวด์แทร็กที่ติดตั้ง + ค้นหาซาวด์แทร็ก + เพิ่มโฟลเดอร์ซาวด์แทร็ก + ไม่พบไฟล์เสียงในโฟลเดอร์นั้น + ความยาวทั้งหมด + %1$d แทร็ก / %2$s + ดิสก์ %1$s + สุ่ม + ก่อนหน้า + เล่น + หยุดชั่วคราว + ถัดไป + ปิดการเล่นซ้ำ + เล่นซ้ำทั้งหมด + เล่นซ้ำหนึ่งเพลง + ระดับเสียง + ไม่พบไฟล์เสียงในซาวด์แทร็กนี้ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 479e767c1b..889d71ef48 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3683,4 +3683,67 @@ Kızıl Kar + Oyun müzikleri + Müzik + Oynatma seçenekleri + Favoriler + Koleksiyonlar + Henüz koleksiyon yok. Oluşturmak için yer imi simgesine dokun. + Kaydedilenler + Koleksiyon oluştur + Kayıtlarını düzenle + Yeni + Oluştur + Koleksiyon adı + Başka bir koleksiyonun kullanmadığı bir ad gir + Yönet + Yeniden adlandır + Parça ekle + Ekle (%1$d) + Parçaları kaldır + Koleksiyonu sil + %1$s silinsin mi? + Parçalar cihazında kalır. Yalnızca koleksiyon kaldırılır. + Seç + Tümünü seç + Tüm seçimleri kaldır + %1$d seçildi + Koleksiyona ekle + Favorilere ekle + Koleksiyondan kaldır + Parça ara + Albüm sırası + Önce en uzun + Önce en kısa + Parçalar + Perde + Sıfırla + Sessizliği atla + Uyku zamanlayıcısı + %1$d dk + Parçanın sonu + %1$s kaldı + Ekolayzır + Bas güçlendirme + Ekolayzır bu cihazda kullanılamıyor + Oyun müzikleri + Oyun içinde etkinleştir + Oyun çalışırken oyun müziği çalmaya devam etsin + Henüz oyun müziği yüklenmedi. + Oyun müziklerinde ara + Oyun müziği klasörü ekle + Bu klasörde ses dosyası yok + Toplam süre + %1$d parça / %2$s + Disk %1$s + Karıştır + Önceki + Oynat + Duraklat + Sonraki + Tekrar kapalı + Tümünü tekrarla + Birini tekrarla + Ses düzeyi + Bu oyun müziğinde ses dosyası yok diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ea4e958377..670d07f991 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3761,4 +3761,67 @@ Багряний сніг + Саундтреки + Музика + Параметри відтворення + Улюблене + Колекції + Колекцій ще немає. Торкніться значка закладки, щоб створити. + Збережено + Створити колекцію + Упорядкуйте свої збережені треки + Нова + Створити + Назва колекції + Введіть назву, яку не використовує жодна інша колекція + Керувати + Перейменувати + Додати треки + Додати (%1$d) + Вилучити треки + Видалити колекцію + Видалити %1$s? + Треки залишаються на вашому пристрої. Буде видалено лише колекцію. + Вибрати + Вибрати все + Скасувати вибір + Вибрано: %1$d + Додати до колекції + Додати до улюбленого + Вилучити з колекції + Пошук треків + Порядок в альбомі + Спочатку найдовші + Спочатку найкоротші + Треки + Висота тону + Скинути + Пропускати тишу + Таймер сну + %1$d хв + Кінець треку + Залишилось %1$s + Еквалайзер + Підсилення басів + Еквалайзер недоступний на цьому пристрої + Саундтреки + Вмикати в грі + Відтворювати саундтрек, поки запущено гру + Саундтреки ще не встановлено. + Пошук саундтреків + Додати теку саундтреку + У цій теці немає аудіофайлів + Загальна тривалість + Треків: %1$d / %2$s + Диск %1$s + Перемішати + Назад + Відтворити + Пауза + Далі + Повтор вимкнено + Повторювати все + Повторювати один + Гучність + У цьому саундтреку немає аудіофайлів diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index e6b9a21732..a85d7b4c88 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3653,4 +3653,67 @@ Tuyết đỏ thẫm + Nhạc nền + Nhạc + Tùy chọn phát + Yêu thích + Bộ sưu tập + Chưa có bộ sưu tập nào. Chạm vào biểu tượng dấu trang để tạo. + Đã lưu + Tạo bộ sưu tập + Sắp xếp các bài đã lưu + Mới + Tạo + Tên bộ sưu tập + Nhập tên chưa được bộ sưu tập nào khác sử dụng + Quản lý + Đổi tên + Thêm bài hát + Thêm (%1$d) + Xóa bài hát + Xóa bộ sưu tập + Xóa %1$s? + Các bài hát vẫn còn trên thiết bị của bạn. Chỉ bộ sưu tập bị xóa. + Chọn + Chọn tất cả + Bỏ chọn tất cả + Đã chọn %1$d + Thêm vào bộ sưu tập + Thêm vào yêu thích + Xóa khỏi bộ sưu tập + Tìm bài hát + Thứ tự album + Dài nhất trước + Ngắn nhất trước + Bài hát + Cao độ + Đặt lại + Bỏ qua khoảng lặng + Hẹn giờ ngủ + %1$d phút + Hết bài + Còn %1$s + Bộ cân bằng âm + Tăng âm trầm + Thiết bị này không có bộ cân bằng âm + Nhạc nền + Bật trong game + Tiếp tục phát nhạc nền khi game đang chạy + Chưa có nhạc nền nào được cài đặt. + Tìm nhạc nền + Thêm thư mục nhạc nền + Không có tệp âm thanh trong thư mục đó + Tổng thời lượng + %1$d bài / %2$s + Đĩa %1$s + Phát ngẫu nhiên + Trước + Phát + Tạm dừng + Tiếp + Tắt lặp lại + Lặp lại tất cả + Lặp lại một bài + Âm lượng + Không có tệp âm thanh trong nhạc nền này diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 67e815130d..38946ef8c7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3657,4 +3657,67 @@ 猩红之雪 + 原声音乐 + 音乐 + 播放选项 + 收藏 + 合集 + 还没有合集。点按书签图标即可创建。 + 已保存 + 创建合集 + 整理你的收藏 + 新建 + 创建 + 合集名称 + 请输入未被其他合集使用的名称 + 管理 + 重命名 + 添加曲目 + 添加(%1$d) + 移除曲目 + 删除合集 + 删除 %1$s? + 曲目仍保留在你的设备上,只会删除合集。 + 选择 + 全选 + 取消全选 + 已选择 %1$d 项 + 添加到合集 + 添加到收藏 + 从合集中移除 + 搜索曲目 + 专辑顺序 + 最长优先 + 最短优先 + 曲目 + 音调 + 重置 + 跳过静音 + 睡眠定时 + %1$d 分钟 + 曲目结束 + 剩余 %1$s + 均衡器 + 低音增强 + 此设备不支持均衡器 + 原声音乐 + 在游戏中启用 + 游戏运行时继续播放原声音乐 + 尚未安装任何原声音乐。 + 搜索原声音乐 + 添加原声音乐文件夹 + 该文件夹中没有音频文件 + 总时长 + %1$d 首曲目 / %2$s + 第 %1$s 张 + 随机播放 + 上一首 + 播放 + 暂停 + 下一首 + 关闭重复 + 全部重复 + 单曲重复 + 音量 + 此原声音乐中没有音频文件 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index f97f66c3a1..b81f12305a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3656,4 +3656,67 @@ 緋紅之雪 + 原聲帶 + 音樂 + 播放選項 + 最愛 + 合集 + 暫時未有合集。點按書籤圖示即可建立。 + 已儲存 + 建立合集 + 整理你的收藏 + 新增 + 建立 + 合集名稱 + 請輸入未被其他合集使用的名稱 + 管理 + 重新命名 + 新增曲目 + 新增(%1$d) + 移除曲目 + 刪除合集 + 刪除 %1$s? + 曲目仍會保留在你的裝置上,只會刪除合集。 + 選取 + 全選 + 取消全選 + 已選取 %1$d 項 + 加入合集 + 加入最愛 + 從合集中移除 + 搜尋曲目 + 專輯順序 + 最長優先 + 最短優先 + 曲目 + 音調 + 重設 + 略過靜音 + 睡眠計時器 + %1$d 分鐘 + 曲目結束 + 剩餘 %1$s + 等化器 + 重低音增強 + 此裝置不支援等化器 + 原聲帶 + 在遊戲中啟用 + 遊戲運行時繼續播放原聲帶 + 尚未安裝任何原聲帶。 + 搜尋原聲帶 + 新增原聲帶資料夾 + 該資料夾中沒有音訊檔案 + 總長度 + %1$d 首曲目 / %2$s + 第 %1$s 張 + 隨機播放 + 上一首 + 播放 + 暫停 + 下一首 + 關閉重複 + 全部重複 + 單曲重複 + 音量 + 此原聲帶中沒有音訊檔案 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ee48c655e2..da5e460fc2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3656,4 +3656,67 @@ 緋紅之雪 + 原聲帶 + 音樂 + 播放選項 + 我的最愛 + 合集 + 尚無合集。點選書籤圖示即可建立。 + 已儲存 + 建立合集 + 整理你的收藏 + 新增 + 建立 + 合集名稱 + 請輸入未被其他合集使用的名稱 + 管理 + 重新命名 + 新增曲目 + 新增(%1$d) + 移除曲目 + 刪除合集 + 刪除 %1$s? + 曲目仍會保留在你的裝置上,只會刪除合集。 + 選取 + 全選 + 取消全選 + 已選取 %1$d 項 + 加入合集 + 加入我的最愛 + 從合集中移除 + 搜尋曲目 + 專輯順序 + 最長優先 + 最短優先 + 曲目 + 音調 + 重設 + 略過靜音 + 睡眠計時器 + %1$d 分鐘 + 曲目結束 + 剩餘 %1$s + 等化器 + 重低音增強 + 此裝置不支援等化器 + 原聲帶 + 在遊戲中啟用 + 遊戲執行時繼續播放原聲帶 + 尚未安裝任何原聲帶。 + 搜尋原聲帶 + 新增原聲帶資料夾 + 該資料夾中沒有音訊檔案 + 總長度 + %1$d 首曲目 / %2$s + 第 %1$s 張 + 隨機播放 + 上一首 + 播放 + 暫停 + 下一首 + 關閉重複 + 全部重複 + 單曲重複 + 音量 + 此原聲帶中沒有音訊檔案 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 734bfbb25e..ce55a06e1e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3999,5 +3999,69 @@ Scarlet Snow White surfaces with red accents. + Soundtracks + Music + Playback options + Favorites + Collections + No collections yet. Tap the bookmark icon to create one. + Saved + Create a collection + Organise your saves + New + Create + Collection name + Enter a name that no other collection uses + Manage + Rename + Add tracks + Add (%1$d) + Remove tracks + Delete collection + Delete %1$s? + The tracks stay on your device. Only the collection is removed. + Select + Select all + Deselect all + %1$d selected + Add to collection + Add to favorites + Remove from collection + Search tracks + Album order + Longest first + Shortest first + Tracks + Pitch + Reset + Skip silence + Sleep timer + %1$d min + End of track + %1$s left + Equalizer + Bass boost + The equalizer is not available on this device + Soundtracks + Enable ingame + Keep the soundtrack playing while a game runs + No soundtracks installed yet. + Search soundtracks + Add a soundtrack folder + No audio files found in that folder + Total length + %1$d Tracks / %2$s + Disc %1$s + Shuffle + Previous + Play + Pause + Next + Repeat off + Repeat all + Repeat one + Volume + No audio files found in this soundtrack + Launch unavailable No web browser is available to open this link. diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt new file mode 100644 index 0000000000..6aa9bb1640 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.frontend + +import com.droiddeck.launcher.frontend.SoundtrackCollections.Collection +import com.droiddeck.launcher.frontend.SoundtrackCollections.TrackRef +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SoundtrackCollectionsTest { + private fun ref(path: String) = TrackRef(path, path, "", "", 0) + + @Test fun toggledAddsThenRemoves() { + val once = SoundtrackCollections.toggled(emptyList(), ref("a")) + assertEquals(listOf("a"), once.map { it.path }) + assertTrue(SoundtrackCollections.toggled(once, ref("a")).isEmpty()) + } + + @Test fun mergedSkipsDuplicatesAndKeepsOrder() { + val result = SoundtrackCollections.merged(listOf(ref("a"), ref("b")), listOf(ref("b"), ref("c"), ref("c"))) + assertEquals(listOf("a", "b", "c"), result.map { it.path }) + } + + @Test fun cleanNameTrimsAndCollapsesSpaces() = assertEquals("My mix", SoundtrackCollections.cleanName(" My mix ")) + + @Test fun nameTakenIgnoresCaseAndExcludedId() { + val list = listOf(Collection(2_000_000_001, "Chill", emptyList())) + assertTrue(SoundtrackCollections.nameTaken(list, "chill")) + assertFalse(SoundtrackCollections.nameTaken(list, "chill", except = 2_000_000_001)) + assertFalse(SoundtrackCollections.nameTaken(list, "Focus")) + } + + @Test fun nextIdStartsAboveFavoritesAndGrows() { + assertEquals(SoundtrackCollections.FAVORITES_ID + 1, SoundtrackCollections.nextId(emptyList())) + val list = listOf(Collection(2_000_000_005, "x", emptyList())) + assertEquals(2_000_000_006, SoundtrackCollections.nextId(list)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackOrderTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackOrderTest.kt new file mode 100644 index 0000000000..167d2c96b9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackOrderTest.kt @@ -0,0 +1,34 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Test + +class SoundtrackOrderTest { + private fun track(name: String, disc: Int, number: Int) = Soundtrack.Track(File("/music/$name"), name, disc, number, 1000L) + + @Test fun savedOrderIsAppliedAndRenumbered() { + val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2), track("c", 1, 3))) + val result = SoundtrackOrder.ordered(disc, listOf("/music/c", "/music/a", "/music/b")) + assertEquals(listOf("c", "a", "b"), result.getValue(1).map { it.title }) + assertEquals(listOf(1, 2, 3), result.getValue(1).map { it.number }) + } + + @Test fun unknownTracksKeepTheirOrderAfterKnownOnes() { + val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2), track("c", 1, 3))) + val result = SoundtrackOrder.ordered(disc, listOf("/music/c")) + assertEquals(listOf("c", "a", "b"), result.getValue(1).map { it.title }) + } + + @Test fun discsStayApart() { + val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2)), 2 to listOf(track("c", 2, 1), track("d", 2, 2))) + val result = SoundtrackOrder.ordered(disc, listOf("/music/d", "/music/b", "/music/a", "/music/c")) + assertEquals(listOf("b", "a"), result.getValue(1).map { it.title }) + assertEquals(listOf("d", "c"), result.getValue(2).map { it.title }) + } + + @Test fun emptyOrderChangesNothing() { + val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2))) + assertEquals(disc, SoundtrackOrder.ordered(disc, emptyList())) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTest.kt new file mode 100644 index 0000000000..ed96285429 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTest.kt @@ -0,0 +1,151 @@ +package com.droiddeck.launcher.frontend + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import java.io.File + +class SoundtrackTest { + private fun raw( + folder: String, name: String, disc: Int? = null, track: Int? = null, title: String? = null, size: Long = 1000L, + ) = Soundtrack.Raw(File("/music/album/${if (folder.isEmpty()) "" else "$folder/"}$name"), folder, disc, track, title, null, 60_000L, size) + + @Test fun titlesDropArtistAlbumAndNumber() { + assertEquals("Once Upon a Time", Soundtrack.cleanTitle("toby fox - UNDERTALE Soundtrack - 01 Once Upon a Time.mp3")) + assertEquals("ANOTHER HIM", Soundtrack.cleanTitle("001 ANOTHER HIM.flac")) + assertEquals("Chapter 5 Logo", Soundtrack.cleanTitle("166 Chapter 5 Logo.mp3")) + assertEquals("Query-", Soundtrack.cleanTitle("094 Query-.mp3")) + assertEquals("Ruins", Soundtrack.cleanTitle("Ruins.ogg")) + } + + @Test fun flatAlbumIsOneDiscOrderedByNumber() { + val disc = Soundtrack.group( + listOf(raw("", "toby fox - X - 10 Ten.mp3"), raw("", "toby fox - X - 02 Two.mp3"), raw("", "toby fox - X - 01 One.mp3")), + ) + assertEquals(listOf(0), disc.keys.toList()) + assertEquals(listOf("One", "Two", "Ten"), disc.getValue(0).map { it.title }) + assertEquals(listOf(1, 2, 3), disc.getValue(0).map { it.number }) + } + + @Test fun subfoldersBecomeDiscs() { + val disc = Soundtrack.group( + listOf(raw("2", "041 B.mp3"), raw("1", "001 A.mp3"), raw("10", "200 C.mp3"), raw("1", "002 A2.mp3")), + ) + assertEquals(listOf(1, 2, 3), disc.keys.toList()) + assertEquals(listOf("A", "A2"), disc.getValue(1).map { it.title }) + assertEquals(listOf("B"), disc.getValue(2).map { it.title }) + assertEquals(listOf("C"), disc.getValue(3).map { it.title }) + } + + @Test fun losslessCopyReplacesLossyDuplicateAndKeepsItsFolder() { + val disc = Soundtrack.group( + listOf( + raw("", "001 ANOTHER HIM.flac", size = 4_130_000L), + raw("", "002 Beginning.flac", size = 4_870_000L), + raw("1", "001 ANOTHER HIM.mp3", size = 1_940_000L), + raw("1", "002 Beginning.mp3", size = 2_320_000L), + raw("2", "041 Faint Glow.mp3"), + ), + ) + assertEquals(listOf(1, 2), disc.keys.toList()) + assertEquals(listOf("flac", "flac"), disc.getValue(1).map { it.file.extension }) + assertEquals(listOf("ANOTHER HIM", "Beginning"), disc.getValue(1).map { it.title }) + assertEquals(listOf("Faint Glow"), disc.getValue(2).map { it.title }) + } + + @Test fun tagsDecideDiscsAndFileNamesDecideOrder() { + val disc = Soundtrack.group( + listOf( + raw("3+4", "088 Late.mp3", disc = 4, track = 1, title = "Old wooden rafters"), + raw("3+4", "001 Early.mp3", disc = 3, track = 2, title = "Second"), + raw("3+4", "002 Early.mp3", disc = 3, track = 1, title = "First"), + ), + ) + assertEquals(listOf(3, 4), disc.keys.toList()) + assertEquals(listOf("Second", "First"), disc.getValue(3).map { it.title }) + assertEquals("Old wooden rafters", disc.getValue(4).single().title) + } + + @Test fun sameTagsCollapseDuplicates() { + val disc = Soundtrack.group( + listOf( + raw("", "a.flac", disc = 1, track = 1, title = "Song", size = 5000L), + raw("1", "a.mp3", disc = 1, track = 1, title = "Song", size = 900L), + ), + ) + assertEquals(1, disc.getValue(1).size) + assertEquals("flac", disc.getValue(1).single().file.extension) + } + + @Test fun renamedPunctuationStillMatchesAcrossFormats() { + val disc = Soundtrack.group( + listOf( + raw("", "094 Query?.flac", size = 5000L), + raw("3+4", "094 Query-.mp3", size = 900L), + raw("3+4", "095 Quiz!.mp3", size = 900L), + ), + ) + assertEquals(2, disc.getValue(0).size + disc.filterKeys { it != 0 }.values.sumOf { it.size }) + assertEquals(listOf("flac", "mp3"), disc.values.flatten().map { it.file.extension }) + } + + @Test fun sameTitleWithDifferentNumbersStaysSeparate() { + val disc = Soundtrack.group(listOf(raw("", "01 Fanfare.mp3"), raw("", "07 Fanfare.mp3"))) + assertEquals(2, disc.values.flatten().size) + } + + @Test fun folderDiscsKeepTheirFolderNameAsLabel() { + val disc = Soundtrack.group( + listOf(raw("3+4", "088 A.mp3", track = 1), raw("3+4", "165 B.mp3", track = 78), raw("5", "166 C.mp3", track = 1), raw("Bonus", "300 D.mp3")), + ) + assertEquals(listOf("3+4", "5", "3"), disc.values.map { it.first().discLabel }.let { it.take(2) + disc.getValue(3).first().discLabel }) + assertEquals(listOf("A", "B"), disc.getValue(1).map { it.title }) + } + + @Test fun tagsFromTheDroppedDuplicateFillTheKeptOne() { + val disc = Soundtrack.group( + listOf( + raw("", "165 Concert for you.flac", size = 90_000L), + raw("3+4", "165 Concert for you.mp3", track = 78, title = "Concert for you", size = 98_000L), + raw("", "088 Flashback (Excerpt).flac", size = 4_800_000L), + raw("3+4", "088 Flashback (Excerpt).mp3", track = 1, title = "Flashback (Excerpt)", size = 1_280_000L), + ), + ) + val tracks = disc.values.flatten() + assertEquals(listOf("Flashback (Excerpt)", "Concert for you"), tracks.map { it.title }) + assertEquals(listOf("flac", "flac"), tracks.map { it.file.extension }) + } + + @Test fun emptyInputGivesNothing() { + assertTrue(Soundtrack.group(emptyList()).isEmpty()) + } + + @Test fun lengthFormatting() { + assertEquals("0:48", Soundtrack.formatLength(48_000L)) + assertEquals("1:20", Soundtrack.formatLength(80_000L)) + assertEquals("4:15:37", Soundtrack.formatLength((4 * 3600 + 15 * 60 + 37) * 1000L)) + } + + @Test fun shortcutLinksRoundTrip() { + assertEquals(391540, SoundtrackShortcuts.parse(SoundtrackShortcuts.uri(391540))) + assertEquals(-5, SoundtrackShortcuts.parse(SoundtrackShortcuts.uri(-5))) + assertNull(SoundtrackShortcuts.parse("droiddeck://game/12")) + assertNull(SoundtrackShortcuts.parse(null)) + } + + @Test fun addedSoundtracksNeverCollideWithSteamIds() { + assertTrue(AddedSoundtracks.idOf("/storage/emulated/0/Music/Album") < 0) + } + + @Test fun addedIdsStayStableWhenAnotherFolderIsRemoved() { + assertEquals("Aa".hashCode(), "BB".hashCode()) + val first = AddedSoundtracks.Entry("/m/Aa", "A") + val second = AddedSoundtracks.Entry("/m/BB", "B") + val assigned = AddedSoundtracks.assignIds(listOf(first, second)) + assertTrue(assigned[0].id != assigned[1].id) + assertTrue(assigned.all { it.id < 0 }) + val after = AddedSoundtracks.assignIds(assigned.drop(1)) + assertEquals(assigned[1].id, after[0].id) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTracksTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTracksTest.kt new file mode 100644 index 0000000000..c601653ca7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackTracksTest.kt @@ -0,0 +1,29 @@ +package com.droiddeck.launcher.frontend + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class SoundtrackTracksTest { + private class T(val title: String, val ms: Long) + private val items = listOf(T("banana", 300), T("Apple", 100), T("cherry", 200)) + private fun sorted(s: SoundtrackTracks.Sort) = SoundtrackTracks.sort(items, s, { it.title }, { it.ms }).map { it.title } + + @Test fun defaultKeepsOrder() = assertEquals(listOf("banana", "Apple", "cherry"), sorted(SoundtrackTracks.Sort.DEFAULT)) + @Test fun titleAscIgnoresCase() = assertEquals(listOf("Apple", "banana", "cherry"), sorted(SoundtrackTracks.Sort.TITLE_ASC)) + @Test fun titleDesc() = assertEquals(listOf("cherry", "banana", "Apple"), sorted(SoundtrackTracks.Sort.TITLE_DESC)) + @Test fun longestFirst() = assertEquals(listOf("banana", "cherry", "Apple"), sorted(SoundtrackTracks.Sort.LONGEST)) + @Test fun shortestFirst() = assertEquals(listOf("Apple", "cherry", "banana"), sorted(SoundtrackTracks.Sort.SHORTEST)) + + @Test fun blankQueryMatchesEverything() = assertTrue(SoundtrackTracks.matches(" ", "anything")) + @Test fun wordsMayHitDifferentFields() = assertTrue(SoundtrackTracks.matches("main theme", "Main Menu", "Theme Composer")) + @Test fun everyWordMustMatch() = assertFalse(SoundtrackTracks.matches("main boss", "Main Menu", "Composer")) + @Test fun matchIsCaseInsensitive() = assertTrue(SoundtrackTracks.matches("MENU", "main menu")) + + @Test fun rankOrdersExactPrefixContains() { + assertEquals(0, SoundtrackTracks.rank("Menu", "menu")) + assertEquals(1, SoundtrackTracks.rank("men", "Menu Theme")) + assertEquals(2, SoundtrackTracks.rank("theme", "Menu Theme")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DragTargetTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DragTargetTest.kt new file mode 100644 index 0000000000..3a35e77f23 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DragTargetTest.kt @@ -0,0 +1,20 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class DragTargetTest { + @Test fun smallMovesStayInPlace() = assertEquals(5, dragTarget(20f, 100f, 5, 0, 9)) + + @Test fun halfRowMovesToNextSlot() { + assertEquals(6, dragTarget(60f, 100f, 5, 0, 9)) + assertEquals(4, dragTarget(-60f, 100f, 5, 0, 9)) + } + + @Test fun longMovesSkipSeveralRows() = assertEquals(8, dragTarget(310f, 100f, 5, 0, 9)) + + @Test fun staysInsideTheDisc() { + assertEquals(9, dragTarget(900f, 100f, 5, 0, 9)) + assertEquals(2, dragTarget(-900f, 100f, 5, 2, 9)) + } +} diff --git a/docs/development/soundtracks.md b/docs/development/soundtracks.md new file mode 100644 index 0000000000..a1b11a3997 --- /dev/null +++ b/docs/development/soundtracks.md @@ -0,0 +1,78 @@ +# Soundtracks + +Steam soundtracks get their own tab under Library, a built-in music player, and an Android media session. + +## Where soundtracks live + +Steam installs a soundtrack to `/steamapps/music/`, next to a normal `appmanifest_.acf`. This holds for the internal Steam library and for a second library folder. + +`Library.steamGames()` skips any manifest whose install directory exists only under `steamapps/music`. `Library.soundtracks()` returns exactly those entries, marked with `SteamGame.soundtrack`. While the Music tab is enabled, games and soundtracks therefore never mix in the Library tab, the launch drawer, game file sync or component preparation. + +Folders added by hand (Soundtracks tab, plus button) are stored in `added-soundtracks.json` and carry a negative app id, so they cannot collide with a Steam app id. + +## Turning it off + +Setup > Launcher > Soundtracks. When off, the tab disappears and installed Steam soundtracks show in Library again, as they did before. + +## Tracks, discs and duplicates + +`Soundtrack.load()` walks the folder (four levels deep) for mp3, flac, ogg, opus, wav, m4a and aac. Tags come from `MediaMetadataRetriever` and are cached per folder in `files/soundtrack-index`, keyed by path, size and modification time. + +`Soundtrack.group()` is pure and unit tested: + +1. The same track in several formats collapses to one. Identity is disc and track number when both tags exist, otherwise the cleaned title. Lossless wins over lossy. +2. Disc comes from the disc tag, otherwise from the subfolder (natural order), labelled with the folder name when it is numeric (for example `3+4`). A folder with no subfolders is one disc and shows no disc headers. Tags missing on the kept copy are filled from its duplicates, since FLAC files often use tag names Android does not read. +3. Tracks sort by the number at the start of the file name, then by track tag, then by name. This matches Valve's soundtrack documentation, which says the Steam music player takes play order from file names and not from metadata. Numbers shown on screen are positions inside the disc. +4. Titles come from the tag, otherwise from the file name with the artist, album and track number removed. + +## Cover art + +Steam's own library cache image first, then `AlbumArtwork`, `cover`, `folder` and similar files in the soundtrack folder. When none exists, the picture embedded in the first track that has one is used, so the grid shows it without opening the album. The player page shows the embedded picture of the track that is playing and falls back to the album cover for tracks without one. The media notification and the system media panel follow the same rule: while a track plays, its embedded picture replaces the item artwork in place, which does not restart playback, unless a cover was chosen in the art changer. The SteamGridDB artwork changer applies to Steam soundtracks like any other Steam entry. + +## Player page + +The layout follows Steam's soundtrack page and uses the DroidDeck theme colors and shapes, so every theme works. Cover, title, artist and total length sit on the left with seek, shuffle, previous, play or pause, next, repeat and volume. The track list with disc headers sits on the right. Portrait stacks the two. The action buttons (game files, shortcut, edit art, uninstall) use the same wide pill style as Steam's See More button. + +Controller: d-pad moves between buttons and rows, A confirms, B goes back, the sliders respond to left and right. + +Shortcuts use `droiddeck://soundtrack/` and open the soundtrack page. + +## Playback and Android media controls + +`SoundtrackService` is a media3 `MediaSessionService` with an `ExoPlayer`. It runs as a foreground service of type `mediaPlayback`, so playback keeps going when DroidDeck is closed and the notification and lock screen controls show the cover, title and artist. `SoundtrackController` connects a `MediaController` to it and exposes Compose state. + +Launching a game pauses the music unless Enable ingame is on (see Playing during games). Audio focus and headphone unplug are handled by ExoPlayer. + +Added dependencies: `androidx.media3:media3-exoplayer` and `androidx.media3:media3-session` 1.3.1. + +## Playback options + +The player page has a Playback options button that opens a panel with: + +- Speed and pitch, from 0.5x to 2x in 0.05 steps, applied through ExoPlayer's playback parameters. +- Skip silence. +- A sleep timer for 15, 30 or 60 minutes or the end of the current track. The timer runs in `SoundtrackService`, so it still fires when DroidDeck is closed. +- An equalizer with the device presets, one slider per band, and bass boost where the device supports it. The effects are attached to the player's audio session in the service. + +Settings are saved in `soundtrack_settings` and sent to the service whenever the controller connects. The last album, track and position are saved too, so the play button on an album resumes where it stopped. The position is saved on track changes, pauses and seeks. + +## Playing during games + +Setup › Launcher has an Enable ingame toggle, shown while soundtracks are on. When it is off, launching a game pauses the soundtrack. When it is on, the soundtrack keeps playing and the service stops requesting audio focus, so the game's own audio mixes with it. The setting is sent to the service with the `INGAME` session command and is read again when the service starts. + +## Searching and sorting + +Inside a soundtrack, a search field above the track list filters by title, artist and album, and a sort button orders the list by album order, title or length. Track numbers always count from 1 by position in the list shown. + +Custom (added) soundtracks, collections and Favorites can be reordered: select tracks first (long-press one, or use the select button), then with Album order selected and no search text, long-press a selected track and drag it. The order of an added soundtrack is stored in `soundtrack-order.json` and applied by `Soundtrack.load` within each disc; a collection stores its order in `soundtrack-collections.json`. Steam soundtracks cannot be reordered. The Music tab search also looks up tracks: soundtracks and collections whose names match come first, followed by a Tracks section. + +## Favorites and collections + +- The heart under the transport controls adds or removes the current track from Favorites. The bookmark button next to it opens the Saved panel to add the track to a collection or create one. +- The Music tab has a Collections chip. Favorites is the first entry under it. The bookmark in the Music header opens the same Saved panel to open or create a collection. +- Long-press a track to select. The selection bar has Select all, Deselect all, Add to collection, Add to favorites and, on a collection page, Remove from collection. +- A collection page has a Manage button to rename, add tracks, remove tracks or delete. Favorites cannot be renamed or deleted. +- Collection pages have Manage, Playback options, Shortcut and Edit art. Edit art changes the cover only, from a track cover or an image of your own, and is stored in `soundtrack-art/`. Added soundtracks have the same Edit art, with the images in their folder and the first track cover as the choices; Steam soundtracks keep the Steam art editor. +- Collections are stored in `soundtrack-collections.json` in the app files directory as snapshots of path, title, artist, album, length and cover. Tracks whose files are gone are skipped when a collection is played. +- Collection and Favorites playback does not overwrite the saved resume position of an album. + From cd945a520a65d3c5e087fbb9ede131dcc57b083a Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Sat, 14 Nov 2026 00:37:56 +0900 Subject: [PATCH 072/101] fix(dircache): Steam no longer deadlocks when a library below calls back in (#2560) With "Run without proot" on, the Steam client hung about a second after login and aborted three minutes later with "fatal stalled cross-thread pipe". The directory cache holds its lock while it adds an inotify watch. Without proot that call reaches the native userland hook, whose inotify_add_watch creates a missing directory with mkdir() by name. That mkdir resolves to the cache's own wrapper, which waits for the same lock on the same thread. Steam's IPC threads then queue behind it. The cache now counts the locks each thread holds. While a thread holds one, calls that come back into the cache (opendir, the change wrappers, created files, missing-name checks, closedir of a stream it did not open) go straight to the next library. The same guard covers the hook's remove(), which calls unlink() by name while the cache's remove wrapper holds its operation lock. --- tools/linuxfs/preload/dircache.c | 84 ++++++++++++++++------------ tools/tests/test_dircache_preload.py | 34 ++++++++++- 2 files changed, 81 insertions(+), 37 deletions(-) diff --git a/tools/linuxfs/preload/dircache.c b/tools/linuxfs/preload/dircache.c index f6951497f0..a94717bd78 100644 --- a/tools/linuxfs/preload/dircache.c +++ b/tools/linuxfs/preload/dircache.c @@ -83,6 +83,19 @@ static int notify = -1; static int forked; static struct { dev_t dev; int fuse; } devs[8]; static int ndevs; +// Libraries preloaded after this one can call back in while a lock is held (the native userland +// hook's inotify_add_watch calls mkdir() by name); such calls go straight to the next library. +static __thread int holding; + +static void take(pthread_mutex_t *m) { + pthread_mutex_lock(m); + holding++; +} + +static void give(pthread_mutex_t *m) { + holding--; + pthread_mutex_unlock(m); +} static long long now_ns(void) { struct timespec t; @@ -109,32 +122,32 @@ static int enabled(void) { } static int eligible(const char *path) { - if (path == NULL || path[0] != '/' || !enabled()) return 0; + if (holding || path == NULL || path[0] != '/' || !enabled()) return 0; const char *s = strstr(path, "/steamapps"); return s && (s[10] == '/' || s[10] == 0); } static int on_fuse(dev_t dev, const char *path) { - pthread_mutex_lock(&lock); + take(&lock); for (int i = 0; i < ndevs; i++) { if (devs[i].dev == dev) { int fuse = devs[i].fuse; - pthread_mutex_unlock(&lock); + give(&lock); return fuse; } } - pthread_mutex_unlock(&lock); + give(&lock); struct statfs fs; int saved = errno; int fuse = statfs(path, &fs) == 0 && (unsigned long)fs.f_type == FUSE_MAGIC; errno = saved; - pthread_mutex_lock(&lock); + take(&lock); if (ndevs < 8) { devs[ndevs].dev = dev; devs[ndevs].fuse = fuse; ndevs++; } - pthread_mutex_unlock(&lock); + give(&lock); return fuse; } @@ -404,7 +417,7 @@ __attribute__((constructor)) static void resolve(void) { #pragma GCC diagnostic pop static DIR *hit(const struct stat *st, struct handle *h, long long now) { - pthread_mutex_lock(&lock); + take(&lock); if (!changing) pump(NULL, 0); int slot = find(st->st_dev, st->st_ino); if (slot >= 0 && same(table[slot], st) && now - table[slot]->filled < DIR_TTL_NS && records(table[slot]) == 0) { @@ -413,7 +426,7 @@ static DIR *hit(const struct stat *st, struct handle *h, long long now) { h->snap->used = now; DIR *d = wrap(h); if (d) { - pthread_mutex_unlock(&lock); + give(&lock); return d; } unref(h->snap); @@ -421,7 +434,7 @@ static DIR *hit(const struct stat *st, struct handle *h, long long now) { } else if (slot >= 0) { drop(slot); } - pthread_mutex_unlock(&lock); + give(&lock); return NULL; } @@ -462,11 +475,11 @@ static int above(struct handle *h, const char *path) { } static int track(struct handle *h, const char *path) { - pthread_mutex_lock(&lock); + take(&lock); h->wd = watch(path, WATCHED); DIR *d = h->wd >= 0 && above(h, path) ? wrap(h) : NULL; if (d == NULL) let_go(h->wd, h->up, h->nup); - pthread_mutex_unlock(&lock); + give(&lock); return d != NULL; } @@ -486,11 +499,11 @@ static void filling(struct handle *h, DIR *real, const struct stat *st, long lon } static void untrack(struct handle *h) { - pthread_mutex_lock(&lock); + take(&lock); int i = registered((DIR *)h); if (i >= 0) __atomic_store_n(&handles[i], NULL, __ATOMIC_RELEASE); let_go(h->wd, h->up, h->nup); - pthread_mutex_unlock(&lock); + give(&lock); } DIR *opendir(const char *path) { @@ -553,11 +566,11 @@ static void finish(struct handle *h) { h->fill = NULL; int current = stat(h->path, &st) == 0 && same(l, &st); if (current) l->folds = folds(h->path, &st); - pthread_mutex_lock(&lock); + take(&lock); if (!changing) pump(NULL, 0); if (current && !__atomic_load_n(&h->dirty, __ATOMIC_RELAXED)) install(l); else destroy(l); - pthread_mutex_unlock(&lock); + give(&lock); } static struct dirent64 *entry(struct handle *h) { @@ -624,7 +637,8 @@ int readdir_r(DIR *d, struct dirent *out, struct dirent **result) { int closedir(DIR *d) { NEXT(closedir); - pthread_mutex_lock(&lock); + if (holding && registered(d) < 0) return next_closedir(d); + take(&lock); int i = registered(d); struct handle *h = i >= 0 ? handles[i] : NULL; if (h) { @@ -632,7 +646,7 @@ int closedir(DIR *d) { if (h->snap) unref(h->snap); let_go(h->wd, h->up, h->nup); } - pthread_mutex_unlock(&lock); + give(&lock); if (h == NULL) return next_closedir(d); int r = 0; if (h->real) r = next_closedir(h->real); @@ -704,10 +718,10 @@ static int watching(const char *path) { } static void begin(void) { - pthread_mutex_lock(&lock); + take(&lock); pump(NULL, 0); changing = 1; - pthread_mutex_unlock(&lock); + give(&lock); } static void before(struct side *s) { @@ -796,10 +810,10 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co } static void end(struct expect *x, int nx) { - pthread_mutex_lock(&lock); + take(&lock); pump(x, nx); changing = 0; - pthread_mutex_unlock(&lock); + give(&lock); } int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, @@ -809,17 +823,17 @@ int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, struct side s; if (!(flags & O_CREAT) || (dirfd != AT_FDCWD && (path == NULL || path[0] != '/')) || !watching(path) || !split(path, &s)) return real(dirfd, path, flags, mode); - pthread_mutex_lock(&oplock); + take(&oplock); begin(); before(&s); int fd = real(dirfd, path, flags, mode); int saved = errno; struct expect x; - pthread_mutex_lock(&lock); + take(&lock); int nx = patch(&s, ADDED, IN_CREATE, fd >= 0, saved, path, &x); - pthread_mutex_unlock(&lock); + give(&lock); end(&x, nx); - pthread_mutex_unlock(&oplock); + give(&oplock); errno = saved; return fd; } @@ -829,18 +843,18 @@ int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, NEXT(name); \ struct side s; \ if (!watching(path) || !split(path, &s)) return call; \ - pthread_mutex_lock(&oplock); \ + take(&oplock); \ begin(); \ before(&s); \ int r = call; \ int saved = errno; \ struct expect x; \ - pthread_mutex_lock(&lock); \ + take(&lock); \ int nx = patch(&s, what, event, r == 0, saved, what == ADDED ? path : NULL, &x); \ if (r == 0 && what == REMOVED) forget_below(path); \ - pthread_mutex_unlock(&lock); \ + give(&lock); \ end(&x, nx); \ - pthread_mutex_unlock(&oplock); \ + give(&oplock); \ errno = saved; \ return r; \ } @@ -864,7 +878,7 @@ ONE_PATH(remove, REMOVED, IN_DELETE, bl_descriptor_remove(path, next_remove)) struct side a, b; \ int track_a = gone && watching(from) && split(from, &a), track_b = watching(to) && split(to, &b); \ if (!track_a && !track_b) return call(from, to); \ - pthread_mutex_lock(&oplock); \ + take(&oplock); \ begin(); \ if (track_a) before(&a); \ if (track_b) before(&b); \ @@ -872,16 +886,16 @@ ONE_PATH(remove, REMOVED, IN_DELETE, bl_descriptor_remove(path, next_remove)) int saved = errno; \ struct expect x[2]; \ int nx = 0; \ - pthread_mutex_lock(&lock); \ + take(&lock); \ if (track_a) nx += patch(&a, REMOVED, IN_MOVED_FROM, r == 0, saved, NULL, &x[nx]); \ if (track_b) { \ if (track_a && strcmp(a.dir, b.dir) == 0) b.known = stat(b.dir, &b.before) == 0; \ nx += patch(&b, ADDED, event, r == 0, saved, to, &x[nx]); \ } \ if (r == 0 && gone) { forget_below(from); forget_below(to); } \ - pthread_mutex_unlock(&lock); \ + give(&lock); \ end(x, nx); \ - pthread_mutex_unlock(&oplock); \ + give(&oplock); \ errno = saved; \ return r; \ } @@ -931,13 +945,13 @@ int bl_dircache_absent(const char *path) { for (const char *c = s.name; *c; c++) if ((unsigned char)*c >= 0x80) return 0; long long now = now_ns(); - pthread_mutex_lock(&lock); + take(&lock); int absent = 0; if (!changing) { pump(NULL, 0); absent = listed_absent(s.dir, s.name, now); } - pthread_mutex_unlock(&lock); + give(&lock); return absent; } diff --git a/tools/tests/test_dircache_preload.py b/tools/tests/test_dircache_preload.py index 42db6817ce..f7b2d9008a 100644 --- a/tools/tests/test_dircache_preload.py +++ b/tools/tests/test_dircache_preload.py @@ -83,9 +83,25 @@ int inotify_add_watch(int fd, const char *path, uint32_t mask) { errno = ENOSPC; return -1; } + if (getenv("NESTED") && (mask & IN_ONLYDIR)) { + static DIR *(*uncounted)(const char *); + if (!uncounted) uncounted = dlsym(RTLD_NEXT, "opendir"); + mkdir(path, 0755); + DIR *d = uncounted("/proc/self/fd"); + while (d && readdir(d)) {} + if (d) closedir(d); + } return next(fd, path, mask); } +int remove(const char *path) { + static int (*next)(const char *); + if (!next) next = dlsym(RTLD_NEXT, "remove"); + if (!getenv("NESTED")) return next(path); + if (unlink(path) == 0) return 0; + return errno == EISDIR ? rmdir(path) : -1; +} + int statfs(const char *path, struct statfs *out) { static int (*next)(const char *, struct statfs *); if (!next) next = dlsym(RTLD_NEXT, "statfs"); @@ -337,9 +353,9 @@ class DirCachePreloadTest(unittest.TestCase): environment.update(env or {}) return environment - def run_program(self, *args, program=None, env=None): + def run_program(self, *args, program=None, env=None, timeout=60): result = subprocess.run([str(program or self.steam), *map(str, args)], env=self.environment(env), - capture_output=True, text=True, check=True, timeout=60) + capture_output=True, text=True, check=True, timeout=timeout) return result.stdout.splitlines() def run_paused(self, *args, between, env=None): @@ -675,6 +691,20 @@ class DirCachePreloadTest(unittest.TestCase): env={"BL_NO_DIR_CACHE": "1"}) self.assertEqual(["-1 2", "-1 2", "2"], out[1:]) + def test_a_preload_below_calling_back_while_a_folder_is_watched_does_not_hang(self): + common = self.lib / "common/Game" + common.mkdir(parents=True) + (common / "game.exe").touch() + out = self.run_program("list", self.staging, "list", common, "list", common, "opens", + env={"NESTED": "1"}, timeout=20) + self.assertEqual(["a.bundle,b.bundle", "game.exe", "game.exe", "2"], out) + + def test_a_preload_below_removing_through_unlink_does_not_hang(self): + s = self.staging + out = self.run_program("list", s, "remove", s / "a.bundle", "list", s, "raw", s, "opens", + env={"NESTED": "1"}, timeout=20) + self.assertEqual(["a.bundle,b.bundle", "b.bundle", "b.bundle", "1"], out) + def test_can_be_turned_off(self): out = self.run_program("list", self.staging, "list", self.staging, "opens", env={"BL_NO_DIR_CACHE": "1"}) self.assertEqual("2", out[-1]) From 1b65508f56c729f5ff525d08a9ebc6c5567b33cd Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 11:42:55 -0500 Subject: [PATCH 073/101] feat(ui): reorder tabs, shelve them in More or hide them (#2569) * feat(ui): reorder tabs, shelve them in More or hide them * fix(ui): back from shelved tabs, startup tab and panel More count --- .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/FrontEndActivity.kt | 1 + .../com/droiddeck/launcher/agent/AgentTab.kt | 2 +- .../launcher/session/SessionPrefs.kt | 20 +- .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/DualScreenPanel.kt | 16 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 4 + .../com/droiddeck/launcher/ui/FrontEndRail.kt | 30 +-- .../droiddeck/launcher/ui/FrontEndScreen.kt | 15 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 7 +- .../com/droiddeck/launcher/ui/MorePage.kt | 98 ++++++++++ .../java/com/droiddeck/launcher/ui/NavTabs.kt | 91 +++++++++ .../com/droiddeck/launcher/ui/TabsSettings.kt | 142 ++++++++++++++ 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 | 13 +- .../com/droiddeck/launcher/ui/NavTabsTest.kt | 178 ++++++++++++++++++ 47 files changed, 584 insertions(+), 100 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 1801f34b5a..6ecd72d5f5 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -44,6 +44,7 @@ class App : Application() { CrashHandler.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.NavTabs.load(this) com.droiddeck.launcher.ui.AgentPet.install(this) if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 765c7b23f9..c8ce1e4ae8 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -3207,6 +3207,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet if (!ok) android.widget.Toast.makeText(this, R.string.setup_reset_settings_partial, android.widget.Toast.LENGTH_LONG).show() com.droiddeck.launcher.ui.Motion.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.NavTabs.load(this) if (!switchLauncherIcon(LauncherIcon.DARK)) recreate() } }, "reset-settings").start() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt index b779288f3e..7392473c72 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.SessionPrefs object AgentTab { - var shown by mutableStateOf(false) + var shown by mutableStateOf(true) private set val visible: Boolean get() = shown && AgentHost.available 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 f55d994e1c..4c567fd1b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -265,7 +265,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } - fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", false) + fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", true) fun setAgentTab(context: Context, show: Boolean) { prefs(context).edit().putBoolean("agentTab", show).apply() @@ -289,6 +289,24 @@ object SessionPrefs { prefs(context).edit().putString("storesTabHidden", hidden.joinToString(",")).apply() } + fun navTabOrder(context: Context): List = idList(prefs(context).getString("navTabOrder", null)) + + fun setNavTabOrder(context: Context, order: List) { + prefs(context).edit().putString("navTabOrder", order.joinToString(",")).apply() + } + + fun navTabShelved(context: Context): Set = idList(prefs(context).getString("navTabShelved", "soundtracks,agent")).toSet() + + fun setNavTabShelved(context: Context, keys: Set) { + prefs(context).edit().putString("navTabShelved", keys.joinToString(",")).apply() + } + + fun navTabHidden(context: Context): Set = idList(prefs(context).getString("navTabHidden", null)).toSet() + + fun setNavTabHidden(context: Context, keys: Set) { + prefs(context).edit().putString("navTabHidden", keys.joinToString(",")).apply() + } + private fun idList(raw: String?): List = raw.orEmpty().split(',').map { it.trim() }.filter { it.isNotEmpty() } val STORES_SORTS = listOf("lastPlayed", "recentlyInstalled", "titleAsc", "titleDesc", "sizeDesc", "sizeAsc", "releaseDateDesc") 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 6849c621c9..7e4053a14a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "railLabels", "agentTab", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "railLabels", "agentTab", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index b46afbb977..df4e4a8d1b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -59,6 +59,8 @@ class DualPanelModel( val appScale: Int, val onSelect: (String) -> Unit, val onResume: () -> Unit, + val title: String = selected, + val moreDownloads: Int = 0, ) object DualScreenPanel { @@ -322,7 +324,7 @@ internal fun DualPanelContent(model: DualPanelModel) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Text(stringResource(R.string.app_name), fontSize = 15.sp, fontWeight = FontWeight.Bold, color = pal.signal) Spacer(Modifier.size(12.dp)) - val (label, _) = railLabelIcon(model.selected) + val (label, _) = railLabelIcon(model.title) Text(stringResource(label), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.Ellipsis) PanelClock() @@ -336,7 +338,7 @@ internal fun DualPanelContent(model: DualPanelModel) { for (row in model.keys.chunked(columns)) { Row(Modifier.fillMaxWidth().height(tileHeight), horizontalArrangement = Arrangement.spacedBy(gap)) { for (key in row) PanelTile(key, key == model.selected, key in model.badges, - if (key == "stores") model.storeDownloads else 0, Modifier.weight(1f)) { model.onSelect(key) } + if (key == "stores") model.storeDownloads else if (key == NavTabs.MORE) model.moreDownloads else 0, Modifier.weight(1f)) { model.onSelect(key) } repeat(columns - row.size) { Spacer(Modifier.weight(1f)) } } } @@ -400,12 +402,10 @@ private fun PanelClock() { } @Composable -internal fun DualPanelPublisher(s: FrontEndState, selected: String, onSelect: (String) -> Unit, a: FrontEndActions) { - val badges = buildSet { - if (setupNeedsAttention(s)) add("setup") - if (s.updates.hasUpdate) add("updates") - } - val model = DualPanelModel(navigationKeys(s), selected, badges, s.storeDownloadsActive, s.running, s.theme, s.appScale, onSelect, a.onResume) +internal fun DualPanelPublisher(s: FrontEndState, selected: String, title: String, onSelect: (String) -> Unit, a: FrontEndActions) { + val keys = navigationKeys(s) + val badges = keys.filter { railBadge(s, it) }.toSet() + val model = DualPanelModel(keys, selected, badges, s.storeDownloadsActive, s.running, s.theme, s.appScale, onSelect, a.onResume, title, railCount(s, NavTabs.MORE)) androidx.compose.runtime.SideEffect { DualScreenPanel.model = model } androidx.compose.runtime.DisposableEffect(Unit) { onDispose { DualScreenPanel.model = null } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index b99ee02316..26d0506a73 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -273,6 +273,10 @@ private fun Content( DesktopPage(s, a, modifier, onSelect) return } + if (selected == NavTabs.MORE) { + MorePage(s, a, onSelect, modifier.padding(horizontal = padH).padding(top = padV)) + return + } if (selected == "agent") { AgentPage(modifier.padding(horizontal = padH).padding(top = padV)) return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 87d8ac6644..5f1b3dfaee 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -51,6 +51,7 @@ import androidx.compose.material.icons.outlined.AutoAwesome import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers import androidx.compose.material.icons.outlined.LocalMall +import androidx.compose.material.icons.outlined.MoreHoriz import androidx.compose.material.icons.outlined.SportsEsports import androidx.compose.material.icons.outlined.Storefront import androidx.compose.material.icons.outlined.SystemUpdate @@ -124,16 +125,7 @@ internal fun BottomBar( } } -internal fun navigationKeys(s: FrontEndState) = buildList { - add("steam"); add("games") - if (s.soundtracksEnabled) add("soundtracks") - if (s.gameStoresEnabled) add("stores") - add("desktop") - if (com.droiddeck.launcher.agent.AgentTab.visible) add("agent") - add("components") - if (s.isHomeApp) add("android-apps") - add("setup"); add("updates") -} +internal fun navigationKeys(s: FrontEndState) = NavTabs.bar(s) internal object RailLabels { var shown by mutableStateOf(true) @@ -208,12 +200,26 @@ internal fun railLabelIcon(key: String): Pair = when (key) { "agent" -> R.string.rail_agent to Icons.Outlined.AutoAwesome "android-apps" -> R.string.rail_apps to Icons.Outlined.Apps "setup" -> R.string.rail_setup to Icons.Outlined.Tune + NavTabs.MORE -> R.string.rail_more to Icons.Outlined.MoreHoriz else -> R.string.rail_updates to Icons.Outlined.SystemUpdate } internal fun setupNeedsAttention(s: FrontEndState): Boolean = !s.ready || (s.available != null && s.available != s.installed) || PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) || com.droiddeck.launcher.sync.Syncthing.needsAttention +internal fun railBadge(s: FrontEndState, key: String, setupNeedsAttention: Boolean = setupNeedsAttention(s)): Boolean = when (key) { + "setup" -> setupNeedsAttention + "updates" -> s.updates.hasUpdate + NavTabs.MORE -> NavTabs.more(s).any { it != NavTabs.MORE && railBadge(s, it, setupNeedsAttention) } + else -> false +} + +internal fun railCount(s: FrontEndState, key: String): Int = when (key) { + "stores" -> s.storeDownloadsActive + NavTabs.MORE -> if ("stores" in NavTabs.more(s)) s.storeDownloadsActive else 0 + else -> 0 +} + @Composable private fun NavigationItems( s: FrontEndState, shown: String, compact: Boolean, iconOnly: Boolean, height: Dp, width: Dp, @@ -224,8 +230,8 @@ private fun NavigationItems( val (label, icon) = railLabelIcon(key) key(key) { RailItem(stringResource(label), icon, key, shown == key, compact, iconOnly, height, width, - badge = (key == "setup" && setupNeedsAttention) || (key == "updates" && s.updates.hasUpdate), - count = if (key == "stores") s.storeDownloadsActive else 0, + badge = railBadge(s, key, setupNeedsAttention), + count = railCount(s, key), place = place, onFocus = { onFocusSelect(key) }) { onSelect(key) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 2d2baaff3f..c936d13c74 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -468,7 +468,9 @@ fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () - @OptIn(ExperimentalComposeUiApi::class) @Composable private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)?, frontFocus: FrontFocus) { - var selected by rememberSaveable { mutableStateOf(if (s.shortcutPicker) "games" else "steam") } + var selected by rememberSaveable { + mutableStateOf(if (s.shortcutPicker) "games" else if (NavTabs.place(s, "steam") == TabPlace.HIDDEN) navigationKeys(s).first { it != "components" } else "steam") + } LaunchedEffect(s.shortcutPicker) { if (s.shortcutPicker) selected = "games" } LaunchedEffect(s.navigate) { val target = s.navigate ?: return@LaunchedEffect @@ -575,6 +577,10 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com ) { selected = if (selected.startsWith("rom:")) "emu:" + selected.removePrefix("rom:").substringBefore(':') else "desktop" } + val backToMore = s.pageKey == null && Hops.origin == null && selected in NavTabs.more(s) + BackHandler(enabled = !processSettingsPageVisible && backToMore) { + selected = NavTabs.MORE + } LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } LaunchedEffect(s.soundtracksEnabled) { if (!s.soundtracksEnabled && (selected == "soundtracks" || selected.startsWith("sound:"))) selected = "games" @@ -587,7 +593,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } remember { Motion.refresh(ctx); true } - val railSelection = when { + val openTab = when { Hops.origin != null && s.pageKey == Hops.origin?.page -> Hops.origin!!.dest s.pageKey == "performance" -> "steam" s.pageKey == "controller-mapping" -> "setup" @@ -596,6 +602,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store" -> "desktop" else -> s.pageKey ?: selected } + val railSelection = if (openTab in NavTabs.more(s)) NavTabs.MORE else openTab val railSelectionNow = androidx.compose.runtime.rememberUpdatedState(railSelection) var railPicks by remember { mutableStateOf(0) } val showRailPage: (String, Boolean) -> Unit = { key, focusContent -> @@ -711,7 +718,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com focusWithinFrames({ frontFocus.last == r.control && anyFocused }) { frontFocus.items[r.control] ?: frontFocus.paneEntry() } } var screenAt by remember { mutableStateOf(Offset.Zero) } - if (s.dualScreen) DualPanelPublisher(s, railSelection, { key -> + if (s.dualScreen) DualPanelPublisher(s, railSelection, openTab, { key -> if (processSettingsPageVisible) return@DualPanelPublisher if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard) focusManager.clearFocus(force = true) @@ -834,7 +841,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com ) } } - val hasBackTarget = (s.pageKey != null && page != null) || + val hasBackTarget = backToMore || (s.pageKey != null && page != null) || (s.pageKey == null && Hops.origin?.page == selected) || ((s.pageKey == null || page == null) && (selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store")) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index fa78998cf4..aa08d07f17 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -91,6 +91,7 @@ private const val LAUNCHER_TAB = 2 internal object SetupTabs { var openLauncher = false + var focusTabs = false var openOverview = false } private const val GLASSES_TAB = 6 @@ -456,10 +457,9 @@ internal fun SetupPanel( remember { RailLabels.load(railContext) } ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } LanguageRow(host, s.language, a.onLanguage) - ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) - ToggleRow(host, "show-soundtracks", stringResource(R.string.setup_soundtracks), null, s.soundtracksEnabled, onChange = a.onSoundtracksEnabled) if (s.soundtracksEnabled) ToggleRow(host, "soundtracks-ingame", stringResource(R.string.setup_soundtracks_ingame), stringResource(R.string.setup_soundtracks_ingame_hint), s.soundtracksIngame, onChange = a.onSoundtracksIngame) } + TabsSettingsGroup(host, s, a) } val device: @Composable () -> Unit = { SettingsGroup(stringResource(R.string.setup_group_device)) { @@ -598,9 +598,6 @@ internal fun SetupPanel( ToggleRow(host, "agent-commands", stringResource(R.string.setup_agent_commands), null, s.agentCommands) { a.onAgentCommands() } if (com.droiddeck.launcher.agent.AgentHost.available) { val agentContext = androidx.compose.ui.platform.LocalContext.current - ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { - com.droiddeck.launcher.agent.AgentTab.set(agentContext, it) - } ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { AgentPet.set(agentContext, it) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt new file mode 100644 index 0000000000..b4d6952413 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt @@ -0,0 +1,98 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +@Composable +internal fun MorePage(s: FrontEndState, a: FrontEndActions, onSelect: (String) -> Unit, modifier: Modifier) { + val keys = NavTabs.more(s) + val open: (String) -> Unit = { key -> if (key == "components") a.onComponents(true) else onSelect(key) } + Column(modifier.verticalScroll(rememberScrollState())) { + PageHeader(stringResource(R.string.rail_more)) { + Spacer(Modifier.weight(1f)) + SecondaryButton(stringResource(R.string.more_edit_tabs), compact = true) { + SetupTabs.openLauncher = true + SetupTabs.focusTabs = true + onSelect("setup") + } + } + BoxWithConstraints(Modifier.fillMaxWidth()) { + val gap = 12.dp + val columns = ((maxWidth + gap) / (160.dp + gap)).toInt().coerceIn(2, 5) + Column(verticalArrangement = Arrangement.spacedBy(gap)) { + keys.chunked(columns).forEachIndexed { r, row -> + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(gap)) { + row.forEachIndexed { c, key -> + MoreTile(s, key, first = r == 0 && c == 0, Modifier.weight(1f)) { open(key) } + } + repeat(columns - row.size) { Spacer(Modifier.weight(1f)) } + } + } + } + } + } +} + +@Composable +private fun MoreTile(s: FrontEndState, key: String, first: Boolean, modifier: Modifier, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val (label, icon) = railLabelIcon(key) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(18.dp) + val count = railCount(s, key) + Box( + contentAlignment = Alignment.Center, + modifier = modifier + .then(if (first) Modifier.paneEntry() else Modifier.paneItem("more:$key")) + .testTag("more-$key") + .height(112.dp).clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else colors.surface) + .glideBorder(hot, shape, pal.signal, pal.line) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick) + .controllerConfirm(onClick = onClick), + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) { + Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(30.dp)) + Text(stringResource(label), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(horizontal = 8.dp)) + } + if (railBadge(s, key)) Box(Modifier.align(Alignment.TopEnd).padding(12.dp).size(9.dp).clip(CircleShape).background(AttentionAmber)) + if (count > 0) Box(Modifier.align(Alignment.TopEnd).padding(10.dp)) { CountPill(count) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt new file mode 100644 index 0000000000..af16570d97 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt @@ -0,0 +1,91 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentTab +import com.droiddeck.launcher.session.SessionPrefs + +internal enum class TabPlace { BAR, MORE, HIDDEN } + +internal object NavTabs { + const val MORE = "more" + val FEATURES = setOf("stores", "soundtracks", "agent") + val ALL = listOf("steam", "games", "soundtracks", "stores", "desktop", "agent", "components", "android-apps", "setup", "updates") + + var order by mutableStateOf(ALL) + private set + var shelved by mutableStateOf(emptySet()) + private set + var hidden by mutableStateOf(emptySet()) + private set + + fun load(context: Context) { + order = arrange(SessionPrefs.navTabOrder(context)) + shelved = SessionPrefs.navTabShelved(context).intersect(ALL.toSet()) + hidden = SessionPrefs.navTabHidden(context).intersect(ALL.toSet()) - FEATURES - "setup" + } + + fun arrange(saved: List): List { + val listed = saved.filter { it in ALL }.distinct() + val missing = ALL.filterNot { it in listed } + val out = listed.toMutableList() + for (key in missing) { + val before = ALL.subList(0, ALL.indexOf(key)).lastOrNull { it in out } + out.add(if (before == null) 0 else out.indexOf(before) + 1, key) + } + return out + } + + fun available(s: FrontEndState, key: String): Boolean = when (key) { + "android-apps" -> s.isHomeApp + "agent" -> AgentHost.available + else -> true + } + + fun hideable(key: String) = key != "setup" + + fun place(s: FrontEndState, key: String): TabPlace = when { + featureOff(s, key) || key in hidden -> TabPlace.HIDDEN + key in shelved -> TabPlace.MORE + else -> TabPlace.BAR + } + + private fun featureOff(s: FrontEndState, key: String) = when (key) { + "stores" -> !s.gameStoresEnabled + "soundtracks" -> !s.soundtracksEnabled + "agent" -> !AgentTab.shown + else -> false + } + + fun listed(s: FrontEndState) = order.filter { available(s, it) } + + fun more(s: FrontEndState) = listed(s).filter { place(s, it) == TabPlace.MORE } + + fun bar(s: FrontEndState): List { + val shown = listed(s).filter { place(s, it) == TabPlace.BAR } + return if (more(s).isEmpty()) shown else shown + MORE + } + + fun move(context: Context, s: FrontEndState, key: String, step: Int) { + val visible = listed(s) + val at = visible.indexOf(key) + val other = visible.getOrNull(at + step) ?: return + val next = order.toMutableList() + val i = next.indexOf(key) + val j = next.indexOf(other) + next[i] = other + next[j] = key + order = next + SessionPrefs.setNavTabOrder(context, next) + } + + fun setPlace(context: Context, key: String, place: TabPlace) { + shelved = if (place == TabPlace.MORE) shelved + key else shelved - key + hidden = if (place == TabPlace.HIDDEN && hideable(key) && key !in FEATURES) hidden + key else hidden - key + SessionPrefs.setNavTabShelved(context, shelved) + SessionPrefs.setNavTabHidden(context, hidden) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt new file mode 100644 index 0000000000..3b964d8983 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt @@ -0,0 +1,142 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.KeyboardArrowDown +import androidx.compose.material.icons.outlined.KeyboardArrowUp +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.key +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentTab + +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) +@Composable +internal fun TabsSettingsGroup(host: MenuHost, s: FrontEndState, a: FrontEndActions) { + val ctx = LocalContext.current + val reveal = remember { BringIntoViewRequester() } + LaunchedEffect(Unit) { + if (!SetupTabs.focusTabs) return@LaunchedEffect + SetupTabs.focusTabs = false + androidx.compose.runtime.withFrameNanos { } + reveal.bringIntoView() + } + val shown = stringResource(R.string.tabs_place_bar) + val more = stringResource(R.string.tabs_place_more) + val hidden = stringResource(R.string.tabs_place_hidden) + val keys = NavTabs.listed(s) + fun pick(key: String, place: TabPlace) { + when (key) { + "stores" -> if ((place != TabPlace.HIDDEN) != s.gameStoresEnabled) a.onGameStoresEnabled(place != TabPlace.HIDDEN) + "soundtracks" -> if ((place != TabPlace.HIDDEN) != s.soundtracksEnabled) a.onSoundtracksEnabled(place != TabPlace.HIDDEN) + "agent" -> if ((place != TabPlace.HIDDEN) != AgentTab.shown) AgentTab.set(ctx, place != TabPlace.HIDDEN) + } + NavTabs.setPlace(ctx, key, place) + } + Box(Modifier.bringIntoViewRequester(reveal)) { + SettingsGroup(stringResource(R.string.setup_group_tabs)) { + keys.forEachIndexed { index, tab -> + key(tab) { + val options = buildList { + add(TabPlace.BAR to shown) + add(TabPlace.MORE to more) + if (NavTabs.hideable(tab)) add(TabPlace.HIDDEN to hidden) + } + TabRow( + host, tab, NavTabs.place(s, tab), options, + canUp = index > 0, canDown = index < keys.lastIndex, + onMove = { step -> NavTabs.move(ctx, s, tab, step) }, + onPick = { pick(tab, it) }, + ) + } + } + } + } +} + +@Composable +private fun TabRow( + host: MenuHost, tab: String, place: TabPlace, options: List>, + canUp: Boolean, canDown: Boolean, onMove: (Int) -> Unit, onPick: (TabPlace) -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val (labelRes, icon) = railLabelIcon(tab) + val label = stringResource(labelRes) + val open = host.open == "tab-$tab" + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth() + .background(if (open) pal.signal.copy(alpha = 0.10f) else androidx.compose.ui.graphics.Color.Transparent) + .padding(start = 14.dp, end = 10.dp, top = 6.dp, bottom = 6.dp), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f).alpha(if (place == TabPlace.HIDDEN) 0.5f else 1f), + ) { + Icon(icon, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + Spacer(Modifier.width(12.dp)) + Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + MoveButton(Icons.Outlined.KeyboardArrowUp, stringResource(R.string.tabs_move_up, label), canUp, "tab-up-$tab") { onMove(-1) } + MoveButton(Icons.Outlined.KeyboardArrowDown, stringResource(R.string.tabs_move_down, label), canDown, "tab-down-$tab") { onMove(1) } + ChoiceChip(host, "tab-$tab", label, options, place, onPick = onPick) + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) +} + +@Composable +private fun MoveButton(icon: ImageVector, description: String, enabled: Boolean, tag: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.testTag(tag).size(40.dp).clip(CircleShape) + .background(colors.surfaceVariant) + .glideBorder(hot, CircleShape, pal.signal, pal.line2) + .alpha(if (enabled) 1f else 0.35f) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button) { if (enabled) onClick() } + .controllerConfirm { if (enabled) onClick() } + .semantics { contentDescription = description }, + ) { Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f92ce94ee7..e3d78e199b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2292,7 +2292,6 @@ المتاجر Steam مخصَّص - المتاجر فئة سرعة التنزيل متوازن سريع @@ -3882,7 +3881,6 @@ المعادل تعزيز الجهير المعادل غير متاح على هذا الجهاز - الموسيقى التصويرية تفعيل أثناء اللعب استمر في تشغيل الموسيقى التصويرية أثناء تشغيل اللعبة لا توجد موسيقى تصويرية مثبّتة بعد. 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 5139e4953d..bcd645f8f2 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2261,7 +2261,6 @@ Tiendas Steam Personalizados - Tiendas Nivel de velocidad de descarga Equilibrado Rápido @@ -3737,7 +3736,6 @@ Ecualizador Refuerzo de graves El ecualizador no está disponible en este dispositivo - Bandas sonoras Activar en el juego Mantén la banda sonora sonando mientras se ejecuta un juego Aún no hay bandas sonoras instaladas. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 4b446b2140..ce0b441579 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2192,7 +2192,6 @@ Магазини Steam Персонализирана - Магазини Скорост на изтегляне Балансирано Бързо @@ -3726,7 +3725,6 @@ Еквалайзер Усилване на басите Еквалайзерът не е наличен на това устройство - Саундтраци Включи в играта Саундтракът да продължи да свири, докато върви игра Все още няма инсталирани саундтраци. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 365c2f1083..d8a5d60f28 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2242,7 +2242,6 @@ Obchody Steam Vlastní - Obchody Úroveň rychlosti stahování Vyvážené Rychlé @@ -3804,7 +3803,6 @@ Ekvalizér Zesílení basů Ekvalizér není na tomto zařízení k dispozici - Soundtracky Povolit ve hře Nechat soundtrack hrát během hry Zatím nejsou nainstalovány žádné soundtracky. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 83ee1c91f4..2b47c9f391 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2192,7 +2192,6 @@ Butikker Steam Brugerdefineret - Butikker Downloadhastighed Afbalanceret Hurtig @@ -3726,7 +3725,6 @@ Equalizer Bassforstærkning Equalizeren er ikke tilgængelig på denne enhed - Soundtracks Aktivér i spil Lad soundtracket spille, mens et spil kører Ingen soundtracks installeret endnu. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3ed4aa1f1b..c2d0dcb4fc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2184,7 +2184,6 @@ Stores Steam Eigene - Stores Download-Tempo Ausgewogen Schnell @@ -3726,7 +3725,6 @@ Equalizer Bassverstärkung Der Equalizer ist auf diesem Gerät nicht verfügbar - Soundtracks Im Spiel aktivieren Soundtrack während eines Spiels weiterspielen Noch keine Soundtracks installiert. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d9e2ac10e8..203a3716a2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2192,7 +2192,6 @@ Καταστήματα Steam Προσαρμοσμένο - Καταστήματα Επίπεδο ταχύτητας λήψης Ισορροπημένο Ταχύ @@ -3726,7 +3725,6 @@ Ισοσταθμιστής Ενίσχυση μπάσων Ο ισοσταθμιστής δεν είναι διαθέσιμος σε αυτή τη συσκευή - Soundtrack Ενεργοποίηση εντός παιχνιδιού Η μουσική συνεχίζει να παίζει όσο εκτελείται ένα παιχνίδι Δεν υπάρχουν εγκατεστημένα soundtrack ακόμη. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7fa671b3ce..104948fff5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2217,7 +2217,6 @@ Tiendas Steam Personalizados - Tiendas Nivel de velocidad de descarga Equilibrado Rápido @@ -3765,7 +3764,6 @@ Ecualizador Refuerzo de graves El ecualizador no está disponible en este dispositivo - Bandas sonoras Activar en el juego Mantén la banda sonora sonando mientras se ejecuta un juego Aún no hay bandas sonoras instaladas. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 222896d3e6..98ea9d8301 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2192,7 +2192,6 @@ Kaupat Steam Mukautettu - Kaupat Latausnopeuden taso Tasapainotettu Nopea @@ -3726,7 +3725,6 @@ Taajuuskorjain Bassonkorostus Taajuuskorjain ei ole käytettävissä tällä laitteella - Soundtrackit Ota käyttöön pelin aikana Pidä soundtrack soimassa pelin aikana Soundtrackeja ei ole vielä asennettu. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 20c091baca..e830f0cea4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2217,7 +2217,6 @@ Boutiques Steam Personnalisé - Boutiques Niveau de vitesse de téléchargement Équilibré Rapide @@ -3765,7 +3764,6 @@ Égaliseur Renforcement des basses L\'égaliseur n\'est pas disponible sur cet appareil - Bandes originales Activer en jeu Garder la bande originale active pendant une partie Aucune bande originale installée pour le moment. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 4046306fe4..bb3173d10d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2192,7 +2192,6 @@ स्टोर Steam कस्टम - स्टोर डाउनलोड स्पीड टियर बैलेंस्ड फ़ास्ट @@ -3726,7 +3725,6 @@ इक्वलाइज़र बास बूस्ट इस डिवाइस पर इक्वलाइज़र उपलब्ध नहीं है - साउंडट्रैक गेम के दौरान चालू करें गेम चलते समय साउंडट्रैक बजता रखें अभी तक कोई साउंडट्रैक इंस्टॉल नहीं है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4a2c408ac7..7ecc8c8e57 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2192,7 +2192,6 @@ Áruházak Steam Egyéni - Áruházak Letöltési sebességi szint Kiegyensúlyozott Gyors @@ -3726,7 +3725,6 @@ Hangszínszabályzó Mélyhangerősítés A hangszínszabályzó nem érhető el ezen az eszközön - Soundtrackek Engedélyezés játék közben A soundtrack szóljon tovább játék közben Még nincs telepített soundtrack. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d71b8f83f1..6a0a20ea14 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2167,7 +2167,6 @@ Toko Steam Khusus - Toko Tingkat kecepatan unduhan Seimbang Cepat @@ -3696,7 +3695,6 @@ Ekualiser Penguat bass Ekualiser tidak tersedia di perangkat ini - Soundtrack Aktifkan saat bermain Tetap putar soundtrack saat game berjalan Belum ada soundtrack yang terpasang. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e5a9d021e2..792b2c47a1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2209,7 +2209,6 @@ Negozi Steam Personalizzati - Negozi Livello di velocità di download Bilanciato Veloce @@ -3765,7 +3764,6 @@ Equalizzatore Potenziamento bassi L\'equalizzatore non è disponibile su questo dispositivo - Colonne sonore Attiva in gioco Mantieni la colonna sonora in riproduzione durante una partita Nessuna colonna sonora installata. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bd0e241e4e..459c1d805f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2167,7 +2167,6 @@ ストア Steam カスタム - ストア ダウンロード速度レベル バランス 高速 @@ -3696,7 +3695,6 @@ イコライザー 低音ブースト このデバイスではイコライザーを使用できません - サウンドトラック ゲーム中も有効にする ゲーム実行中もサウンドトラックを再生し続けます インストール済みのサウンドトラックはまだありません。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4fadd28078..e6b6c42ecf 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2167,7 +2167,6 @@ 스토어 Steam 사용자 정의 - 스토어 다운로드 속도 단계 균형 빠름 @@ -3696,7 +3695,6 @@ 이퀄라이저 베이스 부스트 이 기기에서는 이퀄라이저를 사용할 수 없습니다 - 사운드트랙 게임 중 사용 게임이 실행되는 동안 사운드트랙 계속 재생 설치된 사운드트랙이 아직 없습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index cf509abbf8..fac7d2314f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2167,7 +2167,6 @@ Kedai Steam Tersuai - Kedai Tahap kelajuan muat turun Seimbang Pantas @@ -3696,7 +3695,6 @@ Penyama Peningkat bes Penyama tidak tersedia pada peranti ini - Runut bunyi Dayakan dalam permainan Teruskan memainkan runut bunyi semasa permainan berjalan Belum ada runut bunyi dipasang. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 4605b7306f..65ddcd49c4 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2192,7 +2192,6 @@ Butikker Steam Egendefinert - Butikker Nedlastingshastighetsnivå Balansert Rask @@ -3726,7 +3725,6 @@ Equalizer Bassforsterkning Equalizeren er ikke tilgjengelig på denne enheten - Lydspor Aktiver i spill Fortsett å spille lydsporet mens et spill kjører Ingen lydspor installert ennå. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 558e70e934..8cbd96dd31 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2192,7 +2192,6 @@ Winkels Steam Aangepast - Winkels Niveau voor downloadsnelheid Gebalanceerd Snel @@ -3726,7 +3725,6 @@ Equalizer Basversterking De equalizer is niet beschikbaar op dit apparaat - Soundtracks In-game inschakelen Laat de soundtrack doorspelen terwijl een game draait Nog geen soundtracks geïnstalleerd. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 76cf52a264..a829fda88b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2242,7 +2242,6 @@ Sklepy Steam Własna - Sklepy Poziom szybkości pobierania Zbalansowany Szybki @@ -3804,7 +3803,6 @@ Korektor Wzmocnienie basów Korektor nie jest dostępny na tym urządzeniu - Ścieżki dźwiękowe Włącz w grze Odtwarzaj ścieżkę dźwiękową podczas działania gry Brak zainstalowanych ścieżek dźwiękowych. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 5df34b54fd..c2ee78a1c1 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2209,7 +2209,6 @@ Lojas Steam Personalizados - Lojas Nível de velocidade de transferência Equilibrado Rápido @@ -3765,7 +3764,6 @@ Equalizador Reforço de graves O equalizador não está disponível neste dispositivo - Bandas sonoras Ativar durante o jogo Continuar a reproduzir a banda sonora enquanto um jogo está em execução Ainda não há bandas sonoras instaladas. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index be24a67375..59b5af3105 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2209,7 +2209,6 @@ Lojas Steam Personalizado - Lojas Nível de velocidade de download Equilibrado Rápido @@ -3765,7 +3764,6 @@ Equalizador Reforço de graves O equalizador não está disponível neste dispositivo - Trilhas sonoras Ativar durante o jogo Continuar tocando a trilha sonora enquanto um jogo está em execução Nenhuma trilha sonora instalada ainda. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 059d8c8d45..4795221220 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2217,7 +2217,6 @@ Magazine Steam Personalizat - Magazine Nivelul vitezei de descărcare Echilibrat Rapid @@ -3765,7 +3764,6 @@ Egalizator Amplificare bas Egalizatorul nu este disponibil pe acest dispozitiv - Coloane sonore Activează în joc Continuă redarea coloanei sonore cât timp rulează un joc Nicio coloană sonoră instalată încă. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 34bb4b9cb1..55d3431388 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2325,7 +2325,6 @@ Магазины Steam Свои - Магазины Уровень скорости загрузки Сбалансированный Быстрый @@ -3887,7 +3886,6 @@ Эквалайзер Усиление баса Эквалайзер недоступен на этом устройстве - Саундтреки Включить в игре Продолжать воспроизведение саундтрека во время игры Саундтреки ещё не установлены. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1fcbc9a807..fedeebf4c6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2192,7 +2192,6 @@ Butiker Steam Egna - Butiker Nedladdningshastighet Balanserad Snabb @@ -3726,7 +3725,6 @@ Equalizer Basförstärkning Equalizern är inte tillgänglig på den här enheten - Soundtracks Aktivera i spel Fortsätt spela soundtracket medan ett spel körs Inga soundtracks installerade än. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index bd7ccd6ad8..0f72c64631 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2167,7 +2167,6 @@ สโตร์ Steam กำหนดเอง - สโตร์ ระดับความเร็วการดาวน์โหลด สมดุล เร็ว @@ -3696,7 +3695,6 @@ อีควอไลเซอร์ เพิ่มเสียงเบส อุปกรณ์นี้ไม่รองรับอีควอไลเซอร์ - ซาวด์แทร็ก เปิดใช้ขณะเล่นเกม เล่นซาวด์แทร็กต่อไปขณะที่เกมทำงาน ยังไม่มีซาวด์แทร็กที่ติดตั้ง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 889d71ef48..1700875b0b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2184,7 +2184,6 @@ Mağazalar Steam Özel - Mağazalar İndirme hızı katmanı Dengeli Hızlı @@ -3726,7 +3725,6 @@ Ekolayzır Bas güçlendirme Ekolayzır bu cihazda kullanılamıyor - Oyun müzikleri Oyun içinde etkinleştir Oyun çalışırken oyun müziği çalmaya devam etsin Henüz oyun müziği yüklenmedi. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 670d07f991..de74d56817 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2242,7 +2242,6 @@ Магазини Steam Власна - Магазини Рівень швидкості завантаження Збалансований Швидкий @@ -3804,7 +3803,6 @@ Еквалайзер Підсилення басів Еквалайзер недоступний на цьому пристрої - Саундтреки Вмикати в грі Відтворювати саундтрек, поки запущено гру Саундтреки ще не встановлено. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a85d7b4c88..05c9403f13 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2167,7 +2167,6 @@ Cửa hàng game Steam Tùy chỉnh - Cửa hàng Mức tốc độ tải Cân bằng Nhanh @@ -3696,7 +3695,6 @@ Bộ cân bằng âm Tăng âm trầm Thiết bị này không có bộ cân bằng âm - Nhạc nền Bật trong game Tiếp tục phát nhạc nền khi game đang chạy Chưa có nhạc nền nào được cài đặt. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 38946ef8c7..d775759045 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2248,7 +2248,6 @@ 游戏商店 Steam 自定义 - 游戏商店 下载速度档位 均衡 快速 @@ -3700,7 +3699,6 @@ 均衡器 低音增强 此设备不支持均衡器 - 原声音乐 在游戏中启用 游戏运行时继续播放原声音乐 尚未安装任何原声音乐。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b81f12305a..a7b17a7383 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2167,7 +2167,6 @@ 商店 Steam 自訂 - 商店 下載速度等級 平衡 快速 @@ -3699,7 +3698,6 @@ 等化器 重低音增強 此裝置不支援等化器 - 原聲帶 在遊戲中啟用 遊戲運行時繼續播放原聲帶 尚未安裝任何原聲帶。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index da5e460fc2..a73fbfecb1 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2167,7 +2167,6 @@ 遊戲商店 Steam 自訂 - 遊戲商店 下載速度等級 平衡 快速 @@ -3699,7 +3698,6 @@ 等化器 重低音增強 此裝置不支援等化器 - 原聲帶 在遊戲中啟用 遊戲執行時繼續播放原聲帶 尚未安裝任何原聲帶。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce55a06e1e..732b549ba2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1569,6 +1569,14 @@ Apps Setup Updates + More + Edit tabs + Tabs + Shown + In More + Hidden + Move %1$s up + Move %1$s down %1$d%% Resume %1$s Shows up as /root/ROMs in each session. Internal storage is at /root/Storage. @@ -2585,7 +2593,6 @@ Stores Steam Custom - Stores Download speed tier Balanced Fast @@ -2689,7 +2696,6 @@ Sort Sidebar labels Show names under the sidebar icons. Turn off for a slimmer sidebar. - Agent tab Agent pet DeeDee floats over the launcher and games and shows what the agent is doing. Over other apps @@ -4042,8 +4048,7 @@ Equalizer Bass boost The equalizer is not available on this device - Soundtracks - Enable ingame + Music while playing Keep the soundtrack playing while a game runs No soundtracks installed yet. Search soundtracks diff --git a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt new file mode 100644 index 0000000000..41f8333147 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt @@ -0,0 +1,178 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.Modifier +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.hasTestTag +import androidx.compose.ui.test.hasText +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.compose.ui.unit.dp +import androidx.test.core.app.ApplicationProvider +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w1200dp-h752dp-land", application = android.app.Application::class) +class NavTabsTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx: Context = ApplicationProvider.getApplicationContext() + + @Before @After fun reset() { + ctx.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + NavTabs.load(ctx) + com.droiddeck.launcher.agent.AgentTab.load(ctx) + } + + @Test fun musicStartsInMore() { + assertEquals(listOf("steam", "games", "stores", "desktop", "components", "setup", "updates", NavTabs.MORE), navigationKeys(state())) + assertEquals(listOf("soundtracks"), NavTabs.more(state())) + assertEquals(setOf("soundtracks", "agent"), NavTabs.shelved) + assertTrue(com.droiddeck.launcher.agent.AgentTab.shown) + } + + @Test fun showingMusicOnceKeepsItShownAfterReload() { + NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR) + NavTabs.load(ctx) + assertEquals(listOf("steam", "games", "soundtracks", "stores", "desktop", "components", "setup", "updates"), navigationKeys(state())) + } + + @Test fun shelvedTabsLeaveTheBarAndAddMoreAtTheEnd() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "components", TabPlace.MORE) + val s = state() + assertEquals(listOf("soundtracks", "stores", "components"), NavTabs.more(s)) + assertEquals(NavTabs.MORE, navigationKeys(s).last()) + assertFalse("stores" in navigationKeys(s)) + } + + @Test fun hiddenTabsAreNowhereAndSetupCannotBeHidden() { + NavTabs.setPlace(ctx, "updates", TabPlace.HIDDEN) + NavTabs.setPlace(ctx, "setup", TabPlace.HIDDEN) + val s = state() + assertFalse("updates" in navigationKeys(s)) + assertFalse("updates" in NavTabs.more(s)) + assertTrue("setup" in navigationKeys(s)) + } + + @Test fun disabledStoresFeatureReadsAsHidden() { + assertEquals(TabPlace.HIDDEN, NavTabs.place(state(storesOn = false), "stores")) + } + + @Test fun movingSwapsWithTheNextVisibleTabAndPersists() { + NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR) + NavTabs.move(ctx, state(), "stores", -1) + assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) + NavTabs.load(ctx) + assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) + } + + @Test fun tabsMissingFromASavedOrderSlotInAfterTheirDefaultNeighbour() { + assertEquals(listOf("updates", "steam", "games", "soundtracks", "stores", "desktop", "agent", "components", "android-apps", "setup"), + NavTabs.arrange(listOf("updates", "steam"))) + assertEquals(listOf("games", "soundtracks", "steam", "setup", "stores", "desktop", "agent", "components", "android-apps", "updates"), + NavTabs.arrange(listOf("games", "steam", "setup", "stores", "desktop", "components", "android-apps", "updates", "bogus"))) + } + + @Test fun moreCarriesTheDownloadCountAndBadgesOfShelvedTabs() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "setup", TabPlace.MORE) + val s = state(downloads = 3, setupReady = false) + assertEquals(3, railCount(s, NavTabs.MORE)) + assertTrue(railBadge(s, NavTabs.MORE)) + NavTabs.setPlace(ctx, "stores", TabPlace.BAR) + assertEquals(0, railCount(s, NavTabs.MORE)) + assertEquals(3, railCount(s, "stores")) + } + + @Test fun sideRailShowsTheDownloadCountOnMoreWhenStoresIsShelved() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + val s = state(downloads = 2) + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + Box(Modifier.height(752.dp)) { SideRail(s, "steam", {}, {}, actions(), Modifier) } + } + } + } + compose.onNodeWithTag("rail-stores").assertDoesNotExist() + compose.onNode(hasTestTag("rail-more")).assertIsDisplayed() + compose.onNode(hasText("2") and hasParentTag("rail-more"), useUnmergedTree = true).assertIsDisplayed() + } + + @Test fun morePageListsShelvedTabsWithTheirCount() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "components", TabPlace.MORE) + val s = state(downloads = 4) + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + FocusGlideHost { Box(Modifier.fillMaxSize()) { MorePage(s, actions(), {}, Modifier.fillMaxSize()) } } + } + } + } + compose.onNodeWithTag("more-stores").assertIsDisplayed() + compose.onNodeWithTag("more-components").assertIsDisplayed() + compose.onNode(hasText("4") and hasParentTag("more-stores"), useUnmergedTree = true).assertIsDisplayed() + } + + @Test fun backFromAShelvedTabReturnsToMore() { + NavTabs.setPlace(ctx, "desktop", TabPlace.MORE) + var back: androidx.activity.OnBackPressedDispatcher? = null + compose.mainClock.autoAdvance = false + compose.setContent { + back = androidx.activity.compose.LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher + DroidDeckTheme { FrontEndScreen(state(), actions(), page = null) } + } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("rail-more").performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").assertDoesNotExist() + compose.runOnIdle { back!!.onBackPressed() } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").assertIsDisplayed() + } + + @Test fun startupWithSteamHiddenNeverLandsOnABareComponentsSelection() { + NavTabs.setPlace(ctx, "steam", TabPlace.HIDDEN) + repeat(NavTabs.ALL.size) { NavTabs.move(ctx, state(), "components", -1) } + assertEquals("components", navigationKeys(state()).first()) + compose.mainClock.autoAdvance = false + compose.setContent { DroidDeckTheme { FrontEndScreen(state(), actions(), page = null) } } + compose.mainClock.advanceTimeBy(2_000) + compose.onNode(hasText(ctx.getString(com.droiddeck.launcher.R.string.content_page_gone))).assertDoesNotExist() + compose.onNode(hasTestTag("rail-games") and androidx.compose.ui.test.isSelected()).assertExists() + } + + private fun hasParentTag(tag: String) = androidx.compose.ui.test.hasAnyAncestor(hasTestTag(tag)) + + private fun state(storesOn: Boolean = true, downloads: Int = 0, setupReady: Boolean = true) = FrontEndState( + installed = "r9", ready = setupReady, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", romsDir = null, logsEnabled = false, + steamGames = emptyList(), emulators = emptyList(), running = null, + gameStoresEnabled = storesOn, storeDownloadsActive = downloads, + ) + + private fun actions() = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, onRom = {}, onResume = {}, + onSteamSettings = {}, onDesktopSettings = {}, onInstallPackage = {}, onRemovePackage = {}, + onRuntime = {}, onFrameGenPick = {}, onImportLossless = {}, onProtons = {}, onComponents = {}, + onPerformance = {}, onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, onRemoveDesktop = {}, + ) +} From 392562bfaeedadef785718cee8154fdd91c7e9e6 Mon Sep 17 00:00:00 2001 From: rainleee <50471668+rainleee@users.noreply.github.com> Date: Sat, 14 Nov 2026 01:47:31 +0900 Subject: [PATCH 074/101] fix(session): the Steam UI on the Mali bridge stops flickering (#2506) * fix(session): the Steam UI on the Mali bridge stops flickering On the Mali bridge Steam's own web helper layout makes the Deck UI footer and overlays flicker (Mali-G78 MP14). When the browser UI is on the GPU, default to ANGLE on Vulkan without Chromium's Vulkan compositing. Values set by the user still win, and the software UI path is unchanged. * fix(session): keep empty Mali bridge CEF settings as set --- .../overlay/usr/local/bin/droiddeck-session | 3 ++ tools/tests/test_session_webhelper_layout.py | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index fbea003241..bbfe862b1d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1538,6 +1538,9 @@ case $mode in _bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing) echo "== steam: browser UI in software (Mali bridge)" elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then + # With Steam's own web helper layout the Deck UI's footer and overlays flicker on the bridge + # (Mali-G78 MP14). ANGLE on Vulkan without Chromium's Vulkan compositing draws them steadily. + : "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}" _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle="${BL_VKBRIDGE_CEF_ANGLE:-vulkan}") fi [ "${BL_VKBRIDGE_CEF_LOG:-0}" = 1 ] && _bl_cef+=(-cef-enable-logging=stderr -cef-v=1) diff --git a/tools/tests/test_session_webhelper_layout.py b/tools/tests/test_session_webhelper_layout.py index f14afd61da..0a6ba0b27f 100644 --- a/tools/tests/test_session_webhelper_layout.py +++ b/tools/tests/test_session_webhelper_layout.py @@ -43,6 +43,34 @@ class WebhelperLayoutTest(unittest.TestCase): def test_the_steam_block_uses_it(self): self.assertIn("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", SESSION.read_text()) + def test_the_gpu_ui_on_the_bridge_defaults_to_angle_on_vulkan_without_vulkan_compositing(self): + text = SESSION.read_text() + gpu = text.index('elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then') + software = text.rindex('_bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing)', 0, gpu) + defaults = text.index(': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"', gpu) + self.assertLess(software, gpu) + self.assertLess(defaults, text.index("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", gpu)) + self.assertLess(defaults, text.index("\n fi\n", gpu)) + + def test_the_defaults_give_way_to_settings(self): + script = ': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "bl_webhelper_layout\n" + env = {k: v for k, v in os.environ.items() if k not in KEYS} + run = lambda **s: subprocess.run(["bash", "-c", "set -u\n" + script], env={**env, **s}, + capture_output=True, text=True, check=True).stdout.strip() + self.assertEqual(run(), "--use-gl=angle --use-angle=vulkan") + self.assertEqual(run(BL_VKBRIDGE_CEF_VULKAN="1"), + "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + self.assertEqual(run(BL_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") + + def test_empty_settings_are_kept_as_set(self): + script = ': "${BL_VKBRIDGE_CEF_ANGLE=vulkan}" "${BL_VKBRIDGE_CEF_VULKAN=0}"\n' + layout_function() + "bl_webhelper_layout\n" + env = {k: v for k, v in os.environ.items() if k not in KEYS} + run = lambda **s: subprocess.run(["bash", "-c", "set -u\n" + script], env={**env, **s}, + capture_output=True, text=True, check=True).stdout.strip() + self.assertEqual(run(BL_VKBRIDGE_CEF_ANGLE=""), "stock") + self.assertEqual(run(BL_VKBRIDGE_CEF_VULKAN=""), + "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + if __name__ == "__main__": unittest.main() From 69b612be1f6aa3741ec49022f46dee8b7423da6c Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Fri, 13 Nov 2026 17:06:10 +0000 Subject: [PATCH 075/101] Fix Agent controls in the session drawer (#2568) * Open full agent controls from compact composer * Keep session drawer agent controls keyboard free * Keep agent controls inline beside close * Preserve Agent page Lab ABI compatibility * Open session drawer editor with controls closed * Consume Agent editor focus requests * Keep session editor open during focus transition --- .../com/droiddeck/launcher/ui/AgentPage.kt | 65 ++++++++++++++----- .../droiddeck/launcher/ui/SessionOverlay.kt | 3 +- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index ed036a4933..8a8bea8046 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -129,6 +129,18 @@ private const val COMPOSER_SLIDE_MS = 350L @Composable internal fun AgentPage( modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, hidesPet: Boolean = true, +) = AgentPageContent(modifier, inputModifier, visible, startTyping, hidesPet, showControlsWithoutKeyboard = false) + +@Composable +internal fun AgentPageWithControls( + modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, + showControlsWithoutKeyboard: Boolean, +) = AgentPageContent(modifier, inputModifier, visible, startTyping, hidesPet = true, showControlsWithoutKeyboard = showControlsWithoutKeyboard) + +@Composable +private fun AgentPageContent( + modifier: Modifier, inputModifier: Modifier, visible: Boolean, startTyping: Boolean, hidesPet: Boolean, + showControlsWithoutKeyboard: Boolean, ) { val context = LocalContext.current val view = LocalView.current @@ -227,7 +239,7 @@ internal fun AgentPage( } } androidx.compose.animation.AnimatedVisibility(!hidden, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { - AgentComposer(composer, draft, inputModifier, panel, togglePanel) { setup = true } + AgentComposer(composer, draft, inputModifier, panel, togglePanel, showControlsWithoutKeyboard) { setup = true } } } } @@ -240,6 +252,7 @@ private class ComposerState(typing: Boolean) { var typing by mutableStateOf(typing) var focusRequests by mutableIntStateOf(0) private set + private var consumedFocusRequests by mutableIntStateOf(0) /** Opened and waiting for the text field to take focus; focus passes through nothing on the way. */ var opening = false @@ -248,6 +261,12 @@ private class ComposerState(typing: Boolean) { opening = true focusRequests++ } + + fun hasUnconsumedFocusRequest() = focusRequests > consumedFocusRequests + + fun consumeFocusRequest() { + consumedFocusRequests = focusRequests + } } @Composable @@ -492,12 +511,14 @@ internal fun liveUsed(limit: AgentHost.Limit) = if (limit.resetsAt > 0 && limit. @Composable private fun AgentComposer( - composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit, + composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, + showControlsWithoutKeyboard: Boolean, onSetup: () -> Unit, ) { val context = LocalContext.current var draft by draftState var labOpen by rememberSaveable { mutableStateOf(false) } if (AgentHost.lab == null) labOpen = false + var controlsOpen by rememberSaveable { mutableStateOf(false) } var hadFocus by remember { mutableStateOf(false) } val send = send@{ val text = draft.trim() @@ -538,15 +559,25 @@ private fun AgentComposer( horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), ) { AgentActivity(labOpen) { labOpen = !labOpen } } - AgentEditor(composer, draftState, inputModifier, panel, onPanel, onSetup, send) - } else AgentReadingBar(composer, draft, inputModifier, labOpen, onLab = { labOpen = !labOpen }) { onPanel(AgentPanel.USAGE) } + AgentEditor(composer, draftState, inputModifier, panel, onPanel, onSetup, controlsOpen, { controlsOpen = it }, + highlightControls = showControlsWithoutKeyboard, send = send) + } else AgentReadingBar(composer, draft, inputModifier, labOpen, onLab = { labOpen = !labOpen }) { + if (showControlsWithoutKeyboard) { + controlsOpen = false + composer.typing = true + composer.opening = true + } else { + controlsOpen = true + composer.open() + } + } } } /** The composer while reading: one line holding what is going on, opened by a press or by Y. */ @Composable private fun AgentReadingBar( - composer: ComposerState, draft: String, inputModifier: Modifier, labOpen: Boolean, onLab: () -> Unit, onUsage: () -> Unit, + composer: ComposerState, draft: String, inputModifier: Modifier, labOpen: Boolean, onLab: () -> Unit, onControls: () -> Unit, ) { val context = LocalContext.current val colors = MaterialTheme.colorScheme @@ -569,7 +600,7 @@ private fun AgentReadingBar( horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f).padding(start = 8.dp).horizontalScroll(rememberScrollState()), ) { AgentActivity(labOpen, onLab) } - ContextRing("agent-usage-bar", onUsage) + HeaderAction(Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 36.dp, tag = "agent-controls", onClick = onControls) if (working) Box( contentAlignment = Alignment.Center, modifier = Modifier.padding(start = 4.dp).size(36.dp).clip(CircleShape).background(pal.error.copy(alpha = 0.22f)) @@ -582,7 +613,7 @@ private fun AgentReadingBar( @Composable private fun AgentEditor( composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, - onSetup: () -> Unit, send: () -> Unit, + onSetup: () -> Unit, menu: Boolean, onMenu: (Boolean) -> Unit, highlightControls: Boolean = false, send: () -> Unit, ) { val context = LocalContext.current val colors = MaterialTheme.colorScheme @@ -608,12 +639,11 @@ private fun AgentEditor( for (path in AgentAttachments.pending.toList()) AttachmentChip(path) { AgentAttachments.pending.remove(path) } } var focused by remember { mutableStateOf(false) } - var menu by rememberSaveable { mutableStateOf(false) } val field = remember { FocusRequester() } - LaunchedEffect(composer.focusRequests) { if (composer.focusRequests > 0) runCatching { field.requestFocus() } } + LaunchedEffect(composer.focusRequests) { if (composer.hasUnconsumedFocusRequest()) runCatching { field.requestFocus() } } Column( Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape16).background(colors.surface) - .border(1.dp, if (focused) pal.primary else pal.line, Shape16).padding(6.dp), + .border(if (focused || highlightControls) 2.dp else 1.dp, if (focused || highlightControls) pal.primary else pal.line, Shape16).padding(6.dp), ) { Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().height(36.dp)) { val model = AgentHost.models(context).firstOrNull { it.id == AgentHost.model }?.label ?: AgentHost.model ?: stringResource(R.string.agent_model_default) @@ -631,21 +661,21 @@ private fun AgentEditor( ContextRing("agent-usage", onClick = { onPanel(AgentPanel.USAGE) }) } if (menu) { - HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), size = 32.dp, tag = "agent-history") { menu = false; onPanel(AgentPanel.HISTORY) } - HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), size = 32.dp, tag = "agent-processes") { menu = false; onPanel(AgentPanel.PROCESSES) } + HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), size = 32.dp, tag = "agent-history") { onMenu(false); onPanel(AgentPanel.HISTORY) } + HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), size = 32.dp, tag = "agent-processes") { onMenu(false); onPanel(AgentPanel.PROCESSES) } HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), size = 32.dp, tag = "agent-new") { - menu = false + onMenu(false) AgentHost.forget(context) } HeaderAction(Icons.Outlined.Pets, stringResource(R.string.setup_agent_pet), selected = AgentPet.enabled, size = 32.dp, tag = "agent-pet-toggle") { AgentPet.set(context, !AgentPet.enabled) } HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, size = 32.dp, tag = "agent-settings") { - menu = false + onMenu(false) onSetup() } } - HeaderAction(if (menu) Icons.Outlined.Close else Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 32.dp, tag = "agent-menu") { menu = !menu } + HeaderAction(if (menu) Icons.Outlined.Close else Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 32.dp, tag = "agent-menu") { onMenu(!menu) } } Row(verticalAlignment = Alignment.Bottom) { if (LocalActivityResultRegistryOwner.current != null) AttachButton() @@ -658,7 +688,10 @@ private fun AgentEditor( draft, { draft = it }, Modifier.fillMaxWidth().focusRequester(field).onFocusChanged { focused = it.isFocused - if (it.isFocused) composer.opening = false + if (it.isFocused) { + composer.consumeFocusRequest() + composer.opening = false + } }.testTag("agent-input").then(inputModifier), textStyle = TextStyle(fontSize = 16.sp, color = colors.onSurface), cursorBrush = SolidColor(pal.primary), 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 94f4ff1a3c..92ba3727e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -558,11 +558,12 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont tabModifier = { key -> focus.track(page, "glasses-tab-$key").testTag("glasses-tab-$key") }, ) { selectedGlassesTab = it } // The agent's chat scrolls itself and keeps its composer at the bottom, so it takes the height left. - if (page == SessionDrawerPage.AGENT) AgentPage( + if (page == SessionDrawerPage.AGENT) AgentPageWithControls( Modifier.weight(1f).fillMaxWidth().padding(top = 8.dp, start = 14.dp, end = 14.dp), inputModifier = focus.track(page, "agent-input"), visible = open, startTyping = false, + showControlsWithoutKeyboard = true, ) else Column( modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll.getValue(page)), ) { CompositionLocalProvider(LocalChipMinWidth provides 96.dp, LocalCompactSettings provides true) { From 58af2e136b31db2a916620c147485611b1798613 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 12:32:24 -0500 Subject: [PATCH 076/101] feat(storage): name, select and remove every prefix and store game (#2565) * feat(storage): name, select and remove every prefix and store game * feat(storage): bulk remove picks prefixes, shader caches or both * fix(storage): count and clear a game's shader cache in every library * fix(storage): guard shared prefixes, batches and active downloads * fix(storage): count each shader cache once across games * fix(storage): hold store uninstalls against downloads and keep every shortcut's options * fix(stores): keep download cleanup and uninstall from overlapping * fix(stores): wait for an installer's file discard before uninstalling * fix(stores): a reinstall waits for the cancelled download's file cleanup * fix(storage): fast first scan, readable 4:3 layout and every shader cache counted * fix(storage): keep store sizes current and track discards from failing jobs * fix(stores): uninstall waits for a cancelled update's cleanup * test(stores): a reinstall waits for a failed job's discard --- .../droiddeck/launcher/frontend/AddedGames.kt | 11 + .../launcher/session/SessionPrefs.kt | 5 + .../launcher/storage/SteamStorage.kt | 36 ++ .../droiddeck/launcher/storage/StorageScan.kt | 121 +++++- .../launcher/storage/StorageState.kt | 99 ++++- .../launcher/stores/StoreInstalls.kt | 62 ++- .../droiddeck/launcher/stores/StoresState.kt | 36 +- .../launcher/stores/download/DownloadQueue.kt | 89 ++++- .../com/droiddeck/launcher/ui/StoragePage.kt | 377 +++++++++++++++--- app/src/main/res/values-ar/strings.xml | 15 +- app/src/main/res/values-b+es+419/strings.xml | 15 +- app/src/main/res/values-bg/strings.xml | 15 +- app/src/main/res/values-cs/strings.xml | 15 +- app/src/main/res/values-da/strings.xml | 15 +- app/src/main/res/values-de/strings.xml | 15 +- app/src/main/res/values-el/strings.xml | 15 +- app/src/main/res/values-es/strings.xml | 15 +- app/src/main/res/values-fi/strings.xml | 15 +- app/src/main/res/values-fr/strings.xml | 15 +- app/src/main/res/values-hi/strings.xml | 15 +- app/src/main/res/values-hu/strings.xml | 15 +- app/src/main/res/values-in/strings.xml | 15 +- app/src/main/res/values-it/strings.xml | 15 +- app/src/main/res/values-ja/strings.xml | 15 +- app/src/main/res/values-ko/strings.xml | 15 +- app/src/main/res/values-ms/strings.xml | 15 +- app/src/main/res/values-nb/strings.xml | 15 +- app/src/main/res/values-nl/strings.xml | 15 +- app/src/main/res/values-pl/strings.xml | 15 +- app/src/main/res/values-pt-rPT/strings.xml | 15 +- app/src/main/res/values-pt/strings.xml | 15 +- app/src/main/res/values-ro/strings.xml | 15 +- app/src/main/res/values-ru/strings.xml | 15 +- app/src/main/res/values-sv/strings.xml | 15 +- app/src/main/res/values-th/strings.xml | 15 +- app/src/main/res/values-tr/strings.xml | 15 +- app/src/main/res/values-uk/strings.xml | 15 +- app/src/main/res/values-vi/strings.xml | 15 +- app/src/main/res/values-zh-rCN/strings.xml | 15 +- app/src/main/res/values-zh-rHK/strings.xml | 15 +- app/src/main/res/values-zh-rTW/strings.xml | 15 +- app/src/main/res/values/strings.xml | 15 +- .../launcher/storage/SteamStorageTest.kt | 31 ++ .../download/DownloadQueueRemovalTest.kt | 276 +++++++++++++ .../ui/StorageComponentsBulkConfirmTest.kt | 2 +- 45 files changed, 1494 insertions(+), 146 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRemovalTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index d0f4ea80a0..c4d443184d 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -529,6 +529,17 @@ object AddedGames { } } + class Listed(val appId: Long, val name: String, val launchOptions: String) + + fun listed(context: Context): List? = runCatching { + val file = File(context.filesDir, "session/added-games.json") + if (!file.isFile) return null + val entries = org.json.JSONArray(file.readText()) + (0 until entries.length()).mapNotNull { i -> + entries.optJSONObject(i)?.takeIf { it.has("appid") }?.let { Listed(it.optLong("appid") and 0xFFFFFFFFL, it.optString("name"), it.optString("launch")) } + } + }.getOrNull() + fun writeListing(context: Context, games: List, extra: List = listOfNotNull(com.droiddeck.launcher.stores.epic.EpicClient.steamListing(context))): File { val file = File(context.filesDir, "session/added-games.json").apply { parentFile?.mkdirs() } 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 4c567fd1b6..cf7b324eac 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1281,6 +1281,11 @@ object SessionPrefs { fun addedGameStoredAppId(context: Context, folderPath: String): Long? = prefs(context).getLong("addedAppId:$folderPath", 0L).takeIf { it != 0L } + fun addedGameFolders(context: Context): Map = prefs(context).all.mapNotNull { (key, value) -> + val id = (value as? Long)?.takeIf { key.startsWith("addedAppId:") && it != 0L } ?: return@mapNotNull null + (id and 0xFFFFFFFFL) to key.removePrefix("addedAppId:") + }.toMap() + fun followStoreGame(context: Context, key: String, folderPath: String, gone: (String) -> Boolean) = synchronized(addedGameLock) { val p = prefs(context) val previous = p.getString("storeFolder:$key", null) diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt index 2111bfdee1..62ba45fd9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -155,6 +155,42 @@ object SteamStorage { fun leftoverId(name: String): Int? = name.toLongOrNull()?.takeIf { it in 1 until (1L shl 31) }?.toInt() + fun shortcutId(name: String): Long? = name.toLongOrNull() + ?.takeIf { it in Int.MIN_VALUE until 0 || it in (1L shl 31) until (1L shl 32) }?.and(0xFFFFFFFFL) + + private val COMPAT_PATH = Regex("""STEAM_COMPAT_DATA_PATH=(?:"([^"]*)"|'([^']*)'|(\S+))""") + private val COMPAT_ID = Regex("""/compatdata/(-?\d+)/*$""") + + fun sharedPrefixId(launchOptions: String): Long? { + val path = COMPAT_PATH.find(launchOptions)?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() } ?: return null + return COMPAT_ID.find(path.trim())?.groupValues?.get(1)?.let(::shortcutId) + } + + private val GAME_FOLDER = Regex("""Z:\\\\(?:[^"\\]+\\\\)*?(?:steamapps\\\\common|Games\\\\Stores\\\\[^"\\]+)\\\\([^"\\]+)""") + + fun gameFolderHint(prefix: File): String? = runCatching { + listOf("pfx/system.reg", "pfx/user.reg").map { File(prefix, it) }.filter { it.isFile && it.length() < 64L * 1024 * 1024 } + .flatMap { f -> f.useLines { lines -> lines.flatMap { GAME_FOLDER.findAll(it).map { m -> m.groupValues[1] } }.toList() } } + .groupingBy { it }.eachCount().maxByOrNull { it.value }?.key + }.getOrNull() + + class Shortcut(val name: String, val launchOptions: List) + + fun shortcuts(root: File): Map? = runCatching { + val userdata = File(root, "userdata") + val users = if (userdata.exists()) userdata.listFiles() ?: return null else emptyArray() + users.mapNotNull { File(it, "config/shortcuts.vdf").takeIf(File::isFile) }.flatMap { file -> + val vdf = com.droiddeck.launcher.frontend.SteamAppInfo.readMap(java.nio.ByteBuffer.wrap(file.readBytes()).order(java.nio.ByteOrder.LITTLE_ENDIAN), null) + (vdf["shortcuts"] as? Map<*, *>)?.values?.filterIsInstance>()?.mapNotNull { s -> + fun value(key: String) = s.entries.firstOrNull { (it.key as? String).equals(key, ignoreCase = true) }?.value as? String + val id = value("appid")?.toLongOrNull()?.and(0xFFFFFFFFL) ?: return@mapNotNull null + id to Shortcut(value("AppName") ?: "", listOfNotNull(value("LaunchOptions"))) + }.orEmpty() + }.groupBy({ it.first }, { it.second }).mapValues { (_, all) -> + Shortcut(all.firstOrNull { it.name.isNotEmpty() }?.name.orEmpty(), all.flatMap { it.launchOptions }) + } + }.getOrNull() + fun isStubPrefix(prefix: File): Boolean = prefix.walkTopDown().onEnter { !java.nio.file.Files.isSymbolicLink(it.toPath()) } .none { it.isFile && it.name != "steam_autocloud.vdf" && !java.nio.file.Files.isSymbolicLink(it.toPath()) } } diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt index 3a7c52db38..dc07daabaf 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -18,7 +18,7 @@ enum class Bucket { GAMES, GAME_DATA, TOOLS, COMPONENTS, STORES, DESKTOP, SYSTEM class GameUsage( val appId: Int, val name: String, val art: File?, val library: String, val internal: Boolean, val lastPlayed: Long, - val game: Long, val prefix: Long, val shaders: Long, val workshop: Long, val shaderDir: File?, + val game: Long, val prefix: Long, val shaders: Long, val workshop: Long, val shaderDirs: List, val x64: Boolean = false, val prefixDir: File? = null, ) { val data: Long get() = prefix + shaders + workshop @@ -33,7 +33,16 @@ class ToolUsage( val games: Int, val isDefault: Boolean, val manifests: List, val dirs: List, ) -class Leftover(val appId: Int, val prefix: File?, val shaders: File?, val bytes: Long, val safe: Boolean) +class Leftover(val appId: Long, val prefix: File?, val shaders: File?, val bytes: Long, val safe: Boolean, val shortcut: Boolean = false, val name: String? = null, val prefixBytes: Long = 0) + +enum class PrefixOwner { SHARED, LAUNCHER, GAME, UNKNOWN } + +class KeptPrefix( + val dir: File, val owner: PrefixOwner, val name: String?, val bytes: Long, val library: String, val x64: Boolean, val users: List = emptyList(), + val shaders: File? = null, val shaderBytes: Long = 0, +) + +class StoreGameUsage(val game: com.droiddeck.launcher.stores.InstalledStoreGame, val bytes: Long, val internal: Boolean) class ComponentUsage( val comp: String, val version: String, val bytes: Long, val inUse: Boolean, @@ -59,9 +68,11 @@ class StorageReport( val components: List, val flatpakApps: List, val flatpakRuntimes: Long, - val otherPrefixes: Long, + val kept: List, val leftoversChecked: Boolean, + val storeGames: List = emptyList(), ) { + val otherPrefixes: Long get() = kept.sumOf { it.bytes } val droiddeck: Long get() = buckets.values.sum() val installedShaders: Long get() = games.sumOf { it.shaders } val unusedTools: List get() = tools.filter { it.state == ToolState.UNUSED } @@ -91,7 +102,16 @@ object StorageScan { fun steamRoot(context: Context) = SessionPrefs.steamRoot(context, "arm64") + fun measure(file: File): Long = Walker().measure(file) + fun scan(context: Context): StorageReport { + val phases = ArrayList() + var mark = android.os.SystemClock.elapsedRealtime() + fun phase(name: String) { + val now = android.os.SystemClock.elapsedRealtime() + phases.add("$name ${now - mark}") + mark = now + } val walker = Walker() val files = context.filesDir val rootfs = LinuxRuntime.rootDir(context) @@ -99,6 +119,7 @@ object StorageScan { val x64Root = SessionPrefs.steamRoot(context, "x86_64").takeIf { SteamStorage.x64ClientPresent(it) } val clients = listOfNotNull("arm64", "x86_64".takeIf { x64Root != null }) fun canonical(f: File) = runCatching { f.canonicalPath }.getOrDefault(f.path) + phase("setup") val art = clients.associate { arch -> (arch == "x86_64") to runCatching { Library.steamGames(context, arch = arch) }.getOrDefault(emptyList()).associateBy { it.appId } } @@ -106,6 +127,7 @@ object StorageScan { class Lib(val root: File, val label: String, val internal: Boolean, val data: File, val listing: SteamStorage.Listing?, val x64: Boolean) { val manifests: List? get() = listing?.manifests } + phase("steam games") val libs = clients.flatMap { arch -> val x64 = arch == "x86_64" val primary = canonical(SessionPrefs.steamRoot(context, arch)) @@ -123,6 +145,7 @@ object StorageScan { val clientIds = libs.groupBy { it.x64 }.mapValues { (_, own) -> own.flatMap { it.listing?.ids.orEmpty() }.toSet() } fun installedGames(x64: Boolean) = libs.filter { it.x64 == x64 }.flatMap { it.manifests.orEmpty() } .filter { !SteamStorage.isTool(it) && it.installed }.map { it.appId.toString() }.toSet() + phase("libraries") val armUse = runCatching { SteamStorage.compatMappings(File(steamRoot, "config/config.vdf").readText()) }.getOrNull() ?.let { SteamStorage.ToolUse(it, installedGames(false)) } val x64Vdf = x64Root?.let { File(it, "config/config.vdf") } @@ -132,8 +155,10 @@ object StorageScan { val uses = listOfNotNull(armUse, x64Use) fun gamesOn(tool: String) = uses.sumOf { it.games(tool) } + val libraryDataRoots = File(files, "steam-libraries").listFiles().orEmpty().filter { it.isDirectory } val tools = LinkedHashMap() val games = ArrayList() + val countedShaders = HashSet() for (lib in libs) { for (m in lib.manifests.orEmpty()) { val dir = m.installDir @@ -176,17 +201,19 @@ object StorageScan { val compatRoot = File(lib.data, "steamapps/compatdata").takeIf { it.isDirectory } ?: File(lib.root, "steamapps/compatdata") val prefixDir = File(compatRoot, m.appId.toString()).takeIf { it.isDirectory } val prefix = prefixDir?.let { walker.measure(it) } ?: 0 - val shaderDir = File(lib.data, "steamapps/shadercache/${m.appId}").takeIf { it.isDirectory } - val shaders = shaderDir?.let { walker.measure(it) } ?: 0 + val shaderDirs = ((listOf(lib) + libs.filter { it !== lib && it.x64 == lib.x64 }).map { it.data } + libraryDataRoots) + .map { File(it, "steamapps/shadercache/${m.appId}") }.filter { it.isDirectory }.distinctBy { canonical(it) } + val shaders = shaderDirs.filter { countedShaders.add(canonical(it)) }.sumOf { walker.measure(it) } val workshop = File(lib.root, "steamapps/workshop/content/${m.appId}").takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 val known = art[lib.x64]?.get(m.appId) games.add(GameUsage( m.appId, known?.name ?: m.name, known?.art, lib.label, lib.internal, m.lastPlayed, - gameBytes, prefix, shaders, workshop, shaderDir, lib.x64, prefixDir, + gameBytes, prefix, shaders, workshop, shaderDirs, lib.x64, prefixDir, )) } } + phase("manifests and games") File(steamRoot, "compatibilitytools.d").listFiles()?.sortedBy { it.name }?.forEach { dir -> if (!dir.isDirectory) return@forEach val bytes = walker.measure(dir) @@ -206,6 +233,7 @@ object StorageScan { ) } + phase("compat tools") val leftovers = ArrayList() for (lib in libs) { if (!everyLibraryRead) break @@ -217,16 +245,22 @@ object StorageScan { for (id in (prefixes.keys + caches.keys).sorted()) { val prefix = prefixes[id] val cache = caches[id] - val bytes = (prefix?.let { walker.measure(it) } ?: 0) + (cache?.let { walker.measure(it) } ?: 0) + val prefixBytes = prefix?.let { walker.measure(it) } ?: 0 + val bytes = prefixBytes + (cache?.let { walker.measure(it) } ?: 0) val safe = prefix == null || SteamStorage.isStubPrefix(prefix) - leftovers.add(Leftover(id, prefix, cache, bytes, safe)) + val name = if (safe) null else runCatching { + com.droiddeck.launcher.frontend.SteamAppInfo.info(context, id, File(if (lib.x64) x64Root ?: steamRoot else steamRoot, "appcache/appinfo.vdf"))?.name + }.getOrNull()?.ifEmpty { null } + leftovers.add(Leftover(id.toLong(), prefix, cache, bytes, safe, name = name, prefixBytes = prefixBytes)) } } + phase("leftovers") val logs = SessionPaths.sessionFolders(context).filter { it != SessionPaths.current() } + listOf(File(LinuxRuntime.logDir(context), SessionPaths.TOOLS_DIR)).filter { it.exists() } val logBytes = logs.sumOf { walker.measure(it) } + phase("logs") val flatpakDir = File(rootfs, "root/.local/share/flatpak") val flatpakNames = runCatching { FlatpakManager.installedApps(context) }.getOrDefault(emptyList()).associate { it.id to it.name } val flatpakApps = File(flatpakDir, "app").listFiles().orEmpty().filter { it.isDirectory }.map { dir -> @@ -234,6 +268,7 @@ object StorageScan { }.sortedByDescending { it.bytes } val flatpakRuntimes = File(flatpakDir, "runtime").takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 + phase("flatpak") val componentsDir = File(files, "components") val stored = runCatching { ComponentsManager.stored(context) }.onFailure { Log.w("StorageScan", "components", it) }.getOrNull() val components = stored?.let { st -> @@ -241,10 +276,70 @@ object StorageScan { st.originals.map { ComponentUsage(it.comp, it.protonVersion, it.size, it.kept, protonId = it.protonId, protonName = it.protonName) } }.orEmpty() - val otherPrefixes = libs.flatMap { lib -> - File(lib.data, "steamapps/compatdata").listFiles().orEmpty().filter { it.isDirectory && SteamStorage.leftoverId(it.name) == null } - }.sumOf { walker.measure(it) } + phase("components") + val added = com.droiddeck.launcher.frontend.AddedGames.listed(context) + val shortcuts = listOfNotNull(steamRoot, x64Root).map { SteamStorage.shortcuts(it) } + val ownersRead = added != null && shortcuts.all { it != null } + val live = HashMap() + shortcuts.forEach { it?.forEach { (id, s) -> live[id] = s.name } } + added?.forEach { live[it.appId] = it.name } + val folders = SessionPrefs.addedGameFolders(context) + val removedFolders = SessionPrefs.removedAddedGames(context).toSet() + folders.forEach { (id, path) -> if (id !in live && path !in removedFolders && File(path).exists()) live[id] = File(path).name } + val launchers = mapOf( + com.droiddeck.launcher.runtime.BattleNet.APP_ID to com.droiddeck.launcher.stores.Store.BATTLENET.label, + com.droiddeck.launcher.stores.ubisoft.UbisoftConnect.APP_ID to com.droiddeck.launcher.stores.Store.UBISOFT.label, + com.droiddeck.launcher.stores.epic.EpicClient.shortcutAppId to Library.EPIC_LAUNCHER_NAME, + ) + val users = HashMap>() + fun shares(own: Long, name: String, launchOptions: String) { + SteamStorage.sharedPrefixId(launchOptions)?.takeIf { it != own }?.let { users.getOrPut(it) { LinkedHashSet() }.add(name) } + } + added?.forEach { shares(it.appId, it.name, it.launchOptions) } + shortcuts.forEach { it?.forEach { (id, s) -> s.launchOptions.forEach { shares(id, s.name, it) } } } + phase("added games and shortcuts") + val kept = ArrayList() + for (lib in libs) { + val dirs = File(lib.data, "steamapps/compatdata").listFiles().orEmpty().filter { it.isDirectory && SteamStorage.leftoverId(it.name) == null } + val caches = File(lib.data, "steamapps/shadercache").listFiles().orEmpty() + .mapNotNull { f -> SteamStorage.shortcutId(f.name)?.takeIf { f.isDirectory }?.let { it to f } }.toMap() + for (dir in dirs) { + val bytes = walker.measure(dir) + val id = SteamStorage.shortcutId(dir.name) + val cache = id?.let { caches[it] } + val cacheBytes = cache?.let { walker.measure(it) } ?: 0 + when { + dir.name == "0" -> kept.add(KeptPrefix(dir, PrefixOwner.SHARED, null, bytes, lib.label, lib.x64)) + id != null && (id in launchers || id in users) -> kept.add(KeptPrefix(dir, PrefixOwner.LAUNCHER, + launchers[id] ?: live[id]?.ifEmpty { null }, bytes, lib.label, lib.x64, users[id].orEmpty().toList(), cache, cacheBytes)) + id != null && id in live -> kept.add(KeptPrefix(dir, PrefixOwner.GAME, live[id]?.ifEmpty { null }, bytes, lib.label, lib.x64, shaders = cache, shaderBytes = cacheBytes)) + id != null && ownersRead -> { + leftovers.add(Leftover(id, dir, cache, bytes + cacheBytes, SteamStorage.isStubPrefix(dir), + shortcut = true, name = folders[id]?.let { File(it).name } ?: SteamStorage.gameFolderHint(dir), prefixBytes = bytes)) + } + else -> kept.add(KeptPrefix(dir, PrefixOwner.UNKNOWN, id?.toString() ?: dir.name, bytes, lib.label, lib.x64)) + } + } + if (!ownersRead) continue + val prefixIds = dirs.mapNotNullTo(HashSet()) { SteamStorage.shortcutId(it.name) } + for ((id, cache) in caches) { + if (id in prefixIds || id in live || id in launchers || id in users) continue + leftovers.add(Leftover(id, null, cache, walker.measure(cache), true, shortcut = true, name = folders[id]?.let { File(it).name })) + } + } + phase("kept prefixes") + val storeGames = (com.droiddeck.launcher.stores.StoreInstallRoot.gameFolders(context).mapNotNull { folder -> + com.droiddeck.launcher.stores.StoreGameSidecar.read(folder) + ?.takeIf { it.isInstalled || it.state == com.droiddeck.launcher.stores.StoreGameSidecar.STATE_UPDATING } + ?.let { com.droiddeck.launcher.stores.InstalledStoreGame(it, folder) } + } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetBackend.installedGames(context) }.getOrDefault(emptyList())) + .map { g -> + val internal = g.folder.path.startsWith(files.path + "/") + StoreGameUsage(g, if (internal) walker.measure(g.folder) else -1L, internal) + }.sortedByDescending { it.bytes } + + phase("store games") val clientRoots = listOfNotNull(steamRoot, x64Root) val apps = clientRoots.map { File(it, "steamapps") } val privateRoots = File(files, "steam-libraries").listFiles().orEmpty().filter { it.isDirectory } @@ -269,6 +364,8 @@ object StorageScan { val componentBytes = m(componentsDir) val droiddeck = m(files) + m(context.cacheDir) - rootfsBytes - privateBytes - componentBytes + (privateBytes - toolsPrivate - privatePrefixes - privateShaders) + phase("totals") + Log.i("StorageScan", "scan ms: " + phases.joinToString(", ")) val stat = StatFs(files.path) return StorageReport( System.currentTimeMillis(), stat.totalBytes, stat.availableBytes, @@ -284,7 +381,7 @@ object StorageScan { ), prefixes, shaders, workshop, flatpak, games.sortedByDescending { it.total }, tools.values.toList(), leftovers, logs, logBytes, - components, flatpakApps, flatpakRuntimes, otherPrefixes, everyLibraryRead, + components, flatpakApps, flatpakRuntimes, kept, everyLibraryRead, storeGames, ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt index 331c5b402f..40a48a3669 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt @@ -13,6 +13,7 @@ import com.droiddeck.launcher.files.FileOps import com.droiddeck.launcher.runtime.FlatpakManager import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.StoreGameSidecar enum class CleanItem { OLD_TOOLS, LEFTOVERS, LEFTOVERS_UNSURE, LOGS, UNUSED_CUSTOM, UNUSED_COMPONENTS, SHADERS } @@ -27,6 +28,45 @@ object StorageState { private set var cleaning by mutableStateOf(false) private set + var storeBatch by mutableStateOf(false) + private set + val busy: Boolean get() = cleaning || storeBatch + private var refreshAgain = false + val storeSizes = androidx.compose.runtime.mutableStateMapOf() + private var measuringStores = false + + private fun sizeKey(usage: StoreGameUsage): String = with(usage.game) { + "${folder.path}|${sidecar.installVersion}|${sidecar.installedAt}|${StoreGameSidecar.file(folder).lastModified()}" + } + + fun storeBytes(usage: StoreGameUsage): Long = if (usage.bytes >= 0) usage.bytes else storeSizes[sizeKey(usage)] ?: -1L + + private fun measureStoreGames(app: Context) { + val current = report ?: return + if (measuringStores) return + val wanted = current.storeGames.filter { it.bytes < 0 && sizeKey(it) !in storeSizes }.map { sizeKey(it) to it.game.folder } + if (wanted.isEmpty()) return + measuringStores = true + Thread({ + val started = android.os.SystemClock.elapsedRealtime() + for ((key, folder) in wanted) { + val bytes = runCatching { StorageScan.measure(folder) }.getOrDefault(0L) + main.post { storeSizes[key] = bytes } + } + Log.i(TAG, "measured ${wanted.size} store games on removable storage in ${android.os.SystemClock.elapsedRealtime() - started} ms") + main.post { + measuringStores = false + measureStoreGames(app) + } + }, "storage-store-sizes").start() + } + + private fun publish(app: Context, result: StorageReport) { + report = result + val live = result.storeGames.mapTo(HashSet()) { sizeKey(it) } + storeSizes.keys.retainAll(live) + measureStoreGames(app) + } var lastFreed by mutableStateOf(null) var progress by mutableStateOf(null) private set @@ -48,16 +88,21 @@ object StorageState { fun refresh(context: Context, force: Boolean = false) { val current = report - if (scanning || cleaning) return + if (scanning || cleaning) { + if (force) refreshAgain = true + return + } if (!force && current != null && System.currentTimeMillis() - current.at < FRESH_MS) return + refreshAgain = false val app = context.applicationContext scanning = true Thread({ val result = runCatching { StorageScan.scan(app) } .onFailure { Log.w(TAG, "storage scan failed", it) }.getOrNull() main.post { - if (result != null) report = result + if (result != null) publish(app, result) scanning = false + if (refreshAgain) refresh(app, force = true) } }, "storage-scan").start() } @@ -84,7 +129,7 @@ object StorageState { fun safeBytes(report: StorageReport): Long = SAFE.sumOf { bytes(report, it) } fun clean(context: Context, items: Set, onDone: (Long?) -> Unit) { - if (cleaning || SessionState.running) { onDone(null); return } + if (busy || SessionState.running) { onDone(null); return } val app = context.applicationContext appContext = app cleaning = true @@ -101,7 +146,7 @@ object StorageState { } fun removeTool(context: Context, tool: ToolUsage, onDone: (Long?) -> Unit) { - if (tool.state != ToolState.UNUSED || cleaning || SessionState.running) { onDone(null); return } + if (tool.state != ToolState.UNUSED || busy || SessionState.running) { onDone(null); return } val app = context.applicationContext cleaning = true Thread({ @@ -119,7 +164,7 @@ object StorageState { } private fun act(context: Context, name: String, action: (Context, StorageReport) -> Boolean, onDone: (Long?) -> Unit = {}) { - if (cleaning || SessionState.running) { onDone(null); return } + if (busy || SessionState.running) { onDone(null); return } val app = context.applicationContext appContext = app cleaning = true @@ -137,8 +182,8 @@ object StorageState { } fun clearShaders(context: Context, appId: Int, x64: Boolean = false) = act(context, "shaders-$appId", { _, fresh -> - val dir = fresh.games.firstOrNull { it.appId == appId && it.x64 == x64 }?.shaderDir ?: return@act false - FileOps.delete(dir) + val dirs = fresh.games.firstOrNull { it.appId == appId && it.x64 == x64 }?.shaderDirs.orEmpty() + dirs.isNotEmpty() && dirs.map { FileOps.delete(it) }.all { it } }) fun resetPrefix(context: Context, game: GameUsage) = act(context, "prefix-${game.appId}", { _, fresh -> @@ -155,6 +200,41 @@ object StorageState { true }) + fun resetKept(context: Context, prefix: KeptPrefix) = act(context, "kept-${prefix.dir.name}", { _, fresh -> + val dir = fresh.kept.firstOrNull { it.dir.path == prefix.dir.path && it.owner == prefix.owner } + ?.takeIf { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME }?.dir ?: return@act false + check(FileOps.delete(dir)) { "cannot delete $dir" } + true + }) + + fun uninstallStoreGames(context: Context, games: List) { + if (busy || SessionState.running || games.isEmpty()) return + storeBatch = true + uninstallNext(context.applicationContext, games) + } + + private fun uninstallNext(app: Context, games: List) { + val rest = games.dropWhile { com.droiddeck.launcher.stores.download.DownloadQueue.isActive(it.game.key) } + val next = rest.firstOrNull() + if (next == null || SessionState.running) { + storeBatch = false + com.droiddeck.launcher.stores.StoresState.notifyLibraryChanged(app) + refresh(app, force = true) + return + } + com.droiddeck.launcher.stores.StoresState.uninstall(app, next.game) { uninstallNext(app, rest.drop(1)) } + } + + fun removeDirs(context: Context, dirs: List) = act(context, "remove-${dirs.size}", { _, fresh -> + val allowed = (fresh.games.flatMap { it.shaderDirs + listOfNotNull(it.prefixDir) } + fresh.leftovers.flatMap { listOfNotNull(it.prefix, it.shaders) } + + fresh.kept.filter { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME }.flatMap { listOfNotNull(it.dir, it.shaders) }).mapTo(HashSet()) { it.path } + val wanted = dirs.distinctBy { it.path } + val targets = wanted.filter { it.path in allowed } + if (targets.size < wanted.size) Log.w(TAG, "kept ${wanted.size - targets.size} folders that are no longer safe to remove") + targets.forEach { check(FileOps.delete(it)) { "cannot delete $it" } } + targets.isNotEmpty() + }) + fun removeComponent(context: Context, usage: ComponentUsage) = act(context, "component", { app, fresh -> val current = fresh.components.firstOrNull { it.packageFile == usage.packageFile && it.protonId == usage.protonId && it.comp == usage.comp && it.version == usage.version } ?: return@act false @@ -186,10 +266,11 @@ object StorageState { private fun finish(app: Context, freed: Long?, onDone: (Long?) -> Unit) { val rescanned = runCatching { StorageScan.scan(app) }.getOrNull() main.post { - if (rescanned != null) report = rescanned + if (rescanned != null) publish(app, rescanned) cleaning = false lastFreed = freed onDone(freed) + if (refreshAgain) refresh(app, force = true) } } @@ -201,7 +282,7 @@ object StorageState { CleanItem.LEFTOVERS -> report.leftovers.filter { it.safe }.forEach(::deleteLeftover) CleanItem.LEFTOVERS_UNSURE -> report.leftovers.filter { !it.safe }.forEach(::deleteLeftover) CleanItem.LOGS -> report.logs.forEach { FileOps.delete(it) } - CleanItem.SHADERS -> report.games.mapNotNull { it.shaderDir }.forEach { FileOps.delete(it) } + CleanItem.SHADERS -> report.games.flatMap { it.shaderDirs }.forEach { FileOps.delete(it) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt index c29ea41652..e792b67a94 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt @@ -89,16 +89,62 @@ object StoreInstalls { StoresState.logLine("uninstalled \"${game.sidecar.title}\"") } + private val discarding = HashMap() + + fun isDiscarding(folder: File): Boolean = synchronized(discarding) { folder.absolutePath in discarding } + + internal fun beginDiscard(folder: File) { synchronized(discarding) { discarding.merge(folder.absolutePath, 1, Int::plus) } } + + internal fun endDiscard(folder: File) { + synchronized(discarding) { + discarding.computeIfPresent(folder.absolutePath) { _, n -> (n - 1).takeIf { it > 0 } } + (discarding as Object).notifyAll() + } + } + + fun awaitDiscard(folder: File) { + synchronized(discarding) { while (folder.absolutePath in discarding) (discarding as Object).wait() } + } + + private val started = ThreadLocal?>() + + fun collectingDiscards(into: MutableList = ArrayList(), block: () -> Unit): List { + val previous = started.get() + started.set(into) + try { + block() + } finally { + started.set(previous) + previous?.addAll(into) + } + return into + } + fun discard(context: Context, folder: File, caches: List) { val app = context.applicationContext - Thread({ - val sidecar = StoreGameSidecar.read(folder) - val keep = sidecar?.isInstalled == true || sidecar?.state == StoreGameSidecar.STATE_UPDATING - caches.forEach { deleteTree(it) } - if (!keep) deleteTree(folder) - StoresState.logLine(if (keep) "removed update caches for ${folder.name}; verified file swaps are retained" else "removed ${folder.name}") - StoresState.notifyLibraryChanged(app) - }, "store-cancel-clean").start() + beginDiscard(folder) + val worker = Thread({ + try { + discardNow(app, folder, caches) + } finally { + endDiscard(folder) + } + }, "store-cancel-clean") + started.get()?.add(worker) + worker.start() + } + + @androidx.annotation.VisibleForTesting + internal var beforeDiscard: (File) -> Unit = {} + + private fun discardNow(app: Context, folder: File, caches: List) { + beforeDiscard(folder) + val sidecar = StoreGameSidecar.read(folder) + val keep = sidecar?.isInstalled == true || sidecar?.state == StoreGameSidecar.STATE_UPDATING + caches.forEach { deleteTree(it) } + if (!keep) deleteTree(folder) + StoresState.logLine(if (keep) "removed update caches for ${folder.name}; verified file swaps are retained" else "removed ${folder.name}") + StoresState.notifyLibraryChanged(app) } fun deleteTree(dir: File) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 40fedbded2..46de6eaab0 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -314,23 +314,37 @@ object StoresState { val key = "${game.sidecar.store.id}:${game.sidecar.id}" uninstalling[key] = 0f background("stores-uninstall", onFailure = { main.post { uninstalling.remove(key); onDone() } }) { - runCatching { backends[game.sidecar.store]?.uninstall(app, game) } - if (game.sidecar.store == Store.BATTLENET && com.droiddeck.launcher.runtime.BattleNet.games(app).any { it.folder.absolutePath == game.folder.absolutePath }) { + if (!com.droiddeck.launcher.stores.download.DownloadQueue.holdForRemovalWhenFree(key)) { + logLine("kept \"${game.sidecar.title}\": its download or update is still running") main.post { uninstalling.remove(key); onDone() } return@background } - StoreInstalls.uninstall(app, game, progress = { f -> main.post { if (key in uninstalling) uninstalling[key] = f } }, removed = { - main.post { - installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } - uninstalling.remove(key) - if (game.sidecar.store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchUpdates.applied(app, key) - if (game.sidecar.store == Store.GAMEJOLT) com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.applied(app, key) - } - }) - main.post(onDone) + try { + StoreInstalls.awaitDiscard(game.folder) + uninstallHeld(app, game, key, onDone) + } finally { + com.droiddeck.launcher.stores.download.DownloadQueue.releaseRemoval(key) + } } } + private fun uninstallHeld(app: Context, game: InstalledStoreGame, key: String, onDone: () -> Unit) { + runCatching { backends[game.sidecar.store]?.uninstall(app, game) } + if (game.sidecar.store == Store.BATTLENET && com.droiddeck.launcher.runtime.BattleNet.games(app).any { it.folder.absolutePath == game.folder.absolutePath }) { + main.post { uninstalling.remove(key); onDone() } + return + } + StoreInstalls.uninstall(app, game, progress = { f -> main.post { if (key in uninstalling) uninstalling[key] = f } }, removed = { + main.post { + installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } + uninstalling.remove(key) + if (game.sidecar.store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchUpdates.applied(app, key) + if (game.sidecar.store == Store.GAMEJOLT) com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.applied(app, key) + } + }) + main.post(onDone) + } + @Volatile var libraryListener: (() -> Unit)? = null fun notifyLibraryChanged(context: Context) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt index 379161ebf1..19dc8ea178 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.stores.download import android.content.Context import android.util.Log import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.StoreInstalls import com.droiddeck.launcher.stores.StoresState import java.util.concurrent.atomic.AtomicBoolean @@ -102,6 +103,55 @@ object DownloadQueue { private val lock = Any() private val items = LinkedHashMap() private val heldPaused = HashSet() + private val removing = HashSet() + private val cleaningUp = HashMap() + + fun holdForRemoval(key: String): Boolean = synchronized(lock) { + val item = items[key] + if (item?.entry?.isActive == true || item?.job != null || key in cleaningUp || key in removing) return@synchronized false + removing.add(key) + true + } + + fun releaseRemoval(key: String) { synchronized(lock) { removing.remove(key); (lock as Object).notifyAll() } } + + fun holdForRemovalWhenFree(key: String): Boolean = synchronized(lock) { + while (true) { + val item = items[key] + if (item?.entry?.isActive == true || item?.job != null) return@synchronized false + if (key !in cleaningUp && key !in removing) break + (lock as Object).wait() + } + removing.add(key) + true + } + + private fun beginCleanup(key: String): Boolean = synchronized(lock) { + if (key in removing) return@synchronized false + cleaningUp.merge(key, 1, Int::plus) + true + } + + private fun holdCleanup(key: String) { synchronized(lock) { cleaningUp.merge(key, 1, Int::plus) } } + + private fun endCleanup(key: String) { + synchronized(lock) { + cleaningUp.computeIfPresent(key) { _, n -> (n - 1).takeIf { it > 0 } } + (lock as Object).notifyAll() + } + } + + private fun cleanUpLater(context: Context, key: String, name: String, work: () -> Unit) { + Thread({ + try { + val deleting = ArrayList() + try { StoreInstalls.collectingDiscards(deleting, work) } finally { deleting.forEach { it.join() } } + } finally { + endCleanup(key) + advance(context) + } + }, name).start() + } fun holdPaused(key: String) = synchronized(lock) { heldPaused.add(key) } private var running = 0 @@ -131,6 +181,7 @@ object DownloadQueue { fun enqueue(context: Context, entry: DownloadEntry, factory: () -> DownloadJob) { val app = context.applicationContext synchronized(lock) { + if (entry.key in removing) { Log.i(TAG, "${entry.key}: being uninstalled"); return } items[entry.key]?.let { if (it.entry.isActive) { Log.i(TAG, "${entry.key}: already queued"); return } } items.remove(entry.key) val state = if (heldPaused.remove(entry.key)) DownloadState.PAUSED else DownloadState.QUEUED @@ -185,6 +236,7 @@ object DownloadQueue { val retry: (() -> Unit)? synchronized(lock) { val item = items[key] ?: return + if (key in removing) return if (item.entry.state != DownloadState.PAUSED && item.entry.state != DownloadState.FAILED) return retry = item.retry if (retry == null && item.factory == null) return @@ -206,23 +258,28 @@ object DownloadQueue { val app = context.applicationContext val item: Item val wasRunning: Boolean + var cleanup = false + var awaitDeletion: List = emptyList() synchronized(lock) { item = items[key] ?: return if (!item.entry.interruptible) return wasRunning = item.entry.state == DownloadState.RUNNING if (wasRunning) { item.cancelled.set(true) - item.job?.cancel(deleteFiles = true) + val deleting = StoreInstalls.collectingDiscards { runCatching { item.job?.cancel(deleteFiles = true) } } + if (deleting.isNotEmpty()) { holdCleanup(key); awaitDeletion = deleting } } if (!wasRunning) { + cleanup = beginCleanup(key) item.entry = item.entry.copy(state = DownloadState.CANCELLED, queuePosition = 0, finishedAt = System.currentTimeMillis()) renumber() publishLocked() } } - if (!wasRunning) { - Thread({ runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } }, "store-dl-cancel").start() + if (cleanup) { + cleanUpLater(app, key, "store-dl-cancel") { runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } } } + if (awaitDeletion.isNotEmpty()) cleanUpLater(app, key, "store-dl-cancel-wait") { awaitDeletion.forEach { it.join() } } StoresState.logLine("cancelled \"${item.entry.name}\"") StoreDownloadService.finish(app, key) advance(app) @@ -230,12 +287,16 @@ object DownloadQueue { } fun clear(context: Context, key: String) { - val item = synchronized(lock) { items[key] } ?: return - if (item.entry.state == DownloadState.RUNNING || item.entry.state == DownloadState.QUEUED) return - if (item.entry.state == DownloadState.FAILED || item.entry.state == DownloadState.PAUSED) { - Thread({ runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } }, "store-dl-clear").start() + val item: Item + val cleanup: Boolean + synchronized(lock) { + item = items[key] ?: return + if (item.entry.state == DownloadState.RUNNING || item.entry.state == DownloadState.QUEUED) return + cleanup = (item.entry.state == DownloadState.FAILED || item.entry.state == DownloadState.PAUSED) && beginCleanup(key) + items.remove(key) + publishLocked() } - synchronized(lock) { items.remove(key); publishLocked() } + if (cleanup) cleanUpLater(context.applicationContext, key, "store-dl-clear") { runCatching { item.factory?.invoke()?.cancel(deleteFiles = true) } } StoreDownloadService.finish(context.applicationContext, key) } @@ -298,7 +359,7 @@ object DownloadQueue { val next: Item synchronized(lock) { if (running >= parallel(context)) return - next = items.values.firstOrNull { it.entry.state == DownloadState.QUEUED } ?: return + next = items.values.firstOrNull { it.entry.state == DownloadState.QUEUED && it.entry.key !in cleaningUp } ?: return running++ next.entry = next.entry.copy(state = DownloadState.RUNNING, stage = DownloadStage.MANIFEST, queuePosition = 0) renumber() @@ -318,7 +379,15 @@ object DownloadQueue { val job = checkNotNull(item.factory).invoke() synchronized(lock) { item.job = job } StoresState.logLine("${item.entry.store.label}: fetching manifest for \"${item.entry.name}\"") - result = job.run(handle) + val deleting = ArrayList() + try { + StoreInstalls.collectingDiscards(deleting) { result = job.run(handle) } + } finally { + if (deleting.isNotEmpty()) { + holdCleanup(item.entry.key) + cleanUpLater(context, item.entry.key, "store-dl-run-discard") { deleting.forEach { it.join() } } + } + } if (result == null && !item.cancelled.get()) error = "install failed" } catch (t: Throwable) { error = t.message ?: t.javaClass.simpleName diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index 68bcb8d27d..1333172d7a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.interaction.collectIsHoveredAsState import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow @@ -86,6 +87,9 @@ import com.droiddeck.launcher.storage.Bucket import com.droiddeck.launcher.storage.CleanItem import com.droiddeck.launcher.storage.ComponentUsage import com.droiddeck.launcher.storage.GameUsage +import com.droiddeck.launcher.storage.KeptPrefix +import com.droiddeck.launcher.storage.PrefixOwner +import com.droiddeck.launcher.storage.StoreGameUsage import com.droiddeck.launcher.storage.StorageReport import com.droiddeck.launcher.storage.StorageState import com.droiddeck.launcher.storage.ToolReason @@ -148,6 +152,7 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { "data" -> GameDataView(report, s.sessionRunning) { view = "overview" } "components" -> ComponentsView(report, s.sessionRunning) { view = "overview" } "desktop" -> DesktopView(report, s.sessionRunning) { view = "overview" } + "stores" -> StoreGamesView(report, s.sessionRunning) { view = "overview" } "tools" -> ToolsView(report, s.sessionRunning) { view = "overview" } else -> Overview(report, s.sessionRunning, onCleanUp = { cleanup = true }, onOpen = { view = it }) } @@ -260,12 +265,23 @@ private fun DefaultStorageGroup() { } } -@OptIn(ExperimentalLayoutApi::class) @Composable private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { + val narrowPane = LocalNarrowPane.current + BoxWithConstraints(Modifier.fillMaxWidth()) { + val wide = !narrowPane && maxWidth >= WIDE_OVERVIEW + Column { OverviewContent(report, sessionRunning, wide, onCleanUp, onOpen) } + } +} + +private val WIDE_OVERVIEW = 700.dp +private val NARROW_ROW = 640.dp + +@OptIn(ExperimentalLayoutApi::class) +@Composable +private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val wide = !LocalNarrowPane.current val used = report.total - report.free val safe = StorageState.safeBytes(report) val low = report.free < StorageState.LOW_SPACE_BYTES @@ -275,7 +291,7 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: val usage: @Composable (Modifier) -> Unit = { m -> Column(m) { FlowRow(verticalArrangement = Arrangement.spacedBy(4.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { Text(stringResource(R.string.storage_internal), fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) - Text("· " + stringResource(R.string.storage_used_of, gb(used), gb(report.total)), fontSize = 15.sp, color = colors.onSurfaceVariant) + Text(stringResource(R.string.storage_used_of, gb(used), gb(report.total)), fontSize = 15.sp, color = colors.onSurfaceVariant) Pill(stringResource(R.string.storage_free, gb(report.free)), if (low) AttentionAmber else pal.good) } val time = DateFormat.getTimeInstance(DateFormat.SHORT).format(Date(report.at)) @@ -294,7 +310,7 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: Text(stringResource(R.string.storage_safe_now), fontSize = 13.sp, color = colors.onSurfaceVariant) Text(gb(safe), fontSize = 26.sp, fontWeight = FontWeight.Bold, color = if (safe > 0) pal.good else colors.onBackground) Text(stringResource(R.string.storage_safe_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 10.dp)) - PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.cleaning, compact = true, onClick = onCleanUp) + PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.busy, compact = true, onClick = onCleanUp) } } if (wide) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(18.dp), modifier = summary) { usage(Modifier.weight(1f)) @@ -338,7 +354,8 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: }, { m -> BucketCard(Bucket.STORES, Icons.Outlined.ShoppingBag, stringResource(R.string.storage_stores), - stringResource(R.string.storage_stores_hint), report.buckets.getValue(Bucket.STORES), m) + pluralStringResource(R.plurals.storage_games_installed, report.storeGames.size, report.storeGames.size), + report.buckets.getValue(Bucket.STORES), m) { onOpen("stores") } }, { m -> BucketCard(Bucket.DESKTOP, Icons.Outlined.Monitor, stringResource(R.string.storage_desktop), @@ -485,7 +502,7 @@ private fun CleanUpDialog(report: StorageReport, sessionRunning: Boolean, onDism } }, confirmButton = { - if (picked.isNotEmpty() && !sessionRunning && !StorageState.cleaning) { + if (picked.isNotEmpty() && !sessionRunning && !StorageState.busy) { FocusText(stringResource(R.string.storage_free_button, gb(total)), pal.signal) { StorageState.clean(ctx, picked) { onDismiss() } } @@ -501,8 +518,6 @@ private fun CleanUpDialog(report: StorageReport, sessionRunning: Boolean, onDism private fun CleanRow(item: CleanItem, report: StorageReport, on: Boolean, modifier: Modifier, onToggle: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value val unsureCount = report.leftovers.count { !it.safe } val safeCount = report.leftovers.count { it.safe } val oldTools = report.unusedTools.filter { it.reason != ToolReason.CUSTOM } @@ -517,6 +532,23 @@ private fun CleanRow(item: CleanItem, report: StorageReport, on: Boolean, modifi CleanItem.UNUSED_COMPONENTS -> Triple(stringResource(R.string.storage_item_components), unusedLabels.joinToString(", "), 1) CleanItem.SHADERS -> Triple(stringResource(R.string.storage_item_shaders), stringResource(R.string.storage_item_shaders_detail), 2) } + ToggleRow( + title, detail, StorageState.bytes(report, item), on, modifier, + when (tag) { + 0 -> stringResource(R.string.storage_tag_safe) to pal.good + 1 -> stringResource(R.string.storage_tag_unused) to colors.onSurfaceVariant + else -> stringResource(if (item == CleanItem.SHADERS) R.string.storage_tag_stutter else R.string.storage_tag_saves) to AttentionAmber + }, + onToggle, + ) +} + +@Composable +private fun ToggleRow(title: String, detail: String, bytes: Long, on: Boolean, modifier: Modifier, pill: Pair, onToggle: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value val shape = RoundedCornerShape(12.dp) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), @@ -535,16 +567,12 @@ private fun CleanRow(item: CleanItem, report: StorageReport, on: Boolean, modifi ) { if (on) Icon(Icons.Filled.Check, contentDescription = null, tint = Color.White, modifier = Modifier.size(16.dp)) } Column(Modifier.weight(1f)) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Text(title, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) - when (tag) { - 0 -> Pill(stringResource(R.string.storage_tag_safe), pal.good) - 1 -> Pill(stringResource(R.string.storage_tag_unused), colors.onSurfaceVariant) - else -> Pill(stringResource(if (item == CleanItem.SHADERS) R.string.storage_tag_stutter else R.string.storage_tag_saves), AttentionAmber) - } + Text(title, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + Pill(pill.first, pill.second) } Text(detail, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis) } - Text(gb(StorageState.bytes(report, item)), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Text(gb(bytes), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) } } @@ -583,6 +611,8 @@ private fun GamesView(report: StorageReport, sessionRunning: Boolean, a: FrontEn Column(Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { if (games.isEmpty()) Text(stringResource(R.string.storage_no_games), fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(16.dp)) games.forEachIndexed { i, g -> + BoxWithConstraints(Modifier.fillMaxWidth()) { + val narrow = maxWidth < NARROW_ROW Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth().padding(horizontal = 14.dp, vertical = 8.dp), @@ -594,13 +624,14 @@ private fun GamesView(report: StorageReport, sessionRunning: Boolean, a: FrontEn Text(gameName(g), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) Text( listOfNotNull( + stringResource(R.string.storage_game_parts, gb(g.game), gb(g.data)).takeIf { narrow }, g.library.takeIf { !g.internal }, if (g.lastPlayed > 0) stringResource(R.string.storage_played, DateFormat.getDateInstance(DateFormat.MEDIUM).format(Date(g.lastPlayed * 1000))) else stringResource(R.string.storage_never_played), ).joinToString(" · "), - fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = if (narrow) 2 else 1, overflow = TextOverflow.Ellipsis, ) } - Column(Modifier.weight(1f)) { + if (!narrow) Column(Modifier.weight(1f)) { Row(Modifier.fillMaxWidth().height(8.dp).clip(RoundedCornerShape(4.dp)).background(Color(0xFF0A0C0F))) { listOf(g.game to BucketColors.getValue(Bucket.GAMES), g.prefix to BucketColors.getValue(Bucket.GAME_DATA), (g.shaders + g.workshop) to Color(0xFFC5B8FF)) .forEach { (v, c) -> if (v > 0) Box(Modifier.weight(v.toFloat() / max).fillMaxHeight().background(c)) } @@ -615,6 +646,7 @@ private fun GamesView(report: StorageReport, sessionRunning: Boolean, a: FrontEn Text(gb(g.total), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.widthIn(min = 72.dp)) SecondaryButton(stringResource(R.string.storage_uninstall), compact = true, enabled = !sessionRunning) { confirm = g } } + } if (i < games.lastIndex) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) } } @@ -662,7 +694,7 @@ private fun ToolsView(report: StorageReport, sessionRunning: Boolean, onBack: () stringResource(R.string.storage_tools_detail, gb(report.tools.sumOf { it.bytes }), gb(unused.sumOf { it.bytes })), onBack, ) { if (unused.isNotEmpty()) PrimaryButton(stringResource(R.string.storage_remove_unused, gb(unused.sumOf { it.bytes })), compact = true, - enabled = !sessionRunning && !StorageState.cleaning) { confirmAll = true } + enabled = !sessionRunning && !StorageState.busy) { confirmAll = true } } if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } SectionTitle(stringResource(R.string.storage_in_use), null) @@ -731,26 +763,22 @@ private fun toolDetail(t: ToolUsage): String = when (t.reason) { private fun ToolList(tools: List, sessionRunning: Boolean, onRemove: (ToolUsage) -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - Column(Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { + ListCard { tools.forEachIndexed { i, t -> - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), - modifier = Modifier.fillMaxWidth().heightIn(min = 56.dp).padding(horizontal = 14.dp, vertical = 8.dp), - ) { - Column(Modifier.weight(1f)) { - Text(t.name, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text(toolDetail(t), fontSize = 12.5.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) - } - when (t.state) { - ToolState.IN_USE -> Pill(if (t.isDefault) stringResource(R.string.storage_tag_default) else pluralStringResource(R.plurals.storage_tag_games, t.games, t.games), pal.signal) - ToolState.REQUIRED -> Pill(stringResource(R.string.storage_tag_required), colors.onSurfaceVariant) - ToolState.UNUSED -> Pill(stringResource(R.string.storage_tag_not_used), AttentionAmber) - } - Text(gb(t.bytes), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.widthIn(min = 70.dp)) - if (t.state == ToolState.UNUSED) SecondaryButton(stringResource(R.string.storage_remove), compact = true, enabled = !sessionRunning && !StorageState.cleaning) { onRemove(t) } - else Icon(Icons.Outlined.Lock, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) - } - if (i < tools.lastIndex) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + ItemRow( + t.name, toolDetail(t), t.bytes, i == tools.lastIndex, + pill = { + when (t.state) { + ToolState.IN_USE -> Pill(if (t.isDefault) stringResource(R.string.storage_tag_default) else pluralStringResource(R.plurals.storage_tag_games, t.games, t.games), pal.signal) + ToolState.REQUIRED -> Pill(stringResource(R.string.storage_tag_required), colors.onSurfaceVariant) + ToolState.UNUSED -> Pill(stringResource(R.string.storage_tag_not_used), AttentionAmber) + } + }, + action = { + if (t.state == ToolState.UNUSED) SecondaryButton(stringResource(R.string.storage_remove), compact = true, enabled = !sessionRunning && !StorageState.busy) { onRemove(t) } + else Icon(Icons.Outlined.Lock, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) + }, + ) } } } @@ -811,24 +839,72 @@ private fun ListCard(content: @Composable () -> Unit) { } @Composable -private fun ItemRow(title: String, detail: String?, bytes: Long, last: Boolean, pill: (@Composable () -> Unit)? = null, action: (@Composable () -> Unit)? = null) { +private fun ItemRow( + title: String, detail: String?, bytes: Long, last: Boolean, pill: (@Composable () -> Unit)? = null, + selected: Boolean? = null, onSelect: () -> Unit = {}, selectable: Boolean = true, slot: Boolean = false, + stack: Boolean = pill != null, action: (@Composable () -> Unit)? = null, +) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), - modifier = Modifier.fillMaxWidth().heightIn(min = 56.dp).padding(horizontal = 14.dp, vertical = 8.dp), - ) { - Column(Modifier.weight(1f)) { - Text(title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - if (detail != null) Text(detail, fontSize = 12.5.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + BoxWithConstraints(Modifier.fillMaxWidth()) { + val tight = maxWidth < NARROW_ROW + val narrow = tight && stack + val size = @Composable { + Text(if (bytes < 0) "…" else gb(bytes), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + modifier = if (narrow) Modifier else Modifier.widthIn(min = 70.dp)) + } + Column(Modifier.fillMaxWidth().heightIn(min = 56.dp).padding(horizontal = 14.dp, vertical = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { + if (selected != null) SelectBox(selected, selectable, onSelect) else if (slot) Spacer(Modifier.size(40.dp)) + Column(Modifier.weight(1f)) { + Text(title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = if (narrow) 2 else 1, overflow = TextOverflow.Ellipsis) + if (detail != null) Text(detail, fontSize = 12.5.sp, color = colors.onSurfaceVariant, maxLines = if (tight) 2 else 1, overflow = TextOverflow.Ellipsis) + } + if (narrow) size() else { + pill?.invoke() + size() + action?.invoke() + } + } + if (narrow) Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), + modifier = Modifier.fillMaxWidth(), + ) { + pill?.invoke() + action?.invoke() + } } - pill?.invoke() - Text(gb(bytes), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.widthIn(min = 70.dp)) - action?.invoke() } if (!last) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) } +@Composable +private fun SelectBox(on: Boolean, enabled: Boolean, onToggle: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = enabled && (src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value) + val shape = RoundedCornerShape(6.dp) + val edge = when { + on || hot -> pal.signal + enabled -> colors.onSurfaceVariant + else -> colors.onSurfaceVariant.copy(alpha = 0.35f) + } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(40.dp).clip(RoundedCornerShape(10.dp)) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) + .then(if (enabled) Modifier.hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Checkbox, onClick = onToggle) + .controllerConfirm(onClick = onToggle) else Modifier), + ) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(22.dp).clip(shape).background(if (on) pal.signal else Color.Transparent).border(2.dp, edge, shape), + ) { if (on) Icon(Icons.Filled.Check, contentDescription = null, tint = Color.White, modifier = Modifier.size(16.dp)) } + } +} + @Composable private fun ConfirmDialog(title: String, body: String, confirm: String, danger: Boolean = true, onConfirm: () -> Unit, onDismiss: () -> Unit) { val colors = MaterialTheme.colorScheme @@ -846,22 +922,53 @@ private fun ConfirmDialog(title: String, body: String, confirm: String, danger: ) } +private class DataTarget(val key: String, val label: String, val prefixes: List>, val shaders: List>) + @Composable private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { val ctx = LocalContext.current - val busy = sessionRunning || StorageState.cleaning + val busy = sessionRunning || StorageState.busy var confirm by remember { mutableStateOf(null) } var confirmPrefix by remember { mutableStateOf(null) } - SubHeader(stringResource(R.string.storage_game_data), stringResource(R.string.storage_game_data_hint, gb(report.prefixes), gb(report.workshop), gb(report.shaders)), onBack) + var confirmKept by remember { mutableStateOf(null) } + var picked by remember { mutableStateOf(emptySet()) } + var confirmBulk by remember { mutableStateOf(false) } + val games = report.games.filter { it.data >= ONE_MB || it.prefixDir != null }.sortedByDescending { it.data } + val leftovers = report.leftovers.sortedByDescending { it.bytes } + val safe = leftovers.filter { it.safe } + val unsure = leftovers.filter { !it.safe } + val kept = report.kept.filter { it.bytes + it.shaderBytes >= ONE_MB }.sortedByDescending { it.bytes + it.shaderBytes } + val safeLabel = pluralStringResource(R.plurals.storage_item_leftovers_detail, safe.size, safe.size) + val gameNames = games.associate { gameKey(it) to gameName(it) } + val unsureNames = unsure.associate { leftoverKey(it) to leftoverName(it) } + val keptNames = kept.associate { it.dir.path to keptName(it) } + val targets = buildList { + games.forEach { g -> + add(DataTarget(gameKey(g), gameNames[gameKey(g)].orEmpty(), + listOfNotNull(g.prefixDir?.let { it to g.prefix }), g.shaderDirs.takeIf { g.shaders > 0 }.orEmpty().mapIndexed { i, d -> d to if (i == 0) g.shaders else 0L })) + } + if (safe.isNotEmpty()) add(DataTarget("safe", safeLabel, safe.mapNotNull { l -> l.prefix?.let { it to l.prefixBytes } }, safe.mapNotNull { l -> l.shaders?.let { it to l.bytes - l.prefixBytes } })) + unsure.forEach { l -> add(DataTarget("left:${leftoverKey(l)}", unsureNames[leftoverKey(l)].orEmpty(), listOfNotNull(l.prefix?.let { it to l.prefixBytes }), listOfNotNull(l.shaders?.let { it to l.bytes - l.prefixBytes }))) } + kept.filter { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME } + .forEach { k -> add(DataTarget("kept:${k.dir.path}", keptNames[k.dir.path].orEmpty(), listOf(k.dir to k.bytes), listOfNotNull(k.shaders?.let { it to k.shaderBytes }))) } + }.associateBy { it.key } + val chosen = picked.mapNotNull { targets[it] } + fun bytesOf(t: DataTarget, prefixes: Boolean, shaders: Boolean): Long = + (if (prefixes) t.prefixes.sumOf { it.second } else 0L) + (if (shaders) t.shaders.sumOf { it.second } else 0L) + fun toggle(key: String) { picked = if (key in picked) picked - key else picked + key } + SubHeader(stringResource(R.string.storage_game_data), stringResource(R.string.storage_game_data_hint, gb(report.prefixes), gb(report.workshop), gb(report.shaders)), onBack) { + if (chosen.isNotEmpty()) PrimaryButton(stringResource(R.string.storage_remove_selected, gb(chosen.sumOf { bytesOf(it, true, true) })), compact = true, enabled = !busy) { confirmBulk = true } + } ActionStatus() if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } - val games = report.games.filter { it.data >= ONE_MB || it.prefixDir != null }.sortedByDescending { it.data } SectionTitle(stringResource(R.string.storage_data_installed), gb(games.sumOf { it.data })) ListCard { if (games.isEmpty()) Text(stringResource(R.string.storage_no_games), fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(16.dp)) games.forEachIndexed { i, g -> + val key = gameKey(g) ItemRow( gameName(g), stringResource(R.string.storage_data_parts, gb(g.prefix), gb(g.shaders), gb(g.workshop)), g.data, i == games.lastIndex, + selected = key in picked, selectable = !busy && (g.prefixDir != null || g.shaders > 0), onSelect = { toggle(key) }, stack = true, action = { Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { SecondaryButton(stringResource(R.string.storage_clear_shaders), compact = true, enabled = !busy && g.shaders >= ONE_MB) { StorageState.clearShaders(ctx, g.appId, g.x64) } @@ -871,33 +978,73 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: ) } } - val leftovers = report.leftovers.sortedByDescending { it.bytes } if (!report.leftoversChecked) { SectionTitle(stringResource(R.string.storage_data_leftovers), null) Note(stringResource(R.string.storage_leftovers_unchecked)) } if (leftovers.isNotEmpty()) { SectionTitle(stringResource(R.string.storage_data_leftovers), gb(leftovers.sumOf { it.bytes })) - val safe = leftovers.filter { it.safe } ListCard { if (safe.isNotEmpty()) ItemRow( - pluralStringResource(R.plurals.storage_item_leftovers_detail, safe.size, safe.size), null, safe.sumOf { it.bytes }, leftovers.none { !it.safe }, + safeLabel, null, safe.sumOf { it.bytes }, unsure.isEmpty(), pill = { Pill(stringResource(R.string.storage_tag_safe), LocalPalette.current.good) }, + selected = "safe" in picked, selectable = !busy, onSelect = { toggle("safe") }, action = { SecondaryButton(stringResource(R.string.storage_remove), compact = true, enabled = !busy) { StorageState.clean(ctx, setOf(CleanItem.LEFTOVERS)) { } } }, ) - val unsure = leftovers.filter { !it.safe } unsure.forEachIndexed { i, l -> + val key = "left:${leftoverKey(l)}" ItemRow( - stringResource(R.string.storage_steam_app, l.appId), stringResource(R.string.storage_leftover_unsure_detail), l.bytes, i == unsure.lastIndex, + leftoverName(l), stringResource(R.string.storage_leftover_unsure_detail), l.bytes, i == unsure.lastIndex, pill = { Pill(stringResource(R.string.storage_tag_saves), AttentionAmber) }, + selected = key in picked, selectable = !busy, onSelect = { toggle(key) }, action = { SecondaryButton(stringResource(R.string.storage_remove), compact = true, enabled = !busy) { confirm = l } }, ) } } } - if (report.otherPrefixes > 0) { - SectionTitle(stringResource(R.string.storage_data_other), null) - ListCard { ItemRow(stringResource(R.string.storage_data_other_title), stringResource(R.string.storage_data_other_detail), report.otherPrefixes, true) } + if (kept.isNotEmpty()) { + SectionTitle(stringResource(R.string.storage_data_other), gb(kept.sumOf { it.bytes + it.shaderBytes })) + ListCard { + kept.forEachIndexed { i, k -> + val resettable = k.owner == PrefixOwner.SHARED || k.owner == PrefixOwner.GAME + val key = "kept:${k.dir.path}" + ItemRow( + keptName(k), + listOfNotNull(when (k.owner) { + PrefixOwner.SHARED -> stringResource(R.string.storage_shared_prefix_detail) + PrefixOwner.LAUNCHER -> if (k.users.isEmpty()) stringResource(R.string.storage_launcher_prefix) + else stringResource(R.string.storage_launcher_used_by, k.users.distinct().joinToString(", ")) + PrefixOwner.GAME -> stringResource(R.string.storage_prefix_shaders, gb(k.bytes), gb(k.shaderBytes)) + PrefixOwner.UNKNOWN -> stringResource(R.string.storage_unknown_prefix_detail) + }, k.shaderBytes.takeIf { it >= ONE_MB && k.owner != PrefixOwner.GAME }?.let { stringResource(R.string.storage_bulk_shaders) + " " + gb(it).replace(' ', ' ') }).joinToString(" · "), + k.bytes + k.shaderBytes, i == kept.lastIndex, + pill = if (k.owner == PrefixOwner.LAUNCHER) { { Pill(stringResource(R.string.storage_tag_required), MaterialTheme.colorScheme.onSurfaceVariant) } } else null, + selected = if (resettable) key in picked else null, slot = true, selectable = !busy, onSelect = { toggle(key) }, + action = if (resettable) { + { SecondaryButton(stringResource(R.string.storage_reset_prefix), compact = true, enabled = !busy) { confirmKept = k } } + } else null, + ) + } + } + } + if (confirmBulk) BulkRemoveDialog( + chosen, + hasPrefixes = chosen.any { it.prefixes.isNotEmpty() }, hasShaders = chosen.any { it.shaders.isNotEmpty() }, + bytesOf = ::bytesOf, + onConfirm = { prefixes, shaders -> + StorageState.removeDirs(ctx, chosen.flatMap { (if (prefixes) it.prefixes.map { p -> p.first } else emptyList()) + (if (shaders) it.shaders.map { c -> c.first } else emptyList()) }) + picked = emptySet() + }, + onDismiss = { confirmBulk = false }, + ) + confirmKept?.let { k -> + ConfirmDialog( + stringResource(R.string.storage_reset_prefix_title, keptName(k)), + if (k.owner == PrefixOwner.SHARED) stringResource(R.string.storage_reset_shared_confirm, gb(k.bytes)) + else stringResource(R.string.storage_reset_prefix_confirm, gb(k.bytes), k.library), + stringResource(R.string.storage_reset_prefix), + onConfirm = { StorageState.resetKept(ctx, k) }, onDismiss = { confirmKept = null }, + ) } confirmPrefix?.let { g -> ConfirmDialog( @@ -908,19 +1055,125 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: } confirm?.let { l -> ConfirmDialog( - stringResource(R.string.storage_remove_title, stringResource(R.string.storage_steam_app, l.appId)), + stringResource(R.string.storage_remove_title, leftoverName(l)), stringResource(R.string.storage_leftover_confirm, gb(l.bytes)), stringResource(R.string.storage_remove), onConfirm = { StorageState.removeLeftover(ctx, l) }, onDismiss = { confirm = null }, ) } } +@Composable +private fun BulkRemoveDialog( + chosen: List, hasPrefixes: Boolean, hasShaders: Boolean, bytesOf: (DataTarget, Boolean, Boolean) -> Long, + onConfirm: (prefixes: Boolean, shaders: Boolean) -> Unit, onDismiss: () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var prefixes by remember { mutableStateOf(hasPrefixes) } + var shaders by remember { mutableStateOf(hasShaders) } + val total = chosen.sumOf { bytesOf(it, prefixes, shaders) } + val first = remember { FocusRequester() } + LaunchedEffect(Unit) { runCatching { first.requestFocus() } } + AlertDialog( + properties = androidx.compose.ui.window.DialogProperties(usePlatformDefaultWidth = false), + modifier = Modifier.fillMaxWidth(0.62f).widthIn(min = 420.dp, max = 760.dp), + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.storage_remove_selected, gb(total))) }, + text = { + Column(Modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text(chosen.joinToString("\n") { "• " + it.label }, fontSize = 14.sp, color = colors.onBackground) + Spacer(Modifier.height(4.dp)) + if (hasPrefixes) ToggleRow( + stringResource(R.string.storage_bulk_prefixes), stringResource(R.string.storage_bulk_prefixes_detail), + chosen.sumOf { bytesOf(it, true, false) }, prefixes, Modifier.focusRequester(first), + stringResource(R.string.storage_tag_saves) to AttentionAmber, + ) { prefixes = !prefixes } + if (hasShaders) ToggleRow( + stringResource(R.string.storage_bulk_shaders), stringResource(R.string.storage_item_shaders_detail), + chosen.sumOf { bytesOf(it, false, true) }, shaders, if (hasPrefixes) Modifier else Modifier.focusRequester(first), + stringResource(R.string.storage_tag_stutter) to AttentionAmber, + ) { shaders = !shaders } + } + }, + confirmButton = { + if (prefixes || shaders) FocusText(stringResource(R.string.storage_remove), colors.error) { onDismiss(); onConfirm(prefixes, shaders) } + }, + dismissButton = { FocusText(stringResource(R.string.common_cancel), colors.onBackground, onClick = onDismiss) }, + ) +} + +private fun gameKey(g: com.droiddeck.launcher.storage.GameUsage) = "game:${g.x64}:${g.appId}:${g.prefixDir?.path}" + +private fun leftoverKey(l: com.droiddeck.launcher.storage.Leftover) = l.prefix?.path ?: l.shaders?.path ?: l.appId.toString() + +@Composable +private fun keptName(k: KeptPrefix): String { + val name = when (k.owner) { + PrefixOwner.SHARED -> stringResource(R.string.storage_shared_prefix) + PrefixOwner.GAME -> k.name ?: stringResource(R.string.storage_data_other_title) + else -> k.name ?: k.dir.name + } + return if (k.x64) stringResource(R.string.storage_game_x64, name) else name +} + +@Composable +private fun leftoverName(l: com.droiddeck.launcher.storage.Leftover): String = when { + l.name != null -> l.name + l.shortcut -> stringResource(R.string.storage_shortcut_app, l.appId.toString()) + else -> stringResource(R.string.storage_steam_app, l.appId) +} + +@Composable +private fun StoreGamesView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { + val ctx = LocalContext.current + val uninstalling = com.droiddeck.launcher.stores.StoresState.uninstalling + val busy = sessionRunning || StorageState.busy || uninstalling.isNotEmpty() + var confirm by remember { mutableStateOf>(emptyList()) } + var picked by remember { mutableStateOf(emptySet()) } + val games = report.storeGames + val chosen = games.filter { it.game.folder.path in picked && !com.droiddeck.launcher.stores.download.DownloadQueue.isActive(it.game.key) } + SubHeader(stringResource(R.string.storage_stores), + pluralStringResource(R.plurals.storage_games_installed, games.size, games.size) + " · " + gb(games.sumOf { StorageState.storeBytes(it).coerceAtLeast(0) }), onBack) { + if (chosen.isNotEmpty()) PrimaryButton(stringResource(R.string.storage_uninstall_selected, gb(chosen.sumOf { StorageState.storeBytes(it).coerceAtLeast(0) })), compact = true, enabled = !busy) { confirm = chosen } + } + ActionStatus() + if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } + ListCard { + if (games.isEmpty()) Text(stringResource(R.string.storage_no_games), fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(16.dp)) + games.forEachIndexed { i, g -> + val removing = g.game.key in uninstalling + val downloading = com.droiddeck.launcher.stores.download.DownloadQueue.isActive(g.game.key) + val key = g.game.folder.path + ItemRow( + g.game.sidecar.title, + if (g.internal) g.game.sidecar.store.label else g.game.sidecar.store.label + " · " + stringResource(R.string.fm_drive_sd), + StorageState.storeBytes(g), i == games.lastIndex, + selected = key in picked && !downloading, selectable = !busy && !downloading, onSelect = { picked = if (key in picked) picked - key else picked + key }, + action = { + SecondaryButton(stringResource(if (removing) R.string.stores_uninstalling else R.string.storage_uninstall), compact = true, + enabled = !busy && !downloading) { confirm = listOf(g) } + }, + ) + } + } + if (confirm.isNotEmpty()) { + val list = confirm + val total = gb(list.sumOf { StorageState.storeBytes(it).coerceAtLeast(0) }) + ConfirmDialog( + if (list.size == 1) stringResource(R.string.stores_uninstall_title, list[0].game.sidecar.title) else stringResource(R.string.storage_uninstall_selected, total), + (if (list.size == 1) "" else list.joinToString("\n") { "• " + it.game.sidecar.title } + "\n\n") + stringResource(R.string.stores_uninstall_body_size, total), + stringResource(R.string.storage_uninstall), + onConfirm = { StorageState.uninstallStoreGames(ctx, list); picked = emptySet() }, onDismiss = { confirm = emptyList() }, + ) + } +} + @Composable internal fun ComponentsView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { val ctx = LocalContext.current val pal = LocalPalette.current val colors = MaterialTheme.colorScheme - val busy = sessionRunning || StorageState.cleaning + val busy = sessionRunning || StorageState.busy var confirm by remember { mutableStateOf(null) } var confirmAll by remember { mutableStateOf(false) } val unused = report.unusedComponents @@ -978,7 +1231,7 @@ internal fun ComponentsView(report: StorageReport, sessionRunning: Boolean, onBa @Composable private fun DesktopView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { val ctx = LocalContext.current - val busy = sessionRunning || StorageState.cleaning + val busy = sessionRunning || StorageState.busy var confirm by remember { mutableStateOf(null) } var confirmPrune by remember { mutableStateOf(false) } SubHeader(stringResource(R.string.storage_desktop), stringResource(R.string.storage_desktop_detail, gb(report.flatpak)), onBack) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e3d78e199b..1dcf934d12 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3011,7 +3011,7 @@ اختيار مجلد… استخدم أي مجلد على بطاقة SD أو محرك USB توضع الألعاب في مجلد Games داخل الموقع المحدد. لا تُنقل الألعاب الحالية. - إلى أين يذهب + ما يشغل المساحة ألعاب Steam بيانات الألعاب البادئات %1$s · الورشة %2$s · الشيدرات %3$s @@ -3171,6 +3171,19 @@ محفوظة ألعاب خارج Steam وبادئة Steam المشتركة بادئات ألعاب أُضيفت من المتاجر أو يدويًا + بادئة Steam المشتركة + يشغّل Steam مساعدات Windows الخاصة به هنا + يحذفها (%1$s). ينشئ Steam بادئة جديدة في المرة التالية التي يحتاجها فيها. + تطبيق متجر والألعاب التي تعمل به + مستخدَمة بواسطة %1$s + لعبة خارج Steam %1$s + غير مطابقة لأي لعبة، لذا يُحتفظ بها + حذف المحدد · %1$s + إلغاء تثبيت المحدد · %1$s + بادئات Wine + تُفقد الحفظات والإعدادات داخلها، وتبقى حفظات Steam Cloud في حسابك. + ذاكرات الشيدرات المؤقتة + البادئة %1$s · الشيدرات %2$s حزم منزّلة أصول محفوظة لا حزم مكوّنات منزّلة. 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 bcd645f8f2..cc5f0780fb 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2863,7 +2863,7 @@ Elegir carpeta… Usa cualquier carpeta de una tarjeta SD o unidad USB Los juegos se guardan en una carpeta Games dentro de la ubicación seleccionada. Los juegos existentes no se mueven. - Dónde va + Qué ocupa espacio Juegos de Steam Datos de juegos Prefijos %1$s · taller %2$s · shaders %3$s @@ -3002,6 +3002,19 @@ Conservados Juegos que no son de Steam y prefijo compartido de Steam Prefijos de juegos agregados desde tiendas o a mano + Prefijo compartido de Steam + Steam ejecuta aquí sus propias herramientas de Windows + Lo borra (%1$s). Steam crea uno nuevo la próxima vez que lo necesite. + Una app de tienda y los juegos que se ejecutan con ella + Usado por %1$s + Juego que no es de Steam %1$s + No coincide con ningún juego, así que se conserva + Quitar selección · %1$s + Desinstalar selección · %1$s + Prefijos de Wine + Se pierden las partidas y los ajustes que contienen; las partidas de Steam Cloud se conservan en tu cuenta. + Cachés de shaders + Prefijo %1$s · shaders %2$s Paquetes descargados Originales guardados No hay paquetes de componentes descargados. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index ce0b441579..dad41a96ac 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2895,7 +2895,7 @@ Избор на папка… Използвайте която и да е папка на SD карта или USB устройство Игрите отиват в папка Games в избраното място. Съществуващите игри не се преместват. - Къде отива + Какво заема място Игри от Steam Данни на игрите Префикси %1$s · workshop %2$s · шейдъри %3$s @@ -3027,6 +3027,19 @@ Запазени Игри извън Steam и споделен Steam префикс Префикси на игри, добавени през магазини или ръчно + Споделен Steam префикс + Steam изпълнява тук свои помощни програми за Windows + Изтрива го (%1$s). Steam създава нов следващия път, когато му потрябва. + Приложение магазин и игрите, които работят с него + Използва се от %1$s + Игра извън Steam %1$s + Не е свързан с игра, затова се запазва + Премахни избраните · %1$s + Деинсталирай избраните · %1$s + Префикси на Wine + Записите и настройките в тях се губят; записите в Steam Cloud остават в акаунта ви. + Кешове на шейдърите + Префикс %1$s · шейдъри %2$s Изтеглени пакети Запазени оригинали Няма изтеглени пакети с компоненти. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d8a5d60f28..6fab61abc0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2953,7 +2953,7 @@ Vybrat složku… Použít libovolnou složku na kartě SD nebo disku USB Hry se ukládají do složky Games ve vybraném umístění. Stávající hry se nepřesouvají. - Kam to jde + Co zabírá místo Hry ze Steamu Data her Prefixy %1$s · workshop %2$s · shadery %3$s @@ -3099,6 +3099,19 @@ Zachováno Hry mimo Steam a sdílený prefix Steamu Prefixy her přidaných přes obchody nebo ručně + Sdílený prefix Steamu + Steam zde spouští své pomocné programy pro Windows + Smaže ho (%1$s). Steam si vytvoří nový, až ho bude příště potřebovat. + Aplikace obchodu a hry, které s ní běží + Používá: %1$s + Hra mimo Steam %1$s + Nepatří k žádné hře, proto zůstává + Odebrat vybrané · %1$s + Odinstalovat vybrané · %1$s + Prefixy Wine + Uložené hry a nastavení v nich budou ztraceny; uložení ve Steam Cloud zůstanou ve vašem účtu. + Mezipaměti shaderů + Prefix %1$s · shadery %2$s Stažené balíky Zachované originály Nejsou stažené žádné balíky komponent. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 2b47c9f391..d124460541 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2895,7 +2895,7 @@ Vælg mappe… Brug en hvilken som helst mappe på et SD-kort eller USB-drev Spil placeres i en Games-mappe på den valgte placering. Eksisterende spil flyttes ikke. - Hvor det ender + Hvad bruger plads Steam-spil Spildata Præfikser %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Bevares Ikke-Steam-spil og delt Steam-præfiks Præfikser for spil tilføjet via butikker eller manuelt + Steams delte præfiks + Steam kører sine egne Windows-hjælpere her + Sletter det (%1$s). Steam opretter et nyt, næste gang det skal bruges. + En butiksapp og de spil, der kører med den + Bruges af %1$s + Ikke-Steam-spil %1$s + Ikke knyttet til et spil, så det bevares + Fjern valgte · %1$s + Afinstaller valgte · %1$s + Wine-prefixer + Gemte spil og indstillinger i dem går tabt; Steam Cloud-gemninger forbliver på din konto. + Shadercacher + Præfiks %1$s · shaders %2$s Hentede pakker Bevarede originaler Ingen komponentpakker hentet. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c2d0dcb4fc..d90b549827 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2895,7 +2895,7 @@ Ordner auswählen… Einen beliebigen Ordner auf einer SD-Karte oder einem USB-Laufwerk verwenden Spiele kommen in einen Games-Ordner am ausgewählten Ort. Vorhandene Spiele werden nicht verschoben. - Belegung + Was Speicher belegt Steam-Spiele Spieldaten Präfixe %1$s · Workshop %2$s · Shader %3$s @@ -3027,6 +3027,19 @@ Behalten Gemeinsame Präfixe von Nicht-Steam-Spielen und Steam Präfixe von Spielen aus Stores oder manuell hinzugefügter Spiele + Gemeinsames Präfix von Steam + Steam führt hier eigene Windows-Hilfsprogramme aus + Löscht es (%1$s). Steam erstellt ein neues, sobald es wieder eines braucht. + Eine Store-App und die Spiele, die damit laufen + Verwendet von %1$s + Nicht-Steam-Spiel %1$s + Keinem Spiel zugeordnet, daher bleibt es erhalten + Auswahl entfernen · %1$s + Auswahl deinstallieren · %1$s + Wine-Präfixe + Speicherstände und Einstellungen darin gehen verloren; Steam-Cloud-Speicherstände bleiben in deinem Konto. + Shader-Caches + Präfix %1$s · Shader %2$s Geladene Pakete Gesicherte Originale Keine geladenen Komponentenpakete. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 203a3716a2..ed829530da 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2895,7 +2895,7 @@ Επιλογή φακέλου… Χρησιμοποιήστε οποιονδήποτε φάκελο σε κάρτα SD ή μονάδα USB Τα παιχνίδια μπαίνουν σε φάκελο Games μέσα στην επιλεγμένη τοποθεσία. Τα υπάρχοντα παιχνίδια δεν μετακινούνται. - Πού πηγαίνει + Τι καταλαμβάνει χώρο Παιχνίδια Steam Δεδομένα παιχνιδιών Prefix %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Διατηρούνται Παιχνίδια εκτός Steam και κοινό prefix Steam Prefix παιχνιδιών που προστέθηκαν από καταστήματα ή χειροκίνητα + Κοινό prefix του Steam + Το Steam εκτελεί εδώ τα δικά του βοηθητικά προγράμματα Windows + Το διαγράφει (%1$s). Το Steam δημιουργεί νέο την επόμενη φορά που θα το χρειαστεί. + Μια εφαρμογή καταστήματος και τα παιχνίδια που τρέχουν με αυτήν + Χρησιμοποιείται από %1$s + Παιχνίδι εκτός Steam %1$s + Δεν αντιστοιχεί σε παιχνίδι, οπότε διατηρείται + Αφαίρεση επιλεγμένων · %1$s + Κατάργηση επιλεγμένων · %1$s + Prefix Wine + Οι αποθηκεύσεις και οι ρυθμίσεις μέσα τους χάνονται· οι αποθηκεύσεις Steam Cloud παραμένουν στον λογαριασμό σας. + Προσωρινές μνήμες shaders + Πρόθεμα %1$s · σκιαστές %2$s Ληφθέντα πακέτα Διατηρημένα αρχικά Δεν έχουν ληφθεί πακέτα στοιχείων. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 104948fff5..77899d06a2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2924,7 +2924,7 @@ Elegir carpeta… Usa cualquier carpeta de una tarjeta SD o unidad USB Los juegos se guardan en una carpeta Games dentro de la ubicación seleccionada. Los juegos existentes no se mueven. - Dónde va + Qué ocupa espacio Juegos de Steam Datos de juegos Prefijos %1$s · taller %2$s · shaders %3$s @@ -3063,6 +3063,19 @@ Conservados Juegos que no son de Steam y prefijo compartido de Steam Prefijos de juegos añadidos desde tiendas o a mano + Prefijo compartido de Steam + Steam ejecuta aquí sus propias herramientas de Windows + Lo borra (%1$s). Steam crea uno nuevo la próxima vez que lo necesite. + Una app de tienda y los juegos que se ejecutan con ella + Usado por %1$s + Juego que no es de Steam %1$s + No coincide con ningún juego, así que se conserva + Quitar selección · %1$s + Desinstalar selección · %1$s + Prefijos de Wine + Se pierden las partidas y los ajustes que contienen; las partidas de Steam Cloud se conservan en tu cuenta. + Cachés de shaders + Prefijo %1$s · shaders %2$s Paquetes descargados Originales guardados No hay paquetes de componentes descargados. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 98ea9d8301..40e762bde1 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2895,7 +2895,7 @@ Valitse kansio… Käytä mitä tahansa kansiota SD-kortilla tai USB-asemalla Pelit tallennetaan valitun sijainnin Games-kansioon. Nykyisiä pelejä ei siirretä. - Mihin se menee + Mikä vie tilaa Steam-pelit Pelidata Etuliitteet %1$s · workshop %2$s · shaderit %3$s @@ -3027,6 +3027,19 @@ Säilytetään Muut kuin Steam-pelit ja jaettu Steam-etuliite Kauppojen kautta tai käsin lisättyjen pelien etuliitteet + Steamin jaettu etuliite + Steam suorittaa täällä omia Windows-apuohjelmiaan + Poistaa sen (%1$s). Steam luo uuden, kun tarvitsee sitä seuraavan kerran. + Kauppasovellus ja pelit, jotka toimivat sen kanssa + Käyttää: %1$s + Muu kuin Steam-peli %1$s + Ei vastaa mitään peliä, joten se säilytetään + Poista valitut · %1$s + Poista valittujen asennus · %1$s + Wine-prefixit + Niiden sisällä olevat tallennukset ja asetukset menetetään; Steam Cloud -tallennukset säilyvät tililläsi. + Shadervälimuistit + Etuliite %1$s · shaderit %2$s Ladatut paketit Säilytetyt alkuperäiset Komponenttipaketteja ei ole ladattu. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e830f0cea4..9883772cf6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2924,7 +2924,7 @@ Choisir un dossier… Utiliser n\'importe quel dossier sur une carte SD ou une clé USB Les jeux sont placés dans un dossier Games à l\'emplacement sélectionné. Les jeux existants ne sont pas déplacés. - Où ça va + Ce qui prend de la place Jeux Steam Données de jeu Préfixes %1$s · atelier %2$s · shaders %3$s @@ -3063,6 +3063,19 @@ Conservés Jeux hors Steam et préfixe partagé de Steam Préfixes de jeux ajoutés depuis les boutiques ou à la main + Préfixe partagé de Steam + Steam y exécute ses propres utilitaires Windows + Le supprime (%1$s). Steam en crée un nouveau la prochaine fois qu\'il en a besoin. + Une app de boutique et les jeux qui tournent avec elle + Utilisé par %1$s + Jeu hors Steam %1$s + Associé à aucun jeu, il est donc conservé + Supprimer la sélection · %1$s + Désinstaller la sélection · %1$s + Préfixes Wine + Les sauvegardes et paramètres qu\'ils contiennent sont perdus ; les sauvegardes Steam Cloud restent dans votre compte. + Caches de shaders + Préfixe %1$s · shaders %2$s Paquets téléchargés Originaux conservés Aucun paquet de composant téléchargé. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index bb3173d10d..e5a3ae56f8 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2895,7 +2895,7 @@ फ़ोल्डर चुनें… SD कार्ड या USB ड्राइव पर कोई भी फ़ोल्डर इस्तेमाल करें गेम चुनी गई जगह के अंदर एक Games फ़ोल्डर में जाते हैं। मौजूदा गेम मूव नहीं किए जाते। - कहाँ जाता है + क्या जगह घेर रहा है Steam गेम गेम डेटा प्रीफ़िक्स %1$s · वर्कशॉप %2$s · शेडर %3$s @@ -3027,6 +3027,19 @@ रखा गया गैर-Steam गेम और साझा Steam प्रीफ़िक्स स्टोर से या हाथ से जोड़े गेम के प्रीफ़िक्स + Steam का साझा प्रीफ़िक्स + Steam यहाँ अपने Windows हेल्पर चलाता है + इसे डिलीट करता है (%1$s)। अगली बार ज़रूरत पड़ने पर Steam नया बना लेता है। + एक स्टोर ऐप और उसके साथ चलने वाले गेम + %1$s द्वारा इस्तेमाल + गैर-Steam गेम %1$s + किसी गेम से मेल नहीं खाता, इसलिए रखा जाता है + चुने गए हटाएँ · %1$s + चुने गए अनइंस्टॉल करें · %1$s + Wine प्रीफ़िक्स + इनके अंदर के सेव और सेटिंग खो जाते हैं; Steam Cloud सेव आपके अकाउंट में रहते हैं। + शेडर कैश + प्रीफ़िक्स %1$s · शेडर %2$s डाउनलोड किए पैकेज रखे गए मूल कोई कॉम्पोनेंट पैकेज डाउनलोड नहीं है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 7ecc8c8e57..0d568a2536 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2895,7 +2895,7 @@ Mappa kiválasztása… Bármely mappa használata SD-kártyán vagy USB-meghajtón A játékok a kiválasztott helyen belüli Games mappába kerülnek. A meglévő játékok nem kerülnek áthelyezésre. - Hova kerül + Mi foglalja a helyet Steam-játékok Játékadatok Prefixek %1$s · workshop %2$s · shaderek %3$s @@ -3027,6 +3027,19 @@ Megtartva Nem Steam-es játékok és a megosztott Steam prefix Áruházból vagy kézzel hozzáadott játékok prefixei + A Steam megosztott prefixe + A Steam itt futtatja saját Windows-segédprogramjait + Törli (%1$s). A Steam újat hoz létre, amikor legközelebb szüksége lesz rá. + Egy áruházalkalmazás és a vele futó játékok + Használja: %1$s + Nem Steam-es játék: %1$s + Nem tartozik játékhoz, ezért megmarad + Kijelöltek eltávolítása · %1$s + Kijelöltek eltávolítása · %1$s + Wine-prefixek + A bennük lévő mentések és beállítások elvesznek; a Steam Cloud-mentések a fiókjában maradnak. + Shader-gyorsítótárak + Prefix %1$s · shaderek %2$s Letöltött csomagok Megtartott eredetiek Nincs letöltött összetevő-csomag. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6a0a20ea14..2ea5450c1d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2866,7 +2866,7 @@ Pilih folder… Gunakan folder apa pun di kartu SD atau drive USB Game akan disimpan di folder Games di dalam lokasi yang dipilih. Game yang sudah terpasang tidak dipindahkan. - Ke mana perginya + Yang memakai ruang Gim Steam Data gim Prefix %1$s · workshop %2$s · shader %3$s @@ -2998,6 +2998,19 @@ Disimpan Gim non-Steam dan prefix Steam bersama Prefix gim dari toko atau yang ditambahkan sendiri + Prefix Steam bersama + Steam menjalankan helper Windows-nya sendiri di sini + Menghapusnya (%1$s). Steam membuat yang baru saat membutuhkannya lagi. + Aplikasi toko dan gim yang berjalan dengannya + Dipakai oleh %1$s + Gim non-Steam %1$s + Tidak cocok dengan gim mana pun, jadi tetap disimpan + Hapus yang dipilih · %1$s + Hapus instalasi yang dipilih · %1$s + Prefix Wine + Save dan setelan di dalamnya akan hilang; save Steam Cloud tetap di akun Anda. + Cache shader + Prefix %1$s · shader %2$s Paket yang diunduh Berkas asli yang disimpan Tidak ada paket komponen yang diunduh. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 792b2c47a1..7d7b096e2a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2924,7 +2924,7 @@ Scegli cartella… Usa qualsiasi cartella su una scheda SD o un\'unità USB I giochi vanno in una cartella Games all\'interno della posizione selezionata. I giochi esistenti non vengono spostati. - Dove finisce + Cosa occupa spazio Giochi Steam Dati dei giochi Prefissi %1$s · workshop %2$s · shader %3$s @@ -3063,6 +3063,19 @@ Conservati Giochi non Steam e prefisso condiviso di Steam Prefissi di giochi aggiunti dagli store o a mano + Prefisso condiviso di Steam + Steam esegue qui i propri strumenti Windows + Lo elimina (%1$s). Steam ne crea uno nuovo la prossima volta che serve. + Un\'app di uno store e i giochi che girano con essa + Usato da %1$s + Gioco non Steam %1$s + Non associato a nessun gioco, quindi viene conservato + Rimuovi selezionati · %1$s + Disinstalla selezionati · %1$s + Prefissi Wine + Salvataggi e impostazioni al loro interno vanno persi; i salvataggi di Steam Cloud restano nel tuo account. + Cache shader + Prefisso %1$s · shader %2$s Pacchetti scaricati Originali conservati Nessun pacchetto di componenti scaricato. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 459c1d805f..a289e0dbed 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2866,7 +2866,7 @@ フォルダーを選択… SDカードやUSBドライブの任意のフォルダーを使用します ゲームは選択した場所の中のGamesフォルダーに保存されます。既存のゲームは移動されません。 - 使用内訳 + 容量を使っているもの Steam ゲーム ゲームデータ プレフィックス %1$s · ワークショップ %2$s · シェーダー %3$s @@ -2998,6 +2998,19 @@ 保持 Steam 以外のゲームと Steam の共有プレフィックス ストアから、または手動で追加したゲームのプレフィックス + Steam の共有プレフィックス + Steam が独自の Windows ヘルパーをここで実行します + 削除します(%1$s)。次に必要になったとき Steam が新しく作成します。 + ストアアプリとそれで動くゲーム + %1$s が使用 + Steam 以外のゲーム %1$s + どのゲームにも一致しないため保持されます + 選択項目を削除 · %1$s + 選択項目をアンインストール · %1$s + Wineプレフィックス + その中のセーブデータと設定は失われます。Steam Cloudのセーブデータはアカウントに残ります。 + シェーダーキャッシュ + プレフィックス %1$s · シェーダー %2$s ダウンロード済みのパッケージ 保存済みの元ファイル ダウンロード済みのコンポーネントパッケージはありません。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e6b6c42ecf..82fcb4bb83 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2866,7 +2866,7 @@ 폴더 선택… SD 카드나 USB 드라이브의 아무 폴더나 사용 게임은 선택한 위치 안의 Games 폴더에 저장됩니다. 기존 게임은 이동되지 않습니다. - 사용 내역 + 공간을 차지하는 항목 Steam 게임 게임 데이터 프리픽스 %1$s · 워크숍 %2$s · 셰이더 %3$s @@ -2998,6 +2998,19 @@ 유지 Steam이 아닌 게임과 Steam의 공유 프리픽스 스토어에서 추가했거나 직접 추가한 게임의 프리픽스 + Steam의 공유 프리픽스 + Steam이 자체 Windows 도우미를 여기서 실행합니다 + 삭제합니다(%1$s). 다음에 필요할 때 Steam이 새로 만듭니다. + 스토어 앱과 이 앱으로 실행되는 게임 + 사용 중: %1$s + Steam이 아닌 게임 %1$s + 일치하는 게임이 없어 유지됩니다 + 선택 항목 제거 · %1$s + 선택 항목 제거 · %1$s + Wine 프리픽스 + 그 안의 저장 파일과 설정은 사라지며, Steam Cloud 저장 파일은 계정에 남아 있습니다. + 셰이더 캐시 + 프리픽스 %1$s · 셰이더 %2$s 내려받은 패키지 저장된 원본 파일 내려받은 구성 요소 패키지가 없습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index fac7d2314f..bdb95e029c 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2866,7 +2866,7 @@ Pilih folder… Gunakan mana-mana folder pada kad SD atau pemacu USB Permainan dimasukkan ke dalam folder Games di dalam lokasi yang dipilih. Permainan sedia ada tidak dipindahkan. - Ke mana perginya + Apa yang guna ruang Permainan Steam Data permainan Awalan %1$s · workshop %2$s · shader %3$s @@ -2998,6 +2998,19 @@ Disimpan Permainan bukan Steam dan awalan Steam dikongsi Awalan permainan daripada kedai atau yang ditambah sendiri + Awalan Steam dikongsi + Steam menjalankan pembantu Windowsnya sendiri di sini + Memadamnya (%1$s). Steam mencipta yang baharu apabila memerlukannya lagi. + Aplikasi kedai dan permainan yang berjalan dengannya + Digunakan oleh %1$s + Permainan bukan Steam %1$s + Tidak sepadan dengan mana-mana permainan, jadi ia disimpan + Alih keluar yang dipilih · %1$s + Nyahpasang yang dipilih · %1$s + Prefix Wine + Simpanan dan tetapan di dalamnya akan hilang; simpanan Steam Cloud kekal dalam akaun anda. + Cache shader + Awalan %1$s · shader %2$s Pakej yang dimuat turun Fail asal yang disimpan Tiada pakej komponen dimuat turun. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 65ddcd49c4..dbe9e0626d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2895,7 +2895,7 @@ Velg mappe… Bruk en hvilken som helst mappe på et SD-kort eller en USB-enhet Spill legges i en Games-mappe på valgt plassering. Eksisterende spill flyttes ikke. - Hvor det ender + Hva som bruker plass Steam-spill Spilldata Prefikser %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Beholdes Ikke-Steam-spill og delt Steam-prefiks Prefikser for spill lagt til via butikker eller manuelt + Steams delte prefiks + Steam kjører sine egne Windows-hjelpere her + Sletter det (%1$s). Steam oppretter et nytt neste gang det trengs. + En butikkapp og spillene som kjører med den + Brukes av %1$s + Ikke-Steam-spill %1$s + Ikke knyttet til et spill, så det beholdes + Fjern valgte · %1$s + Avinstaller valgte · %1$s + Wine-prefikser + Lagringer og innstillinger i dem går tapt; Steam Cloud-lagringer blir værende på kontoen din. + Shadercacher + Prefiks %1$s · shaders %2$s Nedlastede pakker Beholdte originaler Ingen komponentpakker lastet ned. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8cbd96dd31..eb9cb76b8b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2895,7 +2895,7 @@ Map kiezen… Gebruik een willekeurige map op een SD-kaart of USB-stick Games komen in een map Games op de gekozen locatie. Bestaande games worden niet verplaatst. - Waar het naartoe gaat + Wat ruimte inneemt Steam-games Gamegegevens Prefixen %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Bewaard Niet-Steam-games en gedeeld Steam-prefix Prefixen van games die via winkels of handmatig zijn toegevoegd + Gedeeld Steam-prefix + Steam voert hier eigen Windows-hulpmiddelen uit + Verwijdert het (%1$s). Steam maakt een nieuw aan zodra het er weer een nodig heeft. + Een winkel-app en de games die ermee draaien + Gebruikt door %1$s + Niet-Steam-game %1$s + Niet aan een game gekoppeld, dus het blijft bewaard + Selectie verwijderen · %1$s + Selectie verwijderen · %1$s + Wine-prefixen + Opgeslagen spellen en instellingen daarin gaan verloren; Steam Cloud-opslagen blijven in je account. + Shadercaches + Prefix %1$s · shaders %2$s Gedownloade pakketten Bewaarde originelen Geen componentpakketten gedownload. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a829fda88b..845213c387 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2953,7 +2953,7 @@ Wybierz folder… Użyj dowolnego folderu na karcie SD lub dysku USB Gry trafiają do folderu Games w wybranym miejscu. Istniejące gry nie są przenoszone. - Gdzie to trafia + Co zajmuje miejsce Gry Steam Dane gier Prefiksy %1$s · warsztat %2$s · shadery %3$s @@ -3099,6 +3099,19 @@ Zachowane Gry poza Steam i współdzielony prefiks Steam Prefiksy gier dodanych przez sklepy lub ręcznie + Współdzielony prefiks Steam + Steam uruchamia tu własne narzędzia pomocnicze Windows + Usuwa go (%1$s). Steam utworzy nowy, gdy znów będzie potrzebny. + Aplikacja sklepu i gry, które z nią działają + Używany przez: %1$s + Gra spoza Steam %1$s + Nie pasuje do żadnej gry, więc zostaje zachowany + Usuń wybrane · %1$s + Odinstaluj wybrane · %1$s + Prefiksy Wine + Zapisy i ustawienia w nich zostaną utracone; zapisy w Steam Cloud pozostają na Twoim koncie. + Pamięci podręczne shaderów + Prefiks %1$s · shadery %2$s Pobrane pakiety Zachowane oryginały Nie pobrano żadnych pakietów komponentów. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index c2ee78a1c1..d55c2d3a0b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2924,7 +2924,7 @@ Escolher pasta… Utilize qualquer pasta num cartão SD ou unidade USB Os jogos vão para uma pasta Games dentro do local selecionado. Os jogos existentes não são movidos. - Para onde vai + O que ocupa espaço Jogos do Steam Dados dos jogos Prefixos %1$s · workshop %2$s · shaders %3$s @@ -3063,6 +3063,19 @@ Mantidos Jogos não Steam e prefixo partilhado do Steam Prefixos de jogos adicionados pelas lojas ou à mão + Prefixo partilhado do Steam + O Steam executa aqui os seus próprios auxiliares do Windows + Elimina-o (%1$s). O Steam cria um novo da próxima vez que precisar. + Uma app de loja e os jogos que correm com ela + Usado por %1$s + Jogo não Steam %1$s + Não corresponde a nenhum jogo, por isso é mantido + Remover seleção · %1$s + Desinstalar seleção · %1$s + Prefixos do Wine + Os guardados e as definições neles perdem-se; os guardados do Steam Cloud ficam na sua conta. + Caches de shaders + Prefixo %1$s · shaders %2$s Pacotes transferidos Originais mantidos Nenhum pacote de componentes transferido. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 59b5af3105..3ae6fd2f50 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2924,7 +2924,7 @@ Escolher pasta… Use qualquer pasta em um cartão SD ou unidade USB Os jogos vão para uma pasta Games dentro do local selecionado. Jogos existentes não são movidos. - Para onde vai + O que ocupa espaço Jogos da Steam Dados dos jogos Prefixos %1$s · workshop %2$s · shaders %3$s @@ -3063,6 +3063,19 @@ Mantidos Jogos não Steam e prefixo compartilhado da Steam Prefixos de jogos adicionados pelas lojas ou à mão + Prefixo compartilhado da Steam + A Steam executa aqui seus próprios auxiliares do Windows + Apaga o prefixo (%1$s). A Steam cria um novo na próxima vez que precisar. + Um app de loja e os jogos que rodam com ele + Usado por %1$s + Jogo não Steam %1$s + Não corresponde a nenhum jogo, então é mantido + Remover seleção · %1$s + Desinstalar seleção · %1$s + Prefixos do Wine + Salvamentos e configurações neles são perdidos; os salvamentos do Steam Cloud continuam na sua conta. + Caches de shaders + Prefixo %1$s · shaders %2$s Pacotes baixados Originais mantidos Nenhum pacote de componentes baixado. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4795221220..27641656a9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2924,7 +2924,7 @@ Alege un folder… Folosește orice folder de pe un card SD sau o unitate USB Jocurile sunt puse într-un folder Games din locația selectată. Jocurile existente nu sunt mutate. - Unde ajunge + Ce ocupă spațiu Jocuri Steam Datele jocurilor Prefixe %1$s · workshop %2$s · shadere %3$s @@ -3063,6 +3063,19 @@ Păstrate Jocuri non-Steam și prefixul Steam partajat Prefixele jocurilor din magazine sau adăugate manual + Prefixul Steam partajat + Steam rulează aici propriile utilitare Windows + Îl șterge (%1$s). Steam creează unul nou data viitoare când are nevoie. + O aplicație de magazin și jocurile care rulează cu ea + Folosit de %1$s + Joc non-Steam %1$s + Nu corespunde niciunui joc, deci este păstrat + Elimină selecția · %1$s + Dezinstalează selecția · %1$s + Prefixuri Wine + Salvările și setările din ele se pierd; salvările din Steam Cloud rămân în contul tău. + Cache-uri de shadere + Prefixe %1$s · shadere %2$s Pachete descărcate Originale păstrate Niciun pachet de componente descărcat. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 55d3431388..a99f40c703 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3036,7 +3036,7 @@ Выбрать папку… Любая папка на SD-карте или USB-накопителе Игры помещаются в папку Games в выбранном месте. Установленные игры не перемещаются. - Куда уходит + Что занимает место Игры Steam Данные игр Префиксы %1$s · мастерская %2$s · шейдеры %3$s @@ -3182,6 +3182,19 @@ Сохранённые Игры не из Steam и общий префикс Steam Префиксы игр, добавленных магазинами или вручную + Общий префикс Steam + Steam запускает здесь свои вспомогательные программы Windows + Удаляет его (%1$s). Steam создаст новый, когда он снова понадобится. + Приложение магазина и игры, которые с ним работают + Используется: %1$s + Игра не из Steam %1$s + Не сопоставлен с игрой, поэтому сохраняется + Удалить выбранные · %1$s + Удалить выбранные · %1$s + Префиксы Wine + Сохранения и настройки в них будут потеряны; сохранения Steam Cloud остаются в вашем аккаунте. + Кэши шейдеров + Префикс %1$s · шейдеры %2$s Загруженные пакеты Сохранённые оригиналы Пакеты компонентов не загружены. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index fedeebf4c6..d686c8693a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2895,7 +2895,7 @@ Välj mapp… Använd valfri mapp på ett SD-kort eller USB-minne Spel hamnar i en Games-mapp på den valda platsen. Befintliga spel flyttas inte. - Vart det tar vägen + Vad som tar plats Steam-spel Speldata Prefix %1$s · workshop %2$s · shaders %3$s @@ -3027,6 +3027,19 @@ Behålls Icke-Steam-spel och delat Steam-prefix Prefix för spel som lagts till via butiker eller manuellt + Steams delade prefix + Steam kör sina egna Windows-hjälpprogram här + Raderar det (%1$s). Steam skapar ett nytt nästa gång det behövs. + En butiksapp och spelen som körs med den + Används av %1$s + Icke-Steam-spel %1$s + Inte kopplat till något spel, så det behålls + Ta bort valda · %1$s + Avinstallera valda · %1$s + Wine-prefix + Sparningar och inställningar i dem går förlorade; Steam Cloud-sparningar finns kvar på ditt konto. + Shadercacheminnen + Prefix %1$s · shaders %2$s Hämtade paket Behållna original Inga komponentpaket hämtade. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 0f72c64631..596678df67 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2866,7 +2866,7 @@ เลือกโฟลเดอร์… ใช้โฟลเดอร์ใดก็ได้บนการ์ด SD หรือไดรฟ์ USB เกมจะอยู่ในโฟลเดอร์ Games ภายในตำแหน่งที่เลือก เกมที่มีอยู่จะไม่ถูกย้าย - ไปอยู่ที่ไหน + สิ่งที่ใช้พื้นที่ เกม Steam ข้อมูลเกม Prefix %1$s · เวิร์กชอป %2$s · เชเดอร์ %3$s @@ -2998,6 +2998,19 @@ เก็บไว้ เกมนอก Steam และ Prefix Steam ที่ใช้ร่วมกัน Prefix ของเกมจากสโตร์หรือที่เพิ่มเอง + Prefix Steam ที่ใช้ร่วมกัน + Steam รันตัวช่วย Windows ของตัวเองที่นี่ + ลบ prefix นี้ (%1$s) Steam จะสร้างใหม่เมื่อต้องใช้ครั้งถัดไป + แอปสโตร์และเกมที่ทำงานกับแอปนั้น + ใช้โดย %1$s + เกมนอก Steam %1$s + ไม่ตรงกับเกมใด จึงเก็บไว้ + นำรายการที่เลือกออก · %1$s + ถอนการติดตั้งรายการที่เลือก · %1$s + Wine prefix + เซฟและการตั้งค่าข้างในจะหายไป เซฟใน Steam Cloud ยังอยู่ในบัญชีของคุณ + แคชเชเดอร์ + Prefix %1$s · เชเดอร์ %2$s แพ็กเกจที่ดาวน์โหลด ต้นฉบับที่เก็บไว้ ยังไม่มีแพ็กเกจคอมโพเนนต์ที่ดาวน์โหลด diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1700875b0b..7b6e1553a1 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2895,7 +2895,7 @@ Klasör seç… SD kart veya USB sürücüdeki herhangi bir klasörü kullanın Oyunlar, seçilen konumdaki bir Games klasörüne yüklenir. Mevcut oyunlar taşınmaz. - Nereye gidiyor + Yer kaplayanlar Steam oyunları Oyun verileri Önekler %1$s · atölye %2$s · gölgelendiriciler %3$s @@ -3027,6 +3027,19 @@ Korunan Steam dışı oyunlar ve Steam\'in ortak öneki Mağazalardan veya elle eklenen oyunların önekleri + Steam\'in ortak öneki + Steam kendi Windows yardımcılarını burada çalıştırır + Siler (%1$s). Steam bir dahaki ihtiyacında yenisini oluşturur. + Bir mağaza uygulaması ve onunla çalışan oyunlar + Kullanan: %1$s + Steam dışı oyun %1$s + Bir oyunla eşleşmedi, bu yüzden korunuyor + Seçilenleri kaldır · %1$s + Seçilenlerin yüklemesini kaldır · %1$s + Wine önekleri + İçindeki kayıtlar ve ayarlar kaybolur; Steam Cloud kayıtları hesabınızda kalır. + Gölgelendirici önbellekleri + Önek %1$s · gölgelendiriciler %2$s İndirilen paketler Kaydedilen orijinaller İndirilmiş bileşen paketi yok. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index de74d56817..2afbe7c796 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2953,7 +2953,7 @@ Вибрати папку… Будь-яка папка на SD-картці або USB-накопичувачі Ігри потрапляють у папку Games у вибраному місці. Наявні ігри не переміщуються. - Куди йде + Що займає місце Ігри Steam Дані ігор Префікси %1$s · майстерня %2$s · шейдери %3$s @@ -3099,6 +3099,19 @@ Збережено Не-Steam ігри та спільний префікс Steam Префікси ігор із магазинів або доданих вручну + Спільний префікс Steam + Steam запускає тут власні допоміжні програми Windows + Видаляє його (%1$s). Steam створить новий, коли він знову знадобиться. + Застосунок магазину та ігри, які з ним працюють + Використовується: %1$s + Не-Steam гра %1$s + Не зіставлено з грою, тому зберігається + Видалити вибрані · %1$s + Видалити вибрані · %1$s + Префікси Wine + Збереження й налаштування в них буде втрачено; збереження Steam Cloud залишаються у вашому обліковому записі. + Кеші шейдерів + Префікси %1$s · шейдери %2$s Завантажені пакети Збережені оригінали Жодного завантаженого пакета компонентів. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 05c9403f13..ea76ef9bc6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2866,7 +2866,7 @@ Chọn thư mục… Dùng bất kỳ thư mục nào trên thẻ SD hoặc ổ USB Game được đặt vào thư mục Games bên trong vị trí đã chọn. Game hiện có không bị di chuyển. - Đi đâu + Mục chiếm bộ nhớ Game Steam Dữ liệu game Prefix %1$s · workshop %2$s · shader %3$s @@ -2998,6 +2998,19 @@ Đã giữ Game ngoài Steam và prefix Steam dùng chung Prefix của game từ cửa hàng hoặc thêm thủ công + Prefix Steam dùng chung + Steam chạy các trình hỗ trợ Windows riêng tại đây + Xóa prefix này (%1$s). Steam sẽ tạo prefix mới vào lần tới khi cần. + Một ứng dụng cửa hàng và các game chạy cùng nó + Được dùng bởi %1$s + Game ngoài Steam %1$s + Không khớp với game nào nên được giữ lại + Gỡ mục đã chọn · %1$s + Gỡ cài đặt mục đã chọn · %1$s + Prefix Wine + Bản lưu và thiết lập bên trong sẽ mất; bản lưu Steam Cloud vẫn ở trong tài khoản của bạn. + Bộ nhớ đệm shader + Prefix %1$s · shader %2$s Gói đã tải Bản gốc đã giữ Chưa tải gói thành phần nào. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d775759045..b84c613839 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2870,7 +2870,7 @@ 选择文件夹… 使用 SD 卡或 USB 驱动器上的任意文件夹 游戏会放在所选位置中的 Games 文件夹内。现有游戏不会被移动。 - 占用去向 + 占用空间的项目 Steam 游戏 游戏数据 前缀 %1$s · 创意工坊 %2$s · 着色器 %3$s @@ -3002,6 +3002,19 @@ 保留 非 Steam 游戏与 Steam 的共享前缀 从商店或手动添加的游戏的前缀 + Steam 的共享前缀 + Steam 在此运行其自带的 Windows 辅助程序 + 删除该前缀(%1$s)。Steam 下次需要时会新建一个。 + 商店应用及通过它运行的游戏 + 由 %1$s 使用 + 非 Steam 游戏 %1$s + 未匹配到游戏,因此保留 + 移除所选 · %1$s + 卸载所选 · %1$s + Wine 前缀 + 其中的存档和设置将丢失;Steam Cloud 存档仍保留在你的账户中。 + 着色器缓存 + 前缀 %1$s · 着色器 %2$s 已下载的包 已保存的原始文件 没有已下载的组件包。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a7b17a7383..c8828521e1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2866,7 +2866,7 @@ 選擇資料夾… 使用 SD 卡或 USB 儲存裝置上的任何資料夾 遊戲會放在所選位置內的 Games 資料夾中。現有遊戲不會移動。 - 空間去向 + 佔用空間的項目 Steam 遊戲 遊戲資料 前綴 %1$s · 工作坊 %2$s · 著色器 %3$s @@ -2998,6 +2998,19 @@ 保留 非 Steam 遊戲與 Steam 的共用前綴 從商店或手動新增的遊戲的前綴 + Steam 的共用前綴 + Steam 在此執行其自帶的 Windows 輔助程式 + 刪除該前綴(%1$s)。Steam 下次需要時會新建一個。 + 商店應用程式及透過它執行的遊戲 + 由 %1$s 使用 + 非 Steam 遊戲 %1$s + 未配對到任何遊戲,因此保留 + 移除所選 · %1$s + 解除安裝所選 · %1$s + Wine 前綴 + 其中的存檔和設定都會遺失;Steam Cloud 存檔仍保留在你的帳戶中。 + 著色器快取 + 前綴 %1$s · 著色器 %2$s 已下載的套件 已儲存的原始檔案 沒有已下載的組件套件。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a73fbfecb1..5cacb7ee87 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2866,7 +2866,7 @@ 選擇資料夾… 使用 SD 卡或 USB 隨身碟上的任何資料夾 遊戲會放在所選位置內的 Games 資料夾中。現有遊戲不會移動。 - 空間去向 + 佔用空間的項目 Steam 遊戲 遊戲資料 前綴 %1$s · 工作坊 %2$s · 著色器 %3$s @@ -2998,6 +2998,19 @@ 保留 非 Steam 遊戲與 Steam 的共用前綴 從商店或手動新增的遊戲的前綴 + Steam 的共用前綴 + Steam 在此執行其自帶的 Windows 輔助程式 + 刪除該前綴(%1$s)。Steam 下次需要時會新建一個。 + 商店應用程式及透過它執行的遊戲 + 由 %1$s 使用 + 非 Steam 遊戲 %1$s + 未配對到任何遊戲,因此保留 + 移除所選 · %1$s + 解除安裝所選 · %1$s + Wine 前綴 + 其中的存檔和設定都會遺失;Steam Cloud 存檔仍保留在你的帳戶中。 + 著色器快取 + 前綴 %1$s · 著色器 %2$s 已下載的套件 已儲存的原始檔案 沒有已下載的元件套件。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 732b549ba2..e59c9e0bdc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3332,7 +3332,7 @@ Choose folder… Use any folder on an SD card or USB drive Games go into a Games folder inside the selected location. Existing games are not moved. - Where it goes + What’s using space Steam games Game data Prefixes %1$s · workshop %2$s · shaders %3$s @@ -3465,6 +3465,19 @@ Kept Non-Steam games and Steam’s shared prefix Prefixes of games added from stores or by hand + Steam’s shared prefix + Steam runs its own Windows helpers here + Deletes it (%1$s). Steam makes a new one the next time it needs it. + A store app and the games that run with it + Used by %1$s + Non-Steam game %1$s + Not matched to a game, so it is kept + Remove selected · %1$s + Uninstall selected · %1$s + Wine prefixes + Saves and settings inside them are lost; Steam Cloud saves stay in your account. + Shader caches + Prefix %1$s · shaders %2$s Downloaded packages Saved originals No component packages downloaded. diff --git a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt index a3b6a8fa24..4740b58073 100644 --- a/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/storage/SteamStorageTest.kt @@ -181,6 +181,37 @@ class SteamStorageTest { assertEquals(452280, SteamStorage.leftoverId("452280")) } + @Test fun shortcutIdsReadBothSignedAndUnsignedFolderNames() { + assertEquals(3207321049L, SteamStorage.shortcutId("3207321049")) + assertEquals(2526420341L, SteamStorage.shortcutId("-1768546955")) + assertNull(SteamStorage.shortcutId("0")) + assertNull(SteamStorage.shortcutId("452280")) + assertNull(SteamStorage.shortcutId("pfx")) + assertNull(SteamStorage.shortcutId("4294967296")) + } + + @Test fun sharedPrefixComesFromTheCompatDataPathInLaunchOptions() { + assertEquals(2929927072L, SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH=/root/.local/share/Steam/steamapps/compatdata/2929927072 %command%")) + assertEquals(2596113170L, SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH=/x/compatdata/2596113170/ %command% --exec=\"launch WoW\"")) + assertNull(SteamStorage.sharedPrefixId("%command% -windowed")) + assertNull(SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH=/x/compatdata/0 %command%")) + assertEquals(3000000002L, SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH=\"/root/My Games/steamapps/compatdata/3000000002\" %command%")) + assertEquals(3000000002L, SteamStorage.sharedPrefixId("STEAM_COMPAT_DATA_PATH='/x/compatdata/3000000002/' %command%")) + } + + @Test fun gameFolderHintReadsTheFolderWineRecorded() { + val prefix = tmp.newFolder("compatdata", "3000000002") + File(prefix, "pfx").mkdirs() + File(prefix, "pfx/system.reg").writeText( + "\"Path\"=\"Z:\\\\usr\\\\local\\\\share\\\\fonts\\\\a.ttf\"\n" + + "\"A\"=\"Z:\\\\root\\\\Games\\\\Stores\\\\Ubisoft\\\\Tom Clancy's Splinter Cell\\\\\"\n" + + "\"B\"=\"Z:\\\\root\\\\Games\\\\Stores\\\\Ubisoft\\\\Tom Clancy's Splinter Cell\\\\system\\\\x.exe\"\n", + ) + File(prefix, "pfx/user.reg").writeText("\"C\"=\"Z:\\\\mnt\\\\droiddeck-lib\\\\1\\\\steamapps\\\\common\\\\198X\\\\198X.exe\"\n") + assertEquals("Tom Clancy's Splinter Cell", SteamStorage.gameFolderHint(prefix)) + assertNull(SteamStorage.gameFolderHint(tmp.newFolder("compatdata", "3000000003"))) + } + @Test fun stubPrefixes() { val stub = tmp.newFolder("compatdata", "10") assertTrue(SteamStorage.isStubPrefix(stub)) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRemovalTest.kt new file mode 100644 index 0000000000..5ad355f8ec --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRemovalTest.kt @@ -0,0 +1,276 @@ +package com.droiddeck.launcher.stores.download + +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.StoresState +import java.io.File +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Assert.fail +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class DownloadQueueRemovalTest { + private val app get() = RuntimeEnvironment.getApplication() + + @After fun cleanRows() { DownloadQueue.dismissFinished() } + + private class BlockingCleanup { + val started = CountDownLatch(1) + val release = CountDownLatch(1) + val cancels = AtomicInteger() + fun job() = object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? = throw IllegalStateException("fails on purpose") + override fun cancel(deleteFiles: Boolean) { + cancels.incrementAndGet() + started.countDown() + release.await(5, TimeUnit.SECONDS) + } + } + } + + private fun failedEntry(id: String, cleanup: BlockingCleanup): String { + val entry = DownloadEntry(Store.GOG, id, id) + DownloadQueue.enqueue(app, entry) { cleanup.job() } + val until = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (System.nanoTime() < until) { + if (DownloadQueue.entry(entry.key)?.state == DownloadState.FAILED) return entry.key + Thread.sleep(10) + } + fail("job never failed: ${DownloadQueue.entry(entry.key)}") + return entry.key + } + + private fun awaitHold(key: String) { + val until = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (System.nanoTime() < until) { + if (DownloadQueue.holdForRemoval(key)) return + Thread.sleep(10) + } + fail("removal hold never became available for $key") + } + + @Test fun aRemovalHoldIsExclusiveUntilReleased() { + val key = "gog:removal-hold-test" + assertTrue(DownloadQueue.holdForRemoval(key)) + assertFalse(DownloadQueue.holdForRemoval(key)) + DownloadQueue.releaseRemoval(key) + assertTrue(DownloadQueue.holdForRemoval(key)) + DownloadQueue.releaseRemoval(key) + } + + @Test fun clearingFirstKeepsRemovalOutUntilItsCleanupFinishes() { + val cleanup = BlockingCleanup() + val key = failedEntry("clear-then-hold", cleanup) + DownloadQueue.clear(app, key) + assertTrue(cleanup.started.await(5, TimeUnit.SECONDS)) + assertFalse(DownloadQueue.holdForRemoval(key)) + cleanup.release.countDown() + awaitHold(key) + DownloadQueue.releaseRemoval(key) + } + + @Test fun cancellingFirstKeepsRemovalOutUntilItsCleanupFinishes() { + val cleanup = BlockingCleanup() + val key = failedEntry("cancel-then-hold", cleanup) + DownloadQueue.cancel(app, key) + assertTrue(cleanup.started.await(5, TimeUnit.SECONDS)) + assertFalse(DownloadQueue.holdForRemoval(key)) + cleanup.release.countDown() + awaitHold(key) + DownloadQueue.releaseRemoval(key) + } + + @Test fun holdingFirstStopsClearAndCancelFromStartingCleanup() { + val cleared = BlockingCleanup() + val clearKey = failedEntry("hold-then-clear", cleared) + assertTrue(DownloadQueue.holdForRemoval(clearKey)) + DownloadQueue.clear(app, clearKey) + val cancelled = BlockingCleanup() + val cancelKey = failedEntry("hold-then-cancel", cancelled) + assertTrue(DownloadQueue.holdForRemoval(cancelKey)) + DownloadQueue.cancel(app, cancelKey) + assertFalse(cleared.started.await(300, TimeUnit.MILLISECONDS)) + assertFalse(cancelled.started.await(300, TimeUnit.MILLISECONDS)) + assertEquals(0, cleared.cancels.get() + cancelled.cancels.get()) + DownloadQueue.releaseRemoval(clearKey) + DownloadQueue.releaseRemoval(cancelKey) + cleared.release.countDown() + cancelled.release.countDown() + } + + @Test fun aReinstallWaitsForTheCancelledDownloadsCleanup() { + val cleanup = BlockingCleanup() + val key = failedEntry("reinstall-after-clear", cleanup) + DownloadQueue.clear(app, key) + assertTrue(cleanup.started.await(5, TimeUnit.SECONDS)) + val ran = CountDownLatch(1) + DownloadQueue.enqueue(app, DownloadEntry(Store.GOG, "reinstall-after-clear", "again")) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { ran.countDown(); return "/done" } + override fun cancel(deleteFiles: Boolean) {} + } + } + assertFalse(ran.await(300, TimeUnit.MILLISECONDS)) + assertEquals(DownloadState.QUEUED, DownloadQueue.entry(key)?.state) + cleanup.release.countDown() + assertTrue(ran.await(5, TimeUnit.SECONDS)) + } + + @Test fun cleanupCollectsTheDeletionWorkerAnInstallerStarts() { + val folder = File(app.filesDir, "collected-discard").apply { mkdirs() } + File(folder, "part.bin").writeText("x") + val workers = StoreInstalls.collectingDiscards { StoreInstalls.discard(app, folder, emptyList()) } + assertEquals(1, workers.size) + workers.forEach { it.join(5000) } + assertFalse(folder.exists()) + assertFalse(StoreInstalls.isDiscarding(folder)) + } + + private fun idleUntil(condition: () -> Boolean): Boolean { + val until = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (System.nanoTime() < until) { + org.robolectric.shadows.ShadowLooper.idleMainLooper() + if (condition()) return true + Thread.sleep(10) + } + return false + } + + @Test fun uninstallWaitsForAnInstallersDiscardThenRemovesTheGame() { + val folder = File(app.filesDir, "discarding-game").apply { mkdirs() } + File(folder, "game.bin").writeText("x") + val game = InstalledStoreGame(StoreGameSidecar(Store.GOG, "discarding", "Discarding", exe = "game.bin"), folder) + StoreInstalls.beginDiscard(folder) + val done = CountDownLatch(1) + try { + StoresState.uninstall(app, game) { done.countDown() } + Thread.sleep(300) + org.robolectric.shadows.ShadowLooper.idleMainLooper() + assertEquals(1L, done.count) + assertTrue(File(folder, "game.bin").isFile) + } finally { + StoreInstalls.endDiscard(folder) + } + assertTrue(idleUntil { done.count == 0L }) + assertFalse(folder.exists()) + } + + @Test fun uninstallWaitsForACancelledUpdatesCleanupThenRemovesTheGame() { + val cleanup = BlockingCleanup() + val key = failedEntry("cancel-then-uninstall", cleanup) + val folder = File(app.filesDir, "cancel-then-uninstall").apply { mkdirs() } + File(folder, "game.bin").writeText("x") + val game = InstalledStoreGame(StoreGameSidecar(Store.GOG, "cancel-then-uninstall", "Cancelled", exe = "game.bin"), folder) + assertEquals(key, game.key) + DownloadQueue.cancel(app, key) + assertTrue(cleanup.started.await(5, TimeUnit.SECONDS)) + val done = CountDownLatch(1) + StoresState.uninstall(app, game) { done.countDown() } + Thread.sleep(300) + org.robolectric.shadows.ShadowLooper.idleMainLooper() + assertEquals(1L, done.count) + assertTrue(File(folder, "game.bin").isFile) + cleanup.release.countDown() + assertTrue(idleUntil { done.count == 0L }) + assertFalse(folder.exists()) + } + + private fun blockDiscards(): CountDownLatch { + val release = CountDownLatch(1) + StoreInstalls.beforeDiscard = { release.await(5, TimeUnit.SECONDS) } + return release + } + + @After fun restoreDiscards() { StoreInstalls.beforeDiscard = {} } + + @Test fun aDiscardStartedInsideARunningJobKeepsTheGameHeld() { + val folder = File(app.filesDir, "run-discard").apply { mkdirs() } + val release = blockDiscards() + val entry = DownloadEntry(Store.GOG, "run-discard", "run") + DownloadQueue.enqueue(app, entry) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { + StoreInstalls.discard(app, folder, emptyList()) + return null + } + override fun cancel(deleteFiles: Boolean) {} + } + } + assertTrue(idleUntil { DownloadQueue.entry(entry.key)?.state == DownloadState.FAILED }) + assertFalse(DownloadQueue.holdForRemoval(entry.key)) + release.countDown() + awaitHold(entry.key) + DownloadQueue.releaseRemoval(entry.key) + } + + @Test fun aJobThatThrowsAfterStartingADiscardStillKeepsTheGameHeld() { + val folder = File(app.filesDir, "throw-after-discard").apply { mkdirs() } + val release = blockDiscards() + val entry = DownloadEntry(Store.GOG, "throw-after-discard", "throws") + DownloadQueue.enqueue(app, entry) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { + StoreInstalls.discard(app, folder, emptyList()) + throw IllegalStateException("fails after discard") + } + override fun cancel(deleteFiles: Boolean) {} + } + } + assertTrue(idleUntil { DownloadQueue.entry(entry.key)?.state == DownloadState.FAILED }) + assertFalse(DownloadQueue.holdForRemoval(entry.key)) + val reinstalled = CountDownLatch(1) + DownloadQueue.enqueue(app, DownloadEntry(Store.GOG, "throw-after-discard", "again")) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { reinstalled.countDown(); return "/done" } + override fun cancel(deleteFiles: Boolean) {} + } + } + assertFalse(reinstalled.await(300, TimeUnit.MILLISECONDS)) + assertEquals(DownloadState.QUEUED, DownloadQueue.entry(entry.key)?.state) + release.countDown() + assertTrue(reinstalled.await(5, TimeUnit.SECONDS)) + assertTrue(idleUntil { DownloadQueue.entry(entry.key)?.state == DownloadState.INSTALLED }) + } + + @Test fun cancellingARunningJobTwiceWaitsForEveryDiscard() { + val folder = File(app.filesDir, "double-cancel").apply { mkdirs() } + val release = blockDiscards() + val running = CountDownLatch(1) + val stop = CountDownLatch(1) + val entry = DownloadEntry(Store.GOG, "double-cancel", "twice") + DownloadQueue.enqueue(app, entry) { + object : DownloadQueue.DownloadJob { + override fun run(handle: DownloadQueue.JobHandle): String? { + running.countDown() + stop.await(5, TimeUnit.SECONDS) + return null + } + override fun cancel(deleteFiles: Boolean) { + if (deleteFiles) StoreInstalls.discard(app, folder, emptyList()) + } + } + } + assertTrue(running.await(5, TimeUnit.SECONDS)) + DownloadQueue.cancel(app, entry.key) + DownloadQueue.cancel(app, entry.key) + stop.countDown() + assertTrue(idleUntil { DownloadQueue.entry(entry.key)?.state != DownloadState.RUNNING }) + assertFalse(DownloadQueue.holdForRemoval(entry.key)) + release.countDown() + awaitHold(entry.key) + DownloadQueue.releaseRemoval(entry.key) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt index 3b47a84904..dec06e5ac4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StorageComponentsBulkConfirmTest.kt @@ -37,7 +37,7 @@ class StorageComponentsBulkConfirmTest { components = components, flatpakApps = emptyList(), flatpakRuntimes = 0L, - otherPrefixes = 0L, + kept = emptyList(), leftoversChecked = true, ) From 13b05656aaf9285c5c9431a8baabcaaefd26c300 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 13:15:24 -0500 Subject: [PATCH 077/101] feat(agent): GitHub sign-in floats its device code over the browser (#2570) * feat(agent): GitHub sign-in floats its device code over the browser * fix(agent): the device code falls back to the browser when nothing could open * fix(agent): dd-gh-login waits for DroidDeck to report whether the page opened --- app/src/main/AndroidManifest.xml | 11 ++ app/src/main/assets/agent/dd-gh-login | 41 ++++- .../droiddeck/launcher/DeviceCodeActivity.kt | 167 ++++++++++++++++++ .../com/droiddeck/launcher/agent/AgentHost.kt | 40 ++++- tools/agent/dd-gh-login | 41 ++++- tools/release/sign-apk.sh | 2 +- 6 files changed, 290 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/DeviceCodeActivity.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1264c8211a..67240f4eb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -118,6 +118,17 @@ + + "$inbox/device-code.part" && mv -f "$inbox/device-code.part" "$inbox/device-code" || return 1 + i=0 + while [ $i -lt 40 ] && [ -e "$inbox/device-code" ]; do + sleep 0.2 + i=$((i + 1)) + done + if [ -e "$inbox/device-code" ]; then + rm -f "$inbox/device-code" + return 1 + fi + # DroidDeck writes "ok" or "failed" once it has tried to open the page; no answer counts as failed. + i=0 + while [ $i -lt 50 ] && [ ! -e "$inbox/device-code.result" ]; do + sleep 0.2 + i=$((i + 1)) + done + result=$(cat "$inbox/device-code.result" 2>/dev/null) + rm -f "$inbox/device-code.result" + [ "$result" = ok ] +} + coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } gh_pid=$GH_PID exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" shown= while IFS= read -r line <&"$ghout"; do - printf '%s\n' "$line" code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) + # gh's own prompts would push the code out of the one line the setup card shows. + case "$line" in + *"one-time code"* | *"Press Enter"* | *"Open this URL"*) ;; + *) printf '%s\n' "$line" ;; + esac if [ -n "$code" ] && [ -z "$shown" ]; then shown=1 echo >&"$ghin" printf 'GitHub device code: %s · github.com/login/device\n' "$code" - android-open https://github.com/login/device + float_code "$code" || android-open "$url" fi done wait "$gh_pid" +status=$? +[ -n "$shown" ] && [ -n "$inbox" ] && [ -d "$inbox" ] && : > "$inbox/device-code" +exit $status diff --git a/app/src/main/java/com/droiddeck/launcher/DeviceCodeActivity.kt b/app/src/main/java/com/droiddeck/launcher/DeviceCodeActivity.kt new file mode 100644 index 0000000000..472521fe20 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/DeviceCodeActivity.kt @@ -0,0 +1,167 @@ +package com.droiddeck.launcher + +import android.app.ActivityOptions +import android.app.PictureInPictureParams +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import android.content.res.Configuration +import android.net.Uri +import android.os.Bundle +import android.util.Rational +import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.widthIn +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.core.AppLanguage +import com.droiddeck.launcher.ui.DroidDeckTheme +import com.droiddeck.launcher.ui.FitText +import com.droiddeck.launcher.ui.LocalPalette +import com.droiddeck.launcher.ui.PrimaryButton +import com.droiddeck.launcher.ui.SecondaryButton +import java.lang.ref.WeakReference + +/** Floats a sign-in code over the browser page that asks for it. */ +class DeviceCodeActivity : ComponentActivity() { + private var code by mutableStateOf("") + private var url = "" + private var display: Int? = null + private var inPip by mutableStateOf(false) + private var openPending = false + + override fun attachBaseContext(newBase: Context) = super.attachBaseContext(AppLanguage.wrap(newBase)) + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + current = WeakReference(this) + read(intent) + openPending = savedInstanceState == null + setContent { DroidDeckTheme { Float() } } + } + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + read(intent) + openPending = true + } + + override fun onDestroy() { + if (current?.get() === this) current = null + super.onDestroy() + } + + override fun onResume() { + super.onResume() + if (!openPending) return + if (isInPictureInPictureMode) { + openPage() + return + } + enterPip() + if (!inPip) { + openPage() + finish() + } + } + + override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) { + super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig) + inPip = isInPictureInPictureMode + if (isInPictureInPictureMode && openPending) openPage() + } + + private fun read(intent: Intent) { + code = intent.getStringExtra(EXTRA_CODE).orEmpty() + url = intent.getStringExtra(EXTRA_URL).orEmpty() + display = intent.getIntExtra(EXTRA_DISPLAY, -1).takeIf { it > 0 } + copy() + } + + private fun copy() { + runCatching { getSystemService(ClipboardManager::class.java)?.setPrimaryClip(ClipData.newPlainText("GitHub", code)) } + } + + private fun enterPip() { + inPip = runCatching { + enterPictureInPictureMode(PictureInPictureParams.Builder().setAspectRatio(Rational(16, 9)).build()) + }.getOrDefault(false) + } + + private fun openPage() { + openPending = false + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + val at = display + val opened = runCatching { + if (at == null) startActivity(intent) + else startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(at).toBundle()) + }.recoverCatching { startActivity(intent) }.isSuccess + com.droiddeck.launcher.agent.AgentHost.deviceCodeOpened(applicationContext, opened) + } + + @androidx.compose.runtime.Composable + private fun Float() { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.signal + BackHandler(enabled = !inPip) { enterPip() } + Box(Modifier.fillMaxSize().background(colors.background), contentAlignment = Alignment.Center) { + Column( + Modifier.widthIn(max = 520.dp).fillMaxWidth().padding(if (inPip) 8.dp else 24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(if (inPip) 2.dp else 16.dp), + ) { + Text(stringResource(R.string.agent_step_github), style = MaterialTheme.typography.labelLarge, color = colors.onSurfaceVariant) + FitText(code, maxSize = if (inPip) 40.sp else 56.sp, fontWeight = FontWeight.Bold, color = accent, + modifier = Modifier.fillMaxWidth()) + Text(Uri.parse(url).let { it.host + it.path }, style = MaterialTheme.typography.labelMedium, color = colors.onSurfaceVariant, maxLines = 1) + if (!inPip) Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + PrimaryButton(stringResource(R.string.fm_copy), onClick = ::copy) + SecondaryButton(stringResource(R.string.common_close), onClick = ::finish) + } + } + } + } + + companion object { + private const val EXTRA_CODE = "code" + private const val EXTRA_URL = "url" + private const val EXTRA_DISPLAY = "display" + private var current: WeakReference? = null + + /** False when this device cannot float a window, so the caller opens the page itself. */ + fun show(context: Context, code: String, url: String, display: Int): Boolean { + if (!PairingGuideActivity.canFloat(context)) return false + val intent = Intent(context, DeviceCodeActivity::class.java) + .putExtra(EXTRA_CODE, code).putExtra(EXTRA_URL, url).putExtra(EXTRA_DISPLAY, display) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + return runCatching { + if (display > 0) context.startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(display).toBundle()) + else context.startActivity(intent) + }.isSuccess + } + + fun close() { + current?.get()?.finish() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index 1f78672f4a..2c22063f71 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -508,6 +508,7 @@ object AgentHost { appContext?.let { app -> claimLabRequest(app) claimOpenUrl(app) + claimDeviceCode(app) // proot comes from an add-on pack fetched after the app starts, so the runtime can become usable later. if (!available && state != State.WORKING) available = LinuxRuntime.hasRootfs(app) lab = LabProgress.read(LinuxRuntime.rootDir(app)) @@ -529,15 +530,43 @@ object AgentHost { val url = runCatching { claimed.readText().trim() }.getOrNull() claimed.delete() if (url == null || !(url.startsWith("https://") || url.startsWith("http://"))) return + if (!openUrl(app, url)) runCatching { File(app.filesDir, "$OPEN_URL.failed").writeText("") } + } + + /** dd-gh-login leaves " " here to float the code over the page, and an empty file when it ends. */ + private fun claimDeviceCode(app: Context) { + val request = File(app.filesDir, DEVICE_CODE) + if (!request.isFile) return + val claimed = File(app.filesDir, "$DEVICE_CODE.claimed") + if (!request.renameTo(claimed)) return + val parts = runCatching { claimed.readText().trim() }.getOrDefault("").split(' ', limit = 2) + claimed.delete() + val code = parts[0] + val url = parts.getOrNull(1)?.takeIf { it.startsWith("https://") } + if (code.isEmpty() || url == null) { + com.droiddeck.launcher.DeviceCodeActivity.close() + return + } + if (!com.droiddeck.launcher.DeviceCodeActivity.show(app, code, url, AgentAdb.browserDisplay)) deviceCodeOpened(app, openUrl(app, url)) + } + + /** Tells dd-gh-login whether the device page opened, so it can fall back to android-open. */ + fun deviceCodeOpened(app: Context, opened: Boolean) { + runCatching { + val part = File(app.filesDir, "$DEVICE_CODE.result.part") + part.writeText(if (opened) "ok" else "failed") + part.renameTo(File(app.filesDir, "$DEVICE_CODE.result")) + } + } + + private fun openUrl(app: Context, url: String): Boolean { val intent = android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)) .addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(AgentAdb.browserDisplay).toBundle() - runCatching { app.startActivity(intent, options) } + return runCatching { app.startActivity(intent, options) } .recoverCatching { app.startActivity(intent) } - .onFailure { - Log.w(TAG, "could not open a sign-in link: ${it.javaClass.simpleName}") - runCatching { File(app.filesDir, "$OPEN_URL.failed").writeText("") } - } + .onFailure { Log.w(TAG, "could not open a sign-in link: ${it.javaClass.simpleName}") } + .isSuccess } /** @@ -593,6 +622,7 @@ object AgentHost { private const val RESUME = "agent/resume" private const val LAB_REQUEST = "agent/lab-request" private const val OPEN_URL = "agent/open-url" + private const val DEVICE_CODE = "agent/device-code" private const val LAB_CHAT_KEY = "lab_chat" /** The raw output of the latest turn, for working out what a CLI did when the chat shows nothing. */ private const val TURN_LOG = "agent/turn.log" diff --git a/tools/agent/dd-gh-login b/tools/agent/dd-gh-login index d3c7517e55..f9b0b7734a 100755 --- a/tools/agent/dd-gh-login +++ b/tools/agent/dd-gh-login @@ -1,17 +1,52 @@ #!/bin/bash -# Starts GitHub's device login and opens its approval page in Android. +# Starts GitHub's device login, floats its code over Android's browser and opens the approval page. +url=https://github.com/login/device +inbox=${DD_AGENT_INBOX:-} + +# DroidDeck takes $inbox/device-code within a few seconds when it can float the code. +float_code() { + [ -n "$inbox" ] && [ -d "$inbox" ] || return 1 + rm -f "$inbox/device-code.result" + printf '%s %s\n' "$1" "$url" > "$inbox/device-code.part" && mv -f "$inbox/device-code.part" "$inbox/device-code" || return 1 + i=0 + while [ $i -lt 40 ] && [ -e "$inbox/device-code" ]; do + sleep 0.2 + i=$((i + 1)) + done + if [ -e "$inbox/device-code" ]; then + rm -f "$inbox/device-code" + return 1 + fi + # DroidDeck writes "ok" or "failed" once it has tried to open the page; no answer counts as failed. + i=0 + while [ $i -lt 50 ] && [ ! -e "$inbox/device-code.result" ]; do + sleep 0.2 + i=$((i + 1)) + done + result=$(cat "$inbox/device-code.result" 2>/dev/null) + rm -f "$inbox/device-code.result" + [ "$result" = ok ] +} + coproc GH { BROWSER=true gh auth login --hostname github.com --git-protocol https --web 2>&1; } gh_pid=$GH_PID exec {ghout}<&"${GH[0]}" {ghin}>&"${GH[1]}" shown= while IFS= read -r line <&"$ghout"; do - printf '%s\n' "$line" code=$(grep -oE '[A-Z0-9]{4}-[A-Z0-9]{4}' <<<"$line" | head -1) + # gh's own prompts would push the code out of the one line the setup card shows. + case "$line" in + *"one-time code"* | *"Press Enter"* | *"Open this URL"*) ;; + *) printf '%s\n' "$line" ;; + esac if [ -n "$code" ] && [ -z "$shown" ]; then shown=1 echo >&"$ghin" printf 'GitHub device code: %s · github.com/login/device\n' "$code" - android-open https://github.com/login/device + float_code "$code" || android-open "$url" fi done wait "$gh_pid" +status=$? +[ -n "$shown" ] && [ -n "$inbox" ] && [ -d "$inbox" ] && : > "$inbox/device-code" +exit $status diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index 160d49b5ea..a7cfd8f531 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -27,7 +27,7 @@ if [ "$pkg" = "$P" ]; then else python3 "$here/axml_rename.py" "$in" "$work/renamed.apk" \ "$P=$pkg" "$P.androidx-startup=$pkg.androidx-startup" "$P.logs=$pkg.logs" \ - "$P.pairingguide=$pkg.pairingguide" "$P.pin=$pkg.pin" \ + "$P.pairingguide=$pkg.pairingguide" "$P.devicecode=$pkg.devicecode" "$P.pin=$pkg.pin" \ "$P.documents=$pkg.documents" "$P.home=$pkg.home" "$P.agent=$pkg.agent" \ "$P.vr_recovery=$pkg.vr_recovery" "$P.dualscreen=$pkg.dualscreen" "$P.typing=$pkg.typing" \ "$P.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION=$pkg.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" From 8a37e71e108526a705c10bf756a2b8dae1cd8c70 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 13:15:55 -0500 Subject: [PATCH 078/101] fix(agent): the agent's tools reach the running app's package and live adb port (#2571) --- .../com/droiddeck/launcher/agent/AgentHost.kt | 2 +- .../droiddeck/launcher/agent/AgentSetup.kt | 8 +++++++ .../launcher/agent/AgentBashrcTest.kt | 22 +++++++++++++++++++ tools/agent/setup | 4 +++- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentBashrcTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index 2c22063f71..63e60f3d5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -382,7 +382,7 @@ object AgentHost { val adb = AgentAdb.prepare(app) val env = listOf( "/usr/bin/env", "HOME=/root", "PATH=$GUEST_PATH", "LANG=C.UTF-8", - "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", + "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", "DROIDDECK_PACKAGE=${app.packageName}", "DD_AGENT=1", "DD_AGENT_INBOX=${File(app.filesDir, "agent").path}", "BROWSER=/root/.local/bin/android-open", "DD_BROWSER_DISPLAY=${AgentAdb.browserDisplay}", ) val shell = listOf( diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index a5f900d6f5..1ff5475b6e 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -191,6 +191,14 @@ object AgentSetup { for (name in HELPERS) copyAsset(app, "agent/$name", File(bin, name)) val ctl = File(root, CTL.removePrefix("/")).apply { mkdirs() } for (name in app.assets.list("agent/ctl").orEmpty()) copyAsset(app, "agent/ctl/$name", File(ctl, name)) + unpinAdbSerial(File(root, "root/.bashrc")) + } + + /** Older tools/agent/setup pinned the adb port in .bashrc, which overrides the live port DroidDeck passes. */ + internal fun unpinAdbSerial(bashrc: File) { + val text = runCatching { bashrc.readText() }.getOrNull() ?: return + val fixed = text.replace("ADB_SERIAL=127.0.0.1:5555 ", "ADB_SERIAL=\"\${ADB_SERIAL:-127.0.0.1:5555}\" ") + if (fixed != text) runCatching { bashrc.writeText(fixed) } } private fun copyAsset(app: Context, asset: String, target: File) { diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentBashrcTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentBashrcTest.kt new file mode 100644 index 0000000000..43f900f065 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentBashrcTest.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class AgentBashrcTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun aPinnedAdbPortGivesWayToTheLiveOne() { + val bashrc = tmp.newFile(".bashrc") + bashrc.writeText("alias ll='ls -l'\n# droiddeck-agent-path\nexport PATH=\"\$HOME/.local/bin:\$PATH\" ADB_SERIAL=127.0.0.1:5555 BROWSER=\"\$HOME/.local/bin/android-open\"\n") + AgentSetup.unpinAdbSerial(bashrc) + assertEquals( + "alias ll='ls -l'\n# droiddeck-agent-path\nexport PATH=\"\$HOME/.local/bin:\$PATH\" ADB_SERIAL=\"\${ADB_SERIAL:-127.0.0.1:5555}\" BROWSER=\"\$HOME/.local/bin/android-open\"\n", + bashrc.readText(), + ) + AgentSetup.unpinAdbSerial(bashrc) + assertEquals(1, Regex("ADB_SERIAL=").findAll(bashrc.readText()).count()) + } +} diff --git a/tools/agent/setup b/tools/agent/setup index 5c2405d8d6..e3b649db5e 100755 --- a/tools/agent/setup +++ b/tools/agent/setup @@ -16,8 +16,10 @@ command -v claude >/dev/null || [ -x "$HOME/.local/bin/claude" ] || mkdir -p "$HOME/.local/bin" for tool in dd-agent dd-lab-build dd-gh-login android-open; do install -m755 "$here/$tool" "$HOME/.local/bin/$tool"; done +# DroidDeck passes the live loopback adb port; a fixed one here would go stale whenever wireless debugging is toggled. +sed -i 's|ADB_SERIAL=127.0.0.1:5555 |ADB_SERIAL="${ADB_SERIAL:-127.0.0.1:5555}" |' "$HOME/.bashrc" 2>/dev/null || true grep -q 'droiddeck-agent-path' "$HOME/.bashrc" 2>/dev/null || - printf '\n# droiddeck-agent-path\nexport PATH="$HOME/.local/bin:$PATH" ADB_SERIAL=127.0.0.1:5555 BROWSER="$HOME/.local/bin/android-open"\n' >> "$HOME/.bashrc" + printf '\n# droiddeck-agent-path\nexport PATH="$HOME/.local/bin:$PATH" ADB_SERIAL="${ADB_SERIAL:-127.0.0.1:5555}" BROWSER="$HOME/.local/bin/android-open"\n' >> "$HOME/.bashrc" # Google publishes aapt2 for x86-64 Linux only; it runs here under qemu-user with Ubuntu's x86-64 runtime. x86=$HOME/x86root From 1e6aebd216933850a0e7369ea1ce6c5bb22f332d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 16:02:40 -0500 Subject: [PATCH 079/101] fix(agent): the pet's windows move without the system's move animation (#2582) --- .../droiddeck/launcher/ui/AgentPetWindows.kt | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt index c8d3aba8c9..675c34a41a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt @@ -110,7 +110,11 @@ internal class PetMotion(private val context: Context) { private val margin = 6 * density private val inset = 24 * density private var settle: ValueAnimator? = null - private val spring = FlingSpring { sx, sy -> x = sx; y = sy } + // A fling's overshoot may carry the pet past the edge it settles on, but never so far that it leaves the screen. + private val spring = FlingSpring { sx, sy -> + x = sx.coerceIn(-size / 2, (width - size / 2).coerceAtLeast(-size / 2)) + y = sy.coerceIn(0f, (height - size).coerceAtLeast(0f)) + } val dockX get() = width - size - margin @@ -333,11 +337,24 @@ internal class PetWindows(private val context: Context) { gravity = Gravity.TOP or Gravity.START if (full) softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES + noMoveAnimation(this) } if (onSize != null) compose.addOnLayoutChangeListener { v, _, _, _, _, _, _, _, _ -> onSize(v.width, v.height) } return Window(frame, params, touchable) } + /** + * The system otherwise eases a moved overlay from where it last placed it, so the pet trails behind + * the finger, lags the chat as it opens, or flashes at an old spot. setCanPlayMoveAnimation sets the + * same flag but makes some ROMs refuse the window, so the flag is set directly. + */ + private fun noMoveAnimation(params: WindowManager.LayoutParams) { + runCatching { + val field = WindowManager.LayoutParams::class.java.getField("privateFlags") + field.setInt(params, field.getInt(params) or PRIVATE_FLAG_NO_MOVE_ANIMATION) + } + } + /** A hidden overlay window still owns its frame, which the system can stretch over the screen, so it also stops taking touches. */ private fun setVisible(window: Window, shown: Boolean) { window.view.visibility = if (shown) View.VISIBLE else View.GONE @@ -467,6 +484,7 @@ internal class PetWindows(private val context: Context) { companion object { private const val OFFSCREEN = 10_000 + private const val PRIVATE_FLAG_NO_MOVE_ANIMATION = 0x40 fun allowed(context: Context) = Settings.canDrawOverlays(context) } } From 0b8a3f1ee81fa928cf6c62f38cf0bcd3f7908d4f Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 16:17:03 -0500 Subject: [PATCH 080/101] Add skip boot movie toggle (#2577) * Add skip boot movie toggle * Hide boot movie controls when skipping * fix(session): resolve the skip movie key to its asset file --- .../assets/steam-startup/skip-startup.webm | Bin 0 -> 2167 bytes .../droiddeck/launcher/session/BootMovie.kt | 3 ++ .../launcher/session/BootMovieReport.kt | 2 +- .../launcher/session/SessionPrefs.kt | 5 +++ .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/BootMovieSection.kt | 31 ++++++++++++------ app/src/main/res/values/strings.xml | 2 ++ 7 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 app/src/main/assets/steam-startup/skip-startup.webm diff --git a/app/src/main/assets/steam-startup/skip-startup.webm b/app/src/main/assets/steam-startup/skip-startup.webm new file mode 100644 index 0000000000000000000000000000000000000000..3853967ad76083d444e7664d380752f1172d6f98 GIT binary patch literal 2167 zcmb1gy}x+AQ(GgW({~{L)X3uWxsk)EsiizMDc7mJk;$pGkx3%BA)S!{1UTFUeP@^K z^4;AXyt+lyb7flan#P3?o><7bY#{HN@9rL;oKVQ&^x!p3jH(c>Oz>`?WD|$s8;Cg! zkznI!L4aJfLF@X)W_~9J--aHa#IiIqBRyk1Lj!|wM-;A0XNLpS9U#Y_S_gHTUP?zJLtATDd{}@*b0eejB6i=rqB&7p*tHHLB9W8Ts%MdKtuY8nXZf5UHzQ>U0j1)+EE-(TzoD0KzB02s`L{J zkrht?IzAcbctb;w>lJb`lgbJzz-l^NLW3MbJpKJ#+9w+rSb-5p4FoXAJ8vs>YkS_v zu-Hwrk%6J%!y$&bj9Lt=7nrz@bF{X0%xvkfZ(?8*WBJb3m@+^6_H1>F>QOWr0;3@? z8UmvsFycZ$kKy05tqhCTHZmwO1hO#b3;tn{V35fF!Xy5Rjg9*+GXullyU3sntbAD` jgEK=RGm>(w>OfWh#NGXy8yU8D0h<^fn;4gVXk-QeF0G4W literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt index a525bed375..148766436c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt @@ -15,6 +15,7 @@ object BootMovie { const val DROIDDECK_30 = "dd30" const val DROIDDECK_60 = "dd60" const val CUSTOM = "custom" + private const val SKIP = "skip" const val MAX_BYTES = 50L shl 20 const val MAX_CONVERT_SECONDS = 60 val PICKER_EXTENSIONS = listOf("webm", "mkv", "mp4", "mov", "m4v", "3gp") @@ -22,6 +23,7 @@ object BootMovie { private val ASSETS = mapOf( DROIDDECK_30 to "droiddeck-startup.webm", DROIDDECK_60 to "droiddeck-startup-60.webm", + SKIP to "skip-startup.webm", ) internal val VIDEO_CODECS = setOf(MediaFormat.MIMETYPE_VIDEO_VP8, MediaFormat.MIMETYPE_VIDEO_VP9, MediaFormat.MIMETYPE_VIDEO_AV1) @@ -74,6 +76,7 @@ object BootMovie { fun prepare(context: Context): File? { BootMovieLibrary.restore(context) + if (SessionPrefs.skipBootMovie(context)) return assetFile(context, SKIP) val source = sourceOf(context, choice(context)) ?: return null return variant(context, source) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt index 18ff31169d..b82dad26d2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt @@ -67,7 +67,7 @@ object BootMovieReport { line("== DroidDeck state") line("choice=${BootMovie.choice(context)} saved choice=${SessionPrefs.bootMovie(context)} pending pick=${SessionPrefs.bootMovieApplyNext(context)}") line("last Steam path seen=${SessionPrefs.bootMovieSteamSeen(context)}") - line("sound=${SessionPrefs.bootMovieSound(context)} volume=${SessionPrefs.bootMovieVolume(context)} seconds=${SessionPrefs.bootMovieSeconds(context)}") + line("sound=${SessionPrefs.bootMovieSound(context)} volume=${SessionPrefs.bootMovieVolume(context)} seconds=${SessionPrefs.bootMovieSeconds(context)} skip=${SessionPrefs.skipBootMovie(context)}") line("session running=${SessionState.running}") line() line("== The movie list as shown") 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 cf7b324eac..faf6a6674f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1164,6 +1164,11 @@ object SessionPrefs { fun setBootMovieVolume(context: Context, percent: Int) { prefs(context).edit().putInt("bootMovieVolume", percent.coerceIn(0, 100)).apply() } fun bootMovieSeconds(context: Context): Int = prefs(context).getInt("bootMovieSeconds", 0).coerceAtLeast(0) fun setBootMovieSeconds(context: Context, seconds: Int) { prefs(context).edit().putInt("bootMovieSeconds", seconds.coerceAtLeast(0)).apply() } + fun skipBootMovie(context: Context): Boolean = prefs(context).getBoolean("skipBootMovie", false) + fun setSkipBootMovie(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("skipBootMovie", on).apply() + setBootMovieApplyNext(context, true) + } fun bootMovieApplyNext(context: Context): Boolean = prefs(context).getBoolean("bootMovieApplyNext", false) fun setBootMovieApplyNext(context: Context, on: Boolean) { prefs(context).edit().putBoolean("bootMovieApplyNext", on).apply() } fun bootMovieSteamSeen(context: Context): String? = prefs(context).getString("bootMovieSteamSeen", null) 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 7e4053a14a..2c600dafee 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -25,7 +25,7 @@ object SettingsReset { "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark", "upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias", - "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", + "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", "skipBootMovie", "bootMovieApplyNext", "bootMovieSteamSeen", "questDefaultsV1", "telemetryAuto", "telemetryOff", "statsStrip", "statsHud", "bottomHud", "bottomStripMetrics", "bottomStripTabs", "statsDash", "statsSpeedUnit", ) 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 8e84ae4cbf..9e915031f2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt @@ -142,18 +142,29 @@ private fun TabChip(label: String, selected: Boolean, modifier: Modifier = Modif @Composable internal fun BootMovieGroup(s: ModeSettings, a: ModeSettingsActions, host: MenuHost) { var tab by rememberSaveable { mutableStateOf(MovieTab.INSTALLED) } + val app = LocalContext.current.applicationContext + var skipBootMovie by remember { mutableStateOf(SessionPrefs.skipBootMovie(app)) } SettingsGroup(stringResource(R.string.boot_movie)) { - Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 10.dp)) { - TabChip(stringResource(R.string.boot_movie_tab_installed), tab == MovieTab.INSTALLED, Modifier.weight(1f)) { tab = MovieTab.INSTALLED } - TabChip(stringResource(R.string.boot_movie_tab_import), tab == MovieTab.IMPORT, Modifier.weight(1f)) { tab = MovieTab.IMPORT } - TabChip(stringResource(R.string.boot_movie_tab_repo), tab == MovieTab.REPO, Modifier.weight(1f)) { tab = MovieTab.REPO } - TabChip(stringResource(R.string.boot_movie_tab_sound), tab == MovieTab.SOUND, Modifier.weight(1f)) { tab = MovieTab.SOUND } + ToggleRow( + host, "boot-movie-skip", stringResource(R.string.boot_movie_skip), + stringResource(R.string.boot_movie_skip_hint), skipBootMovie, + ) { enabled -> + skipBootMovie = enabled + SessionPrefs.setSkipBootMovie(app, enabled) } - when (tab) { - MovieTab.INSTALLED -> InstalledTab(a) - MovieTab.IMPORT -> ImportTab(s, a) - MovieTab.REPO -> RepoTab(a) - MovieTab.SOUND -> SoundTab(s, a, host) + if (!skipBootMovie) { + Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 10.dp)) { + TabChip(stringResource(R.string.boot_movie_tab_installed), tab == MovieTab.INSTALLED, Modifier.weight(1f)) { tab = MovieTab.INSTALLED } + TabChip(stringResource(R.string.boot_movie_tab_import), tab == MovieTab.IMPORT, Modifier.weight(1f)) { tab = MovieTab.IMPORT } + TabChip(stringResource(R.string.boot_movie_tab_repo), tab == MovieTab.REPO, Modifier.weight(1f)) { tab = MovieTab.REPO } + TabChip(stringResource(R.string.boot_movie_tab_sound), tab == MovieTab.SOUND, Modifier.weight(1f)) { tab = MovieTab.SOUND } + } + when (tab) { + MovieTab.INSTALLED -> InstalledTab(a) + MovieTab.IMPORT -> ImportTab(s, a) + MovieTab.REPO -> RepoTab(a) + MovieTab.SOUND -> SoundTab(s, a, host) + } } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e59c9e0bdc..ecbc309951 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3532,6 +3532,8 @@ DroidDeck · %1$d fps 60 fps looks smoother but uses more CPU while Steam starts. A movie picked in Steam\'s own settings shows up here too. Sound + Skip boot movie + Use a 0.1-second black clip as Steam’s startup movie. Applies next session. Your own movie MP4, MOV, MKV or WebM. Other formats and files over %1$d MB are converted to 720p WebM on the device, up to %2$d seconds. Import From bc929c08b2f327c4399c90d9fc407988e3c3bcfd Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 17:24:25 -0500 Subject: [PATCH 081/101] fix(input): save Steam touch layout without existing config (#2580) * fix(input): save Steam touch layout without existing config * fix(input): preserve unreadable Steam touch config on save * test(input): register configset in unreadable touch config fixture --- .../launcher/input/SteamTouchConfig.kt | 3 +- .../input/SteamTouchConfigFilesTest.kt | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt index 1387dce25d..dc9465222e 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchConfig.kt @@ -390,7 +390,8 @@ object SteamTouchConfig { options: Options? = null, ): File? { val dir = configDir(context) ?: return null - val source = bindings.entries.fold(config.text ?: return null) { text, (ref, change) -> + val base = config.text ?: if (config.file == null && bindings.isEmpty()) "\"controller_mappings\"\n{\n\t\"controller_type\"\t\t\"controller_mobile_touch\"\n}\n" else return null + val source = bindings.entries.fold(base) { text, (ref, change) -> SteamTouchBindings.rewrite(text, ref, change) ?: text } val key = steamKey(context, appId) diff --git a/app/src/test/java/com/droiddeck/launcher/input/SteamTouchConfigFilesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SteamTouchConfigFilesTest.kt index 96ff9a1c4e..845104bf51 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SteamTouchConfigFilesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SteamTouchConfigFilesTest.kt @@ -113,4 +113,34 @@ class SteamTouchConfigFilesTest { assertEquals(1, entries.findAll(File(dir, "configset_controller_mobile_touch.vdf").readText()).count()) assertEquals(0, entries.findAll(File(dir, "configset_MT-DROIDDECK0001.vdf").readText()).count()) } + + @Test fun savesLayoutWhenNoTouchConfigExistsOnDisk() { + val config = SteamTouchConfig.load(context, 413150) + assertEquals(null, config.file) + assertEquals(null, config.text) + val elements = listOf(SteamTouchConfig.Element(SteamTouchConfig.A, true, 0.5f, 0.6f)) + val saved = SteamTouchConfig.saveLayouts(context, 413150, config, mapOf(1 to elements)) + assertEquals(File(dir, "413150/controller_mobile_touch.vdf"), saved) + assertTrue(saved!!.readText().contains("\"touch_layout\"")) + val loaded = SteamTouchConfig.load(context, 413150) + assertEquals(saved, loaded.file) + val a = SteamTouchConfig.elementsFor(loaded, 1, emptyList()).first { it.type == SteamTouchConfig.A } + assertEquals(0.5f, a.x, 0.002f) + assertEquals(0.6f, a.y, 0.002f) + } + + @Test fun savingDoesNotOverwriteUnreadableExistingTouchConfig() { + configset("configset_controller_mobile_touch.vdf", "413150" to "\"autosave\"\t\t\"1\"") + val file = File(dir, "413150/controller_mobile_touch.vdf").apply { + parentFile!!.mkdirs() + writeText("\"controller_mappings\"\n{\n\t\"controller_type\"\t\t\"controller_mobile_touch\"\n\t\"touch_layout\"\t\t\"zz\"\n}\n") + } + val original = file.readBytes() + val config = SteamTouchConfig.load(context, 413150) + assertEquals(file, config.file) + assertEquals(null, config.text) + val saved = SteamTouchConfig.saveLayouts(context, 413150, config, emptyMap()) + assertEquals(null, saved) + assertTrue(original.contentEquals(file.readBytes())) + } } From 6d1a0d9fd0bd2234b2677c33a7072eaa89ef2be3 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 18:09:15 -0500 Subject: [PATCH 082/101] fix(native): drive links stored as rootfs paths reach the game library mount (#2522) * fix(native): drive links stored as rootfs paths reach the game library mount * fix(native): relative drive links reach the game library mount * fix(native): keep the path after a relative drive link as written * fix(native): relative links that climb past the rootfs root stop at the guest root Proton copies default_pfx/dosdevices/z: into each prefix with readlink and symlink. The relinked target climbs as many folders as default_pfx is deep, which is one more than a Steam prefix, so natively the kernel left the rootfs and Z: pointed at the app's files folder. Proot stops ".." at the guest root; the hook now does the same for links it resolves. * fix(native): resolve drive links in prefixes stored in bind sources outside the rootfs * fix(native): detect equal-length mount conversion for bound prefixes --- tools/nativeguest/hook/fileops.c | 4 +- tools/nativeguest/hook/paths.c | 133 ++++++++++++++- tools/tests/test_native_hook_mounts.py | 224 +++++++++++++++++++++++++ 3 files changed, 353 insertions(+), 8 deletions(-) create mode 100644 tools/tests/test_native_hook_mounts.py diff --git a/tools/nativeguest/hook/fileops.c b/tools/nativeguest/hook/fileops.c index 9d0ff7cf9d..9ee7976505 100644 --- a/tools/nativeguest/hook/fileops.c +++ b/tools/nativeguest/hook/fileops.c @@ -700,7 +700,7 @@ char *getcwd(char *buf, size_t size) { char *res = orig_getcwd ? orig_getcwd(buf, size) : NULL; if (res) { size_t len = strlen(res); - guest_path_of_mount_source(res, len, buf ? size : len + 1); + guest_path_of_mount_source(res, len, buf ? size : len + 1, NULL); } return res; } @@ -749,7 +749,7 @@ char *realpath(const char *path, char *resolved_path) { } } } - if (res) guest_path_of_mount_source(res, strlen(res), resolved_path ? PATH_MAX : strlen(res) + 1); + if (res) guest_path_of_mount_source(res, strlen(res), resolved_path ? PATH_MAX : strlen(res) + 1, NULL); return res; } diff --git a/tools/nativeguest/hook/paths.c b/tools/nativeguest/hook/paths.c index 4c1340b339..f6361f6133 100644 --- a/tools/nativeguest/hook/paths.c +++ b/tools/nativeguest/hook/paths.c @@ -163,6 +163,108 @@ static long raw_readlinkat(int dirfd, const char *path, char *buf, size_t size) static __thread int t_bind_link_depth = 0; +static void normalize_path(char *path); + +#if defined(__aarch64__) +static long raw_link_dir(const char *link, char *out, size_t size) { + const char *slash = strrchr(link, '/'); + if (!slash || (size_t)(slash - link) >= PATH_MAX) return -1; + char dir[PATH_MAX]; + size_t dlen = slash == link ? 1 : (size_t)(slash - link); + memcpy(dir, link, dlen); + dir[dlen] = '\0'; + register long x8 __asm__("x8") = 56; + register long x0 __asm__("x0") = AT_FDCWD; + register long x1 __asm__("x1") = (long)dir; + register long x2 __asm__("x2") = O_PATH | O_DIRECTORY | O_CLOEXEC; + register long x3 __asm__("x3") = 0; + __asm__ volatile("svc #0" : "+r"(x0) : "r"(x8), "r"(x1), "r"(x2), "r"(x3) : "memory"); + long fd = x0; + if (fd < 0) return -1; + char proc[32]; + snprintf(proc, sizeof(proc), "/proc/self/fd/%ld", fd); + long n = raw_readlinkat(AT_FDCWD, proc, out, size - 1); + register long c8 __asm__("x8") = 57; + register long c0 __asm__("x0") = fd; + __asm__ volatile("svc #0" : "+r"(c0) : "r"(c8) : "memory"); + if (n <= 0 || out[0] != '/') return -1; + out[n] = '\0'; + return n; +} + +static int climbs_past_root(const char *dir, const char *target) { + long depth = 0; + for (const char *p = dir; *p; p++) + if (*p != '/' && (p == dir || p[-1] == '/')) depth++; + for (const char *p = target; *p;) { + while (*p == '/') p++; + const char *end = p; + while (*end && *end != '/') end++; + size_t len = (size_t)(end - p); + if (len == 2 && p[0] == '.' && p[1] == '.') { + if (--depth < 0) return 1; + } else if (len > 0 && !(len == 1 && p[0] == '.')) { + depth++; + } + p = end; + } + return 0; +} + +static size_t guest_path_of_mount_source(char *buf, size_t len, size_t cap, int *converted); + +static const char *guest_path_of_host_dir(const char *dir, char *out, size_t size) { + const char *sub = get_rootfs_subpath(dir); + if (sub) { + ddnatv_copy_cstr(out, size, sub[0] ? sub : "/"); + return out; + } + if (dir[0] != '/') return NULL; + size_t len = ddnatv_copy_cstr(out, size, dir); + int converted = 0; + guest_path_of_mount_source(out, len, size, &converted); + if (converted) return out; + for (int i = 0; i < g_nbinds; i++) { + const struct ddnatv_bind *b = &g_binds[i]; + if (b->identity && is_path_prefix(dir, b->dst, b->dst_len)) { + ddnatv_copy_cstr(out, size, dir); + return out; + } + } + return NULL; +} + +static int join_into_bind(const char *dir, const char *target, const char *rest, char *out, size_t size) { + char guest_dir_buf[PATH_MAX]; + const char *guest_dir = guest_path_of_host_dir(dir, guest_dir_buf, sizeof(guest_dir_buf)); + if (!guest_dir) return 0; + char joined[PATH_MAX]; + size_t used = ddnatv_append(joined, sizeof(joined), 0, guest_dir, strlen(guest_dir)); + used = ddnatv_append(joined, sizeof(joined), used, "/", 1); + used = ddnatv_append(joined, sizeof(joined), used, target, strlen(target)); + if (used + 1 >= sizeof(joined)) return 0; + normalize_path(joined); + used = ddnatv_append(out, size, 0, joined, strlen(joined)); + if (used + 1 >= size) return 0; + if (rest[0] == '/' && used > 0 && out[used - 1] == '/') rest++; + size_t rest_len = strlen(rest); + if (used + rest_len + 1 >= size) return 0; + ddnatv_append(out, size, used, rest, rest_len); + return out[0] == '/'; +} + +static int relative_link_into_bind(const char *link, const char *target, const char *rest, char *out, size_t size) { + char dir[PATH_MAX]; + if (raw_link_dir(link, dir, sizeof(dir)) >= 0) return join_into_bind(dir, target, rest, out, size); + const char *slash = strrchr(link, '/'); + if (!slash) return 0; + size_t dlen = (size_t)(slash - link); + memcpy(dir, link, dlen); + dir[dlen] = '\0'; + return join_into_bind(dir, target, rest, out, size); +} +#endif + // A mount stand-in can hold symbolic links with absolute guest targets (/sys/class/hidraw/hidraw16 -> // /sys/devices/droiddeck/...): proot follows them inside the guest, the kernel on Android's own /sys. // A link met on the way to a deeper path is replaced by its target, mapped again; the last component is @@ -180,10 +282,13 @@ static const char *resolve_bind_links(const char *host, size_t src_len, char *bu long n = raw_readlinkat(AT_FDCWD, prefix, target, sizeof(target) - 1); if (n <= 0) continue; target[n] = '\0'; - if (target[0] != '/') continue; char guest[PATH_MAX]; - size_t used = ddnatv_append(guest, sizeof(guest), 0, target, (size_t)n); - ddnatv_append(guest, sizeof(guest), used, host + i, len - i); + if (target[0] != '/') { + if (!relative_link_into_bind(prefix, target, host + i, guest, sizeof(guest))) continue; + } else { + size_t used = ddnatv_append(guest, sizeof(guest), 0, target, (size_t)n); + ddnatv_append(guest, sizeof(guest), used, host + i, len - i); + } t_bind_link_depth++; const char *mapped = rewrite_path_in_root(guest, buffer, bufsize); if (mapped != buffer) ddnatv_copy_cstr(buffer, bufsize, mapped); @@ -243,7 +348,21 @@ static const char *rewrite_path_in_root(const char *path, char *buffer, size_t b } // Already inside The native userland rootfs - if (get_rootfs_subpath(path) != NULL) { + const char *sub = get_rootfs_subpath(path); + if (sub != NULL) { + if (sub[0] == '/' && t_bind_link_depth < 8) { + for (int i = 0; i < g_nbinds; i++) { + const struct ddnatv_bind *b = &g_binds[i]; + if (b->identity || sub[1] != b->dst[1] || !is_path_prefix(sub, b->dst, b->dst_len)) continue; + char guest[PATH_MAX]; + ddnatv_copy_cstr(guest, sizeof(guest), sub); + t_bind_link_depth++; + const char *mapped = rewrite_path_in_root(guest, buffer, bufsize); + if (mapped != buffer) ddnatv_copy_cstr(buffer, bufsize, mapped); + t_bind_link_depth--; + return buffer; + } + } return resolve_drive_links(path, buffer, bufsize); } @@ -446,7 +565,8 @@ static int is_proc_fd_link(const char *path) { // reports as its real place (getcwd(), /proc/self/cwd and fd links). Wine found no DOS drive for // Sekiro's folder on the SD card library ("starting in the Windows directory"), and the game quit. // Rewrites buf[0..len) in place when the guest path fits in cap; returns the new length. -static size_t guest_path_of_mount_source(char *buf, size_t len, size_t cap) { +static size_t guest_path_of_mount_source(char *buf, size_t len, size_t cap, int *converted) { + if (converted) *converted = 0; const struct ddnatv_bind *best = NULL; for (int i = 0; i < g_nbinds; i++) { const struct ddnatv_bind *b = &g_binds[i]; @@ -460,6 +580,7 @@ static size_t guest_path_of_mount_source(char *buf, size_t len, size_t cap) { memmove(buf + best->dst_len, buf + best->src_len, rest); memcpy(buf, best->dst, best->dst_len); buf[best->dst_len + rest] = '\0'; + if (converted) *converted = 1; return best->dst_len + rest; } @@ -469,7 +590,7 @@ static ssize_t postprocess_readlink(const char *linkpath, char *buf, ssize_t ret buf[ret] = '\0'; ret = (ssize_t)link_root_guest_target(buf, (size_t)ret); } - ret = (ssize_t)guest_path_of_mount_source(buf, (size_t)ret, bufsiz); + ret = (ssize_t)guest_path_of_mount_source(buf, (size_t)ret, bufsiz, NULL); // 1. Strip g_ddnatv_root if target starts with it if (g_ddnatv_root_len > 0 && !is_proc_fd_link(linkpath)) { diff --git a/tools/tests/test_native_hook_mounts.py b/tools/tests/test_native_hook_mounts.py new file mode 100644 index 0000000000..ff46a0fa18 --- /dev/null +++ b/tools/tests/test_native_hook_mounts.py @@ -0,0 +1,224 @@ +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + +from tools.tests.test_usr2_preload import runner + +HOOK_BUILD = Path(__file__).resolve().parents[1] / "nativeguest/build.sh" + +PROBE = r""" +#include +#include +#include +#include +#include +#include + +int main(int argc, char **argv) { + char cwd[4096]; + for (int i = 1; i < argc; i++) { + struct stat st; + if (strncmp(argv[i], "cd:", 3) == 0) { + int ok = chdir(argv[i] + 3) == 0 && getcwd(cwd, sizeof(cwd)) != NULL; + printf("%s\t%s\n", argv[i], ok ? cwd : "-"); + continue; + } + if (strncmp(argv[i], "at:", 3) == 0) { + int dfd = open(argv[i] + 3, O_RDONLY | O_DIRECTORY); + printf("%s\t%d\t%d\n", argv[i], fstatat(AT_FDCWD, argv[i] + 3, &st, 0) == 0, dfd >= 0); + if (dfd >= 0) close(dfd); + continue; + } + if (strncmp(argv[i], "ls:", 3) == 0) { + DIR *dir = opendir(argv[i] + 3); + char names[1024] = ""; + struct dirent *de; + while (dir && (de = readdir(dir)) != NULL) { + if (de->d_name[0] == '.') continue; + if (names[0]) strncat(names, ",", sizeof(names) - strlen(names) - 1); + strncat(names, de->d_name, sizeof(names) - strlen(names) - 1); + } + if (dir) closedir(dir); + printf("%s\t%s\n", argv[i], dir ? names : "-"); + continue; + } + int fd = open(argv[i], O_RDONLY); + char data[64] = "-"; + if (fd >= 0) { + ssize_t n = read(fd, data, sizeof(data) - 1); + data[n > 0 ? n : 0] = 0; + close(fd); + } + printf("%s\t%d\t%s\n", argv[i], stat(argv[i], &st) == 0, data); + } + return 0; +} +""" + +GAME = "/mnt/library/Some Game" + + +class NativeHookMountTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.cc, cls.prefix = runner() + if cls.cc is None: + raise unittest.SkipTest("no aarch64 compiler and runner") + cls.tmp = tempfile.TemporaryDirectory() + tmp = Path(cls.tmp.name) + cls.hook = tmp / "hook.so" + subprocess.run(["bash", str(HOOK_BUILD), str(cls.hook), cls.cc], check=True, capture_output=True) + (tmp / "probe.c").write_text(PROBE) + subprocess.run([cls.cc, "-O1", "-o", str(tmp / "probe"), str(tmp / "probe.c")], check=True) + cls.probe = tmp / "probe" + cls.root = tmp / "root" + cls.library = tmp / "storage/PC GAMES" + (cls.root / "etc").mkdir(parents=True) + (cls.root / "etc/hostname").write_text("rootfs") + (cls.root / "mnt/library/Some Game").mkdir(parents=True) + (cls.root / "mnt/library/Some Game/game.txt").write_text("mount point") + (cls.library / "Some Game").mkdir(parents=True) + (cls.library / "Some Game/game.txt").write_text("library") + for name, target in (("native", str(cls.root)), ("guest", "/")): + devices = cls.root / "pfx" / name / "dosdevices" + devices.mkdir(parents=True) + os.symlink(target, devices / "z:") + relinked = cls.root / "pfx/relinked" + (relinked / "dosdevices").mkdir(parents=True) + (relinked / "drive_c").mkdir() + (relinked / "drive_c/c.txt").write_text("drive c") + os.symlink(os.path.relpath(cls.root, relinked / "dosdevices"), relinked / "dosdevices/z:") + os.symlink("../drive_c", relinked / "dosdevices/c:") + copied = cls.root / "pfx/copied/dosdevices" + copied.mkdir(parents=True) + os.symlink("../" * 12 + "..", copied / "z:") + elsewhere = tmp / "elsewhere" + (elsewhere / "outside/pfx/dosdevices").mkdir(parents=True) + (elsewhere / "mnt/library/Some Game").mkdir(parents=True) + (elsewhere / "mnt/library/Some Game/game.txt").write_text("elsewhere") + os.symlink("../../..", elsewhere / "outside/pfx/dosdevices/z:") + os.symlink(str(elsewhere / "outside/pfx"), cls.root / "pfx/outside") + cls.private = tmp / "private" + private_pfx = cls.private / "123/pfx/dosdevices" + private_pfx.mkdir(parents=True) + os.symlink(os.path.relpath("/", "/mnt/private/123/pfx/dosdevices"), private_pfx / "z:") + private_copy = cls.private / "456/pfx/dosdevices" + private_copy.mkdir(parents=True) + os.symlink("../" * 12 + "..", private_copy / "z:") + cls.eqlen_src = tmp / "eqsrcdir" + cls.eqlen_dst = "/" + "d" * (len(str(cls.eqlen_src)) - 1) + eqlen_pfx = cls.eqlen_src / "123/pfx/dosdevices" + eqlen_pfx.mkdir(parents=True) + os.symlink(os.path.relpath("/", f"{cls.eqlen_dst}/123/pfx/dosdevices"), eqlen_pfx / "z:") + + @classmethod + def tearDownClass(cls): + cls.tmp.cleanup() + + def run_probe(self, *args): + binds = f"{self.library}:/mnt/library|{self.private}:/mnt/private|{self.eqlen_src}:{self.eqlen_dst}" + hook_env = {"DDNATV_ROOT": str(self.root), "DDNATV_BINDS": binds, "LD_PRELOAD": str(self.hook)} + env = {k: v for k, v in os.environ.items() if k != "LD_PRELOAD"} + if self.prefix: + cmd = list(self.prefix) + [arg for key, value in hook_env.items() for arg in ("-E", f"{key}={value}")] + else: + cmd = [] + env.update(hook_env) + out = subprocess.run(cmd + [str(self.probe), *args], env=env, capture_output=True, text=True, timeout=120, + cwd=self.tmp.name) + self.assertEqual(out.returncode, 0, out.stderr) + return {line.split("\t")[0]: line.split("\t")[1:] for line in out.stdout.splitlines()} + + def test_drive_link_stored_as_rootfs_path_reaches_the_mount(self): + path = f"/pfx/native/dosdevices/z:{GAME}/game.txt" + self.assertEqual(self.run_probe(path)[path], ["1", "library"]) + + def test_working_directory_through_a_drive_link_is_the_mount(self): + arg = f"cd:/pfx/native/dosdevices/z:{GAME}/" + self.assertEqual(self.run_probe(arg)[arg], [GAME]) + + def test_rootfs_path_under_a_mount_point_reaches_the_mount(self): + path = f"{self.root}{GAME}/game.txt" + self.assertEqual(self.run_probe(path)[path], ["1", "library"]) + + def test_guest_drive_link_is_unchanged(self): + path = f"/pfx/guest/dosdevices/z:{GAME}/game.txt" + self.assertEqual(self.run_probe(path)[path], ["1", "library"]) + + def test_rootfs_paths_outside_mounts_are_unchanged(self): + paths = ["/pfx/native/dosdevices/z:/etc/hostname", f"{self.root}/etc/hostname", "/etc/hostname"] + result = self.run_probe(*paths) + for path in paths: + self.assertEqual(result[path], ["1", "rootfs"], path) + + def test_wine_lookup_steps_reach_the_mount(self): + for pfx in ("/pfx/native", "/pfx/guest", "/pfx/relinked", f"{self.root}/pfx/native", f"{self.root}/pfx/guest", + f"{self.root}/pfx/relinked"): + drive = f"{pfx}/dosdevices/z:" + args = [f"at:{drive}{GAME}/", f"at:{drive}{GAME}", f"ls:{drive}/mnt/library", f"ls:{drive}{GAME}"] + result = self.run_probe(*args) + self.assertEqual(result[args[0]], ["1", "1"], pfx) + self.assertEqual(result[args[1]], ["1", "1"], pfx) + self.assertEqual(result[args[2]], ["Some Game"], pfx) + self.assertEqual(result[args[3]], ["game.txt"], pfx) + + def test_relative_drive_link_reaches_the_mount(self): + path = f"/pfx/relinked/dosdevices/z:{GAME}/game.txt" + cd = f"cd:/pfx/relinked/dosdevices/z:{GAME}/" + result = self.run_probe(path, cd) + self.assertEqual(result[path], ["1", "library"]) + self.assertEqual(result[cd], [GAME]) + + def test_relative_links_outside_mounts_are_unchanged(self): + paths = ["/pfx/relinked/dosdevices/z:/etc/hostname", "/pfx/relinked/dosdevices/c:/c.txt", + f"{self.root}/pfx/relinked/dosdevices/c:/c.txt"] + result = self.run_probe(*paths) + self.assertEqual(result[paths[0]], ["1", "rootfs"]) + self.assertEqual(result[paths[1]], ["1", "drive c"]) + self.assertEqual(result[paths[2]], ["1", "drive c"]) + + def test_suffix_after_a_relative_link_is_not_collapsed(self): + path = "/pfx/relinked/dosdevices/z:/mnt/library/missing/../Some Game/game.txt" + self.assertEqual(self.run_probe(path)[path], ["0", "-"]) + + def test_relative_drive_link_climbing_past_the_root_reaches_the_mount(self): + path = f"/pfx/copied/dosdevices/z:{GAME}/game.txt" + cd = f"cd:/pfx/copied/dosdevices/z:{GAME}/" + result = self.run_probe(path, cd) + self.assertEqual(result[path], ["1", "library"]) + self.assertEqual(result[cd], [GAME]) + + def test_relative_link_climbing_past_the_root_stays_in_the_rootfs(self): + path = "/pfx/copied/dosdevices/z:/etc/hostname" + self.assertEqual(self.run_probe(path)[path], ["1", "rootfs"]) + + def test_relative_link_is_resolved_from_its_real_directory(self): + path = f"/pfx/outside/dosdevices/z:{GAME}/game.txt" + self.assertEqual(self.run_probe(path)[path], ["1", "elsewhere"]) + + def test_drive_link_in_a_bound_prefix_reaches_the_mount(self): + path = f"/mnt/private/123/pfx/dosdevices/z:{GAME}/game.txt" + cd = f"cd:/mnt/private/123/pfx/dosdevices/z:{GAME}/" + result = self.run_probe(path, cd) + self.assertEqual(result[path], ["1", "library"]) + self.assertEqual(result[cd], [GAME]) + + def test_drive_link_copied_into_a_bound_prefix_reaches_the_mount(self): + path = f"/mnt/private/456/pfx/dosdevices/z:{GAME}/game.txt" + cd = f"cd:/mnt/private/456/pfx/dosdevices/z:{GAME}/" + result = self.run_probe(path, cd) + self.assertEqual(result[path], ["1", "library"]) + self.assertEqual(result[cd], [GAME]) + + def test_drive_link_in_equal_length_bound_prefix_reaches_the_mount(self): + path = f"{self.eqlen_dst}/123/pfx/dosdevices/z:{GAME}/game.txt" + cd = f"cd:{self.eqlen_dst}/123/pfx/dosdevices/z:{GAME}/" + result = self.run_probe(path, cd) + self.assertEqual(result[path], ["1", "library"]) + self.assertEqual(result[cd], [GAME]) + + +if __name__ == "__main__": + unittest.main() From b3ebd54d87f255d77fa81aace6db58eb3b9f881c Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 18:47:15 -0500 Subject: [PATCH 083/101] Start a launcher-run game without scanning its folder and keep Play on Starting until it launches (#2586) * Start a launcher-run game without scanning its folder and keep Play on Starting until it launches * Create the shared added-games cache under one lock * Read a rewritten game manifest again instead of reusing the saved ranking * Tie a saved ranking to the declared executables that exist --- .../droiddeck/launcher/FrontEndActivity.kt | 15 +++++---- .../droiddeck/launcher/frontend/AddedGames.kt | 29 ++++++++++++----- .../launcher/frontend/AddedGamesCache.kt | 14 ++++---- .../launcher/session/NoSteamLaunch.kt | 9 ++++-- .../launcher/frontend/AddedGamesCacheTest.kt | 32 +++++++++++++++++++ .../launcher/session/NoSteamLaunchTest.kt | 7 ++++ 6 files changed, 83 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index c8ce1e4ae8..06735ead38 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -888,13 +888,15 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } } - private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false): Boolean { + private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false, onHandled: () -> Unit = {}): Boolean { if (!SessionPrefs.soundtracksIngame(this)) com.droiddeck.launcher.playback.SoundtrackController.pause(this) if (pkgStage != null) { + onHandled() android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return false } - if (com.droiddeck.launcher.session.NoSteamLaunch.enabled(this, game)) return launchWithoutSteam(game, returnHome) + if (com.droiddeck.launcher.session.NoSteamLaunch.enabled(this, game)) return launchWithoutSteam(game, returnHome, onHandled) + onHandled() if (SessionState.running) { if (SessionState.mode != SessionService.MODE_STEAM || SessionState.stopRequested) { android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() @@ -938,12 +940,13 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet .apply { if (returnHome) putExtra(SessionActivity.EXTRA_LINK_TASK, task) } } - private fun launchWithoutSteam(game: Library.SteamGame, returnHome: Boolean): Boolean { + private fun launchWithoutSteam(game: Library.SteamGame, returnHome: Boolean, onHandled: () -> Unit = {}): Boolean { val app = applicationContext Thread({ - val added = if (game.library == Library.ADDED) runCatching { com.droiddeck.launcher.session.NoSteamLaunch.addedGame(app, game) }.getOrNull() else null + val added = if (com.droiddeck.launcher.session.NoSteamLaunch.needsAddedGame(game)) runCatching { com.droiddeck.launcher.session.NoSteamLaunch.addedGame(app, game) }.getOrNull() else null val command = com.droiddeck.launcher.session.NoSteamLaunch.command(game, added) ui.post { + onHandled() if (isDestroyed) return@post if (command == null) { android.widget.Toast.makeText(this, R.string.game_link_failed, android.widget.Toast.LENGTH_LONG).show() @@ -2069,8 +2072,8 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet com.droiddeck.launcher.frontend.AutoComponents.beforeLaunch(this, g, onBlocked = done) { if (request != gameLaunchRequest.get() || isFinishing || isDestroyed) { done(); return@beforeLaunch } com.droiddeck.launcher.stores.StoreLaunch.prepare(this, g) { - done() - if (request == gameLaunchRequest.get() && !isFinishing && !isDestroyed) launchGame(g) + if (request == gameLaunchRequest.get() && !isFinishing && !isDestroyed) launchGame(g, onHandled = done) + else done() } } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index c4d443184d..eefe397723 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -100,12 +100,13 @@ object AddedGames { fun candidates(folder: File, reuse: Boolean = false): List = rank(folder, reuse).exes fun rank(folder: File, reuse: Boolean = false): GameExePicker.Ranking { - val key = "${folder.path}|${folder.lastModified()}" + val declared = declaredExes(folder) + val stamp = declared.fold(0L) { hash, exe -> hash * 31 + exe.path.hashCode() } + val key = "${folder.path}|${folder.lastModified()}|$stamp" val now = System.currentTimeMillis() ranked[key]?.takeIf { now - it.first < RANK_FRESH_MS }?.let { return it.second } - if (reuse) kept?.rank(folder)?.let { return it } + if (reuse) kept?.rank(folder, stamp)?.let { return it } val guessed = GameExePicker.rank(folder) { !skipExe(it.name) } - val declared = declaredExes(folder) val preferred = declared.map { it.path }.toSet() val result = if (declared.isEmpty()) guessed else GameExePicker.Ranking( declared + guessed.exes.filter { it.path !in preferred }, @@ -115,7 +116,7 @@ object AddedGames { ) if (ranked.size > 256) ranked.clear() ranked[key] = now to result - kept?.keepRank(folder, result) + kept?.keepRank(folder, result, stamp) return result } @@ -200,8 +201,7 @@ object AddedGames { private val scanning = Any() fun scan(context: Context): List = synchronized(scanning) { - val file = File(context.filesDir, AddedGamesCache.FILE) - val cache = kept?.takeIf { it.file == file } ?: AddedGamesCache(file).also { kept = it } + val cache = cache(context) try { scanAll(context) } finally { @@ -209,6 +209,13 @@ object AddedGames { } } + private val keeping = Any() + + private fun cache(context: Context): AddedGamesCache = synchronized(keeping) { + val file = File(context.filesDir, AddedGamesCache.FILE) + kept?.takeIf { it.file == file } ?: AddedGamesCache(file).also { kept = it } + } + private fun scanAll(context: Context): List { val out = ArrayList() GamesFolderMigration.run(context) @@ -241,11 +248,17 @@ object AddedGames { return out.distinctBy { it.folder.canonicalPath } } - fun single(context: Context, folderPath: String): Game? { + fun single(context: Context, folderPath: String, reuse: Boolean = false): Game? { val folder = File(folderPath) if (!folder.isDirectory || folderPath in SessionPrefs.removedAddedGames(context)) return null val out = ArrayList(1) - scanGame(context, folder, out, single = AddedExes.list(context).firstOrNull { it.folder == folderPath }) + val entry = AddedExes.list(context).firstOrNull { it.folder == folderPath } + val cache = if (reuse) cache(context) else null + try { + scanGame(context, folder, out, single = entry, reuse = reuse) + } finally { + cache?.save() + } return out.firstOrNull() } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGamesCache.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGamesCache.kt index c27764dfbd..497c1962b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGamesCache.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGamesCache.kt @@ -7,7 +7,7 @@ import java.io.File import java.util.concurrent.ConcurrentHashMap internal class AddedGamesCache(val file: File) { - private class Rank(val modified: Long, val at: Long, val ranking: GameExePicker.Ranking) + private class Rank(val modified: Long, val declared: Long, val at: Long, val ranking: GameExePicker.Ranking) private class Name(val name: String, val at: Long) private val ranks = ConcurrentHashMap() @@ -22,7 +22,7 @@ internal class AddedGamesCache(val file: File) { val exes = o.getJSONArray("exes") val scores = o.getJSONArray("scores") require(exes.length() > 0 && exes.length() == scores.length()) - ranks[path] = Rank(o.getLong("modified"), o.getLong("at"), GameExePicker.Ranking( + ranks[path] = Rank(o.getLong("modified"), o.optLong("declared"), o.getLong("at"), GameExePicker.Ranking( List(exes.length()) { File(exes.getString(it)) }, List(scores.length()) { scores.getInt(it) }, o.optBoolean("uncertain"), )) } @@ -32,19 +32,19 @@ internal class AddedGamesCache(val file: File) { } } - fun rank(folder: File): GameExePicker.Ranking? { + fun rank(folder: File, declared: Long = 0): GameExePicker.Ranking? { val kept = ranks[folder.path] ?: return null val age = System.currentTimeMillis() - kept.at val top = kept.ranking.exes.first() - return kept.ranking.takeIf { kept.modified == folder.lastModified() && age in 0 until KEEP_MS && top.isFile } + return kept.ranking.takeIf { kept.modified == folder.lastModified() && kept.declared == declared && age in 0 until KEEP_MS && top.isFile } } - fun keepRank(folder: File, ranking: GameExePicker.Ranking) { + fun keepRank(folder: File, ranking: GameExePicker.Ranking, declared: Long = 0) { if (ranking.exes.isEmpty()) { if (ranks.remove(folder.path) != null) changed = true return } - ranks[folder.path] = Rank(folder.lastModified(), System.currentTimeMillis(), ranking) + ranks[folder.path] = Rank(folder.lastModified(), declared, System.currentTimeMillis(), ranking) changed = true } @@ -62,7 +62,7 @@ internal class AddedGamesCache(val file: File) { val oldest = System.currentTimeMillis() - KEEP_MS val keptRanks = JSONObject() ranks.forEach { (path, r) -> - if (r.at >= oldest) keptRanks.put(path, JSONObject().put("modified", r.modified).put("at", r.at) + if (r.at >= oldest) keptRanks.put(path, JSONObject().put("modified", r.modified).put("declared", r.declared).put("at", r.at) .put("exes", JSONArray(r.ranking.exes.map { it.path })).put("scores", JSONArray(r.ranking.scores)) .put("uncertain", r.ranking.uncertain)) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt index a1f39ae470..5541507a10 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt @@ -49,9 +49,14 @@ object NoSteamLaunch { return com.droiddeck.launcher.core.GameResolution.resolve(choice, output) } + fun needsAddedGame(game: Library.SteamGame): Boolean = game.library == Library.ADDED && !viaBattleNet(game) + + private fun viaBattleNet(game: Library.SteamGame): Boolean = + game.library == Library.ADDED && game.source == com.droiddeck.launcher.stores.Store.BATTLENET.id + fun command(game: Library.SteamGame, added: AddedGames.Game?): Command? = when { game.library == Library.EPIC_LAUNCHER -> Command(EPIC, listOf("run"), game.name) - game.library == Library.ADDED && game.source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> + viaBattleNet(game) -> game.storeId?.let(com.droiddeck.launcher.runtime.BattleNet::title)?.let { Command(BATTLENET, listOf("launch", it.code), game.name) } game.library == Library.ADDED -> added?.let { a -> a.steamAppId?.let { Command(PROTON_RUN, listOf("--app", it.toString()), a.name) } ?: addedCommand(a) } game.appId > 0 -> Command(PROTON_RUN, listOf("--app", game.appId.toString()), game.name) @@ -70,7 +75,7 @@ object NoSteamLaunch { fun addedGame(context: Context, game: Library.SteamGame): AddedGames.Game? { val id = game.appId.toLong() and 0xFFFFFFFFL - val one = game.gameFiles?.let { AddedGames.single(context, it.path) } + val one = game.gameFiles?.let { AddedGames.single(context, it.path, reuse = true) } return one?.takeIf { settingsId(it) == id } ?: AddedGames.scan(context).firstOrNull { settingsId(it) == id } } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesCacheTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesCacheTest.kt index 7ef43d7b3c..e04022e806 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesCacheTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesCacheTest.kt @@ -111,6 +111,38 @@ class AddedGamesCacheTest { assertEquals("Bastion", AddedGamesCache(file).name("named")) } + @Test fun aRewrittenManifestIsReadAgain() { + val folder = tmp.newFolder("Game") + val first = File(folder, "First.exe").apply { writeText("first") } + val second = File(folder, "Second.exe").apply { writeText("second") } + val manifest = File(folder, "MicrosoftGame.config").apply { writeText("") } + val files = tmp.newFolder("files") + val context = object : android.content.ContextWrapper(app) { + override fun getFilesDir() = files + } + AddedGames.scan(context) + assertEquals(first, AddedGames.rank(folder).exes.first()) + val modified = folder.lastModified() + manifest.writeText("") + folder.setLastModified(modified) + assertEquals(second, AddedGames.rank(folder, reuse = true).exes.first()) + } + + @Test fun aDeclaredExecutableThatArrivesLaterIsPicked() { + val folder = tmp.newFolder("Game") + val guessed = File(folder, "Game.exe").apply { writeText("game") } + val inner = File(folder, "Content").apply { mkdirs() } + File(folder, "MicrosoftGame.config").writeText("") + val files = tmp.newFolder("files") + val context = object : android.content.ContextWrapper(app) { + override fun getFilesDir() = files + } + AddedGames.scan(context) + assertEquals(guessed, AddedGames.rank(folder).exes.first()) + val late = File(inner, "Late.exe").apply { writeText("late") } + assertEquals(late, AddedGames.rank(folder, reuse = true).exes.first()) + } + @Test fun aRankingAScanReusedIsNotHandedToAFreshLookup() { val folder = tmp.newFolder("Game") val walked = File(folder, "Game.exe").apply { writeText("game") } diff --git a/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt index d0739df4ae..9800990e9d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt @@ -70,6 +70,13 @@ class NoSteamLaunchTest { assertEquals(NoSteamLaunch.EPIC to listOf("run"), epic.program to epic.args) } + @Test fun onlyAnAddedGameStartedFromItsOwnFilesHasItsFolderRead() { + assertTrue(NoSteamLaunch.needsAddedGame(shortcut)) + assertFalse(NoSteamLaunch.needsAddedGame(Library.SteamGame(shortcut.appId, shortcut.name, null, Library.ADDED, source = com.droiddeck.launcher.stores.Store.BATTLENET.id))) + assertFalse(NoSteamLaunch.needsAddedGame(steamGame)) + assertFalse(NoSteamLaunch.needsAddedGame(launcher)) + } + @Test fun anAddedGameOwnedOnSteamUsesItsSteamIdForSettingsAndLaunch() { val routed = AddedGames.Game( File("/x/Stardew Valley"), "Stardew Valley", File("/x/Stardew Valley/Stardew Valley.exe"), From 9a964ba221134828e61f0c92ca6553e1a38a2bff Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 20:20:16 -0500 Subject: [PATCH 084/101] feat(agent): the conversation menu moves to the chat's top right corner (#2583) --- .../com/droiddeck/launcher/ui/AgentPage.kt | 101 ++++++++++++------ .../droiddeck/launcher/ui/AgentPetWindows.kt | 4 +- 2 files changed, 71 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 8a8bea8046..34561b28ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -9,6 +9,8 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.expandVertically import androidx.compose.animation.fadeIn +import androidx.compose.animation.shrinkHorizontally +import androidx.compose.animation.expandHorizontally import androidx.compose.animation.fadeOut import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.Canvas @@ -129,7 +131,8 @@ private const val COMPOSER_SLIDE_MS = 350L @Composable internal fun AgentPage( modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, hidesPet: Boolean = true, -) = AgentPageContent(modifier, inputModifier, visible, startTyping, hidesPet, showControlsWithoutKeyboard = false) + menuSlot: AgentMenuSlot? = null, +) = AgentPageContent(modifier, inputModifier, visible, startTyping, hidesPet, showControlsWithoutKeyboard = false, menuSlot) @Composable internal fun AgentPageWithControls( @@ -140,7 +143,7 @@ internal fun AgentPageWithControls( @Composable private fun AgentPageContent( modifier: Modifier, inputModifier: Modifier, visible: Boolean, startTyping: Boolean, hidesPet: Boolean, - showControlsWithoutKeyboard: Boolean, + showControlsWithoutKeyboard: Boolean, menuSlot: AgentMenuSlot? = null, ) { val context = LocalContext.current val view = LocalView.current @@ -172,6 +175,16 @@ private fun AgentPageContent( val composer = remember { ComposerState(startTyping && AgentHost.entries.isEmpty()) } val focusManager = LocalFocusManager.current val togglePanel: (AgentPanel) -> Unit = { panel = if (panel == it) AgentPanel.NONE else it } + var menuOpen by rememberSaveable { mutableStateOf(false) } + val menu: @Composable () -> Unit = { + AgentMenu(menuOpen, { menuOpen = it }, onPanel = { panel = it }, onSetup = { setup = true }) + } + // A host with a title bar shows the menu there; otherwise it floats over the conversation's top corner. + val inSlot = menuSlot != null && panel != AgentPanel.HISTORY && panel != AgentPanel.PROCESSES + if (menuSlot != null) DisposableEffect(menuSlot, inSlot) { + menuSlot.content = if (inSlot) menu else null + onDispose { menuSlot.content = null } + } // The keyboard leaves too little height for a panel and the editor together, so typing closes the panel. val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 LaunchedEffect(keyboardOpen) { if (keyboardOpen && (panel == AgentPanel.MODEL || panel == AgentPanel.USAGE)) panel = AgentPanel.NONE } @@ -237,9 +250,10 @@ private fun AgentPageContent( ) { AgentJumpPill(toLatest) } + if (menuSlot == null) Box(Modifier.align(Alignment.TopEnd).padding(top = 4.dp)) { menu() } } androidx.compose.animation.AnimatedVisibility(!hidden, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { - AgentComposer(composer, draft, inputModifier, panel, togglePanel, showControlsWithoutKeyboard) { setup = true } + AgentComposer(composer, draft, inputModifier, panel, togglePanel, showControlsWithoutKeyboard) } } } @@ -269,6 +283,46 @@ private class ComposerState(typing: Boolean) { } } +/** Where a host with its own title bar shows the conversation's menu. */ +@Stable +internal class AgentMenuSlot { + var content by mutableStateOf<(@Composable () -> Unit)?>(null) +} + +/** History, processes, a new conversation, the pet and setup, folded behind one button. */ +@Composable +private fun AgentMenu(open: Boolean, onOpen: (Boolean) -> Unit, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val working = AgentHost.state == AgentHost.State.WORKING + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.clip(Shape16).background(colors.surface.copy(alpha = if (open) 0.97f else 0.88f)) + .border(1.dp, pal.line, Shape16).padding(end = 2.dp), + ) { + androidx.compose.animation.AnimatedVisibility(open, enter = expandHorizontally(expandFrom = Alignment.End) + fadeIn(), + exit = shrinkHorizontally(shrinkTowards = Alignment.End) + fadeOut()) { + Row(verticalAlignment = Alignment.CenterVertically) { + HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), size = 36.dp, tag = "agent-history") { onOpen(false); onPanel(AgentPanel.HISTORY) } + HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), size = 36.dp, tag = "agent-processes") { onOpen(false); onPanel(AgentPanel.PROCESSES) } + HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), size = 36.dp, tag = "agent-new") { + onOpen(false) + AgentHost.forget(context) + } + HeaderAction(Icons.Outlined.Pets, stringResource(R.string.setup_agent_pet), selected = AgentPet.enabled, size = 36.dp, tag = "agent-pet-toggle") { + AgentPet.set(context, !AgentPet.enabled) + } + HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, size = 36.dp, tag = "agent-settings") { + onOpen(false) + onSetup() + } + } + } + HeaderAction(Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), selected = open, size = 36.dp, tag = "agent-menu") { onOpen(!open) } + } +} + @Composable private fun AgentPanelBar(title: String, onClose: () -> Unit) { Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp)) { @@ -512,13 +566,12 @@ internal fun liveUsed(limit: AgentHost.Limit) = if (limit.resetsAt > 0 && limit. @Composable private fun AgentComposer( composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, - showControlsWithoutKeyboard: Boolean, onSetup: () -> Unit, + showControlsWithoutKeyboard: Boolean, ) { val context = LocalContext.current var draft by draftState var labOpen by rememberSaveable { mutableStateOf(false) } if (AgentHost.lab == null) labOpen = false - var controlsOpen by rememberSaveable { mutableStateOf(false) } var hadFocus by remember { mutableStateOf(false) } val send = send@{ val text = draft.trim() @@ -559,17 +612,15 @@ private fun AgentComposer( horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), ) { AgentActivity(labOpen) { labOpen = !labOpen } } - AgentEditor(composer, draftState, inputModifier, panel, onPanel, onSetup, controlsOpen, { controlsOpen = it }, - highlightControls = showControlsWithoutKeyboard, send = send) - } else AgentReadingBar(composer, draft, inputModifier, labOpen, onLab = { labOpen = !labOpen }) { + AgentEditor(composer, draftState, inputModifier, panel, onPanel, highlightControls = showControlsWithoutKeyboard, send = send) + } else AgentReadingBar( + composer, draft, inputModifier, labOpen, onLab = { labOpen = !labOpen }, onUsage = { onPanel(AgentPanel.USAGE) }, + ) { + // The session drawer is driven by a controller, so its editor opens without raising the keyboard. if (showControlsWithoutKeyboard) { - controlsOpen = false composer.typing = true composer.opening = true - } else { - controlsOpen = true - composer.open() - } + } else composer.open() } } } @@ -577,7 +628,7 @@ private fun AgentComposer( /** The composer while reading: one line holding what is going on, opened by a press or by Y. */ @Composable private fun AgentReadingBar( - composer: ComposerState, draft: String, inputModifier: Modifier, labOpen: Boolean, onLab: () -> Unit, onControls: () -> Unit, + composer: ComposerState, draft: String, inputModifier: Modifier, labOpen: Boolean, onLab: () -> Unit, onUsage: () -> Unit, onOpen: () -> Unit, ) { val context = LocalContext.current val colors = MaterialTheme.colorScheme @@ -588,7 +639,7 @@ private fun AgentReadingBar( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(44.dp).clip(Shape16).background(colors.surface) .border(if (focused) 2.dp else 1.dp, if (focused) pal.primary else pal.line, Shape16) - .then(inputModifier).onFocusChanged { focused = it.isFocused }.clickable { composer.open() }.testTag("agent-composer-bar") + .then(inputModifier).onFocusChanged { focused = it.isFocused }.clickable(onClick = onOpen).testTag("agent-composer-bar") .padding(start = 14.dp, end = 4.dp), ) { Text( @@ -600,7 +651,7 @@ private fun AgentReadingBar( horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f).padding(start = 8.dp).horizontalScroll(rememberScrollState()), ) { AgentActivity(labOpen, onLab) } - HeaderAction(Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 36.dp, tag = "agent-controls", onClick = onControls) + ContextRing("agent-usage-bar", onUsage) if (working) Box( contentAlignment = Alignment.Center, modifier = Modifier.padding(start = 4.dp).size(36.dp).clip(CircleShape).background(pal.error.copy(alpha = 0.22f)) @@ -613,7 +664,7 @@ private fun AgentReadingBar( @Composable private fun AgentEditor( composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, - onSetup: () -> Unit, menu: Boolean, onMenu: (Boolean) -> Unit, highlightControls: Boolean = false, send: () -> Unit, + highlightControls: Boolean = false, send: () -> Unit, ) { val context = LocalContext.current val colors = MaterialTheme.colorScheme @@ -660,22 +711,6 @@ private fun AgentEditor( } ContextRing("agent-usage", onClick = { onPanel(AgentPanel.USAGE) }) } - if (menu) { - HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), size = 32.dp, tag = "agent-history") { onMenu(false); onPanel(AgentPanel.HISTORY) } - HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), size = 32.dp, tag = "agent-processes") { onMenu(false); onPanel(AgentPanel.PROCESSES) } - HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), size = 32.dp, tag = "agent-new") { - onMenu(false) - AgentHost.forget(context) - } - HeaderAction(Icons.Outlined.Pets, stringResource(R.string.setup_agent_pet), selected = AgentPet.enabled, size = 32.dp, tag = "agent-pet-toggle") { - AgentPet.set(context, !AgentPet.enabled) - } - HeaderAction(Icons.Outlined.Settings, stringResource(R.string.agent_setup_title), enabled = !working, size = 32.dp, tag = "agent-settings") { - onMenu(false) - onSetup() - } - } - HeaderAction(if (menu) Icons.Outlined.Close else Icons.Outlined.MoreHoriz, stringResource(R.string.agent_more), size = 32.dp, tag = "agent-menu") { onMenu(!menu) } } Row(verticalAlignment = Alignment.Bottom) { if (LocalActivityResultRegistryOwner.current != null) AttachButton() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt index 675c34a41a..b79bed3726 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt @@ -519,6 +519,7 @@ internal fun PetChat(open: Boolean, motion: PetMotion, onClose: () -> Unit, onCl } else { Rect(margin, motion.dockY + motion.size + gap, w - margin, h - margin) } + val menuSlot = remember { AgentMenuSlot() } val grow = remember { Animatable(0f) } val fade = remember { Animatable(0f) } LaunchedEffect(open) { @@ -559,9 +560,10 @@ internal fun PetChat(open: Boolean, motion: PetMotion, onClose: () -> Unit, onCl Text(stringResource(R.string.agent_pet_name), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.padding(start = 4.dp)) Spacer(Modifier.weight(1f)) + menuSlot.content?.invoke() HeaderAction(Icons.Outlined.Close, stringResource(R.string.agent_close), size = 34.dp, tag = "agent-pet-close", onClick = onClose) } - AgentPage(Modifier.weight(1f).fillMaxWidth(), visible = open, startTyping = AgentHost.entries.isEmpty(), hidesPet = false) + AgentPage(Modifier.weight(1f).fillMaxWidth(), visible = open, startTyping = AgentHost.entries.isEmpty(), hidesPet = false, menuSlot = menuSlot) } } } From e8d28c164ac56cffd23276b3f2a075a71f856a06 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 20:20:44 -0500 Subject: [PATCH 085/101] Make hiding Home launcher from Recents optional (#2579) --- app/src/main/java/com/droiddeck/launcher/HomeApp.kt | 6 +++++- .../main/java/com/droiddeck/launcher/core/AppUiPrefs.kt | 7 +++++++ .../main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt | 8 ++++++++ app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 789af4ec49..e2096a673c 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -18,6 +18,7 @@ import android.net.Uri import android.os.Build import android.provider.Settings import androidx.core.graphics.drawable.toBitmap +import com.droiddeck.launcher.core.AppUiPrefs import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState import kotlin.math.roundToInt @@ -196,7 +197,10 @@ object HomeApp { } private fun syncRecents(activity: android.app.Activity) = - keepOutOfRecents(activity, activity is FrontEndActivity && !SessionState.running && isDefault(activity)) + keepOutOfRecents( + activity, + activity is FrontEndActivity && !SessionState.running && isDefault(activity) && AppUiPrefs.hideHomeFromRecents(activity), + ) internal enum class RecentsStep { HIDE, SHOW, FORGET, NONE } diff --git a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt index 3f308636db..c4c29a2369 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt @@ -46,6 +46,13 @@ object AppUiPrefs { context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putString("home-page", value).apply() } + fun hideHomeFromRecents(context: Context): Boolean = + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).getBoolean("hide-home-from-recents", false) + + fun setHideHomeFromRecents(context: Context, hidden: Boolean) { + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putBoolean("hide-home-from-recents", hidden).apply() + } + internal fun normalizeScale(percent: Int): Int = percent.takeIf { it in scales } ?: DEFAULT_SCALE fun scale(context: Context): Int = normalizeScale( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index aa08d07f17..6ae4c38762 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -147,6 +147,7 @@ internal fun SetupPanel( ) { val host = rememberMenuHost() val ctx = LocalContext.current + var hideHomeFromRecents by remember { mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.hideHomeFromRecents(ctx)) } var processLimitBusy by remember { mutableStateOf(false) } var processLimitMessage by remember { mutableStateOf(null) } val setProcessLimit: (Boolean) -> Unit = { enabled -> @@ -470,6 +471,13 @@ internal fun SetupPanel( ) { a.onHomeScreen(it) } if (s.homeScreenEnabled) { ActionRow(stringResource(R.string.setup_default_home), s.defaultHomeLabel ?: stringResource(R.string.setup_choose_home), stringResource(R.string.setup_choose), a.onHomeApp) + ToggleRow( + host, "hide-home-from-recents", stringResource(R.string.setup_hide_home_from_recents), + stringResource(R.string.setup_hide_home_from_recents_hint), hideHomeFromRecents, + ) { hidden -> + hideHomeFromRecents = hidden + com.droiddeck.launcher.core.AppUiPrefs.setHideHomeFromRecents(ctx, hidden) + } ChoiceRow( host, "home-page", stringResource(R.string.setup_home_page), stringResource(R.string.setup_home_page_hint), com.droiddeck.launcher.core.AppUiPrefs.homePageOptions.map { (value, label) -> value to stringResource(label) }, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ecbc309951..160c1290dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1014,6 +1014,8 @@ Done Default Home app Choose a Home app + Hide launcher from Recents while idle + Only applies when DroidDeck is the default Home app and no session is running. Choose Linux apps (beta) Files From f6d1794624722e53792b8c9069f6887da31fac66 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 20:26:08 -0500 Subject: [PATCH 086/101] perf(session): keep a game that holds a steady pace off the fastest cores (#2572) --- .../droiddeck/launcher/FrontEndActivity.kt | 5 +- .../droiddeck/launcher/core/DeviceReport.kt | 1 + .../launcher/session/SessionFiles.kt | 1 + .../launcher/session/SessionPrefs.kt | 6 + .../launcher/session/SessionService.kt | 1 + .../launcher/session/SettingsReset.kt | 2 +- .../launcher/ui/PerformanceDialog.kt | 7 + 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 + .../usr/local/bin/droiddeck-pace-cores | 266 ++++++++++++++++++ .../overlay/usr/local/bin/droiddeck-session | 4 + tools/tests/test_pace_cores.py | 241 ++++++++++++++++ 43 files changed, 598 insertions(+), 2 deletions(-) create mode 100755 tools/linuxfs/overlay/usr/local/bin/droiddeck-pace-cores create mode 100644 tools/tests/test_pace_cores.py diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 06735ead38..b195192643 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -179,6 +179,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private var syncFallback by mutableStateOf(true) private var fsyncFirst by mutableStateOf(false) private var gamescopeRealtime by mutableStateOf(false) + private var paceCores by mutableStateOf(true) private var ramCapMb by mutableStateOf(0) private var zramClient by mutableStateOf(true) private var vramCapMb by mutableStateOf(0) @@ -2624,7 +2625,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private fun PerformanceHost() { PerformancePage( cores = CpuCores.all.map { c -> CoreRow(c, "cpu$c" + (CpuCores.maxGhz(c)?.let { String.format(java.util.Locale.US, " · %.1f GHz", it) } ?: "")) }, - clientOverride = clientOverride, clientCores = clientCores, gameCores = gameCores, + clientOverride = clientOverride, clientCores = clientCores, gameCores = gameCores, paceCores = paceCores, tuSysmem = tuSysmem, zinkLazy = zinkLazy, glThread = glThread, noGlError = noGlError, noXalia = noXalia, fastSync = fastSync, syncFallback = syncFallback, @@ -2638,6 +2639,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, nativeUserland = nativeUserland, cursorComposite = cursorComposite, guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, + onPaceCores = { on -> SessionPrefs.setPaceCores(this, on); paceCores = on }, onTuSysmem = { on -> SessionPrefs.setTuSysmem(this, on); tuSysmem = on }, onZinkLazy = { on -> SessionPrefs.setZinkLazy(this, on); zinkLazy = on }, onGlThread = { on -> SessionPrefs.setGlThread(this, on); glThread = on }, @@ -2944,6 +2946,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet syncFallback = SessionPrefs.syncFallback(this) fsyncFirst = SessionPrefs.fsyncFirst(this) gamescopeRealtime = SessionPrefs.gamescopeRealtime(this) + paceCores = SessionPrefs.paceCores(this) ramCapMb = SessionPrefs.ramCapMb(this) zramClient = SessionPrefs.zramClient(this) vramCapMb = SessionPrefs.vramCapMb(this) diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index 63037a24ac..c6dd49a4c3 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -274,6 +274,7 @@ object DeviceReport { EsyncPacks.status(LinuxRuntime.rootDir(context)).let { k("droiddeck-esync packs", "${it.installed} installed, ${it.wanted} wanted") } k("Linux x86 (FEX)", if (com.droiddeck.launcher.runtime.LinuxFex.ready(context)) "ready" else "not set up") k("gamescope realtime", SessionPrefs.gamescopeRealtime(context)) + k("pace cores", SessionPrefs.paceCores(context)) k("zRAM: compress Steam during games", SessionPrefs.zramClient(context)) k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" }) k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 13348cef74..9d179cefd9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -104,6 +104,7 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-share" to "usr/local/bin/droiddeck-steam-share", "usr/local/bin/droiddeck-seed-redists" to "usr/local/bin/droiddeck-seed-redists", "usr/local/bin/droiddeck-launcher-cores" to "usr/local/bin/droiddeck-launcher-cores", + "usr/local/bin/droiddeck-pace-cores" to "usr/local/bin/droiddeck-pace-cores", "usr/local/bin/droiddeck-proton-extra" to "usr/local/bin/droiddeck-proton-extra", "usr/local/bin/droiddeck-netmanager" to "usr/local/bin/droiddeck-netmanager", "usr/local/bin/droiddeck-login1" to "usr/local/bin/droiddeck-login1", 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 faf6a6674f..ae64425b77 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -750,6 +750,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("syncFallback", on).apply() } + fun paceCores(context: Context): Boolean = prefs(context).getBoolean("paceCores", true) + + fun setPaceCores(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("paceCores", on).apply() + } + fun gamescopeRealtime(context: Context): Boolean = prefs(context).getBoolean("gamescopeRealtime", false) fun setGamescopeRealtime(context: Context, on: Boolean) { 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 3e7f30b15f..6613319033 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -985,6 +985,7 @@ class SessionService : Service() { guest.add("BL_SYNC=" + (if (SessionPrefs.fastSync(this)) "1" else "0")) guest.add("BL_SYNC_FALLBACK=" + (if (SessionPrefs.syncFallback(this)) "1" else "0")) guest.add("BL_FSYNC_FIRST=" + (if (SessionPrefs.fsyncFirst(this)) "1" else "0")) + guest.add("BL_PACE_CORES=" + (if (SessionPrefs.paceCores(this)) "1" else "0")) guest.add("BL_GAMESCOPE_REALTIME=" + (if (SessionPrefs.gamescopeRealtime(this)) "1" else "0")) if (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=1") relativeMouseForSession().takeIf { it != 0 }?.let { guest.add("gamescope_relative_mouse=$it") } 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 2c600dafee..17696c44a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -20,7 +20,7 @@ object SettingsReset { "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", "stretch16x9", "picturePosition", "railLabels", "agentTab", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", - "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", + "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index f8f44907a7..fdfd5ca3d2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -36,6 +36,7 @@ fun PerformancePage( clientOverride: Boolean, clientCores: Set, gameCores: Set, + paceCores: Boolean, tuSysmem: Boolean, zinkLazy: Boolean, glThread: Boolean, @@ -58,6 +59,7 @@ fun PerformancePage( guestHostname: String, phantomWarning: String?, onClientOverride: (Boolean) -> Unit, + onPaceCores: (Boolean) -> Unit, onTuSysmem: (Boolean) -> Unit, onZinkLazy: (Boolean) -> Unit, onGlThread: (Boolean) -> Unit, @@ -105,6 +107,11 @@ fun PerformancePage( stringResource(R.string.perf_game_cores_hint), coreItems, gameCores, onToggle = onGameCore, ) + ToggleRow( + host, "paceCores", stringResource(R.string.perf_pace_cores), + stringResource(R.string.perf_pace_cores_hint), + paceCores, onChange = onPaceCores, + ) } SettingsGroup(stringResource(R.string.perf_client_ui)) { ToggleRow( diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 1dcf934d12..8e447bf260 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -576,6 +576,8 @@ أنوية الألعاب أنوية الألعاب الأنوية المخصّصة للألعاب. عند تحديدها جميعًا، يوزّع Android المهام بحرية. + توفير الطاقة في الألعاب الثابتة + يشغّل اللعبة على الأنوية الأبطأ ما دامت تحافظ على معدل إطارات ثابت، ويعيدها إلى أنويتها المعتادة عندما تتأخر. واجهة العميل GL متعدد مؤشرات الترابط قد يجعل قوائم Steam أسرع استجابة. 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 cc5f0780fb..24ea2b1422 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -570,6 +570,8 @@ Núcleos de juegos Núcleos de juegos Núcleos para los juegos. Con todos seleccionados, Android los asigna libremente. + Ahorrar energía en juegos estables + Ejecuta un juego en los núcleos más lentos mientras mantiene una tasa de fotogramas estable, y lo devuelve a sus núcleos habituales cuando se queda atrás. Interfaz del cliente GL con subprocesos Puede hacer los menús de Steam más ágiles. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index dad41a96ac..22fc348301 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -568,6 +568,8 @@ Ядра за игри Ядра за игри Ядра за игри. Когато всички са избрани, Android ги разпределя свободно. + Пестене на енергия при стабилни игри + Пуска играта на по-бавните ядра, докато държи стабилна кадрова честота, и я връща на обичайните ѝ ядра, щом изостане. Интерфейс на клиента Многонишков GL Може да направи менютата на Steam по-отзивчиви. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6fab61abc0..63608182bd 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -572,6 +572,8 @@ Jádra pro hru Jádra pro hru Jádra pro hry. Se všemi vybranými plánuje Android volně. + Šetřit energii u stabilních her + Spouští hru na pomalejších jádrech, dokud drží stabilní snímkovou frekvenci, a vrátí ji na obvyklá jádra, jakmile začne zaostávat. Rozhraní klienta Vícevláknové GL Může zrychlit odezvu nabídek Steamu. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d124460541..7ce9bb32f0 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -568,6 +568,8 @@ Spilkerner Spilkerner Kerner til spil. Med alle valgt planlægger Android frit. + Spar strøm i stabile spil + Kører et spil på de langsommere kerner, mens det holder en stabil billedfrekvens, og flytter det tilbage til sine vante kerner, når det halter bagefter. Klientgrænseflade Threaded GL Kan gøre Steam-menuer mere lydhøre. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d90b549827..d5fe280ca9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -568,6 +568,8 @@ Spielkerne Spielkerne Kerne für Spiele. Sind alle ausgewählt, verteilt Android frei. + Strom sparen bei stabilen Spielen + Lässt ein Spiel auf den langsameren Kernen laufen, solange es eine stabile Bildrate hält, und gibt ihm seine üblichen Kerne zurück, sobald es zurückfällt. Client-Oberfläche Threaded GL Kann Steam-Menüs reaktionsschneller machen. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ed829530da..c41a86e35d 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -568,6 +568,8 @@ Πυρήνες παιχνιδιού Πυρήνες παιχνιδιού Πυρήνες για παιχνίδια. Με όλους επιλεγμένους, το Android τους προγραμματίζει ελεύθερα. + Εξοικονόμηση ενέργειας σε σταθερά παιχνίδια + Τρέχει το παιχνίδι στους πιο αργούς πυρήνες όσο κρατά σταθερό ρυθμό καρέ, και το επιστρέφει στους συνήθεις πυρήνες του όταν μένει πίσω. Διεπαφή πελάτη Νηματοποιημένο GL Μπορεί να κάνει τα μενού του Steam πιο αποκρίσιμα. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 77899d06a2..9791e456a2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -570,6 +570,8 @@ Núcleos de juegos Núcleos de juegos Núcleos para los juegos. Con todos seleccionados, Android los asigna libremente. + Ahorrar energía en juegos estables + Ejecuta un juego en los núcleos más lentos mientras mantiene una tasa de fotogramas estable, y lo devuelve a sus núcleos habituales cuando se queda atrás. Interfaz del cliente GL con subprocesos Puede hacer los menús de Steam más ágiles. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 40e762bde1..81ba87e48f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -568,6 +568,8 @@ Pelin ytimet Pelin ytimet Ytimet peleille. Kun kaikki on valittuna, Android ajoittaa vapaasti. + Säästä virtaa tasaisissa peleissä + Ajaa pelin hitaammilla ytimillä, kun se pitää tasaisen ruudunpäivitysnopeuden, ja palauttaa sen tavallisille ytimilleen, kun se jää jälkeen. Asiakasohjelman käyttöliittymä Säikeistetty GL Voi tehdä Steamin valikoista reagoivampia. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9883772cf6..61add42185 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -570,6 +570,8 @@ Cœurs de jeu Cœurs de jeu Cœurs utilisés par les jeux. Si tous sont sélectionnés, Android planifie librement. + Économiser l\'énergie dans les jeux stables + Fait tourner un jeu sur les cœurs plus lents tant qu\'il tient une fréquence d\'images stable, et le remet sur ses cœurs habituels dès qu\'il prend du retard. Interface du client Multithread GL Peut rendre les menus Steam plus réactifs. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index e5a3ae56f8..3984c5ebcf 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -568,6 +568,8 @@ गेम कोर गेम कोर गेम के लिए कोर। सभी चुने होने पर, Android खुद शेड्यूल करता है। + स्थिर गेम में बिजली बचाएँ + जब तक गेम स्थिर फ़्रेम रेट बनाए रखता है, उसे धीमे कोर पर चलाता है, और पिछड़ते ही उसके सामान्य कोर पर लौटा देता है। क्लाइंट इंटरफ़ेस थ्रेडेड GL Steam मेनू को ज़्यादा रिस्पॉन्सिव बना सकता है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0d568a2536..642c55099a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -568,6 +568,8 @@ Játékmagok Játékmagok Magok a játékokhoz. Ha mind kiválasztva van, az Android szabadon ütemez. + Energiatakarékosság stabil játékoknál + A játékot a lassabb magokon futtatja, amíg stabil képkockasebességet tart, és visszaadja a szokásos magjait, amint lemarad. Kliens felhasználói felület Szálalt GL Reszponzívabbá teheti a Steam menüit. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 2ea5450c1d..7995aec302 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -566,6 +566,8 @@ Core gim Core gim Core untuk gim. Dengan semua dipilih, Android menjadwalkan secara bebas. + Hemat daya pada game yang stabil + Menjalankan game di core yang lebih lambat selama frame rate-nya stabil, dan mengembalikannya ke core biasanya begitu tertinggal. Antarmuka klien GL berulir (threaded) Dapat membuat menu Steam lebih responsif. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7d7b096e2a..b4f510ad7e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -570,6 +570,8 @@ Core dei giochi Core dei giochi Core per i giochi. Con tutti selezionati, Android li gestisce liberamente. + Risparmia energia nei giochi stabili + Esegue un gioco sui core più lenti finché mantiene un frame rate stabile, e lo riporta sui suoi core abituali appena resta indietro. Interfaccia del client GL multithread Può rendere più reattivi i menu di Steam. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a289e0dbed..ff21b89acf 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -566,6 +566,8 @@ ゲームコア ゲームコア ゲームが使用するコア。すべて選択するとAndroidが自由にスケジュールします。 + 安定したゲームで省電力 + フレームレートが安定している間はゲームを低速コアで動かし、遅れ始めたら元のコアに戻します。 クライアントUI GLマルチスレッド Steamメニューの応答が速くなる可能性があります。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 82fcb4bb83..da130bf356 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -566,6 +566,8 @@ 게임 코어 게임 코어 게임에서 사용하는 코어입니다. 모두 선택하면 Android가 자유롭게 스케줄링합니다. + 안정적인 게임에서 전력 절약 + 게임이 안정적인 프레임 레이트를 유지하는 동안 느린 코어에서 실행하고, 뒤처지면 원래 코어로 되돌립니다. 클라이언트 UI GL 멀티스레딩 Steam 메뉴 응답 속도를 높일 수 있습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index bdb95e029c..199a9e216e 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -566,6 +566,8 @@ Teras permainan Teras permainan Teras untuk permainan. Dengan semua dipilih, Android menjadualkan secara bebas. + Jimat kuasa dalam permainan yang stabil + Menjalankan permainan pada teras yang lebih perlahan selagi kadar bingkainya stabil, dan mengembalikannya ke teras biasanya sebaik ia ketinggalan. Antara muka klien GL berbenang Boleh menjadikan menu Steam lebih responsif. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index dbe9e0626d..2402ebbd7a 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -568,6 +568,8 @@ Spillkjerner Spillkjerner Kjerner for spill. Med alle valgt, planlegger Android fritt. + Spar strøm i stabile spill + Kjører et spill på de tregere kjernene mens det holder en stabil bildefrekvens, og flytter det tilbake til de vanlige kjernene når det henger etter. Klientgrensesnitt Trådet GL Kan gjøre Steam-menyer mer responsive. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index eb9cb76b8b..850d2710b0 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -568,6 +568,8 @@ Gamecores Gamecores Cores voor games. Met alles geselecteerd verdeelt Android vrij. + Stroom besparen bij stabiele games + Draait een game op de tragere kernen zolang de framerate stabiel blijft, en zet hem terug op zijn gebruikelijke kernen zodra hij achterraakt. Clientinterface GL-threading Kan Steam-menu’s sneller laten reageren. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 845213c387..0ef2c93915 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -572,6 +572,8 @@ Rdzenie gier Rdzenie gier Rdzenie dla gier. Gdy wszystkie są zaznaczone, Android swobodnie przydziela zadania. + Oszczędzaj energię w stabilnych grach + Uruchamia grę na wolniejszych rdzeniach, dopóki utrzymuje stabilną liczbę klatek, a gdy zaczyna nie nadążać, przywraca jej zwykłe rdzenie. Interfejs klienta Wielowątkowy GL Może poprawić responsywność menu Steam. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index d55c2d3a0b..8d0551a995 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -570,6 +570,8 @@ Núcleos dos jogos Núcleos dos jogos Núcleos para os jogos. Com todos selecionados, o Android distribui livremente. + Poupar energia em jogos estáveis + Executa um jogo nos núcleos mais lentos enquanto mantém uma taxa de fotogramas estável, e devolve-o aos núcleos habituais quando fica para trás. Interface do cliente GL multithread Pode fazer os menus do Steam responder mais depressa. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3ae6fd2f50..43c698f03a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -570,6 +570,8 @@ Núcleos dos jogos Núcleos dos jogos Núcleos para os jogos. Com todos selecionados, o Android distribui livremente. + Economizar energia em jogos estáveis + Executa um jogo nos núcleos mais lentos enquanto mantém uma taxa de quadros estável, e o devolve aos núcleos de sempre quando fica para trás. Interface do cliente GL em threads Pode deixar os menus da Steam mais responsivos. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 27641656a9..c8b190e4e7 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -570,6 +570,8 @@ Nuclee pentru joc Nuclee pentru joc Nuclee pentru jocuri. Cu toate selectate, Android le programează liber. + Economisește energie în jocurile stabile + Rulează jocul pe nucleele mai lente cât timp își menține o rată de cadre stabilă și îl readuce pe nucleele obișnuite când rămâne în urmă. Interfața clientului GL pe fire Poate face meniurile Steam mai receptive. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a99f40c703..36d59e8f9e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -591,6 +591,8 @@ Ядра игры Ядра игры Ядра, используемые играми. При выборе всех ядер Android планирует свободно. + Экономить энергию в стабильных играх + Запускает игру на более медленных ядрах, пока она держит стабильную частоту кадров, и возвращает её на обычные ядра, как только она отстаёт. Интерфейс клиента Многопоточность GL Может ускорить отклик меню Steam. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d686c8693a..68747edf73 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -568,6 +568,8 @@ Spelkärnor Spelkärnor Kärnor för spel. Med alla valda schemalägger Android fritt. + Spara ström i stabila spel + Kör ett spel på de långsammare kärnorna medan det håller en stabil bildfrekvens, och flyttar tillbaka det till sina vanliga kärnor när det halkar efter. Klientgränssnitt Trådad GL Kan göra Steams menyer mer responsiva. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 596678df67..1ceee97401 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -566,6 +566,8 @@ คอร์สำหรับเกม คอร์เกม คอร์สำหรับเกม เมื่อเลือกทั้งหมด Android จะจัดสรรได้อย่างอิสระ + ประหยัดพลังงานในเกมที่นิ่ง + รันเกมบนคอร์ที่ช้ากว่าขณะที่เฟรมเรตคงที่ และย้ายกลับไปยังคอร์ปกติทันทีที่ตามไม่ทัน อินเทอร์เฟซไคลเอนต์ GL แบบเธรด อาจทำให้เมนู Steam ตอบสนองไวขึ้น diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7b6e1553a1..ed4f94f76e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -568,6 +568,8 @@ Oyun çekirdekleri Oyun çekirdekleri Oyunlar için çekirdekler. Tümü seçiliyse Android serbestçe zamanlar. + Kararlı oyunlarda güç tasarrufu + Oyun kare hızını sabit tutarken onu yavaş çekirdeklerde çalıştırır, geride kalınca her zamanki çekirdeklerine geri döndürür. İstemci arayüzü İş parçacıklı GL Steam menülerinin daha hızlı tepki vermesini sağlayabilir. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2afbe7c796..1ad105a297 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -572,6 +572,8 @@ Ядра для ігор Ядра для ігор Ядра для ігор. Якщо вибрано всі, Android розподіляє навантаження вільно. + Заощаджувати енергію в стабільних іграх + Запускає гру на повільніших ядрах, поки вона тримає стабільну частоту кадрів, і повертає її на звичні ядра, щойно вона відстає. Інтерфейс клієнта Багатопотоковий GL Меню Steam можуть реагувати швидше. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ea76ef9bc6..ab2a98ce24 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -566,6 +566,8 @@ Lõi game Lõi game Lõi dành cho game. Khi chọn tất cả, Android tự do lập lịch. + Tiết kiệm pin với game ổn định + Chạy game trên các nhân chậm hơn khi game giữ tốc độ khung hình ổn định, và đưa game về các nhân thường dùng khi bị tụt lại. Giao diện client GL đa luồng Có thể giúp menu Steam phản hồi nhanh hơn. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b84c613839..4bd469ad4f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -566,6 +566,8 @@ 游戏核心 游戏核心 分配给游戏的核心。全选时由 Android 自由调度。 + 稳定的游戏省电运行 + 游戏帧率稳定时在较慢的核心上运行,一旦跟不上就回到原来的核心。 客户端界面 线程化 GL 可能让 Steam 菜单更流畅。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index c8828521e1..91ad629e73 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -566,6 +566,8 @@ 遊戲核心 遊戲核心 供遊戲使用的核心。全選時由 Android 自由排程。 + 穩定的遊戲省電運行 + 遊戲幀率穩定時在較慢的核心上運行,一旦跟不上就回到原來的核心。 用戶端介面 GL 多線程 可能讓 Steam 選單反應更快。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5cacb7ee87..53f9257b2d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -566,6 +566,8 @@ 遊戲核心 遊戲核心 供遊戲使用的核心。全選時由 Android 自由排程。 + 穩定的遊戲省電執行 + 遊戲影格率穩定時在較慢的核心上執行,一旦跟不上就回到原本的核心。 用戶端介面 GL 多執行緒 可能讓 Steam 選單回應更快。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 160c1290dd..5b0bef4927 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -616,6 +616,8 @@ Game cores Game cores Cores for games. With all selected, Android schedules freely. + Save power on steady games + Runs a game on the slower cores while it holds a steady frame rate, and back on its usual cores once it falls behind. Client interface Threaded GL May make Steam menus more responsive. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pace-cores b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pace-cores new file mode 100755 index 0000000000..0b1c62f7c9 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pace-cores @@ -0,0 +1,266 @@ +#!/usr/bin/python3 +import os +import signal +import struct +import sys +import time +from pathlib import Path + +MAGIC = 0x46484444 +HEADER = 128 +POLL = 0.5 +SETTLE = 3.0 +WINDOW = 1.0 +LATE = 1.5 +PACED_LATE_SHARE = 0.02 +RELEASE_LATE_SHARE = 0.05 +SLOWER = 1.04 +MAX_INTERVAL = 1e9 / 30 +SPREAD = 0.08 +BACKOFF = 30.0 +BACKOFF_MAX = 600.0 + + +def log(message): + print("droiddeck-pace-cores: " + message, flush=True) + + +def parse_cores(text): + cores = set() + for part in text.strip().split(","): + if not part: + continue + first, _, last = part.partition("-") + cores.update(range(int(first), int(last or first) + 1)) + return cores + + +def efficient_cores(cpu=Path("/sys/devices/system/cpu"), own=None): + try: + online = parse_cores((cpu / "online").read_text()) + except (OSError, ValueError): + online = set(range(os.cpu_count() or 0)) + online &= own if own is not None else os.sched_getaffinity(0) + for name in ("cpu_capacity", "cpufreq/cpuinfo_max_freq"): + try: + speed = {core: int((cpu / f"cpu{core}/{name}").read_text()) for core in online} + except (OSError, ValueError): + continue + top = max(speed.values(), default=0) + return {core for core, value in speed.items() if value < top} + return set() + + +class Frames: + """gamescope's per-frame feed for the HUD: frame intervals of the focused app, its pid and whether Steam is in front.""" + + def __init__(self, path): + self.path = Path(path) + self.count = None + + def read(self): + try: + data = self.path.read_bytes() + except OSError: + return None + if len(data) < HEADER or struct.unpack_from(" LATE * period) / len(intervals) + + +def paced_interval(intervals): + """The interval of a game a cap holds at 30 fps or more; a starved or uncapped game spreads.""" + if len(intervals) < 2: + return None + ordered = sorted(intervals) + held = ordered[len(ordered) // 2] + if held > 1.04 * MAX_INTERVAL: + return None + if ordered[len(ordered) // 10] < (1 - SPREAD) * held or ordered[len(ordered) * 9 // 10] > (1 + SPREAD) * held: + return None + if late_share(intervals, held) > PACED_LATE_SHARE: + return None + return held + + +class Cores: + + def get(self, tid): + return os.sched_getaffinity(tid) + + def set(self, tid, cpus): + os.sched_setaffinity(tid, cpus) + + +class Parker: + """Keeps one process's threads off the fastest cores and puts back what each had.""" + + def __init__(self, efficient, proc=Path("/proc"), cores=None): + self.efficient = efficient + self.proc = proc + self.cores = cores or Cores() + self.pid = None + self.before = {} + self.present = None + self.own = set() + + def tasks(self, pid): + try: + return [int(tid) for tid in os.listdir(self.proc / str(pid) / "task") if tid.isdigit()] + except OSError: + return [] + + def park(self, pid): + self.pid = pid + tids = self.tasks(pid) + if self.present is None: + self.present = set(tids) + masks = {} + for tid in tids: + if tid not in self.before: + try: + masks[tid] = self.cores.get(tid) + except OSError: + continue + # A mask the game gave one of its own threads may be passed on by it, not by a parked thread. + self.own.update(frozenset(now) for tid, now in masks.items() if tid in self.present) + inherited = {} + for before, parked in self.before.values(): + inherited[frozenset(parked)] = inherited.get(frozenset(parked), set()) | before + for tid, now in masks.items(): + try: + wanted = now & self.efficient + if wanted and wanted != now: + self.cores.set(tid, wanted) + self.before[tid] = (now, wanted) + elif tid not in self.present and frozenset(now) in inherited and frozenset(now) not in self.own: + self.before[tid] = (inherited[frozenset(now)], now) + except OSError: + continue + + def release(self): + for tid, (before, parked) in self.before.items(): + try: + if self.cores.get(tid) == parked: + self.cores.set(tid, before) + except OSError: + continue + self.pid = None + self.present = None + self.own.clear() + self.before.clear() + + +class Governor: + def __init__(self, frames, parker, clock=time.monotonic): + self.frames = frames + self.parker = parker + self.clock = clock + self.pid = None + self.window = [] + self.since = None + self.held = None + self.blocked = {} + + def tick(self): + read = self.frames.read() + if read is None: + return + pid, steam, intervals = read + now = self.clock() + if steam or not pid or pid != self.pid: + if self.parker.pid is not None: + self.release(now, "focus left the game", backoff=False) + self.pid = None if steam else pid + self.window, self.since = [], now + return + self.window.extend((now, value) for value in intervals) + if self.parker.pid is None and not intervals: + self.window, self.since = [], now + return + if self.parker.pid is None: + self.consider(now) + else: + self.watch(now) + + def consider(self, now): + self.window = [entry for entry in self.window if entry[0] >= now - SETTLE] + if now - self.since < SETTLE or now < self.blocked.get(self.pid, (0, 0))[0]: + return + intervals = [value for _, value in self.window] + if sum(intervals) < 0.9 * SETTLE * 1e9: + return + held = paced_interval(intervals) + if held is None: + return + self.held = held + self.parker.park(self.pid) + if self.parker.before: + self.window = [] + self.since = now + log(f"pid {self.pid} holds {1e9 / held:.0f} fps, {len(self.parker.before)} thread(s) off the fastest cores") + else: + self.parker.release() + + def watch(self, now): + self.parker.park(self.pid) + self.window = [entry for entry in self.window if entry[0] >= now - WINDOW] + intervals = [value for _, value in self.window] + if now - self.since < WINDOW: + return + if len(intervals) < 0.5 * WINDOW * 1e9 / self.held: + self.release(now, "frames stalled") + return + if late_share(intervals, self.held) > RELEASE_LATE_SHARE or median(intervals) > SLOWER * self.held: + self.release(now, "frames fell behind") + + def release(self, now, why, backoff=True): + pid = self.parker.pid + self.parker.release() + if backoff: + _, wait = self.blocked.get(pid, (0, BACKOFF / 2)) + wait = min(wait * 2, BACKOFF_MAX) + self.blocked[pid] = (now + wait, wait) + log(f"pid {pid} back on every core: {why}; not again for {wait:.0f} s") + else: + log(f"pid {pid} back on every core: {why}") + self.window, self.since = [], now + + def stop(self, *_): + self.parker.release() + sys.exit(0) + + +def main(argv): + if len(argv) != 1: + print("usage: droiddeck-pace-cores ", file=sys.stderr) + return 2 + efficient = efficient_cores() + if not efficient: + return 0 + governor = Governor(Frames(argv[0]), Parker(efficient)) + for sig in (signal.SIGTERM, signal.SIGHUP, signal.SIGINT): + signal.signal(sig, governor.stop) + while True: + governor.tick() + time.sleep(POLL) + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index bbfe862b1d..90bd191b4d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -1183,6 +1183,10 @@ case $mode in && [ "${BL_STEAM_UI:-}" != desktop ] && [ -x /usr/local/bin/droiddeck-launcher-cores ]; then /usr/local/bin/droiddeck-launcher-cores "$BL_LAUNCH_DIR/agent/focus.json" 2>&1 & fi + if [ "${BL_PACE_CORES:-1}" != 0 ] && [ -n "${DROIDDECK_HUD_FRAMES:-}" ] && [ -z "${BL_DESKTOP:-}" ] \ + && [ -x /usr/local/bin/droiddeck-pace-cores ]; then + /usr/local/bin/droiddeck-pace-cores "$DROIDDECK_HUD_FRAMES" 2>&1 & + fi if [ "$steam_x64" = 0 ]; then step "registering the app's game library with Steam" diff --git a/tools/tests/test_pace_cores.py b/tools/tests/test_pace_cores.py new file mode 100644 index 0000000000..564edb24be --- /dev/null +++ b/tools/tests/test_pace_cores.py @@ -0,0 +1,241 @@ +from pathlib import Path +import runpy +import struct +import tempfile +import unittest + + +BIN = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin' +MODULE = runpy.run_path(str(BIN / 'droiddeck-pace-cores')) +Frames = MODULE['Frames'] +Parker = MODULE['Parker'] +Governor = MODULE['Governor'] +efficient_cores = MODULE['efficient_cores'] +paced_interval = MODULE['paced_interval'] + +ALL = set(range(8)) +EFFICIENT = set(range(6)) +VBLANK = 1e9 / 60 +CAPACITY = 1024 + + +class FakeCores: + + def __init__(self, tids): + self.state = {tid: set(ALL) for tid in tids} + + def get(self, tid): + if tid not in self.state: + raise ProcessLookupError(tid) + return set(self.state[tid]) + + def set(self, tid, cpus): + if tid not in self.state: + raise ProcessLookupError(tid) + self.state[tid] = set(cpus) + + +class FeedWriter: + + def __init__(self, path): + self.path = path + self.count = 0 + self.data = bytearray(128 + CAPACITY * 16) + struct.pack_into('= 6 else '792\n') + self.assertEqual(efficient_cores(cpu, set(ALL)), EFFICIENT) + self.assertEqual(efficient_cores(cpu, {6, 7}), set()) + + def test_one_tier_has_none(self): + with tempfile.TemporaryDirectory() as temp: + cpu = Path(temp) + (cpu / 'online').write_text('0-3\n') + for core in range(4): + (cpu / f'cpu{core}').mkdir() + (cpu / f'cpu{core}/cpu_capacity').write_text('1024\n') + self.assertEqual(efficient_cores(cpu, set(range(4))), set()) + + +class GovernorTest(unittest.TestCase): + PID = 400 + TIDS = (400, 401, 402) + + def setUp(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + root = Path(temp.name) + for tid in self.TIDS: + (root / f'proc/{self.PID}/task/{tid}').mkdir(parents=True) + self.cores = FakeCores(self.TIDS) + self.feed = FeedWriter(root / 'frames') + self.feed.focus(self.PID) + self.now = 0.0 + self.governor = Governor(Frames(root / 'frames'), Parker(EFFICIENT, root / 'proc', self.cores), + clock=lambda: self.now) + self.governor.tick() + + def run_for(self, seconds, interval): + for _ in range(int(seconds / 0.5)): + self.now += 0.5 + self.feed.frames(*([interval] * int(0.5e9 / interval))) + self.governor.tick() + + def test_parks_a_game_that_holds_its_pace(self): + self.run_for(4, VBLANK) + self.assertEqual(self.governor.parker.pid, self.PID) + self.assertTrue(all(cpus == EFFICIENT for cpus in self.cores.state.values())) + + def test_releases_when_frames_fall_behind_and_backs_off(self): + self.run_for(4, VBLANK) + self.run_for(2, 2 * VBLANK) + self.assertIsNone(self.governor.parker.pid) + self.assertTrue(all(cpus == ALL for cpus in self.cores.state.values())) + self.run_for(10, VBLANK) + self.assertIsNone(self.governor.parker.pid) + self.run_for(30, VBLANK) + self.assertEqual(self.governor.parker.pid, self.PID) + + def test_struggling_game_stays_on_every_core(self): + for step in range(20): + self.now += 0.5 + self.feed.frames(*([VBLANK, 2 * VBLANK] * 10)) + self.governor.tick() + self.assertIsNone(self.governor.parker.pid) + self.assertTrue(all(cpus == ALL for cpus in self.cores.state.values())) + + def test_steam_in_front_releases_without_backoff(self): + self.run_for(4, VBLANK) + self.feed.focus(self.PID, steam=True) + self.now += 0.5 + self.governor.tick() + self.assertTrue(all(cpus == ALL for cpus in self.cores.state.values())) + self.feed.focus(self.PID) + self.run_for(4, VBLANK) + self.assertEqual(self.governor.parker.pid, self.PID) + + def test_a_mask_the_game_set_itself_is_kept(self): + self.run_for(4, VBLANK) + self.cores.state[401] = {7} + self.run_for(2, 2 * VBLANK) + self.assertEqual(self.cores.state[401], {7}) + self.assertEqual(self.cores.state[400], ALL) + + def idle_for(self, seconds): + for _ in range(int(seconds / 0.5)): + self.now += 0.5 + self.governor.tick() + + def test_thread_born_parked_is_restored(self): + self.run_for(4, VBLANK) + (self.governor.parker.proc / f'{self.PID}/task/403').mkdir() + self.cores.state[403] = set(EFFICIENT) + self.run_for(1, VBLANK) + self.run_for(2, 2 * VBLANK) + self.assertEqual(self.cores.state[403], ALL) + + def test_a_thread_already_on_efficient_cores_keeps_its_mask(self): + self.cores.state[402] = set(EFFICIENT) + self.run_for(4, VBLANK) + self.run_for(1, VBLANK) + self.run_for(2, 2 * VBLANK) + self.assertEqual(self.cores.state[402], EFFICIENT) + self.assertEqual(self.cores.state[400], ALL) + + def test_a_child_of_a_game_pinned_thread_keeps_its_mask(self): + self.cores.state[402] = set(EFFICIENT) + self.run_for(4, VBLANK) + (self.governor.parker.proc / f'{self.PID}/task/404').mkdir() + self.cores.state[404] = set(EFFICIENT) + self.run_for(1, VBLANK) + self.run_for(2, 2 * VBLANK) + self.assertEqual(self.cores.state[404], EFFICIENT) + self.assertEqual(self.cores.state[400], ALL) + + def test_a_child_of_a_game_pinned_thread_that_exited_keeps_its_mask(self): + self.cores.state[402] = set(EFFICIENT) + self.run_for(4, VBLANK) + (self.governor.parker.proc / f'{self.PID}/task/402').rmdir() + del self.cores.state[402] + (self.governor.parker.proc / f'{self.PID}/task/404').mkdir() + self.cores.state[404] = set(EFFICIENT) + self.run_for(1, VBLANK) + self.run_for(2, 2 * VBLANK) + self.assertEqual(self.cores.state[404], EFFICIENT) + self.assertEqual(self.cores.state[400], ALL) + + def test_born_parked_thread_gets_every_original_it_could_have_had(self): + for tid in self.TIDS: + self.cores.state[tid] = EFFICIENT | {6} + self.cores.state[402] = EFFICIENT | {7} + self.run_for(4, VBLANK) + (self.governor.parker.proc / f'{self.PID}/task/404').mkdir() + self.cores.state[404] = set(EFFICIENT) + self.run_for(1, VBLANK) + self.run_for(2, 2 * VBLANK) + self.assertEqual(self.cores.state[404], ALL) + self.assertEqual(self.cores.state[402], EFFICIENT | {7}) + + def test_a_stalled_game_is_not_parked_on_old_frames(self): + self.run_for(0.5, VBLANK) + self.idle_for(3) + self.assertIsNone(self.governor.parker.pid) + self.run_for(2, VBLANK) + self.assertIsNone(self.governor.parker.pid) + + def test_a_parked_game_that_stops_presenting_is_released(self): + self.run_for(4, VBLANK) + self.run_for(1, 1e9) + self.idle_for(1) + self.assertIsNone(self.governor.parker.pid) + self.assertTrue(all(cpus == ALL for cpus in self.cores.state.values())) + + def test_threads_pinned_to_fast_cores_are_left_alone(self): + self.cores.state[402] = {6, 7} + self.run_for(4, VBLANK) + self.assertEqual(self.cores.state[402], {6, 7}) + self.assertEqual(self.cores.state[400], EFFICIENT) + + +if __name__ == '__main__': + unittest.main() From 30d103280bc38ec31e0675e6dfa57d0f1b0d612d Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 13 Nov 2026 20:57:42 -0500 Subject: [PATCH 087/101] fix(session): games keep OpenGL error checks when the client skips them (#2562) * fix(session): games keep OpenGL error checks when the client skips them * docs(session): separate the GL error checks note from the picker paragraph --- .../launcher/session/SessionService.kt | 6 +++-- docs/development/game-environment.md | 8 +++++++ .../overlay/usr/local/bin/droiddeck-game-env | 22 +++++++++++-------- tools/tests/test_game_environment.py | 16 ++++++++++++++ tools/tests/test_game_gpu_launchers.py | 11 +++++++++- 5 files changed, 51 insertions(+), 12 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 6613319033..8da979cc39 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -997,7 +997,9 @@ class SessionService : Service() { SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_VRAM_MB=$it") } guest.add("AUDIO_DIRECT_DECAY=0") val extra = extraEnv() + agentEnvironment - if (extra.none { it.startsWith("TU_DEBUG=") }) guest.add("$GAME_TU_DEBUG=" + (tuOverride ?: if (tuDriver) "sysmem" else "")) + mapOf("TU_DEBUG" to (tuOverride ?: if (tuDriver) "sysmem" else ""), "MESA_NO_ERROR" to "").forEach { (name, game) -> + if (extra.none { it.startsWith("$name=") }) guest.add("$GAME_PREFIX$name=$game") + } extra.forEach { guest.add(it) } com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this)?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } val clientPinned = steamHere && SessionPrefs.clientCpusOverride(this) @@ -2377,7 +2379,7 @@ class SessionService : Service() { private const val TRACER_NICE = -6 private const val MIC_RELEASE_TIMEOUT_MS = 5_000L private const val TU_DEBUG_SWITCH = "Download/droiddeck-tu-debug" - private const val GAME_TU_DEBUG = "DROIDDECK_GAME_TU_DEBUG" + private const val GAME_PREFIX = "DROIDDECK_GAME_" private const val LEGACY_ENV_SWITCH = "Download/droiddeck-env" private const val ENV_SWITCH_NAME = "droiddeck-env" diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index 766a565a55..5fb2f1be40 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -254,6 +254,14 @@ The former feature-level rules for Caravan SandWitch, RoboCop: Rogue City, ReSkate and Cyberpunk 2077 compensated for the global `12_2` override and are removed. Stellar Blade also uses automatic detection. The separate Deep Rock Galactic GDK ray-tracing opt-out and Mali bridge capability cap remain. + +"Skip GL error checks" (under "Client interface") sets `MESA_NO_ERROR=1` for the client +interface and Chromium apps only. Games keep Mesa's GL error checks: with +`MESA_NO_ERROR`, an invalid call such as `glBufferData` with no buffer bound reads +a NULL buffer object instead of returning `GL_INVALID_OPERATION`, and the game's +render thread stops. A game profile entry, or `MESA_NO_ERROR` in the session's own +environment, still applies to games. + Other picker suggestions are editable starting values and are enabled only when added and saved. Older or custom components can support a different set of options. Android Wine wrapper, diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 459e8a6fac..75c740a58e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -10,7 +10,8 @@ import sys import tempfile from pathlib import Path -GAME_TU_DEBUG = "DROIDDECK_GAME_TU_DEBUG" +GAME_PREFIX = "DROIDDECK_GAME_" +GAME_SPLIT_KEYS = ("TU_DEBUG", "MESA_NO_ERROR") CHROMIUM_FILES = {"chrome-sandbox", "chrome_100_percent.pak", "v8_context_snapshot.bin"} D3D9_DEFAULT_MEMORY_MB = 4096 SYNC_KEYS = ("BL_SYNC", "BL_SYNC_FALLBACK", "BL_FSYNC_FIRST", "BL_SYNC_MIN_NOFILE", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") @@ -385,16 +386,19 @@ def chromium_app(folder): def game_gpu(env, keep=False): - if GAME_TU_DEBUG not in env: + if not any(GAME_PREFIX + key in env for key in GAME_SPLIT_KEYS): return env result = env.copy() - value = result.pop(GAME_TU_DEBUG) - if keep: - return result - if value: - result["TU_DEBUG"] = value - else: - result.pop("TU_DEBUG", None) + for key in GAME_SPLIT_KEYS: + if GAME_PREFIX + key not in result: + continue + value = result.pop(GAME_PREFIX + key) + if keep: + continue + if value: + result[key] = value + else: + result.pop(key, None) return result diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 5f7b4af087..d423d8a355 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -950,6 +950,22 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(MODULE["apply_config"](env, config, "42")["TU_DEBUG"], "sysmem") self.assertNotIn("TU_DEBUG", MODULE["apply_config"](env, config, "43")) + def test_games_run_with_gl_error_checks_unless_the_user_turns_them_off(self): + gpu = MODULE["game_gpu"] + session = {"MESA_NO_ERROR": "1", "DROIDDECK_GAME_MESA_NO_ERROR": "", "KEEP": "1"} + self.assertEqual(gpu(session), {"KEEP": "1"}) + self.assertEqual(gpu(session, True), {"MESA_NO_ERROR": "1", "KEEP": "1"}) + self.assertEqual(gpu({"MESA_NO_ERROR": "1"}), {"MESA_NO_ERROR": "1"}) + self.assertEqual(gpu({"MESA_NO_ERROR": "1", "DROIDDECK_GAME_MESA_NO_ERROR": "1"}), {"MESA_NO_ERROR": "1"}) + both = gpu({"MESA_NO_ERROR": "1", "DROIDDECK_GAME_MESA_NO_ERROR": "", "TU_DEBUG": "sysmem", "DROIDDECK_GAME_TU_DEBUG": "nolrz"}) + self.assertEqual(both, {"TU_DEBUG": "nolrz"}) + self.assertEqual(gpu({"TU_DEBUG": "sysmem", "DROIDDECK_GAME_TU_DEBUG": "", "MESA_NO_ERROR": "1"}), + {"MESA_NO_ERROR": "1"}) + config = {"version": 1, "games": {"42": {"MESA_NO_ERROR": "1"}}} + env = gpu(session) + self.assertEqual(MODULE["apply_config"](env, config, "42")["MESA_NO_ERROR"], "1") + self.assertNotIn("MESA_NO_ERROR", MODULE["apply_config"](env, config, "43")) + def test_a_chromium_app_keeps_the_sessions_turnip_debug(self): gpu = MODULE["game_gpu"] self.assertEqual(gpu({"TU_DEBUG": "sysmem", "DROIDDECK_GAME_TU_DEBUG": "", "KEEP": "1"}, True), diff --git a/tools/tests/test_game_gpu_launchers.py b/tools/tests/test_game_gpu_launchers.py index 09b3aef85a..b4ddd3cbf4 100644 --- a/tools/tests/test_game_gpu_launchers.py +++ b/tools/tests/test_game_gpu_launchers.py @@ -9,7 +9,7 @@ from pathlib import Path BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" KEYS = ("TU_DEBUG", "DROIDDECK_GAME_TU_DEBUG", "MESA_LOADER_DRIVER_OVERRIDE", "GALLIUM_DRIVER", - "LIBGL_KOPPER_DRI2", "VK_ICD_FILENAMES", "VK_DRIVER_FILES") + "LIBGL_KOPPER_DRI2", "VK_ICD_FILENAMES", "VK_DRIVER_FILES", "MESA_NO_ERROR", "DROIDDECK_GAME_MESA_NO_ERROR") SESSION = {"TU_DEBUG": "sysmem", "DROIDDECK_GAME_TU_DEBUG": ""} GPU_SESSION = {"MESA_LOADER_DRIVER_OVERRIDE": "zink", "GALLIUM_DRIVER": "zink", "LIBGL_KOPPER_DRI2": "true", "VK_ICD_FILENAMES": "/runtime/turnip.json", @@ -68,6 +68,15 @@ class GameGpuLaunchersTest(unittest.TestCase): self.chromium() self.assertEqual("sysmem", self.wrapper("--for", str(self.app / "files"))["TU_DEBUG"]) + def test_programs_get_gl_error_checks_back_while_chromium_keeps_the_client_setting(self): + session = dict(GPU_SESSION, MESA_NO_ERROR="1", DROIDDECK_GAME_MESA_NO_ERROR="") + values = self.wrapper(session=session) + self.assertEqual(("unset", "unset"), (values["MESA_NO_ERROR"], values["DROIDDECK_GAME_MESA_NO_ERROR"])) + self.assertEqual(GPU_SESSION, {key: values[key] for key in GPU_SESSION}) + self.assertEqual("1", self.wrapper("--chromium", session=session)["MESA_NO_ERROR"]) + self.assertEqual("unset", self.flatpak(session)["MESA_NO_ERROR"]) + self.assertEqual("1", self.wrapper(session={"MESA_NO_ERROR": "1"})["MESA_NO_ERROR"]) + def test_without_the_game_setting_the_wrapper_changes_nothing(self): self.assertEqual("sysmem", self.wrapper(session={"TU_DEBUG": "sysmem"})["TU_DEBUG"]) self.assertEqual("unset", self.wrapper(session={})["TU_DEBUG"]) From f502b8b3e632d92df1239fdb443c8e5edac04b44 Mon Sep 17 00:00:00 2001 From: LunaDL <91587464+EnzoDLofi@users.noreply.github.com> Date: Fri, 13 Nov 2026 22:41:44 -0400 Subject: [PATCH 088/101] feat(hud): add battery runtime estimate to DD overlay ( hud ) (#2573) --- .../launcher/hud/DroidDeckHudConfig.kt | 2 +- .../launcher/hud/DroidDeckHudModels.kt | 6 +- .../launcher/hud/DroidDeckHudView.kt | 141 ++++++++---------- .../droiddeck/launcher/hud/HudMetrics.java | 56 +++---- .../droiddeck/launcher/hud/MangoReadings.kt | 128 +++++++++++++--- .../launcher/session/BatteryComponent.kt | 14 +- .../session/BatteryRuntimeEstimator.kt | 74 +++++++++ .../launcher/ui/DroidDeckHudSettings.kt | 14 +- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../launcher/hud/MangoReadingsTest.kt | 33 +++- .../session/BatteryRuntimeEstimatorTest.kt | 25 ++++ 43 files changed, 380 insertions(+), 146 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/BatteryRuntimeEstimator.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/BatteryRuntimeEstimatorTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt index 8fc38a95f9..151d4a03d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt @@ -9,7 +9,7 @@ internal object DroidDeckHudConfig { "hudOutline" to "40", "hudOutlineAccent" to "1", "showFPS" to "1", "showFPSGraph" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", "showGPULoad" to "1", "showVram" to "1", "showRAM" to "1", "showPower" to "1", "showTemp" to "1", "showBatteryTemp" to "1", - "showGpuTemp" to "0", "showBattery" to "0", "showLow1" to "1", "showLow01" to "1", "showLow001" to "1", "fpsDecimal" to "1", "showPerCore" to "1", + "showGpuTemp" to "0", "showBattery" to "0", "showBatteryTime" to "0", "showLow1" to "1", "showLow01" to "1", "showLow001" to "1", "fpsDecimal" to "1", "showPerCore" to "1", "showSwap" to "1", "showNet" to "1", "showResolution" to "1", "showProton" to "1", "showSession" to "1", "showClock" to "1", "showEngine" to "1", "showRenderer" to "1", "showGpuModel" to "1", "tempUnit" to "c", "tempBands" to "1", "tempAuto" to "1", "tempRedCpu" to "90", "tempRedGpu" to "90", "tempRedBat" to "48", diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt index b77d69772f..dd6936f860 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt @@ -37,11 +37,11 @@ enum class DroidDeckHudSize(val token: String, val label: String) { fun from(token: String?): DroidDeckHudSize = values().firstOrNull { it.token.equals(token, ignoreCase = true) } ?: FULL - val MINIMAL_CHIPS = setOf("FPS", "FPS graph", "1% low", "0.1% low", "0.01% low", "FPS .1", "Engine", "Clock") - val PILL_CHIPS = setOf("FPS", "FPS graph", "GPU", "CPU", "VRAM", "RAM", "Battery", "GPU model", "FPS .1", "Engine", "Clock") + val MINIMAL_CHIPS = setOf("FPS", "Battery time", "FPS graph", "1% low", "0.1% low", "0.01% low", "FPS .1", "Engine", "Clock") + val PILL_CHIPS = setOf("FPS", "Battery time", "FPS graph", "GPU", "CPU", "VRAM", "RAM", "Battery", "GPU model", "FPS .1", "Engine", "Clock") val STANDARD_CHIPS = setOf( "FPS", "FPS graph", "GPU", "GPU temp", "CPU", "VRAM", "RAM", "Power", "Temp", - "Battery", "GPU model", "Engine", "1% low", "0.1% low", "0.01% low", "FPS .1", "Clock", + "Battery", "Battery time", "GPU model", "Engine", "1% low", "0.1% low", "0.01% low", "FPS .1", "Clock", ) val MEGA_ONLY = setOf( "Per-core", "Swap", "Network", "Resolution", "Proton", "Wrapper", "DX ver", "Session", diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index a353a6d201..2d289a4185 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -87,6 +87,7 @@ class DroidDeckHudView(context: Context) : View(context) { private var showVram = true private var showRAM = true private var showBattery = true + private var showBatteryTime = true private var showPower = true private var showBatteryTemp = false private var showGraph = false @@ -308,6 +309,7 @@ class DroidDeckHudView(context: Context) : View(context) { showVram = cfg.get("showVram", "1") == "1" showRAM = cfg.get("showRAM", "1") == "1" showBattery = cfg.get("showBattery", "1") == "1" + showBatteryTime = cfg.get("showBatteryTime", "1") == "1" showPower = cfg.get("showPower", "1") == "1" showBatteryTemp = cfg.get("showBatteryTemp", "0") == "1" showGraph = cfg.get("showFPSGraph", "0") == "1" @@ -758,6 +760,7 @@ class DroidDeckHudView(context: Context) : View(context) { if (showPower && s.battery.watts > 0f) { if (any) v += gap(unitPx); v += numUnit(fmt1(s.battery.watts), "W", rowPx, unitPx); any = true } if (any) rows.add(HudRow(Span("BAT", colBat, rowPx), v)) } + if (showBatteryTime) rows.add(HudRow(Span("TIME", colBat, rowPx), listOf(Span(s.battery.runtimeText ?: "—", colValue, rowPx)))) if (showFPS) { val v = ArrayList() v += glowing(numUnit(fpsText(fpsNow), "FPS", rowPx, unitPx)) @@ -843,6 +846,7 @@ class DroidDeckHudView(context: Context) : View(context) { if (showPower && s.battery.watts > 0f) { if (any) parts += Span(" · ", colDim, subPx); parts += numUnit(fmt1(s.battery.watts), "W", valPx, unitPx); any = true } if (any) tiles.add(Tile("BAT", colBat, parts, null, true)) } + if (showBatteryTime) tiles.add(Tile("BAT TIME", colBat, listOf(Span(s.battery.runtimeText ?: "—", colValue, valPx)), "", true)) if (tiles.isEmpty()) { contentW = 0f; contentH = 0f; return } val keyH = lineH(keyPx); val valH = lineH(valPx); val subH = lineH(subPx) @@ -890,40 +894,39 @@ class DroidDeckHudView(context: Context) : View(context) { private fun buildPill(s: HudMetrics.Snapshot) { val bigPx = sp(30f); val bigUnitPx = bigPx * 0.36f; val stkPx = sp(11.5f) val pad = sp(10f); val midGap = sp(12f); val stkLineGap = sp(3f) - val left = ArrayList() val generating = differs(fpsNow) val fpsPx = if (generating) bigPx * 0.55f else bigPx - left += Span(fpsText(fpsNow), colValue, fpsPx, glow = true) - left += Span("fps", colDim, if (generating) bigUnitPx * 0.8f else bigUnitPx) + if (showFPS) { + left += Span(fpsText(fpsNow), colValue, fpsPx, glow = true) + left += Span("fps", colDim, if (generating) bigUnitPx * 0.8f else bigUnitPx) + } else if (showBatteryTime) left += Span(s.battery.runtimeText ?: "TIME —", colBat, bigPx * 0.8f) val stack = ArrayList>() val gpuName = if (showGpuModel && gpuNameText().isNotBlank()) gpuModelSpans(stkPx, colDim, compact = true) else null run { val l = ArrayList() - if (showGPU && s.gpuPercent != null) { l += Span("GPU ${s.gpuPercent}%", colGpu, stkPx) } + if (showGPU && s.gpuPercent != null) l += Span("GPU ${s.gpuPercent}%", colGpu, stkPx) if (showCPU) { if (l.isNotEmpty()) l += Span(" · ", colDim, stkPx); l += Span("CPU ${s.cpuPercent ?: "—"}%", colCpu, stkPx) } if (l.isNotEmpty()) stack.add(l) } if (showRAM) stack.add(listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, stkPx))) if (showBattery || showPower || showBatteryTemp) { val l = ArrayList() - fun part(spans: List) { - l += if (l.isEmpty()) Span("BAT ", colBat, stkPx) else Span(" · ", colDim, stkPx) - l += spans - } + fun part(spans: List) { l += if (l.isEmpty()) Span("BAT ", colBat, stkPx) else Span(" · ", colDim, stkPx); l += spans } if (showBattery && s.battery.percent != null) part(listOf(Span("${s.battery.percent}%", colBat, stkPx))) - if (showBatteryTemp && s.battery.tempC != null) - part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, stkPx, stkPx * 0.62f)) + if (showBatteryTemp && s.battery.tempC != null) part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, stkPx, stkPx * 0.62f)) if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, stkPx))) if (l.isNotEmpty()) stack.add(l) } + if (showBatteryTime) stack.add(listOf(Span("BAT TIME ${s.battery.runtimeText ?: "—"}", colBat, stkPx))) run { val l = ArrayList() - l += Span("${fmt1(1000f / max(fpsNow, 1f))}ms", colDim, stkPx) - if (displayServer.isNotBlank()) { l += Span(" · ", colDim, stkPx); l += Span(displayServer, colDisp, stkPx) } - if (showVram && s.vramText() != null) { l += Span(" · ", colDim, stkPx); l += Span("${s.vramText()} vram", colDim, stkPx) } - stack.add(l) + if (showFPS) l += Span("${fmt1(1000f / max(fpsNow, 1f))}ms", colDim, stkPx) + if (showFPS && displayServer.isNotBlank()) { l += Span(" · ", colDim, stkPx); l += Span(displayServer, colDisp, stkPx) } + else if (displayServer.isNotBlank()) l += Span(displayServer, colDisp, stkPx) + if (showVram && s.vramText() != null) { if (l.isNotEmpty()) l += Span(" · ", colDim, stkPx); l += Span("${s.vramText()} vram", colDim, stkPx) } + if (l.isNotEmpty()) stack.add(l) } if (hdrState != DroidDeckHudHdr.NONE) stack.add(hdrLine(stkPx)) @@ -931,13 +934,11 @@ class DroidDeckHudView(context: Context) : View(context) { for (l in stack) statsW = max(statsW, runWidth(l)) val nameOnTop = gpuName != null && runWidth(gpuName) > statsW if (gpuName != null && !nameOnTop) stack.add(0, gpuName) - val apiStr = apiLabel() - val hasApi = apiStr != "FPS" + val hasApi = showFPS && apiStr != "FPS" val apiH = if (hasApi) lineH(stkPx) else 0f val apiGap = if (hasApi) stkLineGap else 0f - - val leftW = runWidth(left); val leftH = lineH(bigPx) + val leftW = runWidth(left); val leftH = if (left.isEmpty()) 0f else lineH(bigPx) val apiW = if (hasApi) measure(apiStr, stkPx) else 0f val leftBlockW = max(leftW, apiW) val leftColH = apiH + apiGap + leftH @@ -949,23 +950,13 @@ class DroidDeckHudView(context: Context) : View(context) { val topLineH = if (nameOnTop) stkH + stkLineGap else 0f contentW = pad + leftBlockW + midGap + stackW + pad contentH = pad + topLineH + innerH + pad - var ly = pad + topLineH + (innerH - leftColH) / 2f - if (hasApi) { - placeRun(pad, ly - ascent(stkPx), listOf(Span(apiStr, colFps, stkPx))) - ly += apiH + apiGap - } - placeRun(pad, ly - ascent(bigPx), left) + if (hasApi) { placeRun(pad, ly - ascent(stkPx), listOf(Span(apiStr, colFps, stkPx))); ly += apiH + apiGap } + if (left.isNotEmpty()) placeRun(pad, ly - ascent(bigPx), left) var sy = pad + topLineH + (innerH - stackTotalH) / 2f - for (l in stack) { - placeRun(pad + leftBlockW + midGap, sy - ascent(stkPx), l) - sy += stkH + stkLineGap - } + for (l in stack) { placeRun(pad + leftBlockW + midGap, sy - ascent(stkPx), l); sy += stkH + stkLineGap } addSubtleClock(pad, leftAligned = true) - if (nameOnTop && gpuName != null) { - val end = placeRun(pad, pad - ascent(stkPx), gpuName) - contentW = max(contentW, end + pad) - } + if (nameOnTop && gpuName != null) { val end = placeRun(pad, pad - ascent(stkPx), gpuName); contentW = max(contentW, end + pad) } } private fun buildMinimal(s: HudMetrics.Snapshot) { @@ -973,55 +964,39 @@ class DroidDeckHudView(context: Context) : View(context) { val stroke = outlineWidth() val left = contentLeft() val inner = panelInset() + stroke - + val runtime = if (showBatteryTime) s.battery.runtimeText ?: "TIME —" else null val minGenerating = differs(fpsNow) - val big = listOf( - Span(fpsText(fpsNow), colValue, if (minGenerating) bigPx * 0.55f else bigPx), - Span("fps", colDim, if (minGenerating) bigUnitPx * 0.8f else bigUnitPx)) + val big = when { + showFPS -> listOf(Span(fpsText(fpsNow), colValue, if (minGenerating) bigPx * 0.55f else bigPx), Span("fps", colDim, if (minGenerating) bigUnitPx * 0.8f else bigUnitPx)) + runtime != null -> listOf(Span(runtime, colBat, sp(24f))) + else -> emptyList() + } val sub = ArrayList() fun low(label: String, value: Float) { if (sub.isNotEmpty()) sub += Span(" · ", colDim, subPx) sub += Span("$label ", colDim, subPx) sub += Span(lowText(value) ?: "—", colFps, subPx) } - if (showLow1) low("1%", lows.low1Fps) - if (showLow01) low("0.1%", lows.low01Fps) - if (showLow001) low("0.01%", lows.low001Fps) - val footerLabel = listOf(if (showEngine) engineLabel else "", displayServer) - .filter { it.isNotBlank() }.joinToString(" · ") + if (showFPS && showLow1) low("1%", lows.low1Fps) + if (showFPS && showLow01) low("0.1%", lows.low01Fps) + if (showFPS && showLow001) low("0.01%", lows.low001Fps) + if (showBatteryTime) { + if (sub.isNotEmpty()) sub += Span(" · ", colDim, subPx) + sub += Span("BAT TIME ", colBat, subPx) + sub += Span(s.battery.runtimeText ?: "—", colBat, subPx) + } + val footerLabel = listOf(if (showFPS && showEngine) engineLabel else "", if (showFPS) displayServer else "").filter { it.isNotBlank() }.joinToString(" · ") val hdr = if (hdrState != DroidDeckHudHdr.NONE) hdrLine(footPx) else emptyList() - val (headerBottom, headerRight) = addPanelHeader(left, inner) - val x = headerRight - - val colW = maxOf(runWidth(big), runWidth(sub), x - left, - max(measure(footerLabel, footPx), runWidth(hdr)), if (showGraph) sp(120f) else 0f) - val bigBase = headerBottom + sp(8f) + capHeight(big[0].sizePx) - placeRun(left - inkLeft(big[0].text, big[0].sizePx), bigBase, big, glow = true) - var last = bigBase - if (sub.isNotEmpty()) { - last += sp(10f) + capHeight(subPx) - placeRun(left - inkLeft(sub[0].text, subPx), last, sub) - } - if (showGraph) { - val top = last + sp(9f) - graphRect = RectF(left, top, left + colW, top + sp(24f)) - last = top + sp(24f) - } - if (footerLabel.isNotBlank()) { - val base = last + sp(8f) + capHeight(footPx) - glyphs.add(Glyph(left - inkLeft(footerLabel, footPx), base, footerLabel, blend(colDim), footPx)) - last = base - } - if (hdr.isNotEmpty()) { - val base = last + sp(6f) + capHeight(footPx) - placeRun(left - inkLeft(hdr[0].text, footPx), base, hdr) - last = base - } + val colW = maxOf(runWidth(big), runWidth(sub), headerRight - left, max(measure(footerLabel, footPx), runWidth(hdr)), if (showFPS && showGraph) sp(120f) else 0f) + var last = headerBottom + sp(8f) + if (big.isNotEmpty()) { last += capHeight(big[0].sizePx); placeRun(left - inkLeft(big[0].text, big[0].sizePx), last, big, glow = showFPS) } + if (sub.isNotEmpty()) { last += sp(10f) + capHeight(subPx); placeRun(left - inkLeft(sub[0].text, subPx), last, sub) } + if (showFPS && showGraph) { val top = last + sp(9f); graphRect = RectF(left, top, left + colW, top + sp(24f)); last = top + sp(24f) } + if (footerLabel.isNotBlank()) { val base = last + sp(8f) + capHeight(footPx); glyphs.add(Glyph(left - inkLeft(footerLabel, footPx), base, footerLabel, blend(colDim), footPx)); last = base } + if (hdr.isNotEmpty()) { val base = last + sp(6f) + capHeight(footPx); placeRun(left - inkLeft(hdr[0].text, footPx), base, hdr); last = base } measurePaint.textSize = footPx - val panel = RectF(panelLeft(), panelInset(), left + colW + sp(34f), last + measurePaint.fontMetrics.descent + sp(9f) + stroke) - - finishPanel(panel, halfRound = true) + finishPanel(RectF(panelLeft(), panelInset(), left + colW + sp(34f), last + measurePaint.fontMetrics.descent + sp(9f) + stroke), halfRound = true) } private fun buildStrip(s: HudMetrics.Snapshot) { @@ -1045,14 +1020,16 @@ class DroidDeckHudView(context: Context) : View(context) { right -= groupGap } - val generating = differs(fpsNow) - val fps = ArrayList() - if (apiLabel() != "FPS") fps += Span("${apiLabel()} ", colDim, rowPx) - fps += Span(fpsText(fpsNow), colValue, if (generating) fpsPx * 0.8f else fpsPx, glow = true) - fps += Span("fps", colDim, unitPx) - x = placeRun(x, baseline, fps) + groupGap + if (showFPS) { + val generating = differs(fpsNow) + val fps = ArrayList() + if (apiLabel() != "FPS") fps += Span("${apiLabel()} ", colDim, rowPx) + fps += Span(fpsText(fpsNow), colValue, if (generating) fpsPx * 0.8f else fpsPx, glow = true) + fps += Span("fps", colDim, unitPx) + x = placeRun(x, baseline, fps) + groupGap + } - if (showGraph) { + if (showFPS && showGraph) { val gw = sp(72f); val gh = h * 0.55f if (x + gw <= right) { graphRect = RectF(x, mid - gh / 2f, x + gw, mid + gh / 2f) @@ -1068,9 +1045,9 @@ class DroidDeckHudView(context: Context) : View(context) { l += Span("$label ", colDim, rowPx) l += Span(lowText(value) ?: "—", colFps, rowPx) } - if (showLow1) low("1%", lows.low1Fps) - if (showLow01) low("0.1%", lows.low01Fps) - if (showLow001) low("0.01%", lows.low001Fps) + if (showFPS && showLow1) low("1%", lows.low1Fps) + if (showFPS && showLow01) low("0.1%", lows.low01Fps) + if (showFPS && showLow001) low("0.01%", lows.low001Fps) if (l.isNotEmpty()) groups += l } if (showGPU || showGpuTemp) { @@ -1099,6 +1076,7 @@ class DroidDeckHudView(context: Context) : View(context) { if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, rowPx))) if (l.isNotEmpty()) groups += l } + if (showBatteryTime) groups += listOf(Span("BAT TIME ${s.battery.runtimeText ?: "—"}", colBat, rowPx)) if (displayServer.isNotBlank()) groups += listOf(Span(displayServer, colDisp, rowPx)) if (hdrState != DroidDeckHudHdr.NONE) groups += hdrLine(rowPx) if (showGpuModel && gpuNameText().isNotBlank()) groups += gpuModelSpans(rowPx, colDim, compact = true) @@ -1228,6 +1206,7 @@ class DroidDeckHudView(context: Context) : View(context) { if (showPower && s.battery.watts > 0f) { if (any) v += gap(unitPx); v += numUnit(fmt1(s.battery.watts), "W", rowPx, unitPx); any = true } if (any) right.add(HudRow(Span("BAT", colBat, rowPx), v)) } + if (showBatteryTime) right.add(HudRow(Span("TIME", colBat, rowPx), listOf(Span(s.battery.runtimeText ?: "—", colValue, rowPx)))) if (showFPS) { val v = ArrayList() v += glowing(numUnit(fpsText(fpsNow), "FPS", rowPx, unitPx)) diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java index 1dc5a39bcd..2fab8cdc14 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java @@ -14,6 +14,8 @@ package com.droiddeck.launcher.hud; +import com.droiddeck.launcher.session.BatteryRuntimeEstimator; + import android.app.ActivityManager; import android.content.Context; import android.content.Intent; @@ -560,10 +562,9 @@ public class HudMetrics { return sawSignal; } - private Double smoothedBatteryRuntimeHours = null; - private static final double MAX_RUNTIME_HOURS = 72.0; - private static final double RUNTIME_SMOOTHING_OLD_WEIGHT = 0.65; - private static final double RUNTIME_SMOOTHING_NEW_WEIGHT = 0.35; + private final BatteryRuntimeEstimator batteryRuntimeEstimator = new BatteryRuntimeEstimator(); + private Boolean lastBatteryDischarging = null; + private Boolean lastBatteryCharging = null; public Battery collectBattery() { BatteryManager bm = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE); @@ -581,11 +582,22 @@ public class HudMetrics { int st = status.getIntExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_UNKNOWN); boolean charging = st == BatteryManager.BATTERY_STATUS_CHARGING || st == BatteryManager.BATTERY_STATUS_FULL; + boolean discharging = st == BatteryManager.BATTERY_STATUS_DISCHARGING + || st == BatteryManager.BATTERY_STATUS_NOT_CHARGING; + if (lastBatteryDischarging != null && lastBatteryDischarging.booleanValue() != discharging) { + batteryRuntimeEstimator.reset(); + } + lastBatteryDischarging = discharging; if (st == BatteryManager.BATTERY_STATUS_UNKNOWN) { Boolean sysCharging = readChargingFromPowerSupply(); if (sysCharging != null) charging = sysCharging; } - long currentMicroAmps = Math.abs(bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)); + if (lastBatteryCharging != null + && lastBatteryCharging.booleanValue() != charging) { + batteryRuntimeEstimator.reset(); + } + lastBatteryCharging = charging; + long currentMicroAmps = BatteryRuntimeEstimator.toMicroamps(bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)); long chargeCounter = bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER); int voltageMv = status.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0); @@ -606,36 +618,16 @@ public class HudMetrics { if (uw != null && uw != 0L) watts = (float) (Math.abs(uw) / 1_000_000.0); } + Double runtimeHours = !charging + ? batteryRuntimeEstimator.estimateHours(chargeCounter, Math.abs((double) currentMicroAmps)) + : null; String runtimeText; - if (charging) { - smoothedBatteryRuntimeHours = null; - runtimeText = "LEFT CHG"; - } else if (currentMicroAmps <= 0L || chargeCounter <= 0L) { - runtimeText = null; - } else { - double rawHours = (double) chargeCounter / (double) currentMicroAmps; - if (!Double.isFinite(rawHours) || rawHours <= 0.0 || rawHours > MAX_RUNTIME_HOURS) { - runtimeText = null; - } else { - double smoothed = smoothedBatteryRuntimeHours == null ? rawHours - : (smoothedBatteryRuntimeHours * RUNTIME_SMOOTHING_OLD_WEIGHT) - + (rawHours * RUNTIME_SMOOTHING_NEW_WEIGHT); - smoothedBatteryRuntimeHours = smoothed; - runtimeText = "LEFT " + formatRuntimeHours(smoothed); - } - } + if (st == BatteryManager.BATTERY_STATUS_FULL || (percent != null && percent >= 100)) runtimeText = "Full"; + else if (charging) runtimeText = "Charging"; + else runtimeText = BatteryRuntimeEstimator.formatDuration(runtimeHours); return new Battery(watts, charging, percent, tempC, runtimeText); } - private static String formatRuntimeHours(double hours) { - int totalMinutes = Math.max(1, (int) Math.round(hours * 60.0)); - int wholeHours = totalMinutes / 60; - int minutes = totalMinutes % 60; - if (wholeHours > 0 && minutes > 0) return wholeHours + "h " + minutes + "m"; - if (wholeHours > 0) return wholeHours + "h"; - return minutes + "m"; - } - private static float currentRawToAmps(long raw) { if (raw == 0L || raw == Long.MIN_VALUE) return 0f; long a = Math.abs(raw); @@ -843,7 +835,7 @@ public class HudMetrics { Battery android = collectBattery(); MangoReadings.Battery bat = m.battery(); Battery battery = bat == null ? android : new Battery(bat.getWatts(), bat.getCharging(), - bat.getPercent() != null ? bat.getPercent() : android.percent, android.tempC, android.runtimeText); + bat.getPercent() != null ? bat.getPercent() : android.percent, android.tempC, bat.getRuntimeText()); long[] net = readNetRateBps(); int[] perCoreClk = getPerCoreClockMhz(); return new Snapshot(cpu != null ? cpu.getPercent() : null, m.gpuPercent(), fastestCoreMhz(perCoreClk), m.gpuClockMhz(), diff --git a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt index d9fbaa4dfc..900fa12fd2 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt @@ -2,13 +2,18 @@ package com.droiddeck.launcher.hud import android.os.Environment import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.BatteryRuntimeEstimator import java.io.File +import kotlin.math.abs import kotlin.math.roundToInt internal class MangoReadings(private val sessionDir: File, private val rootDir: File) { class Cpu(val percent: Int, val perCore: IntArray) class Memory(val usedBytes: Long, val totalBytes: Long, val swapUsedBytes: Long, val swapTotalBytes: Long) - class Battery(val percent: Int?, val watts: Float, val charging: Boolean) + class Battery(val percent: Int?, val watts: Float, val charging: Boolean, val runtimeText: String?) + + private val batteryRuntimeEstimator = BatteryRuntimeEstimator() + private var lastBatteryDischarging: Boolean? = null private val cpuTimes = HashMap() private val cpuPercents = HashMap() @@ -106,32 +111,113 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: fun vramBytes(): Long? = fresh(File(rootDir, VRAM_FILE), VRAM_FRESH_MS)?.let(::readLong)?.takeIf { it > 0 } fun battery(): Battery? { - val dirs = File(sessionDir, "sys/power_supply").listFiles { f -> f.name.contains("BAT") }?.sortedBy { it.name } + val dirs = File(sessionDir, "sys/power_supply").listFiles { f -> f.name.contains("BAT") }?.sortedBy { it.name }?.take(2) if (dirs.isNullOrEmpty()) return null - var chargeNow = 0f - var chargeFull = 0f - var watts = 0f - var charging = false + + var weightedChargeNow = 0.0 + var weightedChargeFull = 0.0 + var allHaveWeightedCharge = true + val perBatteryPercents = ArrayList() + var runtimeChargeUah = 0.0 + var runtimeChargeComplete = true + var aggregateCurrentUa = 0.0 + var currentComplete = true + var watts = 0.0 + var anyDischarging = false + var anyChargingStatus = false + var allFull = true + var suppliedRuntimeSeconds: Long? = null + for (dir in dirs) { val status = runCatching { File(dir, "status").readLines().firstOrNull() }.getOrNull() - if (status == "Charging" || status == "Unknown" || status == "Full") charging = true - val now = File(dir, "charge_now").takeIf { it.exists() } ?: File(dir, "energy_now") - val full = File(dir, "charge_full").takeIf { it.exists() } ?: File(dir, "energy_full") - if (now.exists()) { - chargeNow += (readFloat(now) ?: 0f) / 1_000_000f - chargeFull += (readFloat(full) ?: 0f) / 1_000_000f - } else { - chargeNow += (readFloat(File(dir, "capacity")) ?: 0f) / 100f - chargeFull = dirs.size.toFloat() + val isDischarging = status == "Discharging" || status == "Not charging" + if (isDischarging) anyDischarging = true + if (status == "Charging" || status == "Unknown") anyChargingStatus = true + if (status != "Full") allFull = false + + val chargeNowFile = File(dir, "charge_now") + val chargeFullFile = File(dir, "charge_full") + val energyNowFile = File(dir, "energy_now") + val energyFullFile = File(dir, "energy_full") + val voltageFile = File(dir, "voltage_now") + val chargeNow = if (chargeNowFile.isFile) readFloat(chargeNowFile)?.toDouble() else null + val chargeFull = if (chargeFullFile.isFile) readFloat(chargeFullFile)?.toDouble() else null + val energyNow = if (energyNowFile.isFile) readFloat(energyNowFile)?.toDouble() else null + val energyFull = if (energyFullFile.isFile) readFloat(energyFullFile)?.toDouble() else null + val voltageUv = if (voltageFile.isFile) readFloat(voltageFile)?.toDouble() else null + + val nowForPercent: Double? = when { + chargeNow != null && chargeNow >= 0.0 -> chargeNow + energyNow != null && voltageUv != null -> BatteryRuntimeEstimator.chargeMicroampHoursFromEnergy(energyNow, voltageUv) + else -> null } - if (!charging) { - val power = File(dir, "power_now") - watts += if (power.exists()) kotlin.math.abs(readFloat(power) ?: 0f) / 1_000_000f - else kotlin.math.abs((readFloat(File(dir, "current_now")) ?: 0f) * (readFloat(File(dir, "voltage_now")) ?: 0f)) / 1e12f + val fullForPercent: Double? = when { + chargeFull != null && chargeFull > 0.0 -> chargeFull + energyFull != null && voltageUv != null -> BatteryRuntimeEstimator.chargeMicroampHoursFromEnergy(energyFull, voltageUv) + else -> null + } + if (nowForPercent != null && fullForPercent != null && fullForPercent > 0.0) { + weightedChargeNow += nowForPercent + weightedChargeFull += fullForPercent + perBatteryPercents += (nowForPercent * 100.0 / fullForPercent).roundToInt().coerceIn(0, 100) + } else { + allHaveWeightedCharge = false + readFloat(File(dir, "capacity"))?.roundToInt()?.coerceIn(0, 100)?.let { perBatteryPercents += it } + } + + when { + chargeNow != null && chargeNow >= 0.0 -> runtimeChargeUah += chargeNow + energyNow != null && voltageUv != null -> + BatteryRuntimeEstimator.chargeMicroampHoursFromEnergy(energyNow, voltageUv)?.let { runtimeChargeUah += it } + ?: run { runtimeChargeComplete = false } + else -> runtimeChargeComplete = false + } + + if (dirs.size == 1) { + suppliedRuntimeSeconds = readLong(File(dir, "time_to_empty_avg"))?.takeIf { it > 0L } + ?: readLong(File(dir, "time_to_empty_now"))?.takeIf { it > 0L } + ?: suppliedRuntimeSeconds + } + + val currentFile = File(dir, "current_now") + val powerFile = File(dir, "power_now") + val currentNow = if (currentFile.isFile) readFloat(currentFile)?.toDouble() else null + val currentForEta = when { + currentNow != null -> abs(currentNow) + powerFile.isFile && voltageUv != null -> readFloat(powerFile)?.toDouble()?.let { + BatteryRuntimeEstimator.currentMicroampsFromPower(it, voltageUv) + } + else -> null + } + if (currentForEta == null) currentComplete = false else aggregateCurrentUa += currentForEta + + if (isDischarging) { + val power = if (powerFile.isFile) readFloat(powerFile)?.toDouble() else null + if (power != null) watts += abs(power) / 1_000_000.0 + else if (currentNow != null && voltageUv != null) watts += abs(currentNow * voltageUv) / 1_000_000_000_000.0 } } - val percent = if (chargeFull > 0f) Math.round(chargeNow / chargeFull * 100f) else null - return Battery(percent, if (charging) 0f else watts, charging) + + val percent = when { + allHaveWeightedCharge && weightedChargeFull > 0.0 -> (weightedChargeNow * 100.0 / weightedChargeFull).roundToInt().coerceIn(0, 100) + perBatteryPercents.isNotEmpty() -> perBatteryPercents.average().roundToInt().coerceIn(0, 100) + else -> null + } + if (lastBatteryDischarging != null && lastBatteryDischarging != anyDischarging) { + batteryRuntimeEstimator.reset() + } + lastBatteryDischarging = anyDischarging + val estimatedHours = if (anyDischarging && runtimeChargeComplete && currentComplete) + batteryRuntimeEstimator.estimateHours(runtimeChargeUah, aggregateCurrentUa) else null + val runtimeHours = suppliedRuntimeSeconds?.let { it / 3600.0 } ?: estimatedHours + val charging = !anyDischarging && anyChargingStatus + val runtimeText = when { + anyDischarging -> BatteryRuntimeEstimator.formatDuration(runtimeHours) + charging -> "Charging" + allFull -> "Full" + else -> null + } + return Battery(percent, if (anyDischarging) watts.toFloat() else 0f, charging, runtimeText) } private fun fresh(file: File, maxAgeMs: Long = FEED_FRESH_MS): File? = diff --git a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt index ef64bfde02..77223a9666 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt @@ -11,6 +11,8 @@ import kotlin.math.abs class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart() { @Volatile private var running = false private var thread: Thread? = null + private val runtimeEstimator = BatteryRuntimeEstimator() + private var lastDischarging: Boolean? = null override fun start() { File(dir, "BAT0").deleteRecursively() @@ -49,11 +51,17 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart val currentAvgUa = toMicroamps(bm?.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE)?.takeIf { it != Long.MIN_VALUE && it != 0L } ?: 0L) .takeIf { it != 0L } ?: currentNowUa val discharging = status == BatteryManager.BATTERY_STATUS_DISCHARGING || status == BatteryManager.BATTERY_STATUS_NOT_CHARGING + if (lastDischarging != null && lastDischarging != discharging) runtimeEstimator.reset() + lastDischarging = discharging + val currentForRuntimeUa = currentNowUa.takeIf { it != 0L } ?: currentAvgUa val chargeFullUah = if (chargeNowUah > 0 && pct > 0) chargeNowUah * 100 / pct else 0L val energyNowUwh = chargeNowUah * voltageUv / 1_000_000L val energyFullUwh = chargeFullUah * voltageUv / 1_000_000L val powerNowUw = abs(currentNowUa) * voltageUv / 1_000_000L - val timeToEmptyS = if (discharging && chargeNowUah > 0 && abs(currentAvgUa) > 0) chargeNowUah * 3600L / abs(currentAvgUa) else 0L + val runtimeHours = if (discharging) + runtimeEstimator.estimateHours(chargeNowUah.toDouble(), currentForRuntimeUa.toDouble()) + else null + val timeToEmptyS = BatteryRuntimeEstimator.secondsFromHours(runtimeHours) val charging = status == BatteryManager.BATTERY_STATUS_CHARGING val timeToFullS = if (charging && chargeFullUah > chargeNowUah && abs(currentAvgUa) > 0) (chargeFullUah - chargeNowUah) * 3600L / abs(currentAvgUa) else 0L val statusText = when (status) { @@ -126,9 +134,7 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart companion object { private const val TAG = "SessionService" - private const val MILLIAMP_CEILING = 10_000L - - internal fun toMicroamps(raw: Long): Long = if (abs(raw) < MILLIAMP_CEILING) raw * 1000L else raw + internal fun toMicroamps(raw: Long): Long = BatteryRuntimeEstimator.toMicroamps(raw) private const val PERIOD_MS = 5_000L private val VPOWER_FILES = listOf( "ac_status", "battery_percent", "battery_status", diff --git a/app/src/main/java/com/droiddeck/launcher/session/BatteryRuntimeEstimator.kt b/app/src/main/java/com/droiddeck/launcher/session/BatteryRuntimeEstimator.kt new file mode 100644 index 0000000000..624ce9d7b9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BatteryRuntimeEstimator.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.session + +import java.util.ArrayDeque +import kotlin.math.abs +import kotlin.math.roundToLong + +class BatteryRuntimeEstimator { + private val currentSamples = ArrayDeque() + + @Synchronized + fun reset() { + currentSamples.clear() + } + + @Synchronized + fun estimateHours(chargeNowUah: Double, currentSampleUa: Double): Double? { + if (currentSampleUa.isFinite() && currentSampleUa != 0.0) { + currentSamples.addLast(abs(currentSampleUa)) + while (currentSamples.size > MAX_SAMPLES) currentSamples.removeFirst() + } + if (!chargeNowUah.isFinite() || chargeNowUah <= 0.0 || currentSamples.isEmpty()) return null + var sum = 0.0 + for (sample in currentSamples) sum += sample + val averageCurrentUa = sum / currentSamples.size + if (!averageCurrentUa.isFinite() || averageCurrentUa <= 0.0) return null + val hours = chargeNowUah / averageCurrentUa + return hours.takeIf { it.isFinite() && it > 0.0 } + } + + companion object { + private const val MAX_SAMPLES = 25 + private const val MILLIAMP_CEILING = 10_000L + + @JvmStatic + fun toMicroamps(raw: Long): Long { + if (raw == Long.MIN_VALUE) return 0L + return if (abs(raw) < MILLIAMP_CEILING) raw * 1_000L else raw + } + + @JvmStatic + fun chargeMicroampHoursFromEnergy(energyUwh: Double, voltageUv: Double): Double? { + if (!energyUwh.isFinite() || energyUwh <= 0.0 || !voltageUv.isFinite() || voltageUv <= 0.0) return null + return (energyUwh * 1_000_000.0 / voltageUv).takeIf { it.isFinite() && it > 0.0 } + } + + @JvmStatic + fun currentMicroampsFromPower(powerUw: Double, voltageUv: Double): Double? { + if (!powerUw.isFinite() || voltageUv <= 0.0 || !voltageUv.isFinite()) return null + return (abs(powerUw) * 1_000_000.0 / voltageUv).takeIf { it.isFinite() && it > 0.0 } + } + + @JvmStatic + fun secondsFromHours(hours: Double?): Long { + if (hours == null || !hours.isFinite() || hours <= 0.0) return 0L + val seconds = hours * 3_600.0 + return if (seconds.isFinite() && seconds < Long.MAX_VALUE.toDouble()) seconds.toLong() else 0L + } + + @JvmStatic + fun formatDuration(hours: Double?): String? { + if (hours == null || !hours.isFinite() || hours <= 0.0) return null + val totalMinutes = (hours * 60.0).roundToLong().coerceAtLeast(1L) + val wholeHours = totalMinutes / 60L + val minutes = totalMinutes % 60L + val hourUnit = if (wholeHours == 1L) "hr" else "hrs" + val minuteUnit = if (minutes == 1L) "min" else "mins" + return when { + wholeHours > 0L && minutes > 0L -> "$wholeHours $hourUnit $minutes $minuteUnit" + wholeHours > 0L -> "$wholeHours $hourUnit" + else -> "$minutes $minuteUnit" + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 4b67d9eea4..7ef5dd3567 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -64,6 +64,16 @@ internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (Stri if (metric.chip !in chips || metric.chip in HIDDEN[size].orEmpty()) continue ToggleRow(host, "hud-${metric.key}", stringResource(metric.label), null, on(metric.key), chipModifier = track("hud-${metric.key}")) { a.onHudSetting(metric.key, flag(it)) } + if (metric.key == "showBattery" && size != DroidDeckHudSize.MINIMAL) { + ToggleRow(host, "hud-showBatteryTime", stringResource(R.string.hud_metric_battery_time), null, on("showBatteryTime"), + chipModifier = track("hud-showBatteryTime")) { a.onHudSetting("showBatteryTime", flag(it)) } + } + } + + if (size == DroidDeckHudSize.MINIMAL && "Battery time" in chips && + "Battery time" !in HIDDEN[size].orEmpty()) { + ToggleRow(host, "hud-showBatteryTime", stringResource(R.string.hud_metric_battery_time), null, on("showBatteryTime"), + chipModifier = track("hud-showBatteryTime")) { a.onHudSetting("showBatteryTime", flag(it)) } } } @@ -176,8 +186,6 @@ private val METRICS = listOf( ) private val HIDDEN = mapOf( - DroidDeckHudSize.PILL to setOf("FPS", "FPS graph"), - DroidDeckHudSize.MINIMAL to setOf("FPS"), + DroidDeckHudSize.PILL to setOf("FPS graph"), DroidDeckHudSize.TILES to setOf("FPS graph", "0.1% low", "0.01% low"), - DroidDeckHudSize.STRIP to setOf("FPS"), ) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 8e447bf260..6c21f13de7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -696,6 +696,7 @@ ذاكرة الرسومات ذاكرة التبديل مستوى البطارية + الوقت المتبقي لعمر البطارية استهلاك الطاقة الشبكة الدقة 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 24ea2b1422..35f8b630b1 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -690,6 +690,7 @@ Memoria gráfica Memoria de intercambio Nivel de batería + Tiempo de batería restante Consumo de energía Red Resolución diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 22fc348301..30319356f2 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -688,6 +688,7 @@ Графична памет Swap памет Ниво на батерията + Оставащо време на батерията Консумация на енергия Мрежа Разделителна способност diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 63608182bd..25f6cf966e 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -692,6 +692,7 @@ Grafická paměť Odkládací paměť Stav baterie + Zbývající výdrž baterie Příkon Síť Rozlišení diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7ce9bb32f0..fb5ef93135 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -688,6 +688,7 @@ Grafikhukommelse Swap-hukommelse Batteriniveau + Resterende batteritid Strømforbrug Netværk Opløsning diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d5fe280ca9..05bac55919 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -688,6 +688,7 @@ Grafikspeicher Swap-Speicher Akkustand + Verbleibende Akkulaufzeit Leistungsaufnahme Netzwerk Auflösung diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c41a86e35d..365dea32bb 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -688,6 +688,7 @@ Μνήμη γραφικών Μνήμη swap Στάθμη μπαταρίας + Υπολειπόμενη διάρκεια μπαταρίας Κατανάλωση ισχύος Δίκτυο Ανάλυση diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9791e456a2..8a8a54960e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -690,6 +690,7 @@ Memoria gráfica Memoria de intercambio Nivel de batería + Tiempo de batería restante Consumo de energía Red Resolución diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 81ba87e48f..31d93c64a3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -688,6 +688,7 @@ Näytönohjaimen muisti Swap-tila Akun varaus + Akun jäljellä oleva käyttöaika Virrankulutus Verkko Tarkkuus diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 61add42185..404440df8e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -690,6 +690,7 @@ Mémoire graphique Mémoire d\'échange Niveau de batterie + Autonomie restante de la batterie Consommation Réseau Résolution diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3984c5ebcf..a14eca1439 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -688,6 +688,7 @@ ग्राफ़िक्स मेमोरी स्वैप बैटरी लेवल + बैटरी का शेष समय पावर खपत नेटवर्क रिज़ॉल्यूशन diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 642c55099a..1e1ca4e228 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -688,6 +688,7 @@ Grafikus memória Swap-memória Akkuszint + Hátralévő akkumulátor-üzemidő Energiafelvétel Hálózat Felbontás diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7995aec302..1f23d84b1b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -686,6 +686,7 @@ Memori grafis Memori swap Level baterai + Sisa waktu baterai Konsumsi daya Jaringan Resolusi diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b4f510ad7e..ddb13b488c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -690,6 +690,7 @@ Memoria grafica Memoria swap Livello batteria + Autonomia residua della batteria Consumo energetico Rete Risoluzione diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ff21b89acf..8bd99a0963 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -686,6 +686,7 @@ グラフィックスメモリ スワップ バッテリー残量 + バッテリー残り時間 消費電力 ネットワーク 解像度 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index da130bf356..8b5ceeb0ef 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -686,6 +686,7 @@ 그래픽 메모리 스왑 배터리 잔량 + 남은 배터리 사용 시간 소비 전력 네트워크 해상도 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 199a9e216e..4d624af6a5 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -686,6 +686,7 @@ Memori grafik Memori swap Tahap bateri + Baki hayat bateri Penggunaan kuasa Rangkaian Resolusi diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2402ebbd7a..cb7a8f8294 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -688,6 +688,7 @@ Grafikkminne Swap-minne Batterinivå + Gjenværende batteritid Strømforbruk Nettverk Oppløsning diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 850d2710b0..f9a5cbb753 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -688,6 +688,7 @@ Grafisch geheugen Swapgeheugen Accuniveau + Resterende batterijduur Stroomverbruik Netwerk Resolutie diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0ef2c93915..793558e9b4 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -692,6 +692,7 @@ Pamięć graficzna Pamięć wymiany Poziom baterii + Pozostały czas pracy baterii Pobór mocy Sieć Rozdzielczość diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 8d0551a995..7d8467909f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -690,6 +690,7 @@ Memória gráfica Memória swap Nível da bateria + Autonomia restante da bateria Consumo de energia Rede Resolução diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 43c698f03a..e49887a37a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -690,6 +690,7 @@ Memória gráfica Memória swap Nível da bateria + Tempo restante da bateria Consumo de energia Rede Resolução diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c8b190e4e7..34df44fe1e 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -690,6 +690,7 @@ Memorie grafică Memorie swap Nivel baterie + Autonomie rămasă a bateriei Consum de energie Rețea Rezoluție diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 36d59e8f9e..f78eb676d0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -711,6 +711,7 @@ Видеопамять Подкачка Заряд батареи + Оставшееся время работы батареи Потребляемая мощность Сеть Разрешение diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 68747edf73..e6435a97f2 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -688,6 +688,7 @@ Grafikminne Växlingsminne Batterinivå + Återstående batteritid Strömförbrukning Nätverk Upplösning diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1ceee97401..fc85d51320 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -686,6 +686,7 @@ หน่วยความจำกราฟิก พื้นที่สว็อป ระดับแบตเตอรี่ + เวลาการใช้งานแบตเตอรี่ที่เหลือ การใช้พลังงาน เครือข่าย ความละเอียด diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ed4f94f76e..6540c78ea2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -688,6 +688,7 @@ Grafik belleği Takas alanı Pil seviyesi + Kalan pil süresi Güç tüketimi Ağ Çözünürlük diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 1ad105a297..0197150d07 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -692,6 +692,7 @@ Відеопам\'ять Підкачка Заряд батареї + Залишковий час роботи батареї Споживана потужність Мережа Роздільна здатність diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ab2a98ce24..32c69c9011 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -686,6 +686,7 @@ Bộ nhớ đồ họa Bộ nhớ swap Mức pin + Thời lượng pin còn lại Công suất tiêu thụ Mạng Độ phân giải diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4bd469ad4f..9dd55ac618 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -686,6 +686,7 @@ 显存 交换空间 电池电量 + 剩余电池续航时间 功耗 网络 分辨率 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 91ad629e73..3ed9ca90e1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -686,6 +686,7 @@ 顯示記憶體 交換空間 電池電量 + 剩餘電池續航時間 功耗 網絡 解像度 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 53f9257b2d..1f675e8e91 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -686,6 +686,7 @@ 顯示記憶體 交換空間 電池電量 + 剩餘電池續航時間 功耗 網路 解析度 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5b0bef4927..3bb9dde90f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -739,6 +739,7 @@ Graphics memory Swap Battery level + Battery life remaining Power draw Network Resolution diff --git a/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt index 4de40ea2a2..8d841612d6 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt @@ -37,12 +37,14 @@ class MangoReadingsTest { assertEquals(100, m.cpu(stat)!!.percent) } - private fun battery(status: String, chargeNow: Long, chargeFull: Long, powerUw: Long) { + private fun battery(status: String, chargeNow: Long, chargeFull: Long, powerUw: Long, currentUa: Long = 1_000_000L) { val dir = File(tmp.root, "sys/power_supply/BAT1").apply { mkdirs() } File(dir, "status").writeText("$status\n") File(dir, "charge_now").writeText("$chargeNow\n") File(dir, "charge_full").writeText("$chargeFull\n") File(dir, "power_now").writeText("$powerUw\n") + File(dir, "current_now").writeText("$currentUa\n") + File(dir, "voltage_now").writeText("4000000\n") } @Test fun batteryHidesWattsWhileChargingAsMangoHudDoes() { @@ -50,13 +52,42 @@ class MangoReadingsTest { val discharging = readings().battery()!! assertEquals(94, discharging.percent) assertEquals(8.76f, discharging.watts, 0.001f) + assertEquals("3 hrs 37 mins", discharging.runtimeText) assertFalse(discharging.charging) battery("Charging", 3_622_942, 3_854_193, 8_760_000) val charging = readings().battery()!! assertEquals(0f, charging.watts, 0f) + assertEquals("Charging", charging.runtimeText) assertTrue(charging.charging) } + @Test fun dualBatteryRuntimeSumsBothPacksAndBothCurrents() { + battery("Discharging", 2_000_000, 3_000_000, 2_000_000, 500_000) + val second = File(tmp.root, "sys/power_supply/BAT2").apply { mkdirs() } + File(second, "status").writeText("Discharging\n") + File(second, "charge_now").writeText("2000000\n") + File(second, "charge_full").writeText("3000000\n") + File(second, "power_now").writeText("2000000\n") + File(second, "current_now").writeText("500000\n") + File(second, "voltage_now").writeText("4000000\n") + val result = readings().battery()!! + assertEquals(67, result.percent) + assertEquals("4 hrs", result.runtimeText) + assertEquals(4f, result.watts, 0.001f) + } + + @Test fun energyOnlyBatteryConvertsEnergyToChargeBeforeEstimatingRuntime() { + val dir = File(tmp.root, "sys/power_supply/BAT1").apply { mkdirs() } + File(dir, "status").writeText("Discharging\n") + File(dir, "energy_now").writeText("4000000\n") + File(dir, "energy_full").writeText("5000000\n") + File(dir, "current_now").writeText("1000000\n") + File(dir, "voltage_now").writeText("4000000\n") + val result = readings().battery()!! + assertEquals(80, result.percent) + assertEquals("1 hr", result.runtimeText) + } + @Test fun noBatteryFolderMeansNoReading() { assertNull(readings().battery()) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/BatteryRuntimeEstimatorTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BatteryRuntimeEstimatorTest.kt new file mode 100644 index 0000000000..f94b8f31af --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BatteryRuntimeEstimatorTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Test + +class BatteryRuntimeEstimatorTest { + @Test fun estimateUsesChargeDividedByRollingMeanCurrent() { + val estimator = BatteryRuntimeEstimator() + assertEquals(1.0, estimator.estimateHours(1_000_000.0, 1_000_000.0)!!, 0.0001) + assertEquals(1.3333, estimator.estimateHours(2_000_000.0, 2_000_000.0)!!, 0.001) + } + + @Test fun energyAndPowerFallbacksKeepMicroUnitsConsistent() { + assertEquals(1_000_000.0, BatteryRuntimeEstimator.chargeMicroampHoursFromEnergy(4_000_000.0, 4_000_000.0)!!, 0.0) + assertEquals(1_000_000.0, BatteryRuntimeEstimator.currentMicroampsFromPower(4_000_000.0, 4_000_000.0)!!, 0.0) + } + + @Test fun durationFormattingUsesHoursAndMinutes() { + assertEquals("2 hrs 15 mins", BatteryRuntimeEstimator.formatDuration(2.25)) + assertEquals("1 hr", BatteryRuntimeEstimator.formatDuration(1.0)) + assertEquals("5 mins", BatteryRuntimeEstimator.formatDuration(5.0 / 60.0)) + assertNotNull(BatteryRuntimeEstimator.formatDuration(0.01)) + } +} From e816d795811689af4a9edb11e8e13db45e4256fa Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 14 Nov 2026 01:18:10 -0500 Subject: [PATCH 089/101] feat(session): seed Steam defaults for battery percent, byte download rates and recent sort (#2599) --- .../launcher/session/SessionFiles.kt | 84 ++++++++++++++++++- .../launcher/session/SteamUserDefaultsTest.kt | 71 ++++++++++++++++ 2 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/SteamUserDefaultsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 9d179cefd9..96c556f174 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -355,7 +355,10 @@ object SessionFiles { "stage session=$startsSession pending=$force choice=${SessionPrefs.bootMovie(context)} movie=${startupMovie?.path} " + "staged=$bigPictureMovieInstalled done=$done steam=${home.path} config: $before -> ${startupMoviePath(config)}", ) - if (startsSession) disableIdleSleep(home) + if (startsSession) { + disableIdleSleep(home) + seedUserDefaults(home) + } if (!done) allDone = false if (!bigPictureMovieInstalled) allInstalled = false if (done && home.path.contains(".droiddeck-x64") == activeIsX64) seen = if (bigPictureMovieInstalled) BOOT_MOVIE_PATH else "" @@ -575,6 +578,85 @@ object SessionFiles { } } + private const val USER_DEFAULTS_MARKER = "droiddeck-user-defaults-initialized" + private const val BATTERY_PREFERENCES = "CachedBatteryPreferences" + private const val UI_STATE = "UIStoreLocalSteamUIState" + private const val SORT_RECENT_OFF = "\\\"bSortedByRecent\\\":false" + private const val SORT_RECENT_ON = "\\\"bSortedByRecent\\\":true" + private const val BATTERY_PERCENT_ON = "{\\\"bShowBatteryPercentage\\\":true}" + + /** + * Seeds opinionated first-run defaults into each Steam account's localconfig.vdf: battery percentage shown and + * download speeds in bytes rather than bits, and the library sorted by recently played. A value is written once per account and only when the key is + * absent, so a later choice made in Steam is never overridden. Runs while Steam is stopped, as it keeps the + * file in memory and rewrites it. + */ + internal fun seedUserDefaults(steamHome: File) { + val users = File(steamHome, "userdata").listFiles { f -> f.isDirectory && f.name.all(Char::isDigit) && f.name != "0" } ?: return + for (user in users) { + val configDir = File(user, "config") + val marker = File(configDir, USER_DEFAULTS_MARKER) + val file = File(configDir, "localconfig.vdf") + if (marker.exists() || !file.isFile) continue + try { + val text = file.readText() + val updated = withUserDefaults(text) ?: continue + if (updated != text) { + val staged = File(configDir, file.name + ".staged") + staged.writeText(updated) + if (!staged.renameTo(file)) { staged.delete(); continue } + } + marker.writeText("1\n") + } catch (e: Exception) { + Log.w(TAG, "could not seed Steam user defaults", e) + } + } + } + + internal fun withUserDefaults(text: String): String? { + val newline = if (text.contains("\r\n")) "\r\n" else "\n" + val root = findObject(text, "UserLocalConfigStore", 0, text.length) ?: return null + var out = text + val system = findObject(out, "system", root.open + 1, root.close) + if (system == null) { + out = insertInto(out, root, listOf("\"system\"", "{", "\t\"displayratesasbits\"\t\t\"0\"", "}"), newline) + } else if (!hasKey(out.substring(system.keyStart, system.close + 1), "displayratesasbits")) { + val block = out.substring(system.keyStart, system.close + 1) + out = out.replaceRange(system.keyStart, system.close + 1, setScalar(block, "displayratesasbits", "0", newline)) + } + val reroot = findObject(out, "UserLocalConfigStore", 0, out.length) ?: return out + val web = findObject(out, "WebStorage", reroot.open + 1, reroot.close) + if (web == null) { + out = insertInto(out, reroot, listOf("\"WebStorage\"", "{", "\t\"$BATTERY_PREFERENCES\"\t\t\"$BATTERY_PERCENT_ON\"", "}"), newline) + } else if (!hasKey(out.substring(web.keyStart, web.close + 1), BATTERY_PREFERENCES)) { + val block = out.substring(web.keyStart, web.close + 1) + out = out.replaceRange(web.keyStart, web.close + 1, setScalar(block, BATTERY_PREFERENCES, BATTERY_PERCENT_ON, newline)) + } + return seedRecentSort(out, newline) + } + + // The library sort lives inside a JSON string; Steam writes bSortedByRecent:false until the player picks a sort, + // so the first seed flips it once and the marker file keeps a later choice. + private fun seedRecentSort(text: String, newline: String): String { + val root = findObject(text, "UserLocalConfigStore", 0, text.length) ?: return text + val web = findObject(text, "WebStorage", root.open + 1, root.close) ?: return text + val block = text.substring(web.keyStart, web.close + 1) + if (!hasKey(block, UI_STATE)) { + return text.replaceRange(web.keyStart, web.close + 1, + setScalar(block, UI_STATE, "{\\\"nVersion\\\":1,$SORT_RECENT_ON}", newline)) + } + return text.replaceRange(web.keyStart, web.close + 1, block.replace(SORT_RECENT_OFF, SORT_RECENT_ON)) + } + + private fun hasKey(block: String, key: String) = Regex("(?m)^[\\t ]*\"${Regex.escape(key)}\"[\\t ]").containsMatchIn(block) + + private fun insertInto(text: String, parent: VdfBlock, lines: List, newline: String): String { + val lineStart = text.lastIndexOf('\n', parent.close).let { if (it < 0) 0 else it + 1 } + val indent = text.substring(lineStart, parent.close).takeWhile { it == '\t' || it == ' ' } + "\t" + val section = lines.joinToString(newline) { indent + it } + newline + return text.substring(0, lineStart) + section + text.substring(lineStart) + } + private val IDLE_SLEEP_TIMERS = listOf("IdleSuspendBatterySeconds", "IdleSuspendACSeconds") internal fun disableIdleSleep(steamHome: File): Boolean { diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamUserDefaultsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamUserDefaultsTest.kt new file mode 100644 index 0000000000..468b5728f8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamUserDefaultsTest.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SteamUserDefaultsTest { + @get:Rule val temp = TemporaryFolder() + + private val battery = "\"CachedBatteryPreferences\"\t\t\"{\\\"bShowBatteryPercentage\\\":true}\"" + + private fun home(body: String): File = temp.newFolder().also { + File(it, "userdata/123/config").mkdirs() + File(it, "userdata/123/config/localconfig.vdf").writeText("\"UserLocalConfigStore\"\n{\n$body}\n") + } + + private fun text(home: File) = File(home, "userdata/123/config/localconfig.vdf").readText() + private fun bits(text: String) = Regex("\"displayratesasbits\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) + + @Test fun freshAccountGetsBothDefaults() { + val home = home("") + SessionFiles.seedUserDefaults(home) + assertEquals("0", bits(text(home))) + assertTrue(text(home).contains(battery)) + assertTrue(File(home, "userdata/123/config/droiddeck-user-defaults-initialized").isFile) + } + + @Test fun existingBlocksGainTheKeysBesideOtherSettings() { + val home = home("\t\"system\"\n\t{\n\t\t\"PushToTalkKey\"\t\t\"0\"\n\t}\n\t\"WebStorage\"\n\t{\n\t\t\"Other\"\t\t\"{\\\"a\\\":1}\"\n\t}\n") + SessionFiles.seedUserDefaults(home) + val t = text(home) + assertEquals("0", bits(t)) + assertTrue(t.contains("\"PushToTalkKey\"\t\t\"0\"")) + assertTrue(t.contains("\"Other\"\t\t\"{\\\"a\\\":1}\"")) + assertTrue(t.contains(battery)) + } + + @Test fun aChoiceAlreadyMadeIsKept() { + val home = home("\t\"system\"\n\t{\n\t\t\"displayratesasbits\"\t\t\"1\"\n\t}\n\t\"WebStorage\"\n\t{\n\t\t\"CachedBatteryPreferences\"\t\t\"{\\\"bShowBatteryPercentage\\\":false}\"\n\t}\n") + SessionFiles.seedUserDefaults(home) + assertEquals("1", bits(text(home))) + assertTrue(text(home).contains("false")) + } + + @Test fun laterChangesAreNotReseeded() { + val home = home("") + SessionFiles.seedUserDefaults(home) + File(home, "userdata/123/config/localconfig.vdf").writeText(text(home).replace("\"displayratesasbits\"\t\t\"0\"", "\"displayratesasbits\"\t\t\"1\"")) + SessionFiles.seedUserDefaults(home) + assertEquals("1", bits(text(home))) + } + + @Test fun missingLocalConfigIsRetriedLater() { + val home = temp.newFolder() + File(home, "userdata/123/config").mkdirs() + SessionFiles.seedUserDefaults(home) + assertFalse(File(home, "userdata/123/config/droiddeck-user-defaults-initialized").exists()) + } + + @Test fun librarySortsByRecentlyPlayed() { + val fresh = home("") + SessionFiles.seedUserDefaults(fresh) + assertTrue(text(fresh).contains("\\\"bSortedByRecent\\\":true")) + val existing = home("\t\"WebStorage\"\n\t{\n\t\t\"UIStoreLocalSteamUIState\"\t\t\"{\\\"nVersion\\\":1,\\\"bSortedByRecent\\\":false,\\\"eGameListView\\\":1}\"\n\t}\n") + SessionFiles.seedUserDefaults(existing) + assertTrue(text(existing).contains("\\\"bSortedByRecent\\\":true,\\\"eGameListView\\\":1")) + assertEquals(1, Regex("UIStoreLocalSteamUIState").findAll(text(existing)).count()) + } +} From 2183b05573a1aeee5651903b014a3b30432af7c1 Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Sat, 14 Nov 2026 19:00:44 +0800 Subject: [PATCH 090/101] l10n: translate the missing strings and add the input library in every locale (#2556) * l10n: translate the strings added since the last pass * l10n: add the input library and input strings in every locale * l10n: keep the input hints unformatted and drop the untranslatable keys aapt2 rejects input_axis_action_hint and input_trigger_action_hint without formatted="false", because their translations hold two bare percent signs. The default resource sets it, the 32 locales did not. The 40 translatable="false" keys are left out of every locale again; lint's ExtraTranslation check is fatal in release builds and the entries were added here by mistake. Also fixes wording the review caught: the Danish and Norwegian labels for sticks and neighboring directions, the Bulgarian and Vietnamese D-pad names, the Greek release and remap wording, the page names Hungarian, Indonesian and Russian point users to, the Arabic log folder path, and the Finnish library removal hint that read as deleting the folder. * l10n: translate the strings the newer upstream commits added * l10n: drop the two keys upstream no longer ships --- app/src/main/res/values-ar/input_library.xml | 132 ++++++++ app/src/main/res/values-ar/input_strings.xml | 38 +++ app/src/main/res/values-ar/strings.xml | 294 ++++++++++++++++++ .../res/values-b+es+419/input_library.xml | 132 ++++++++ .../res/values-b+es+419/input_strings.xml | 38 +++ app/src/main/res/values-b+es+419/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-bg/input_library.xml | 132 ++++++++ app/src/main/res/values-bg/input_strings.xml | 38 +++ app/src/main/res/values-bg/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-cs/input_library.xml | 132 ++++++++ app/src/main/res/values-cs/input_strings.xml | 38 +++ app/src/main/res/values-cs/strings.xml | 292 +++++++++++++++++ app/src/main/res/values-da/input_library.xml | 132 ++++++++ app/src/main/res/values-da/input_strings.xml | 38 +++ app/src/main/res/values-da/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-de/input_library.xml | 132 ++++++++ app/src/main/res/values-de/input_strings.xml | 38 +++ app/src/main/res/values-de/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-el/input_library.xml | 132 ++++++++ app/src/main/res/values-el/input_strings.xml | 38 +++ app/src/main/res/values-el/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-es/input_library.xml | 132 ++++++++ app/src/main/res/values-es/input_strings.xml | 38 +++ app/src/main/res/values-es/strings.xml | 291 +++++++++++++++++ app/src/main/res/values-fi/input_library.xml | 132 ++++++++ app/src/main/res/values-fi/input_strings.xml | 38 +++ app/src/main/res/values-fi/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-fr/input_library.xml | 132 ++++++++ app/src/main/res/values-fr/input_strings.xml | 38 +++ app/src/main/res/values-fr/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-hi/input_library.xml | 132 ++++++++ app/src/main/res/values-hi/input_strings.xml | 38 +++ app/src/main/res/values-hi/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-hu/input_library.xml | 132 ++++++++ app/src/main/res/values-hu/input_strings.xml | 38 +++ app/src/main/res/values-hu/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-in/input_library.xml | 132 ++++++++ app/src/main/res/values-in/input_strings.xml | 38 +++ app/src/main/res/values-in/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-it/input_library.xml | 132 ++++++++ app/src/main/res/values-it/input_strings.xml | 38 +++ app/src/main/res/values-it/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-ja/input_library.xml | 132 ++++++++ app/src/main/res/values-ja/input_strings.xml | 38 +++ app/src/main/res/values-ja/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-ko/input_library.xml | 132 ++++++++ app/src/main/res/values-ko/input_strings.xml | 38 +++ app/src/main/res/values-ko/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-ms/input_library.xml | 132 ++++++++ app/src/main/res/values-ms/input_strings.xml | 38 +++ app/src/main/res/values-ms/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-nb/input_library.xml | 132 ++++++++ app/src/main/res/values-nb/input_strings.xml | 38 +++ app/src/main/res/values-nb/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-nl/input_library.xml | 132 ++++++++ app/src/main/res/values-nl/input_strings.xml | 38 +++ app/src/main/res/values-nl/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-pl/input_library.xml | 132 ++++++++ app/src/main/res/values-pl/input_strings.xml | 38 +++ app/src/main/res/values-pl/strings.xml | 292 +++++++++++++++++ .../main/res/values-pt-rPT/input_library.xml | 132 ++++++++ .../main/res/values-pt-rPT/input_strings.xml | 38 +++ app/src/main/res/values-pt-rPT/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-pt/input_library.xml | 132 ++++++++ app/src/main/res/values-pt/input_strings.xml | 38 +++ app/src/main/res/values-pt/strings.xml | 291 +++++++++++++++++ app/src/main/res/values-ro/input_library.xml | 132 ++++++++ app/src/main/res/values-ro/input_strings.xml | 38 +++ app/src/main/res/values-ro/strings.xml | 291 +++++++++++++++++ app/src/main/res/values-ru/input_library.xml | 132 ++++++++ app/src/main/res/values-ru/input_strings.xml | 38 +++ app/src/main/res/values-ru/strings.xml | 209 +++++++++++++ app/src/main/res/values-sv/input_library.xml | 132 ++++++++ app/src/main/res/values-sv/input_strings.xml | 38 +++ app/src/main/res/values-sv/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-th/input_library.xml | 132 ++++++++ app/src/main/res/values-th/input_strings.xml | 38 +++ app/src/main/res/values-th/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-tr/input_library.xml | 132 ++++++++ app/src/main/res/values-tr/input_strings.xml | 38 +++ app/src/main/res/values-tr/strings.xml | 290 +++++++++++++++++ app/src/main/res/values-uk/input_library.xml | 132 ++++++++ app/src/main/res/values-uk/input_strings.xml | 38 +++ app/src/main/res/values-uk/strings.xml | 292 +++++++++++++++++ app/src/main/res/values-vi/input_library.xml | 132 ++++++++ app/src/main/res/values-vi/input_strings.xml | 38 +++ app/src/main/res/values-vi/strings.xml | 290 +++++++++++++++++ .../main/res/values-zh-rCN/input_library.xml | 132 ++++++++ .../main/res/values-zh-rCN/input_strings.xml | 38 +++ app/src/main/res/values-zh-rCN/strings.xml | 286 +++++++++++++++++ .../main/res/values-zh-rHK/input_library.xml | 132 ++++++++ .../main/res/values-zh-rHK/input_strings.xml | 38 +++ app/src/main/res/values-zh-rHK/strings.xml | 287 +++++++++++++++++ .../main/res/values-zh-rTW/input_library.xml | 132 ++++++++ .../main/res/values-zh-rTW/input_strings.xml | 38 +++ app/src/main/res/values-zh-rTW/strings.xml | 287 +++++++++++++++++ 96 files changed, 14642 insertions(+) create mode 100644 app/src/main/res/values-ar/input_library.xml create mode 100644 app/src/main/res/values-ar/input_strings.xml create mode 100644 app/src/main/res/values-b+es+419/input_library.xml create mode 100644 app/src/main/res/values-b+es+419/input_strings.xml create mode 100644 app/src/main/res/values-bg/input_library.xml create mode 100644 app/src/main/res/values-bg/input_strings.xml create mode 100644 app/src/main/res/values-cs/input_library.xml create mode 100644 app/src/main/res/values-cs/input_strings.xml create mode 100644 app/src/main/res/values-da/input_library.xml create mode 100644 app/src/main/res/values-da/input_strings.xml create mode 100644 app/src/main/res/values-de/input_library.xml create mode 100644 app/src/main/res/values-de/input_strings.xml create mode 100644 app/src/main/res/values-el/input_library.xml create mode 100644 app/src/main/res/values-el/input_strings.xml create mode 100644 app/src/main/res/values-es/input_library.xml create mode 100644 app/src/main/res/values-es/input_strings.xml create mode 100644 app/src/main/res/values-fi/input_library.xml create mode 100644 app/src/main/res/values-fi/input_strings.xml create mode 100644 app/src/main/res/values-fr/input_library.xml create mode 100644 app/src/main/res/values-fr/input_strings.xml create mode 100644 app/src/main/res/values-hi/input_library.xml create mode 100644 app/src/main/res/values-hi/input_strings.xml create mode 100644 app/src/main/res/values-hu/input_library.xml create mode 100644 app/src/main/res/values-hu/input_strings.xml create mode 100644 app/src/main/res/values-in/input_library.xml create mode 100644 app/src/main/res/values-in/input_strings.xml create mode 100644 app/src/main/res/values-it/input_library.xml create mode 100644 app/src/main/res/values-it/input_strings.xml create mode 100644 app/src/main/res/values-ja/input_library.xml create mode 100644 app/src/main/res/values-ja/input_strings.xml create mode 100644 app/src/main/res/values-ko/input_library.xml create mode 100644 app/src/main/res/values-ko/input_strings.xml create mode 100644 app/src/main/res/values-ms/input_library.xml create mode 100644 app/src/main/res/values-ms/input_strings.xml create mode 100644 app/src/main/res/values-nb/input_library.xml create mode 100644 app/src/main/res/values-nb/input_strings.xml create mode 100644 app/src/main/res/values-nl/input_library.xml create mode 100644 app/src/main/res/values-nl/input_strings.xml create mode 100644 app/src/main/res/values-pl/input_library.xml create mode 100644 app/src/main/res/values-pl/input_strings.xml create mode 100644 app/src/main/res/values-pt-rPT/input_library.xml create mode 100644 app/src/main/res/values-pt-rPT/input_strings.xml create mode 100644 app/src/main/res/values-pt/input_library.xml create mode 100644 app/src/main/res/values-pt/input_strings.xml create mode 100644 app/src/main/res/values-ro/input_library.xml create mode 100644 app/src/main/res/values-ro/input_strings.xml create mode 100644 app/src/main/res/values-ru/input_library.xml create mode 100644 app/src/main/res/values-ru/input_strings.xml create mode 100644 app/src/main/res/values-sv/input_library.xml create mode 100644 app/src/main/res/values-sv/input_strings.xml create mode 100644 app/src/main/res/values-th/input_library.xml create mode 100644 app/src/main/res/values-th/input_strings.xml create mode 100644 app/src/main/res/values-tr/input_library.xml create mode 100644 app/src/main/res/values-tr/input_strings.xml create mode 100644 app/src/main/res/values-uk/input_library.xml create mode 100644 app/src/main/res/values-uk/input_strings.xml create mode 100644 app/src/main/res/values-vi/input_library.xml create mode 100644 app/src/main/res/values-vi/input_strings.xml create mode 100644 app/src/main/res/values-zh-rCN/input_library.xml create mode 100644 app/src/main/res/values-zh-rCN/input_strings.xml create mode 100644 app/src/main/res/values-zh-rHK/input_library.xml create mode 100644 app/src/main/res/values-zh-rHK/input_strings.xml create mode 100644 app/src/main/res/values-zh-rTW/input_library.xml create mode 100644 app/src/main/res/values-zh-rTW/input_strings.xml diff --git a/app/src/main/res/values-ar/input_library.xml b/app/src/main/res/values-ar/input_library.xml new file mode 100644 index 0000000000..68f65da57e --- /dev/null +++ b/app/src/main/res/values-ar/input_library.xml @@ -0,0 +1,132 @@ + + + الشاشة المحددة غير متاحة. وصّلها لتحرير هذا التخطيط بحجمه الفعلي. + تجاهل تغييرات التخطيط غير المحفوظة؟ + يستخدم هذا التخطيط %1$d من ملفات التعريف. تُطبَّق التغييرات المحفوظة على جميعها. + ملفات التعريف الافتراضية + وضع سطح المكتب + وضع اللعب + افتراضي لسطح المكتب واللعب + افتراضي لوضع اللعب + افتراضي لوضع سطح المكتب + إعدادات الجهاز + عناصر التحكم + أزرار وعصي وزنادات ومفاتيح إضافية + نسخ ملف التعريف + إعادة تعيين الإجراءات + إعادة تعيين الإجراءات في %1$s إلى قيم ملف التعريف الأساسي؟ ستبقى التخطيطات وملفات التعريف الأخرى دون تغيير. + حذف %1$s؟ ستعود الأوضاع التي تستخدمه إلى ملف التعريف الافتراضي المدمج. ستبقى التخطيطات المحفوظة والإعدادات المشتركة متاحة. + الظهور + ينطبق على جميع ملفات التعريف. يعرض Auto عناصر تحكم الشاشة الرئيسية عند عدم توصيل وحدة تحكم في وضع اللعب. + التحرير على الشاشة + التخطيطات المحفوظة… + اختر تخطيطًا أو أنشئ تخطيطك + اختر عناصر تحكم ملف التعريف في قائمة جلسة الشاشة الثانوية. يحدد محددا ملف التعريف والشاشة الثانوية في قائمة وحدة التحكم عناصر التحكم المعروضة. + إجراءات الأزرار + مشترك مع %1$s. تُطبَّق التعديلات على تلك الملفات أيضًا. + إعادة استخدام الإعدادات + استخدام الإعدادات من… + النسخ من ملف تعريف آخر أو إبقاء الإعدادات مشتركة + جعله مستقلًا + الاحتفاظ بالإعداد الحالي وإيقاف مشاركة التغييرات + تحفظ التخطيطات العناصر ومواضعها. يمكن لكل ملف تعريف تعيين إجراءاته. حرّر بالحجم الكامل على الشاشة الهدف. + التخطيط الحالي + حذف التخطيط غير المستخدم %1$s وإجراءاته المحفوظة؟ + إعادة تسمية التخطيط الحالي + تم حفظ إعدادات الإدخال غير المقروءة في نسخة استرداد. يمكنك متابعة تحرير ملفات التعريف المستعادة. + الخصائص + خصائص النقر + %1$s · نقر + أزرار + العصي واللوحات والزنادات + إخفاء الأدوات + وحدة التحكم + إرسال إدخال وحدة التحكم إلى Steam Input أو اللعبة. + هذا العنصر لا يرسل إدخال وحدة تحكم أو فأرة أو لوحة مفاتيح. + نقرة الفأرة + إجراء DroidDeck + إجراء + سرعة التمرير: %1$d خطوة/ث + + ملف تعريف جديد + + تخطيط جديد + %1$s · يستخدمه %2$d من ملفات التعريف. تُطبَّق التغييرات على كل ملف تعريف يستخدم هذه التعيينات. + إعادة تسمية + حذف + أضف عناصر إلى التخطيط قبل تعيين إجراءاتها. + تعذّر حفظ إعدادات الإدخال + الاسم + البدء من + زر + عصا + لوحة لمس + توجيه متقاطع + زناد + تم + تراجع + + إضافة + اسحب للتحريك. اسحب زاوية لتغيير الحجم. اضغط على الخصائص لتعيين إجراء. + التحرير على الشاشة الثانوية + إعادة استخدام %1$s من ملف تعريف آخر. ستبقى مصادر التحكم الأخرى دون تغيير. + إبقاء عناصر التحكم الفعلية مشتركة + افتراضيًا، جميع عناصر التحكم والتخطيطات المخصصة نسخ مستقلة. المشاركة تربط عناصر التحكم الفعلية فقط. + استخدام هذه العناصر والمواضع. تحافظ المشاركة على تزامن تعديلات الأبعاد المستقبلية؛ تبقى إجراءات الأزرار مستقلة. يبدأ التخطيط المختلف بإجراءات غير معيّنة. + نسخ عناصر التحكم والإجراءات هذه أو ربطها بحيث تنطبق التعديلات المستقبلية على كلا الملفين. + إبقاء مشتركًا + نسخة مستقلة + بدء العصا عند موضع اللمس + إخفاء العصا عند عدم الاستخدام + الأدوات + تلقائي (%1$s) + مخصص (%1$s) + حفظ كملف تعريف جديد + عناصر تحكم ملف التعريف + ملف التعريف + إيماءات لوحة لمس الفأرة + عند تعيينها لمؤشر الفأرة: اضغط للنقر، واستمر للتمرير بالسحب، ومرّر بإصبعين. + لدى %1$s تجاوز للقائمة السريعة. اختر تلقائي هناك لاستخدام ملف التعريف الافتراضي والأجزاء الثلاثة المحفوظة. + إدخال DroidDeck + يُحتجز أثناء تحريك العصا في أي اتجاه: يُضغط فوق 55% ويُحرّر تحت 35%. استخدم مفاتيح الاتجاه لتعيين كل اتجاه على حدة. تُنفَّذ أوامر DroidDeck مرة واحدة لكل انحراف. يُضبط النقر على العصا على حدة. + يُحتجز أثناء لمس لوحة اللمس؛ ويُحرّر عند رفع إصبعك. تُنفَّذ أوامر DroidDeck مرة واحدة لكل لمسة. يُضبط النقر على اللوحة على حدة. + يُحتجز عندما يتجاوز الزناد 55%؛ ويُحرّر تحت 35%. تُنفَّذ أوامر DroidDeck مرة واحدة لكل ضغطة. + اتجاه التمرير + رأسي + أفقي + تمرير أفقي + القياسات + فعّل التسجيل، واستخدم عناصر التحكم في جلسة قيد التشغيل، ثم عد واقرأ النتائج. يقيس زمن إرسال DroidDeck فقط، وليس زمن استجابة الشاشة. ينتهي التسجيل عند إغلاق عملية التطبيق. + %1$d عناصر تحكم + تخطيطات محفوظة أخرى (%1$d) ▾ + إخفاء التخطيطات المحفوظة الأخرى (%1$d) ▴ + الرئيسية / Guide + رجوع · نقرة واحدة + رجوع · نقر مزدوج + رجوع · مرتان في Steam ومرة في سطح المكتب + في وضع Steam. الاستمرار بالضغط على رجوع يفتح الوصول السريع أيضًا. + الاستعادة إلى الافتراضي + يتم تذكر اختيار اللوحة. يفتح سطح المكتب مساحة عمل ثانية؛ ولا يغيّر الجلسة أو ملف تعريف الإدخال. + وحدة تحكم افتراضية + نوع وحدة التحكم التي يراها Steam أو اللعبة. + شاشة لمس + كيفية التعامل مع اللمسات على شاشة اللعبة. تحتفظ أزرار ملف التعريف بإجراءاتها المعيّنة. + مؤشر اللمس + إظهار مؤشر للمسات المباشرة على شاشة اللعبة. + اللمس والاستمرار + إجراء الفأرة عند الاستمرار بإصبع على شاشة اللعبة. + نقرات زر رجوع + الإجراء الأول: نقرة واحدة. الإجراء الثاني: نقرتان. + زر تبديل + اضغط للاستمرار، واضغط مرة أخرى للتحرير. فتح قائمة أو تبديل ملف التعريف يحرّر الزر. + الشكل + مستدير + كبسولة + دائرة + مستطيل + تسمية الزر + نص + صورة مستوردة + مفاتيح قطرية منفصلة + عيّن مفتاحًا لكل قطر. القطر الفارغ يضغط الاتجاهين المجاورين. + الاتجاهات المجاورة + تم حفظ مفاتيح الشاشة القديمة كملفات تعريف مستوردة أدناه. اختر واحدًا لاستخدامه أو تحريره. تم الاحتفاظ بتحديدات ملف التعريف الحالية. + لم نتمكن من استيراد مفاتيح الشاشة القديمة تلقائيًا. تم الاحتفاظ بالإعدادات الأصلية. + diff --git a/app/src/main/res/values-ar/input_strings.xml b/app/src/main/res/values-ar/input_strings.xml new file mode 100644 index 0000000000..d375d35ff4 --- /dev/null +++ b/app/src/main/res/values-ar/input_strings.xml @@ -0,0 +1,38 @@ + + + ملفات تعريف الإدخال + ملفات التعريف + وحدة تحكم فعلية + الشاشة الرئيسية + الشاشة الثانوية + أصلي / Steam Input + أصلي: %1$s + إرسال تحكم آخر من وحدة التحكم + معطّل + مفتاح أو مجموعة مفاتيح + مفاتيح الاتجاه + تحريك المؤشر + سرعة المؤشر: %1$d + تمرير + تمرير عمودي + زر الفأرة الأيسر + زر الفأرة الأيمن + زر الفأرة الأوسط + فتح قائمة DroidDeck + إظهار لوحة المفاتيح + فتح قائمة Steam + فتح الوصول السريع في Steam + إزالة عنصر التحكم + إضافة عنصر تحكم + أزرار خاصة بالجهاز + تعيين زر فعلي + حرّر الزر ثم اختر تحرير أو إعادة المحاولة أو إلغاء. يلغي B أو رجوع بعد التحرير. + إعادة المحاولة + اضغط زرًا، بما في ذلك زر رجوع يُبلّغ عنه كمفتاح. مفاتيح الصوت ومفاتيح نظام Android محجوزة. ينطبق التعيين على هذا الجهاز فقط. + إزالة التعيين + تشخيص الإدخال + تسجيل زمن إرسال الإدخال + قراءة القياسات + يقيس الإرسال من Android حتى النشر في ناقل الإدخال الحالي. لا يشمل وصول Bluetooth أو استعلام الضيف أو العرض أو زمن استجابة الشاشة. التسجيل متوقف افتراضيًا. + استخدام تعيين الإدخال العادي + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 6c21f13de7..fc3a68d12b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -185,6 +185,7 @@ تعذّر تنزيل بيئة رسومات PowerVR. تحقق من الاتصال وحاول مرة أخرى. تعذّر تنزيل DirectAudio، لذا يستخدم صوت الألعاب المسار الأبطأ في هذه الجلسة. هذا البرنامج + لم تتمكن الجلسة من الرسم على الشاشة: %1$s. تعرض هذه الشاشة السبب بدلًا من شاشة سوداء؛ والتفاصيل في سجلات الجلسة. تعذّر تنزيل عميل Steam. قد تكون شبكتك أو VPN تحظر خوادم Steam؛ تحقّق من الاتصال وحاول مرة أخرى. تعذّر إعداد عميل Steam. تحقّق من الاتصال والمساحة الفارغة، ثم حاول مرة أخرى. %1$s مبني لأجهزة كمبيوتر x86 ويعمل عبر FEX، الذي لم يتم تثبيته بعد. شغّل Steam مرة واحدة أثناء تسجيل الدخول ودعه يُنزّل FEX وSteam Linux Runtime، ثم شغّل هذا البرنامج مجددًا. @@ -391,6 +392,9 @@ غير مدعوم هنا بعد جارٍ تحميل المكوّنات… تعذّر التثبيت: %1$s + هذا التنزيل بحاجة إلى تحديث. + التحديث في قائمة الانتظار. + إعادة محاولة التحديث تم التنزيل جارٍ تنزيل %1$s جارٍ التثبيت: %1$s @@ -421,6 +425,22 @@ مساحة التخزين الداخلية فقط المجلد: %1$s مكتبة ثانية + مكتبات Steam إضافية + مجلدات يستطيع Steam تثبيت الألعاب فيها وتشغيلها منها، لكل منها اسمه. إزالة أحدها تبقي ألعابه على القرص. + إضافة مكتبة + إعادة التسمية + اسم المكتبة + اختر مجلدًا للمكتبة + الحد الأقصى للمكتبات المضافة: %1$d + هذا المجلد مكتبة بالفعل أو داخل مكتبة أخرى + %1$s · غير متاح + يسري بدءًا من جلسة Steam التالية + تم العثور عليها على هذا الجهاز · %1$s · %2$s + إضافة + العثور على مكتبات في التخزين الداخلي + اسمح بالوصول إلى جميع الملفات ليتمكن DroidDeck من رؤية مكتبات Steam التي تحتفظ بها تطبيقات أخرى على التخزين الداخلي + السماح + تمت إضافة %1$s، مكتبة Steam الموجودة داخل المجلد الذي اخترته قد تتقطع الألعاب التي تحمّل ملفاتها باستمرار من بطاقة SD أو من مساحة التخزين المشتركة. تشخيص التخزين يسجّل نتائج تخصيص المساحة وعينات من توقيتات التخزين في «مشاركة السجلات». قد يبطئ عمليات التثبيت أثناء تفعيله. يُطبَّق في الجلسة التالية. @@ -613,7 +633,10 @@ يعطّل مساعد التنقّل بوحدة التحكم في Proton، الذي يستهلك CPU في كل لعبة. تشغيل proot بلا seccomp قد يُصلح أخطاء استدعاءات النظام (syscall) الناقصة على بعض الأنوية. قد يقلّل الأداء. + التشغيل دون proot (تجريبي) + يبدأ تشغيل جانب Linux مباشرة على Android. يسري على الجلسة التالية. أوقفه إذا تعذر تشغيل أي شيء. مسار proot السريع + لا يُستخدم دون proot. يحتاج إلى مرشّح seccomp في proot. عمليات بحث أسرع عن الملفات وتقطّع أقل. أوقفه إذا تعذّر على برنامج العثور على ملفاته. رسم المؤشر داخل gamescope @@ -827,6 +850,7 @@ الجهاز مدعوم GPU غير مُختبَر GPU غير مدعوم + GPU عبر جسر Mali %1$s · %2$s %1$s: %2$s لا تتوفر واجهة رسومات متوافقة مع %1$s. قد يعرض Steam شاشة سوداء. @@ -856,15 +880,38 @@ الجلسة سجلات الجلسة تُحفَظ بعد كل جلسة + تشخيصات موسعة للجلسة التالية + يجمع سجلات مفصلة لجلسة واحدة. قد يقلل الأداء ويستهلك مساحة تخزين أكبر. يوقف نفسه عند بدء الجلسة؛ راجع السجلات قبل مشاركتها. سجلات تصحيح الألعاب تضمين بيانات تشخيص Proton وWine والرسومات عند تشغيل اللعبة التالية. قد يقلّل الأداء ويستهلك مساحة تخزين أكبر. أعِد تشغيل هذه الجلسة لحفظ سجلات تصحيح الألعاب تعذّر تحديث التسجيل. تحقّق من المفتاح وحاول مرة أخرى. أدوات تصحيح الأخطاء + سجلات رسوميات مفصلة + واجهة Steam: الرسم عبر GPU + مع زوج مشغّلات Xclipse، ترسم Steam صفحاتها برمجيًا (أظهر الرسم عبر GPU مربعات مشوهة). شغّله للحصول على واجهة Steam أسرع إذا بدت الصورة سليمة على هذا الهاتف. + بُني في %1$s + تم تحديث %1$s إلى أحدث إصدار + فشل جسر Mali في اختباره الذاتي على %1$s خلال الجلسة الأخيرة (الصور أو عمليات الرسم)، لذا استخدمت الجلسة زوج برامج التشغيل PanVK بدلًا من ذلك. + لم يجد جسر Mali أي طريقة لمشاركة الذاكرة مع برنامج التشغيل على %1$s خلال الجلسة الأخيرة، لذا استخدمت الجلسة زوج برامج التشغيل PanVK بدلًا من ذلك. لا يمكن للجسر العمل على هذا الهاتف؛ وإيقافه يُبقي زوج PanVK. + تُضاف سجلات Proton وDXVK وبرامج التشغيل لكل لعبة إلى سجلات الجلسة. تكون مفعّلة دائمًا عندما لا يكون معالج الرسوميات Adreno. أحدث سجلات الجلسة سجلات الجلسة المحفوظة يحتفظ بأحدث %1$d مسح السجلات + سجلات الجلسات المتاحة + لا توجد سجلات جلسات محفوظة بعد. + تتضمن ملفات ZIP المشتركة والمحفوظة الجلسة المحددة، إضافةً إلى بيانات التشخيص ذات الصلة بـ Steam والمتجر والأدوات وBattle.net. + %1$s · %2$s + الجلسة الحالية + مشاركة + الحفظ على الجهاز + حذف + حذف سجلات الجلسة؟ + حذف %1$s؟ لا يمكن التراجع عن هذا. + تم حفظ سجلات الجلسة. + تعذّر حفظ سجلات الجلسة. + تعذّر حذف سجلات الجلسة. إعادة تعيين كل الإعدادات إرجاع كل إعداد إلى قيمته الافتراضية إعادة تعيين @@ -891,6 +938,8 @@ استخدام كشاشة رئيسية يمكن أن يكون DroidDeck تطبيق الشاشة الرئيسية لا يُعرَض DroidDeck أبدًا كتطبيق للشاشة الرئيسية + يفتح زر الشاشة الرئيسية + الصفحة التي تظهر عندما يكون DroidDeck تطبيق الشاشة الرئيسية وتضغط على زر الشاشة الرئيسية في إضافة الألعاب، اضبط DroidDeck على تضمين الاتجاه اتجاه المشغّل @@ -904,15 +953,22 @@ ملء الشاشة يخفي شريطي الحالة والتنقّل في Android يعرض شريطي الحالة والتنقّل في Android + المشغّل على شاشتين + يضع الوضع «تلقائي» أقسام المشغّل (Steam والمكتبة والمتاجر وغيرها) على الشاشة الثانية في الأجهزة المحمولة المزوّدة بشاشة ثانية مدمجة. ويستخدم الوضع «تشغيل» أي شاشة ثانية. أما الوضع «إيقاف» فيُبقي المشغّل على شاشة واحدة. + الجلسات على شاشتين + يثبّت الوضع «تلقائي» قائمة داخل اللعبة على الشاشة الثانية المدمجة بدلًا من النافذة المنبثقة. ويستخدم الوضع «تشغيل» أي شاشة ثانية. أما الوضع «إيقاف» فيُبقي القائمة على شاشة اللعبة، ويمكنك مع ذلك اختيار شاشة ثانية منها. تلقائي تشغيل إيقاف عناصر تحكم الشاشة السفلية في الألعاب + لوحة مفاتيح Android لحقول النص يفتح لوحة اللمس ولوحة المفاتيح على الشاشة الثانية عند بدء الجلسة. الكتابة على الشاشة العلوية تم تطبيق الشاشة الرئيسية الافتراضي اختيار تطبيق للشاشة الرئيسية + إخفاء المشغل من قائمة التطبيقات الحديثة أثناء الخمول + يسري ذلك فقط عندما يكون DroidDeck تطبيق الشاشة الرئيسية الافتراضي ولا توجد جلسة قيد التشغيل. اختيار تطبيقات Linux (تجريبي) الملفات @@ -1027,6 +1083,151 @@ إصدارات الاختبار جرّب إصلاحًا قبل إصداره رسميًا لا شيء حاليًا + إصدار المختبر + إصدارات المختبر + قيد الاستخدام + متوقف مؤقتًا بعد أن أعاد Android تحسين DroidDeck + غير مُحمّل: %1$s + بانتظار إعادة التشغيل + تم الاحتفاظ بها + لإصدار آخر + إعادة البناء + يحذف هذا الإصدار من الجهاز + إعادة التشغيل به + إيقاف + استخدام + حذف + حذف الآن + تعذّر تجهيز إعادة التشغيل: %1$s. قم بإقران تصحيح الأخطاء اللاسلكي في الإعداد، ثم حاول مجددًا. + تم تثبيت إصدار المختبر + أُعيد تشغيل DroidDeck على %1$s + نسخة المختبر متوقفة مؤقتًا + أعاد Android تحسين DroidDeck، لذا لم يتم تحميل %1$s. افتح التحديثات لإعادة التشغيل عليها. + تم إيقاف نسخة المختبر + بُنيت لإصدار آخر من DroidDeck. وهي محفوظة في التحديثات. + لم يبدأ DroidDeck عليها مرتين + الوكيل + الوكيل + الوكيل يعمل + ثبّت Claude Code في بيئة مستخدم Linux لاستخدام الوكيل. + اسأل عن لعبة، أو تعطّل، أو تغيير في DroidDeck + إرسال + محادثة جديدة + إيقاف + التخزين + إزالة + إزالة الآن + Claude Code + Codex + الكود المصدري لـ DroidDeck + ذاكرات التنزيل المؤقتة + التغييرات التي لم تُرفع تُفقد + تنزّلها عمليات البناء من جديد + يمكن للإعداد تثبيتها مجددًا؛ تسجيلات الدخول محفوظة + عاد DroidDeck للعمل على نسخة المختبر. تابع من حيث توقفت. + اسأله لماذا لا تبدأ لعبة، أو اطلب شرح سجل، أو غيّر DroidDeck وجرّب التغيير على هذا الجهاز. + فشل: %1$s + %1$s انتهى (رمز الخروج %2$d) + تم الإيقاف + انتهى دون رد + إعادة المحاولة + جارٍ إعداد الوكيل + أعد بناء نسخة المختبر %1$s لإصدار DroidDeck المثبّت وأعد التشغيل عليها. + %1$s مدخلات · %2$s مخرجات + يفكّر + فكّر + يفكّر · %1$s + %1$s · %2$s + الإدخال + الإخراج + قيد التشغيل… + لا توجد نتيجة: انتهت الجولة أولًا + لا مخرجات + اكتب لإضافة الرسالة التالية إلى الانتظار + إضافة إلى الانتظار + التالي: %1$s + لا تُرسل + إرفاق + إزالة + الافتراضي + جهد الاستدلال + تنفيذ + تعديل + لم يتغير شيء بعد + المضي قدماً في الخطة. + إرسال الآن + رسالة + المزيد + إغلاق + الأحدث + قيد العمل + السياق + %1$s من %2$s + هذه المحادثة · %1$s + يظهر الاستخدام بعد الرد الأول + حد مدته %1$d ساعة + حد مدته %1$d دقيقة + الحد الأسبوعي + %1$d%% · يُعاد ضبطه %2$s + + %1$d ملفات + %1$d ملفًا + %1$d ملف + %1$d ملف + %1$d ملفان + %1$d ملفات + + خطّط أولًا + تخطيط + يقترح خطة دون تغيير أي شيء + المحادثات + لا توجد محادثات بعد + الآن + حذف + يحذفها ومرفقاتها + العمليات + لا شيء يعمل في بيئة مستخدم Linux + الوكيل + إيقاف + بناء المختبر + جارٍ تجهيز إصدارات المختبر + %1$d%% · حوالي %2$s متبقٍ + حوالي %1$s متبقٍ + إلغاء + إلغاء البناء + جارٍ البدء + %1$d%% + جارٍ التغليف + جارٍ إعادة تشغيل DroidDeck عليه + تم + فشل: %1$s + إعداد الوكيل + ثبّت وقت تشغيل Linux في الإعداد أولًا. + إعادة المحاولة + ابدأ المحادثة + اتصال الجهاز + التصحيح اللاسلكي، ليتمكّن الوكيل من رؤية DroidDeck والتحكم به + ثبّت %1$s + داخل مساحة مستخدم Linux، مع git وgh وadb + تسجيل الدخول إلى %1$s + يفتح متصفحك + GitHub + اختياري، لفتح طلبات السحب + أدوات البناء + اختياري، لبناءات Lab على هذا الجهاز · حوالي 5 GB + الوكيل جاهز + أكمل إعداد الوكيل + تم تسجيل الدخول إلى %1$s + بناءات Lab + بناءات سريعة + بناءات Lab سريعة + يُجمّع هذا الإصدار مسبقًا، فتستغرق بناءات Lab دقائق · حوالي 20 دقيقة لمرة واحدة + جارٍ التجميع · %1$d%% · حوالي %2$s متبقٍ + تحضير + تعذّر الوصول إلى تصحيح الأخطاء اللاسلكي؛ زر الاقتران يشغّله + اقتران + تثبيت + تسجيل الدخول PR #%1$d لم يُبنَ لهذه النسخة من DroidDeck تم التحديث %1$s @@ -1282,6 +1483,14 @@ التطبيقات الإعداد التحديثات + المزيد + تعديل التبويبات + التبويبات + معروض + في المزيد + مخفي + نقل %1$s إلى الأعلى + نقل %1$s إلى الأسفل %1$d%% استئناف %1$s يظهر باسم /root/ROMs في كل جلسة. مساحة التخزين الداخلية متاحة في /root/Storage. @@ -1303,6 +1512,15 @@ إلغاء الطلب المعلَّق لوحة مفاتيح Android إخفاء ✕ + الحجم على الشاشة + نسبة الشاشة التي تشغلها لوحة المفاتيح، بما في ذلك الشريط العلوي. + العتامة + قلّلها لرؤية اللعبة خلف لوحة المفاتيح. + المفاتيح المخفية + المفاتيح التي نادرًا ما تستخدمها لا تظهر على لوحة المفاتيح. + صف Esc ومفاتيح الوظائف + Ins / Del / Home / End / PgUp / PgDn + مفاتيح الأسهم تشغيل %1$s اختر شاشة. الشاشة الثانوية: %1$s. لم تعد الشاشة الثانوية متاحة. @@ -1872,7 +2090,24 @@ الوحدة الطرفية مقابض Deck + لوحتا اللمس لوحة المعلومات + سطح المكتب + تشغيل سطح المكتب + سطح المكتب · %1$s + لوحة اللمس + اللمس المباشر + لوحة اللمس. انقر للتبديل إلى اللمس المباشر + اللمس المباشر. انقر للتبديل إلى لوحة اللمس + جارٍ تشغيل سطح مكتب KDE… + أُغلق سطح المكتب. + تعذّر تشغيل سطح المكتب. سجلاته في مجلد bottom-desktop لهذه الجلسة. + سطح المكتب مغلق. لا يوجد ما يُعرض هنا بعد. + تبديل الشاشتين + الشاشة السفلية مشغولة حاليًا + شاشة اللعبة + عرض اللعبة على + الشاشة العلوية + الشاشة السفلية التنزيلات لا توجد تنزيلات جارية. Steam @@ -1907,6 +2142,20 @@ الوقود، t الرئيسي %1$s t الاحتياطي %1$s t + زمن الإطار + آخر %1$d ث + متوسط زمن الإطار + أدنى 1% + إطارات تتجاوز 33 مللي ثانية + %1$d / دقيقة + مدة اللعب %1$s + %1$d أنوية، حتى %2$s غيغاهرتز + %1$d أنوية + اللعبة + إطار/ث من أصل %1$d هرتز + العلامة الحمراء هي النقطة التي تُظهر فيها المؤشرات درجة الحرارة باللون الأحمر. + الجهاز بالكامل + البطارية إرسال بيانات لوحة العدادات تلقائي يفعّلها لكل لعبة مدرجة هنا، بما في ذلك الألعاب التي يُعثر عليها لاحقًا. تبقى الألعاب التي توقفها متوقفة. @@ -1930,6 +2179,10 @@ الميكروفون متوقف لهذه اللعبة. للتحدث، فعِّل «الميكروفون» في إعدادات Steam في DroidDeck (الصوت) وابدأ اللعبة من جديد. مستوى الصوت %1$d%% إحصاءات داخل اللعبة + مؤشرات الشاشة السفلية + شريط على كل تبويب + أدنى 1% و0.1% + درجة حرارة المعالج FPS CPU GPU @@ -2106,6 +2359,7 @@ جارٍ بدء الجلسة… %1$d:%2$02d منقضية · لا تزال جارية جارٍ تنزيل تحديث عميل Steam · %1$d%% + جارٍ تطبيق تحديث عميل Steam… جارٍ تنزيل عميل Steam · %1$s يوجد تثبيت لأداة توافق قيد التنفيذ بالفعل @@ -2182,11 +2436,29 @@ حدود كرتونية مع زيادة الحدّة. وحدة GPU ليست من نوع Adreno + برنامج تشغيل PowerVR في النظام: يختلف التوافق باختلاف الجهاز + تجريبي: RADV أو برنامج تشغيل Xclipse في النظام + PowerVR في النظام + يستخدم برامج التشغيل المدمجة لهذا المعالج الرسومي + تم اختيار برنامج تشغيل PowerVR الخاص بالنظام لوقت التشغيل والعرض. + لا يغطي أي برنامج تشغيل مفتوح جهاز Mali هذا بعد: جسر Mali مُفعّل. + هذه نسخة اختبار للأجهزة غير المزوّدة بـ Snapdragon: النسخ الرسمية هنا تعمل على Adreno فقط، لذا لا تُثبَّت فوقها. نسخ الاختبار الجديدة متاحة على github.com/The412Banner/droiddeck-nonadreno-drivers. + انتهت الجلسة الأخيرة لأن Android أغلق DroidDeck لتحرير الذاكرة، لا بسبب تعطّل. أغلق التطبيقات الأخرى أو قلّل إعدادات نسيج اللعبة، ثم حاول مجددًا. + Mali (Venus) + جسر Mali + لا يغطي أي برنامج تشغيل مفتوح جهاز Mali هذا بعد: يُستخدم %1$s على برنامج تشغيل الهاتف نفسه. + لم يُنشر %1$s بعد: يُستخدم %2$s حتى يُنشر. + %1$s غير متاح، ويُبلّغ برنامج تشغيل هذا الهاتف عن Vulkan %2$s (يحتاج Venus إلى 1.2): يُستخدم جسر Mali. + لم يُنشر %1$s بعد: جسر Mali مُفعّل إلى أن يُنشر. + في قائمة الانتظار: %1$s (في انتظار برنامج تشغيل مختلف لوقت التشغيل) + توفّر بيئة تشغيل PowerVR الخاصة بالنظام حزمة DXVK. يمكن تخزين حزم DXVK الأخرى، لكنها لا تُطبَّق مع برنامج التشغيل هذا. مدعوم تجريبي: برامج تشغيله إصدارات اختبارية دعم تجريبي لـ Adreno 850: يتطلب برامج تشغيل تجريبية متوافقة للعرض والألعاب، ولم يُتحقَّق منه على هذا الجهاز أقل من العتاد المُختبَر (Adreno 725 وأحدث): قد لا يعمل غير مدعوم: لا تتوفر واجهة رسومات متوافقة مع وحدة معالجة الرسومات هذه + يعمل عبر جسر Mali، على برنامج تشغيل Vulkan الخاص بالهاتف + غير مدعوم عند إيقاف جسر Mali: يحتاج Turnip إلى معالج رسوميات Adreno (Snapdragon) تم الوصول إلى حدّ الطلبات في GitHub - حاوِل مرة أخرى لاحقًا استجاب GitHub بـ HTTP %1$d @@ -2387,6 +2659,13 @@ ترتيب تسميات الشريط الجانبي إظهار الأسماء أسفل رموز الشريط الجانبي. أوقفه للحصول على شريط جانبي أنحف. + رفيق الوكيل + يظهر DeeDee فوق المشغل والألعاب ويعرض ما يفعله الوكيل. + فوق التطبيقات الأخرى + اسمح لـ DeeDee بالظهور فوق كل التطبيقات وفتح المحادثة هناك + السماح + DeeDee + الدردشة مع DeeDee العرض بطاقات أكبر بطاقات أصغر @@ -2682,6 +2961,11 @@ المطوّر علامة مائية لاسم الإصدار عرض اسم إصدار الاختبار أو Lab على الشاشة. مفعّل افتراضيًا. + مشاركة حزم التشخيص + الجلسة والجهاز + الرسوميات + الألعاب والتوافق + جميع الحزم جاهز للّعب غير جاهز للّعب بعد بيئة التشغيل %1$s @@ -2720,6 +3004,9 @@ فعّل إنجازات GOG في إعدادات المتاجر الإنجازات غير متوفرة؛ تحقّق من سجلات الجلسة تم فتح الإنجاز + Mali (Venus): مُعطَّل + Mali (Venus): مُفعَّل + يُبلّغ برنامج التشغيل على %1$s عن Vulkan %2$s. يحتاج Mali (Venus) إلى Vulkan 1.2 أو أحدث (لا يبدأ gamescope على الإصدارات الأقدم)، لذا تتجاوز الجلسات Venus وتستخدم زوج برامج تشغيل PanVK بدلًا منه. لصق العصا اليسرى العصا اليمنى @@ -3083,6 +3370,7 @@ تثبيتات VC++ وDirectX التي تحتاجها الألعاب يشغّل ألعاب Linux x86 أداة Steam + يُنزّل Steam هذا للألعاب التي تأتي بنظام مكافحة الغش، حتى وهو مُعطَّل. إزالته تُعلّق تثبيتها عند 0% يشغّل DroidDeck الألعاب دون بيئة التشغيل هذه Proton x86، ولا يستطيع DroidDeck تشغيله الافتراضي لكل الألعاب @@ -3229,6 +3517,8 @@ DroidDeck · %1$d إطار/ث معدل 60 إطارًا/ث أكثر سلاسة لكنه يستهلك المعالج أكثر أثناء بدء Steam. فيديو مختار في إعدادات Steam نفسها يظهر هنا أيضًا. الصوت + تخطي مقطع بدء التشغيل + استخدم مقطعًا أسود مدته 0.1 ثانية كمقطع بدء تشغيل Steam. يسري في الجلسة التالية. فيديو خاص بك MP4 أو MOV أو MKV أو WebM. تُحوَّل الصيغ الأخرى والملفات الأكبر من %1$d ميغابايت إلى WebM بدقة 720p على الجهاز، حتى %2$d ثانية. استيراد @@ -3690,6 +3980,7 @@ إبقاء Alt+Tab ومفتاح Win وزر الرئيسية داخل جلسة DroidDeck النشطة بدلاً من Android. فعّل «السطوع» من الإعداد → تكامل Steam جسر Mali: متوقف + لا يمكن لـ %1$s استخدام جسر Mali (يحتاج إلى معالج رسوميات Mali من دون مسار لبرنامج تشغيل النظام)، لذا ليس لهذا المفتاح أي تأثير هنا. جسر Mali: يعمل %1$s ليس Adreno. جسر Vulkan التجريبي يعمل: تعرض الجلسة الرسومات عبر برنامج تشغيل الهاتف نفسه. توقّع وجود أخطاء؛ أرسل سجلات الجلسة. الوضع الآمن @@ -3853,6 +4144,7 @@ تعذّر استيراد هذا التخطيط ثلج قرمزي + أسطح بيضاء مع لمسات حمراء. الموسيقى التصويرية الموسيقى @@ -3916,4 +4208,6 @@ تكرار مقطع واحد مستوى الصوت لا توجد ملفات صوتية في هذه الموسيقى التصويرية + التشغيل غير متاح + لا يتوفر متصفح ويب لفتح هذا الرابط. diff --git a/app/src/main/res/values-b+es+419/input_library.xml b/app/src/main/res/values-b+es+419/input_library.xml new file mode 100644 index 0000000000..7769845d32 --- /dev/null +++ b/app/src/main/res/values-b+es+419/input_library.xml @@ -0,0 +1,132 @@ + + + La pantalla seleccionada no está disponible. Conéctala para editar este diseño a su tamaño real. + ¿Descartar los cambios de diseño sin guardar? + Este diseño lo usan %1$d perfiles. Los cambios guardados se aplican a todos. + Perfiles predeterminados + Modo escritorio + Modo juego + Predeterminado para escritorio y juego + Predeterminado para el modo juego + Predeterminado para el modo escritorio + Ajustes del dispositivo + Controles + Botones, palancas, gatillos y teclas extra + Copiar perfil + Restablecer acciones + ¿Restablecer las acciones de %1$s a los valores predeterminados de su perfil base? Los diseños y otros perfiles no cambiarán. + ¿Eliminar %1$s? Los modos que lo usan volverán a su perfil predeterminado integrado. Los diseños guardados y los ajustes compartidos seguirán disponibles. + Visibilidad + Se aplica a todos los perfiles. Auto muestra los controles de la pantalla principal cuando no hay control conectado en el modo juego. + Editar en pantalla + Diseños guardados… + Elige un diseño o crea el tuyo + Elige Controles de perfil en el menú de sesión de la pantalla secundaria. Los selectores de Perfil y Pantalla secundaria del menú del control eligen los controles que se muestran. + Acciones de botones + Compartido con %1$s. Las ediciones también se aplican a esos perfiles. + Reutilizar ajustes + Usar ajustes de… + Copiar de otro perfil o mantener los ajustes compartidos + Hacer independiente + Mantener la configuración actual y dejar de compartir cambios + Los diseños guardan elementos y sus posiciones. Cada perfil puede asignar sus propias acciones. Edita a tamaño completo en la pantalla de destino. + Diseño actual + ¿Eliminar el diseño sin usar %1$s y sus acciones guardadas? + Renombrar el diseño actual + La configuración de entrada ilegible se guardó en una copia de recuperación. Puedes seguir editando los perfiles restaurados. + Propiedades + Propiedades del clic + %1$s · Clic + Botones + Palancas, pads y gatillos + Ocultar herramientas + Control + Envía la entrada del control a Steam Input o al juego. + Este elemento no envía entrada de control, mouse ni teclado. + Clic del mouse + Acción de DroidDeck + Acción + Velocidad de desplazamiento: %1$d pasos/s + + Perfil nuevo + + Diseño nuevo + %1$s · Lo usan %2$d perfiles. Los cambios se aplican a todos los perfiles que usan estas asignaciones. + Cambiar nombre + Eliminar + Agrega elementos al diseño antes de asignar sus acciones. + No se pudo guardar la configuración de entrada + Nombre + Empezar desde + Botón + Palanca + Panel táctil + Cruceta + Gatillo + Listo + Deshacer + + Agregar + Arrastra para mover. Arrastra una esquina para cambiar el tamaño. Toca Propiedades para asignar una acción. + Editando en la pantalla secundaria + Reutilizar %1$s de otro perfil. Las demás fuentes de control no cambiarán. + Mantener compartidos los controles físicos + Por defecto, todos los controles y diseños personalizados son copias independientes. Compartir solo vincula los controles físicos. + Usar estos elementos y posiciones. Compartir mantiene sincronizados los cambios futuros de geometría; tus acciones de botón siguen siendo independientes. Un diseño distinto empieza con acciones sin asignar. + Copiar estos controles y acciones, o vincularlos para que los cambios futuros se apliquen a ambos perfiles. + Mantener compartido + Copia independiente + Iniciar la palanca en el punto de toque + Ocultar la palanca cuando no se use + Herramientas + Auto (%1$s) + Personalizado (%1$s) + Guardar como perfil nuevo + Controles del perfil + Perfil + Gestos del panel táctil del mouse + Si se asigna al puntero del mouse: toca para hacer clic, mantén para arrastrar y desplaza con dos dedos. + %1$s tiene una anulación del menú rápido. Selecciona Auto allí para usar su perfil predeterminado y sus tres partes guardadas. + Entrada de DroidDeck + Se mantiene mientras la palanca se mueve en cualquier dirección: se presiona por encima del 55 %, se suelta por debajo del 35 %. Usa Teclas de dirección para asignar cada dirección por separado. Los comandos de DroidDeck se ejecutan una vez por desvío. El clic de la palanca se configura aparte. + Se mantiene mientras se toca el panel táctil; se suelta al levantar el dedo. Los comandos de DroidDeck se ejecutan una vez por toque. El clic del panel se configura aparte. + Se mantiene cuando el gatillo supera el 55 %; se suelta por debajo del 35 %. Los comandos de DroidDeck se ejecutan una vez por pulsación. + Dirección de desplazamiento + Vertical + Horizontal + Desplazar horizontalmente + Mediciones + Activa la grabación, usa los controles en una sesión en marcha y luego vuelve y lee los resultados. Mide solo el tiempo de envío de DroidDeck, no la latencia de pantalla. La grabación termina al cerrar el proceso de la app. + %1$d controles + Otros diseños guardados (%1$d) ▾ + Ocultar otros diseños guardados (%1$d) ▴ + Inicio / Guía + Atrás · un toque + Atrás · doble toque + Atrás · dos veces en Steam, una en escritorio + En modo Steam. Mantener Atrás también abre el acceso rápido. + Restaurar valores predeterminados + Tu elección de panel se recuerda. Escritorio abre un segundo espacio de trabajo; no cambia la sesión ni su perfil de entrada. + Control virtual + El tipo de control que ven Steam o el juego. + Pantalla táctil + Cómo se manejan los toques en la pantalla del juego. Los botones del perfil mantienen sus acciones asignadas. + Cursor táctil + Muestra un puntero para toques directos en la pantalla del juego. + Tocar y mantener + Acción del mouse al mantener un dedo en la pantalla del juego. + Toques del botón Atrás + Primera acción: un toque. Segunda acción: doble toque. + Botón de alternar + Toca para mantener, toca de nuevo para soltar. Abrir un menú o cambiar de perfil suelta el botón. + Forma + Redondeada + Píldora + Círculo + Rectángulo + Etiqueta del botón + Texto + Imagen importada + Teclas diagonales separadas + Asigna una tecla a cada diagonal. Una diagonal vacía presiona sus dos direcciones vecinas. + Direcciones vecinas + Tus antiguas teclas en pantalla se guardaron como perfiles importados abajo. Selecciona uno para usarlo o editarlo. Se mantuvieron tus selecciones de perfil actuales. + Las antiguas teclas en pantalla no se pudieron importar automáticamente. Se conservó la configuración original. + diff --git a/app/src/main/res/values-b+es+419/input_strings.xml b/app/src/main/res/values-b+es+419/input_strings.xml new file mode 100644 index 0000000000..744979897b --- /dev/null +++ b/app/src/main/res/values-b+es+419/input_strings.xml @@ -0,0 +1,38 @@ + + + Perfiles de entrada + Perfiles + Control físico + Pantalla principal + Pantalla secundaria + Nativo / Steam Input + Nativo: %1$s + Enviar otro control del mando + Desactivado + Tecla o combinación de teclas + Teclas de dirección + Mover el puntero + Velocidad del puntero: %1$d + Desplazar + Desplazar verticalmente + Botón izquierdo del mouse + Botón derecho del mouse + Botón central del mouse + Abrir el menú de DroidDeck + Mostrar el teclado + Abrir el menú de Steam + Abrir el acceso rápido de Steam + Quitar control + Agregar control + Botones específicos del dispositivo + Asignar un botón físico + Suelta el botón y elige Editar, Reintentar o Cancelar. B o Atrás cancela después de soltarlo. + Reintentar + Presiona un botón, incluso un botón Atrás informado como tecla. Las teclas de volumen y del sistema Android están reservadas. La asignación solo se aplica a este dispositivo. + Quitar asignación + Diagnóstico de entrada + Registrar el tiempo de envío de entrada + Leer mediciones + Mide el envío de Android hasta su publicación en el transporte de entrada existente. No incluye la llegada por Bluetooth, el sondeo del invitado, el renderizado ni la latencia de pantalla. La grabación está desactivada de forma predeterminada. + Usar la asignación de entrada normal + 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 35f8b630b1..0a11b9e776 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -185,6 +185,7 @@ No se pudo descargar el entorno gráfico de PowerVR. Revisa la conexión e inténtalo de nuevo. No se pudo descargar DirectAudio, así que el audio de los juegos usa la ruta más lenta en esta sesión. Este programa + La sesión no pudo dibujar en la pantalla: %1$s. En lugar de una pantalla negra, esta pantalla muestra el motivo; los registros de la sesión tienen los detalles. 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. @@ -388,6 +389,9 @@ Aún no compatible aquí Cargando los componentes… No se pudo instalar: %1$s + Esta descarga necesita una actualización. + Actualización en cola. + Reintentar actualización Descargado Descargando %1$s Instalando: %1$s @@ -418,6 +422,22 @@ Solo interno Carpeta: %1$s Segunda biblioteca + Más bibliotecas de Steam + Carpetas donde Steam puede instalar y ejecutar juegos, cada una con su propio nombre. Al quitar una, sus juegos permanecen en el disco. + Agregar biblioteca + Cambiar nombre + Nombre de la biblioteca + Elige una carpeta para la biblioteca + Como máximo %1$d bibliotecas agregadas + Esa carpeta ya es una biblioteca o está dentro de una + %1$s · no disponible + Se aplica a partir de la próxima sesión de Steam + Se encontró en este dispositivo · %1$s · %2$s + Agregar + Encontrar bibliotecas en el almacenamiento interno + Permite el acceso a todos los archivos para que DroidDeck pueda ver las bibliotecas de Steam que otras apps guardan en el almacenamiento interno + Permitir + Se agregó %1$s, la biblioteca de Steam dentro de la carpeta que elegiste Los juegos que cargan recursos desde la SD o el almacenamiento compartido pueden tener microcortes. Diagnóstico de almacenamiento Registra los resultados de asignación y muestras de tiempos de almacenamiento en Compartir registros. Puede ralentizar las instalaciones mientras esté activado. Se aplica en la próxima sesión. @@ -607,7 +627,10 @@ Desactiva el asistente de navegación con control de Proton, que consume CPU en cada juego. Ejecutar proot sin seccomp Puede corregir errores de syscalls ausentes en algunos kernels. Puede reducir el rendimiento. + Ejecutar sin proot (experimental) + Inicia el entorno Linux directamente en Android. Se aplica a la próxima sesión. Desactívalo si algo falla al iniciar. Ruta rápida de proot + No se usa sin proot. Requiere el filtro seccomp de proot. Búsquedas de archivos más rápidas y menos microcortes. Desactívalo si un programa no encuentra sus archivos. Dibujar el cursor dentro de gamescope @@ -845,6 +868,7 @@ Dispositivo compatible GPU sin probar GPU no compatible + GPU a través del puente Mali %1$s · %2$s %1$s: %2$s No hay un motor gráfico compatible disponible para %1$s. Steam puede mostrar una pantalla negra. @@ -874,15 +898,38 @@ Sesión Registros de sesión Se guardan tras cada sesión + Diagnósticos mejorados para la próxima sesión + Captura registros detallados durante una sesión. Puede reducir el rendimiento y usar más almacenamiento. Se desactiva automáticamente al iniciar la sesión; revisa los registros antes de compartirlos. Registros de depuración de juegos Incluye diagnósticos de Proton, Wine y gráficos en el próximo inicio de un juego. Puede reducir el rendimiento y usar más almacenamiento. Reinicia esta sesión para guardar los registros de depuración de juegos No se pudo actualizar el registro. Revisa el interruptor e inténtalo de nuevo. Herramientas de depuración + Registros detallados de gráficos + Interfaz de Steam: dibujo con GPU + Con el par de controladores Xclipse, Steam dibuja sus páginas por software (el dibujo con GPU mostraba mosaicos con errores). Actívalo para una interfaz de Steam más rápida si se ve bien en este teléfono. + compilado %1$s + %1$s se actualizó a la compilación más reciente + El puente Mali no pasó la autoprueba en %1$s durante la última sesión (imágenes o dibujos), por lo que la sesión usó el par de controladores PanVK en su lugar. + El puente Mali no encontró ninguna forma de compartir memoria con el controlador en %1$s durante la última sesión, por lo que la sesión usó el par de controladores PanVK en su lugar. El puente no puede funcionar en este teléfono; desactivarlo mantiene el par PanVK. + Los registros de Proton, DXVK y de los controladores de cada juego se incluyen en los registros de la sesión. Siempre activado cuando la GPU no es Adreno. Últimos registros de sesión Registros de sesión guardados Conserva los %1$d más recientes Borrar registros + Registros de sesión disponibles + Todavía no hay registros de sesión guardados. + Los archivos ZIP compartidos y guardados incluyen la sesión seleccionada, además de los diagnósticos relacionados de Steam, la tienda, las herramientas y Battle.net. + %1$s · %2$s + Sesión actual + Compartir + Guardar en el dispositivo + Eliminar + ¿Eliminar los registros de sesión? + ¿Eliminar %1$s? Esta acción no se puede deshacer. + Registros de sesión guardados. + No se pudieron guardar los registros de sesión. + No se pudieron eliminar los registros de sesión. Restablecer todos los ajustes Devuelve cada ajuste a su valor predeterminado Restablecer @@ -909,6 +956,8 @@ Usar como pantalla de inicio DroidDeck puede ser la app de inicio DroidDeck nunca se ofrece como app de inicio + El botón de inicio abre + La página que se muestra cuando DroidDeck es la app de inicio y presionas Inicio En Agregar juegos, cambia DroidDeck a Incluir Orientación Orientación del launcher @@ -922,15 +971,22 @@ Pantalla completa Oculta las barras de estado y navegación de Android Muestra las barras de estado y navegación de Android + Lanzador de doble pantalla + Automático coloca las secciones del lanzador (Steam, Biblioteca, Tiendas y las demás) en la segunda pantalla integrada de las consolas portátiles que la tienen. Activado usa cualquier segunda pantalla. Desactivado mantiene el lanzador en una sola pantalla. + Sesiones de doble pantalla + Automático acopla el menú del juego en la segunda pantalla integrada en lugar de mostrarlo como ventana emergente. Activado usa cualquier segunda pantalla. Desactivado mantiene el menú en la pantalla del juego; todavía puedes elegir una segunda pantalla desde el menú. Automático Activado Desactivado Controles en la pantalla inferior en juegos + Teclado de Android para campos de texto Abre el trackpad y el teclado en la segunda pantalla cuando empieza una sesión. Escribiendo en la pantalla superior Listo App de inicio predeterminada Elige una app de inicio + Ocultar el lanzador de Recientes mientras esté inactivo + Solo se aplica cuando DroidDeck es la app de inicio predeterminada y no hay ninguna sesión en ejecución. Elegir Apps de Linux (beta) Archivos @@ -1045,6 +1101,148 @@ Versiones de prueba Prueba una corrección antes de su publicación Ninguna por ahora + Compilación de laboratorio + Compilaciones de laboratorio + En uso + En pausa después de que Android volvió a optimizar DroidDeck + No cargada: %1$s + Esperando un reinicio + Conservada + Para otra versión + Recompilar + Elimina esta compilación del dispositivo + Reiniciar con esta + Desactivar + Usar + Eliminar + Eliminar ahora + No se pudo preparar el reinicio: %1$s. Empareja la depuración inalámbrica en Configuración y vuelve a intentarlo. + Compilación de laboratorio instalada + DroidDeck se reinició con %1$s + Compilación de Lab pausada + Android volvió a optimizar DroidDeck, así que %1$s no está cargada. Abre Actualizaciones para arrancar de nuevo con ella. + Compilación de Lab desactivada + Se creó para otra versión de DroidDeck. Se conserva en Actualizaciones. + DroidDeck no arrancó con ella dos veces + Agente + Agente + El agente está trabajando + Instala Claude Code en el entorno de usuario de Linux para usar el agente. + Pregunta sobre un juego, un fallo o un cambio en DroidDeck + Enviar + Nueva conversación + Detener + Almacenamiento + Quitar + Quitar ahora + Claude Code + Codex + Código fuente de DroidDeck + Cachés de descarga + Los cambios que no se suben se pierden + Las compilaciones vuelven a descargarlos + El proceso de configuración puede volver a instalarlo; se conservan los inicios de sesión + DroidDeck arrancó de nuevo con tu compilación de Lab. Continúa donde te quedaste. + Pídele que explique por qué un juego no arranca, interprete un registro o cambie DroidDeck y pruebe el cambio en este dispositivo. + Falló: %1$s + %1$s finalizó (código de salida %2$d) + Detenido + Finalizó sin respuesta + Reintentar + Configurando el agente + Recompila mi compilación de Lab %1$s para la versión instalada de DroidDeck y arranca de nuevo con ella. + %1$s de entrada · %2$s de salida + Pensando + Pensamiento + Pensando · %1$s + %1$s · %2$s + ENTRADA + SALIDA + Ejecutando… + Sin resultado: el turno terminó antes + Sin salida + Escribe para encolar el siguiente mensaje + Encolar + Siguiente: %1$s + No enviar + Adjuntar + Quitar + Predeterminado + Esfuerzo de razonamiento + Adelante + Revisar + Aún no hay cambios + Adelante con el plan. + Enviar ahora + Mensaje + Más + Cerrar + Más reciente + Trabajando + Contexto + %1$s de %2$s + Esta conversación · %1$s + El uso se muestra después de la primera respuesta + Límite de %1$d horas + Límite de %1$d minutos + Límite semanal + %1$d%% · se restablece %2$s + + %1$d archivos + %1$d archivo + %1$d archivos + + Planear primero + Planear + Propone un plan sin cambiar nada + Conversaciones + Aún no hay conversaciones + Ahora mismo + Eliminar + Elimina la conversación y sus archivos adjuntos + Procesos + No hay nada en ejecución en el espacio de usuario de Linux + AGENTE + Detener + Compilación de Lab + Preparando compilaciones de Lab + %1$d%% · aprox. %2$s restantes + aprox. %1$s restantes + Cancelar + Cancelar compilación + Iniciando + %1$d%% + Empaquetando + Reiniciando DroidDeck en él + Listo + Falló: %1$s + Configurar el agente + Instala primero el entorno de ejecución de Linux en Configuración. + Reintentar + Empezar a chatear + Conexión del dispositivo + Depuración inalámbrica para que el agente pueda ver y controlar DroidDeck + Instalar %1$s + En el espacio de usuario de Linux, con git, gh y adb + Iniciar sesión en %1$s + Abre tu navegador + GitHub + Opcional, para abrir pull requests + Herramientas de compilación + Opcional, para compilaciones de Lab en este dispositivo · unos 5 GB + Agente listo + Terminar de configurar el agente + Sesión iniciada en %1$s + Compilaciones de Lab + compilaciones rápidas + Compilaciones rápidas de Lab + Precompila esta versión para que las compilaciones de Lab tarden unos minutos · unos 20 minutos una sola vez + Compilando · %1$d%% · unos %2$s restantes + Preparar + No se puede acceder a la depuración inalámbrica; Vincular la activa + Vincular + Instalar + Iniciar sesión PR #%1$d No compilada para esta copia de DroidDeck Actualizada %1$s @@ -1331,6 +1529,14 @@ Apps Configuración Actualizar + Más + Editar pestañas + Pestañas + Mostrada + En Más + Oculta + Mover %1$s hacia arriba + Mover %1$s hacia abajo %1$d%% Reanudar %1$s Aparece como /root/ROMs en cada sesión. El almacenamiento interno está en /root/Storage. @@ -1352,6 +1558,15 @@ Cancelar en cola Teclado de Android Ocultar ✕ + Tamaño en pantalla + Parte de la pantalla que ocupa el teclado, encabezado incluido. + Opacidad + Bájala para ver el juego detrás del teclado. + Teclas ocultas + Las teclas que casi no usas no aparecen en el teclado. + Esc y fila de funciones + Ins / Del / Home / End / PgUp / PgDn + Teclas de dirección Iniciar %1$s Elige una pantalla. Secundaria: %1$s. La pantalla secundaria ya no está disponible. @@ -1864,7 +2079,24 @@ Terminal Agarres de Deck + trackpads Panel + Escritorio + Iniciar el escritorio + Escritorio · %1$s + Panel táctil + Toque directo + Panel táctil. Toca para usar el toque directo + Toque directo. Toca para usar el panel táctil + Iniciando el escritorio KDE… + El escritorio se cerró. + No se pudo iniciar el escritorio. Los registros están en la carpeta bottom-desktop de esta sesión. + El escritorio está cerrado. Todavía no hay nada que mostrar aquí. + Intercambiar pantallas + La pantalla inferior está ocupada ahora + Pantalla del juego + Mostrar el juego en + Pantalla superior + Pantalla inferior Descargas No hay descargas en curso. Steam @@ -1899,6 +2131,20 @@ Combustible, t Principal %1$s t Reserva %1$s t + Tiempo de fotograma + últimos %1$d s + fotograma promedio + mínimo al 1% + fotogramas de más de 33 ms + %1$d / min + Jugando durante %1$s + %1$d núcleos, hasta %2$s GHz + %1$d núcleos + juego + FPS de %1$d Hz + La marca roja indica el punto donde el HUD muestra la temperatura en rojo. + todo el dispositivo + batería Enviar datos al panel Automático Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados. @@ -1922,6 +2168,10 @@ El micro está desactivado en este juego. Para hablar, activa Micrófono en los ajustes de Steam de DroidDeck (Audio) y vuelve a iniciar el juego. Volumen %1$d%% Estadísticas del juego + HUD de la pantalla inferior + Franja en todas las pestañas + Mínimos al 1% y 0.1% + Temperatura de la CPU FPS CPU GPU @@ -2086,6 +2336,7 @@ Iniciando la sesión… %1$d:%2$02d transcurridos · sigue en marcha Descargando la actualización del cliente de Steam · %1$d%% + Aplicando la actualización del cliente de Steam… Descargando el cliente de Steam · %1$s Ya se está instalando una herramienta de compatibilidad Detén la sesión activa antes de instalar herramientas de compatibilidad @@ -2157,11 +2408,29 @@ Bordes anime Contornos toon más nitidez. La GPU no es Adreno + Controlador PowerVR del sistema: la compatibilidad varía según el dispositivo + Experimental: RADV o el controlador Xclipse del sistema + PowerVR del sistema + Usa los controladores integrados para esta GPU + El controlador PowerVR del sistema está seleccionado para el entorno de ejecución y la pantalla. + Todavía no hay un controlador de código abierto que cubra este Mali: el puente Mali está activado. + Esta es la compilación de prueba para dispositivos sin Snapdragon: las compilaciones oficiales de aquí solo funcionan en Adreno, por lo que no se instalan sobre ella. Las nuevas compilaciones de prueba están en github.com/The412Banner/droiddeck-nonadreno-drivers. + La última sesión terminó porque Android cerró DroidDeck para liberar memoria, no fue un fallo. Cierra otras apps o reduce la calidad de las texturas del juego y vuelve a intentarlo. + Mali (Venus) + el puente Mali + Todavía no hay un controlador de código abierto que cubra este Mali: se usa %1$s, sobre el controlador del propio celular. + %1$s aún no está publicado: se usa %2$s hasta que se publique. + %1$s no está disponible y el controlador de este celular indica Vulkan %2$s (Venus necesita 1.2): se usa el puente Mali. + %1$s aún no está publicado: el puente Mali está activado hasta que se publique. + En cola: %1$s (en espera de otro controlador del entorno de ejecución) + DXVK lo proporciona el entorno de ejecución PowerVR del sistema. Se pueden guardar otros paquetes de DXVK, pero no se aplican con este controlador. Compatible Experimental: sus controladores son versiones de prueba Compatibilidad experimental con Adreno 850: requiere controladores experimentales de pantalla y de juegos compatibles; no verificada en este dispositivo Por debajo del hardware probado (Adreno 725 y posteriores): puede que no funcione No compatible: no hay un motor gráfico compatible disponible para esta GPU + Funciona a través del puente Mali, sobre el controlador Vulkan del propio celular + No es compatible con el puente Mali desactivado: Turnip necesita una GPU Adreno (Snapdragon) Se alcanzó el límite de solicitudes de GitHub - inténtalo más tarde GitHub respondió HTTP %1$d Error en la descarga @@ -2322,6 +2591,13 @@ Ordenar Etiquetas de la barra lateral Muestra los nombres debajo de los íconos de la barra lateral. Desactívalo para una barra lateral más estrecha. + Mascota del agente + DeeDee flota sobre el lanzador y los juegos y muestra lo que hace el agente. + Sobre otras aplicaciones + Permite que DeeDee flote sobre todas las aplicaciones y abra su chat allí + Permitir + DeeDee + Chatear con DeeDee Vista Tarjetas más grandes Tarjetas más pequeñas @@ -2619,6 +2895,11 @@ Desarrollador Marca de agua de compilación Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. + Compartir paquetes de diagnóstico + Sesión y dispositivo + Gráficos + Juegos y compatibilidad + Todos los paquetes Listo para jugar Aún no está listo para jugar runtime %1$s @@ -2657,6 +2938,9 @@ Activa los logros de GOG en los ajustes de tiendas Logros no disponibles; revisa los registros de la sesión Logro desbloqueado + Mali (Venus): desactivado + Mali (Venus): activado + El controlador de %1$s indica Vulkan %2$s. Mali (Venus) necesita Vulkan 1.2 o posterior (gamescope no se inicia en versiones anteriores), así que las sesiones omiten Venus y usan en su lugar el par de controladores PanVK. Pegar Stick izquierdo Stick derecho @@ -2935,6 +3219,7 @@ Instaladores de VC++ y DirectX que piden los juegos Ejecuta juegos Linux x86 Herramienta de Steam + Steam descarga esto para los juegos que incluyen sistema antitrampas, incluso cuando está desactivado. Si lo eliminas, la instalación de esos juegos se queda atascada al 0% DroidDeck ejecuta juegos sin este runtime Proton x86, que DroidDeck no puede ejecutar Predeterminado para todos los juegos @@ -3054,6 +3339,8 @@ DroidDeck · %1$d fps 60 fps se ve más fluido pero usa más CPU mientras Steam se inicia. Un video elegido en la configuración de Steam también aparece aquí. Sonido + Omitir el video de inicio + Usa un clip negro de 0.1 segundos como video de inicio de Steam. Se aplica en la próxima sesión. Tu propio video MP4, MOV, MKV o WebM. Otros formatos y archivos de más de %1$d MB se convierten a WebM 720p en el dispositivo, hasta %2$d segundos. Importar @@ -3549,6 +3836,7 @@ Mantiene Alt+Tab, la tecla Win y el botón Inicio dentro de una sesión activa de DroidDeck en lugar de Android. Activa Brillo en Configuración → Integración con Steam Puente Mali: desactivado + %1$s no puede usar el puente Mali (necesita una GPU Mali sin ruta de controlador del sistema), así que esta opción no tiene efecto aquí. Puente Mali: activado %1$s no es una Adreno. El puente Vulkan experimental está activado: la sesión dibuja a través del propio controlador del teléfono. Espera errores; envía los registros de la sesión. Modo seguro @@ -3771,4 +4059,6 @@ Repetir una Volumen No hay archivos de audio en esta banda sonora + Inicio no disponible + No hay un navegador web disponible para abrir este enlace. diff --git a/app/src/main/res/values-bg/input_library.xml b/app/src/main/res/values-bg/input_library.xml new file mode 100644 index 0000000000..53f2103152 --- /dev/null +++ b/app/src/main/res/values-bg/input_library.xml @@ -0,0 +1,132 @@ + + + Избраният дисплей не е наличен. Свържете го, за да редактирате това оформление в реален размер. + Да се отхвърлят ли незапазените промени по оформлението? + Това оформление се използва от %1$d профила. Запазените промени важат за всички. + Профили по подразбиране + Режим на работен плот + Игрови режим + По подразбиране за работен плот и игра + По подразбиране за игрови режим + По подразбиране за режим на работен плот + Настройки на устройството + Управление + Бутони, стикове, спусъци и допълнителни клавиши + Копиране на профил + Нулиране на действията + Да се нулират ли действията в %1$s до стойностите на базовия профил? Оформленията и другите профили остават непроменени. + Да се изтрие ли %1$s? Режимите, които го използват, ще се върнат към вградените настройки по подразбиране. Запазените оформления и споделените настройки остават налични. + Видимост + Важи за всички профили. Auto показва управлението на основния екран, когато в игрови режим няма свързан контролер. + Редактиране на екрана + Запазени оформления… + Изберете оформление или създайте свое + Изберете Управление на профила в менюто на сесията на втория екран. Изборите Профил и Втори екран в менюто на контролера определят кое управление да се показва. + Действия на бутоните + Споделено с %1$s. Промените важат и за тези профили. + Повторно използване на настройки + Използване на настройки от… + Копиране от друг профил или запазване на споделени настройки + Направете независимо + Запазване на текущата настройка и спиране на споделянето на промени + Оформленията пазят елементи и позиции. Всеки профил може да задава свои действия. Редактирайте в пълен размер на целевия екран. + Текущо оформление + Да се изтрие ли неизползваното оформление %1$s и запазените му действия? + Преименуване на текущото оформление + Нечетимите настройки за вход са запазени в копие за възстановяване. Можете да продължите да редактирате възстановените профили. + Свойства + Свойства на щракване + %1$s · Щракване + Бутони + Стикове, подложки и спусъци + Скриване на инструментите + Контролер + Изпращане на входа от контролера към Steam Input или играта. + Този елемент не изпраща вход от контролер, мишка или клавиатура. + Щракване с мишка + Действие на DroidDeck + Действие + Скорост на превъртане: %1$d стъпки/с + + Нов профил + + Ново оформление + %1$s · Използва се от %2$d профила. Промените важат за всеки профил с тези задавания. + Преименуване + Изтриване + Добавете елементи към оформлението, преди да зададете действията им. + Настройките за вход не можаха да бъдат запазени + Име + Започване от + Бутон + Стик + Тъчпад + D-pad + Спусък + Готово + Отмяна + + Добавяне + Плъзнете за преместване. Плъзнете ъгъл за преоразмеряване. Докоснете Свойства, за да зададете действие. + Редактиране на втория екран + Повторно използване на %1$s от друг профил. Останалите източници на управление остават непроменени. + Физическото управление да остане споделено + По подразбиране всички контроли и персонализирани оформления са независими копия. Споделянето свързва само физическите контроли. + Използване на тези елементи и позиции. Споделянето синхронизира бъдещи промени по геометрията; действията на бутоните остават независими. Различно оформление започва с незададени действия. + Копиране на тези контроли и действия или свързването им, за да важат бъдещи промени и за двата профила. + Остави споделено + Независимо копие + Стартиране на стика от точката на докосване + Скриване на стика, когато не се използва + Инструменти + Автоматично (%1$s) + Персонализирано (%1$s) + Запазване като нов профил + Управление на профила + Профил + Жестове на тъчпада на мишката + Когато е зададено на показалеца на мишката: докоснете за щракване, задръжте за плъзгане и превъртайте с два пръста. + %1$s има замяна на бързото меню. Изберете Автоматично, за да използвате профила по подразбиране и трите запазени части. + Вход на DroidDeck + Задържа се, докато стикът е отместен в която и да е посока: натиска при над 55%, отпуска под 35%. Използвайте Клавиши за посока, за да зададете всяка посока отделно. Командите на DroidDeck се изпълняват веднъж на отклонение. Щракването на стика се настройва отделно. + Задържа се, докато докосвате тъчпада; отпуска се при вдигане на пръста. Командите на DroidDeck се изпълняват веднъж на докосване. Щракването на тъчпада се настройва отделно. + Задържа се, когато спусъкът премине 55%; отпуска се под 35%. Командите на DroidDeck се изпълняват веднъж на натискане. + Посока на превъртане + Вертикално + Хоризонтално + Хоризонтално превъртане + Измервания + Включете записа, използвайте управлението в активна сесия, след което се върнете и прочетете резултатите. Измерва само времето за изпращане на DroidDeck, не закъснението на екрана. Записът приключва при затваряне на процеса на приложението. + %1$d контрола + Други запазени оформления (%1$d) ▾ + Скриване на други запазени оформления (%1$d) ▴ + Начало / Guide + Назад · едно докосване + Назад · двойно докосване + Назад · два пъти в Steam, веднъж в работен плот + В режим Steam. Задържането на Назад отваря и бързия достъп. + Връщане към подразбирането + Изборът на панел се запомня. Работният плот отваря второ работно пространство; не сменя сесията или профила ѝ за вход. + Виртуален контролер + Типът контролер, който Steam или играта виждат. + Сензорен екран + Как се обработват докосванията на екрана на играта. Бутоните на профила запазват зададените си действия. + Курсор за докосване + Показва показалец за директни докосвания на екрана на играта. + Докосване и задържане + Действие на мишката при задържане на пръст на екрана на играта. + Докосвания на бутона Назад + Първо действие: едно докосване. Второ действие: двойно докосване. + Превключващ бутон + Докоснете за задържане, докоснете отново за освобождаване. Отваряне на меню или смяна на профил освобождава бутона. + Форма + Заоблена + Капсула + Кръг + Правоъгълник + Надпис на бутона + Текст + Импортирано изображение + Отделни диагонални клавиши + Задайте клавиш за всеки диагонал. Празният диагонал натиска двете съседни посоки. + Съседни посоки + Старите ви екранни клавиши са запазени като импортирани профили по-долу. Изберете един за използване или редактиране. Текущите избори на профил са запазени. + Старите екранни клавиши не можаха да се импортират автоматично. Оригиналните настройки са запазени. + diff --git a/app/src/main/res/values-bg/input_strings.xml b/app/src/main/res/values-bg/input_strings.xml new file mode 100644 index 0000000000..3e16a7059a --- /dev/null +++ b/app/src/main/res/values-bg/input_strings.xml @@ -0,0 +1,38 @@ + + + Профили за вход + Профили + Физически контролер + Основен екран + Втори екран + Собствен / Steam Input + Собствен: %1$s + Изпращане на друга команда от контролера + Изключено + Клавиш или комбинация от клавиши + Клавиши за посока + Движение на показалеца + Скорост на показалеца: %1$d + Превъртане + Вертикално превъртане + Ляв бутон на мишката + Десен бутон на мишката + Среден бутон на мишката + Отваряне на менюто на DroidDeck + Показване на клавиатурата + Отваряне на менюто на Steam + Отваряне на бързия достъп на Steam + Премахване на контрола + Добавяне на контрол + Бутони, специфични за устройството + Задаване на физически бутон + Отпуснете бутона, след което изберете Редакция, Повторение или Отказ. B или Назад отменя след отпускането. + Повторение + Натиснете бутон, включително бутон Назад, съобщен като клавиш. Клавишите за сила на звука и системните клавиши на Android са запазени. Задаването важи само за това устройство. + Премахване на задаването + Диагностика на входа + Записване на времето за изпращане на входа + Прочитане на измерванията + Измерва пътя от изпращането в Android до публикуването в съществуващия входен транспорт. Не включва пристигането по Bluetooth, запитването на госта, изобразяването и закъснението на екрана. Записът е изключен по подразбиране. + Използване на обичайното задаване на вход + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 30319356f2..3c13f1b753 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -185,6 +185,7 @@ Графичната среда за PowerVR не можа да бъде изтеглена. Проверете връзката и опитайте отново. DirectAudio не можа да бъде изтеглен, затова звукът на игрите използва по-бавния път в тази сесия. Тази програма + Сесията не успя да изобрази съдържание на екрана: %1$s. Вместо черен екран тук е показана причината; подробностите са в дневниците на сесията. Клиентът на Steam не можа да бъде изтеглен. Мрежата или VPN връзката ви може да блокира сървърите на Steam; проверете връзката и опитайте отново. Клиентът на Steam не можа да бъде настроен. Проверете връзката и свободното място, след което опитайте отново. %1$s е компилирана за x86 компютри и се стартира през FEX, който още не е инсталиран. Стартирайте Steam веднъж, докато сте влезли, и го оставете да изтегли FEX и Steam Linux Runtime, след което стартирайте отново. @@ -387,6 +388,9 @@ Все още не се поддържа тук Зареждане на компонентите… Инсталирането не бе успешно: %1$s + Това изтегляне се нуждае от актуализация. + Актуализацията е в опашката. + Повтори актуализацията Изтеглено Изтегляне на %1$s Инсталиране: %1$s @@ -417,6 +421,22 @@ Само вътрешна памет Папка: %1$s Втора библиотека + Още библиотеки на Steam + Папки, в които Steam може да инсталира игри и от които да ги пуска, всяка със свое име. При премахване на папка игрите ѝ остават на диска. + Добави библиотека + Преименувай + Име на библиотеката + Избери папка за библиотеката + Най-много %1$d добавени библиотеки + Тази папка вече е библиотека или се намира в такава + %1$s · не е налична + Влиза в сила от следващата сесия на Steam + Открити на това устройство · %1$s · %2$s + Добави + Откриване на библиотеки във вътрешната памет + Разреши достъп до всички файлове, за да може DroidDeck да вижда библиотеките на Steam, които други приложения съхраняват във вътрешната памет. + Разреши + Добавена е %1$s, библиотеката на Steam в папката, която избра Игри, които стриймват ресурси от SD картата или общото хранилище, може да заекват. Диагностика на хранилището Записва резултатите от заделянето и извадкови времена на хранилището в „Споделяне на дневници“. Може да забави инсталациите, докато е включено. Прилага се от следващата сесия. @@ -605,7 +625,10 @@ Изключва помощника на Proton за навигация с контролер, който използва процесорно време във всяка игра. Стартиране на proot без seccomp Може да отстрани грешки с липсващи системни извиквания на някои ядра. Може да намали производителността. + Стартиране без proot (експериментално) + Стартира Linux частта директно в Android. Влиза в сила от следващата сесия. Изключи, ако нещо не се стартира. Бърз път на proot + Не се използва без proot. Изисква филтъра seccomp на proot. По-бързо търсене на файлове и по-малко заекване. Изключете, ако програма не може да намери файловете си. Изобразяване на курсора в gamescope @@ -815,6 +838,7 @@ Устройството се поддържа Непроверен GPU GPU не се поддържа + GPU през Mali мост %1$s · %2$s %1$s: %2$s Няма съвместим графичен бекенд за %1$s. Steam може да показва черен екран. @@ -844,15 +868,38 @@ Сесия Дневници на сесията Запазват се след всяка сесия + Разширена диагностика за следващата сесия + Записва подробни дневници за една сесия. Може да намали производителността и да заема повече място за съхранение. Изключва се сама при стартиране на сесията; прегледай дневниците, преди да ги споделиш. Дневници за дебъгване на игри Включва диагностика на Proton, Wine и графиката при следващото стартиране на игра. Може да намали производителността и да заеме повече място. Рестартирайте тази сесия, за да запазите дневниците за дебъгване на игри Записването в дневник не можа да бъде променено. Проверете превключвателя и опитайте пак. Инструменти за отстраняване на грешки + Подробни дневници за графиката + Интерфейс на Steam: изрисуване чрез GPU + При двойката драйвери Xclipse Steam изрисува страниците си софтуерно (изрисуването чрез GPU даваше разбити плочки). Включи за по-бърз интерфейс на Steam, ако изглежда правилно на този телефон. + компилирано на %1$s + %1$s вече използва най-новата компилация + Мостикът Mali не премина самопроверката си при последната сесия на %1$s (изображения или команди за рисуване), затова в сесията беше използвана двойката драйвери PanVK. + Мостикът Mali не намери начин да споделя памет с драйвера при последната сесия на %1$s, затова в сесията беше използвана двойката драйвери PanVK. Мостикът не може да работи на този телефон; изключването му запазва двойката драйвери PanVK. + Логовете на Proton, DXVK и драйверите за всяка игра са в логовете на сесията. Винаги включено, когато GPU не е Adreno. Последни дневници на сесията Запазени дневници на сесията Запазва най-новите %1$d Изчистване на дневниците + Налични логове от сесиите + Още няма запазени логове от сесии. + Споделените и запазените ZIP архиви включват избраната сесия заедно със свързаните диагностични данни от Steam, магазина, инструментите и Battle.net. + %1$s · %2$s + Текуща сесия + Сподели + Запази на устройството + Изтрий + Да се изтрият ли логовете от сесията? + Да се изтрие ли %1$s? Това не може да се отмени. + Логовете от сесията са запазени. + Логовете от сесията не можаха да бъдат запазени. + Логовете от сесията не можаха да бъдат изтрити. Нулиране на всички настройки Връща всяка настройка към стойността по подразбиране Нулиране @@ -879,6 +926,8 @@ Използване като начален екран DroidDeck може да бъде приложението за начален екран DroidDeck никога не се предлага като приложение за начален екран + Бутонът „Начало“ отваря + Страницата, която се показва, когато DroidDeck е приложението за „Начало“ и натиснеш „Начало“ В „Добавяне на игри“ задайте DroidDeck на „Включване“ Ориентация Ориентация на стартера @@ -892,15 +941,22 @@ Цял екран Скрива лентите за състояние и навигация на Android Показва лентите за състояние и навигация на Android + Лаунчер с два екрана + Автоматично: секциите на лаунчера (Steam, Библиотека, Магазини и останалите) се показват на втория екран при преносими устройства с вграден такъв. Включено: използва се всеки втори дисплей. Изключено: лаунчерът остава на един екран. + Сесии с два екрана + Автоматично: менюто в играта се показва закрепено на вградения втори екран, а не като изскачащ прозорец. Включено: използва се всеки втори дисплей. Изключено: менюто остава на екрана с играта; от него все още можете да изберете втори екран. Автоматично Вкл. Изкл. Контроли на долния екран в игрите + Android клавиатура за текстови полета Отваря тракпада и клавиатурата на втория екран при стартиране на сесия. Въвеждане за горния екран Готово Приложение за начален екран по подразбиране Изберете приложение за начален екран + Скрий лаунчера от „Последни приложения“, докато е неактивен + Важи само когато DroidDeck е приложението по подразбиране за „Начало“ и няма активна сесия. Избор Приложения за Linux (бета) Файлове @@ -1015,6 +1071,147 @@ Тестови версии Изпробвайте поправка, преди да бъде издадена Няма в момента + Лабораторна компилация + Лабораторни компилации + В употреба + На пауза, след като Android повторно оптимизира DroidDeck + Не е заредена: %1$s + В очакване на рестарт + Запазена + За друга версия + Преизгради + Изтрива тази компилация от устройството + Рестартирай с нея + Изключи + Използвай + Изтрий + Изтрий сега + Не можа да се подготви рестартът: %1$s. Сдвоете безжичното отстраняване на грешки в Настройки и опитайте отново. + Лабораторна компилация е инсталирана + DroidDeck се рестартира с %1$s + Лаб компилацията е на пауза + Android оптимизира отново DroidDeck, затова %1$s не е заредена. Отворете Актуализации, за да рестартирате с нея. + Лаб компилацията е изключена + Създадена е за друга версия на DroidDeck. Запазена е в Актуализации. + DroidDeck не стартира два пъти с нея + Агент + Агент + Агентът работи + Инсталирайте Claude Code в потребителското пространство на Linux, за да използвате агента. + Попитайте за игра, срив или промяна в DroidDeck + Изпрати + Нов разговор + Спри + Съхранение + Премахни + Премахни сега + Claude Code + Codex + Изходен код на DroidDeck + Кешове за изтегляне + Неизпратените промени се губят + Компилациите ги изтеглят отново + Настройката може да го инсталира отново; вписванията се запазват + DroidDeck рестартира с вашата лаб компилация. Продължете оттам, където спряхте. + Попитайте го защо игра не стартира, помолете го да обясни лог или да промени DroidDeck и да изпробва промяната на това устройство. + Неуспешно: %1$s + %1$s приключи (изход %2$d) + Спряно + Приключи без отговор + Опитай отново + Настройва се агентът + Прекомпилирай моята лаб компилация %1$s за инсталираната версия на DroidDeck и рестартирай с нея. + %1$s на вход · %2$s на изход + Мисли + Мисъл + Мисли · %1$s + %1$s · %2$s + ВХОД + ИЗХОД + Изпълнява се… + Няма резултат: ходът приключи първи + Няма изход + Въведете, за да наредите следващото съобщение + В опашката + Следващо: %1$s + Не изпращай + Прикачи + Премахни + По подразбиране + Усилие за разсъждение + Напред + Преработи + Още нищо не е променено + Изпълни плана. + Изпрати сега + Съобщение + Още + Затвори + Най-новото + Работи + Контекст + %1$s от %2$s + Този разговор · %1$s + Използването се показва след първия отговор + %1$d-часов лимит + %1$d-минутен лимит + Седмичен лимит + %1$d%% · нулира се %2$s + + %1$d файл + %1$d файла + + Планирай първо + План + Предлага план, без да променя нищо + Разговори + Все още няма разговори + Току-що + Изтрий + Изтрива го заедно с прикачените файлове + Процеси + В потребителското пространство на Linux няма работещи процеси + АГЕНТ + Спри + Сборка Lab + Подготовка на сборки Lab + %1$d%% · остават около %2$s + остават около %1$s + Отмени + Отмени сборката + Стартиране + %1$d%% + Опаковане + Рестартиране на DroidDeck върху него + Готово + Неуспешно: %1$s + Настройка на агента + Първо инсталирайте Linux средата за изпълнение в „Настройки“. + Опитай отново + Започни разговор + Връзка с устройството + Безжично отстраняване на грешки, за да може агентът да вижда и управлява DroidDeck + Инсталиране на %1$s + В потребителското пространство на Linux, с git, gh и adb + Вход в %1$s + Отваря браузъра ви + GitHub + Незадължително, за отваряне на pull requests + Инструменти за компилиране + Незадължително, за Lab компилации на това устройство · около 5 GB + Агентът е готов + Завършете настройката на агента + Влезли сте в %1$s + Lab компилации + бързи компилации + Бързи Lab компилации + Компилира тази версия предварително, така че Lab компилациите да отнемат минути · около 20 минути еднократно + Компилиране · %1$d%% · остават около %2$s + Подготви + Безжичното отстраняване на грешки не е достъпно; сдвояването го включва + Сдвой + Инсталирай + Влез PR #%1$d Не е компилирана за това копие на DroidDeck Актуализирано %1$s @@ -1254,6 +1451,14 @@ Приложения Настройка Актуализации + Още + Редактирай раздели + Раздели + Показан + В „Още“ + Скрит + Премести %1$s нагоре + Премести %1$s надолу %1$d%% Продължаване на %1$s Показва се като /root/ROMs във всяка сесия. Вътрешната памет е на /root/Storage. @@ -1275,6 +1480,15 @@ Отказ на изчакването Клавиатура на Android Скриване ✕ + Размер на екрана + Каква част от екрана заема клавиатурата, включително заглавката. + Непрозрачност + Намалете я, за да виждате играта зад клавиатурата. + Скрити клавиши + Рядко използваните клавиши не се показват на клавиатурата. + Esc и ред с функционални клавиши + Ins / Del / Home / End / PgUp / PgDn + Клавиши със стрелки Пускане на %1$s Избери екран. Втори: %1$s. Вторият екран вече не е достъпен. @@ -1776,7 +1990,24 @@ Терминал Захвати + тракпади на Deck Табло + Работен плот + Стартирайте работния плот + Работен плот · %1$s + Тъчпад + Директно докосване + Тъчпад. Докоснете за директно докосване + Директно докосване. Докоснете за тъчпад + Стартиране на работния плот KDE… + Работният плот се затвори. + Работният плот не можа да се стартира. Логовете му са в папката bottom-desktop на тази сесия. + Работният плот е затворен. Все още няма нищо за показване. + Размяна на екраните + Долният екран не е свободен в момента + Екран на играта + Покажете играта на + Горен екран + Долен екран Изтегляния Няма активни изтегляния. Steam @@ -1811,6 +2042,20 @@ Гориво, t Основно %1$s t Резерв %1$s t + Време на кадъра + последните %1$d s + ср. кадър + най-ниските 1% + кадри над 33 ms + %1$d / min + В игра от %1$s + %1$d ядра, до %2$s GHz + %1$d ядра + игра + FPS от %1$d Hz + Червената маркировка е мястото, където HUD показва температурата в червено. + цялото устройство + батерия Изпращане на данни за таблото Автоматично Включва го за всяка игра от списъка тук, включително игри, открити по-късно. Игрите, които изключите, остават изключени. @@ -1834,6 +2079,10 @@ Микрофонът е изключен за тази игра. За да говорите, включете „Микрофон“ в настройките на Steam в DroidDeck (Звук) и стартирайте играта отново. Сила на звука %1$d%% Статистика в играта + HUD на долния екран + Лента на всеки раздел + най-ниските 1% и 0.1% + Температура на CPU FPS CPU GPU @@ -2006,6 +2255,7 @@ Стартиране на сесията… %1$d:%2$02d изминали · все още работи Изтегляне на актуализацията на клиента на Steam · %1$d%% + Прилагане на актуализацията на клиента Steam… Изтегляне на клиента на Steam · %1$s Вече тече инсталация на инструмент за съвместимост @@ -2082,11 +2332,29 @@ Контури като в анимация плюс изостряне. Не е GPU Adreno + Системен драйвер PowerVR: съвместимостта варира според устройството + Експериментално: RADV или системният драйвер Xclipse + Системен PowerVR + Използва вградените драйвери за този GPU + Системният драйвер PowerVR е избран за средата за изпълнение и дисплея. + Нито един драйвер с отворен код засега не поддържа този Mali: мостът Mali е включен. + Това е тестовата версия за устройства без Snapdragon: официалните версии тук работят само на Adreno, затова не се инсталират върху нея. Новите тестови версии са на github.com/The412Banner/droiddeck-nonadreno-drivers. + Последната сесия приключи, защото Android затвори DroidDeck, за да освободи памет, а не заради срив. Затворете други приложения или намалете настройките за текстури на играта, после опитайте отново. + Mali (Venus) + мостът Mali + Нито един драйвер с отворен код засега не поддържа този Mali: използва се %1$s със собствения драйвер на телефона. + %1$s все още не е публикуван: дотогава се използва %2$s. + %1$s не е наличен, а драйверът на този телефон отчита Vulkan %2$s (Venus изисква 1.2): използва се мостът Mali. + %1$s все още не е публикуван: дотогава мостът Mali е включен. + В опашка: %1$s (изчаква друг драйвер на средата за изпълнение) + DXVK се предоставя от системната среда за изпълнение PowerVR. Други DXVK пакети могат да се съхраняват, но не се прилагат с този драйвер. Поддържан Експериментален: драйверите му са тестови версии Експериментална поддръжка на Adreno 850: изисква съвместими експериментални драйвери за дисплея и игрите; не е проверена на това устройство Под тестваните устройства (Adreno 725 и по-нови): може да не работи Не се поддържа: няма съвместим графичен бекенд за този GPU + Работи през моста Mali, със собствения драйвер Vulkan на телефона + Не се поддържа, когато мостът Mali е изключен: Turnip изисква графичен процесор Adreno (Snapdragon) Достигнато е ограничението на GitHub за заявки - опитай отново по-късно GitHub отговори с HTTP %1$d @@ -2287,6 +2555,13 @@ Сортиране Етикети в страничната лента Показване на имена под иконите в страничната лента. Изключете за по-тясна странична лента. + Любимец на агента + DeeDee стои над лаунчера и игрите и показва какво прави агентът. + Над други приложения + Позволи на DeeDee да се показва над всяко приложение и да отваря чата си там + Разреши + DeeDee + Чат с DeeDee Изглед По-големи карти По-малки карти @@ -2574,6 +2849,11 @@ Разработчик Воден знак с етикет на компилацията Показва етикета на тестовата или Lab компилация на екрана. Включено по подразбиране. + Споделяне на диагностични пакети + Сесия и устройство + Графика + Игри и съвместимост + Всички пакети Готово за игра Още не е готово за игра среда %1$s @@ -2612,6 +2892,9 @@ Включи постиженията на GOG в настройките на магазините Постиженията не са достъпни; проверете логовете на сесията Постижение отключено + Mali (Venus): изключен + Mali (Venus): включен + Драйверът на %1$s отчита Vulkan %2$s. Mali (Venus) изисква Vulkan 1.2 или по-нова версия (gamescope не стартира на по-стари версии), затова сесиите пропускат Venus и вместо това използват двойката драйвери PanVK. Поставяне Ляв стик Десен стик @@ -2967,6 +3250,7 @@ Инсталации на VC++ и DirectX, нужни на игрите Стартира игри за Linux x86 Инструмент на Steam + Steam изтегля това за игри, които включват анти-чийт, дори когато е изключен. Премахването му спира инсталацията им на 0% DroidDeck стартира игри без тази среда Proton x86, който DroidDeck не може да стартира По подразбиране за всички игри @@ -3077,6 +3361,8 @@ DroidDeck · %1$d кадъра/с 60 кадъра/с изглежда по-гладко, но натоварва повече процесора, докато Steam се стартира. Видео, избрано в настройките на Steam, също се показва тук. Звук + Пропусни стартовото видео + Използвай 0,1-секунден черен клип като стартовото видео на Steam. Влиза в сила при следващата сесия. Собствено видео MP4, MOV, MKV или WebM. Други формати и файлове над %1$d MB се конвертират на устройството до WebM 720p, до %2$d секунди. Импортиране @@ -3538,6 +3824,7 @@ Задържа Alt+Tab, клавиша Win и бутона Начало в активната сесия на DroidDeck вместо в Android. Включете „Яркост“ в Настройка → Интеграция със Steam Mali мост: изкл. + %1$s не може да използва моста Mali (нужен е графичен процесор Mali без маршрут през системен драйвер), затова този превключвател няма ефект тук. Mali мост: вкл. %1$s не е Adreno. Експерименталният Vulkan мост е включен: сесията рисува през собствения драйвер на телефона. Очаквайте грешки; изпратете логовете на сесията. Безопасен режим @@ -3697,6 +3984,7 @@ Това разположение не можа да бъде импортирано Ален сняг + Бели повърхности с червени акценти. Саундтраци Музика @@ -3760,4 +4048,6 @@ Повтаряне на една Сила на звука В този саундтрак няма аудиофайлове + Стартирането е недостъпно + Няма наличен уеб браузър за отваряне на тази връзка. diff --git a/app/src/main/res/values-cs/input_library.xml b/app/src/main/res/values-cs/input_library.xml new file mode 100644 index 0000000000..10783695ce --- /dev/null +++ b/app/src/main/res/values-cs/input_library.xml @@ -0,0 +1,132 @@ + + + Vybraný displej není dostupný. Připojte jej, abyste mohli toto rozložení upravit v plné velikosti. + Zahodit neuložené změny rozložení? + Toto rozložení používá %1$d profilů. Uložené změny platí pro všechny. + Výchozí profily + Režim plochy + Režim hry + Výchozí pro plochu i hru + Výchozí pro režim hry + Výchozí pro režim plochy + Nastavení zařízení + Ovládání + Tlačítka, páčky, spouště a další klávesy + Kopírovat profil + Obnovit akce + Obnovit akce v %1$s na výchozí hodnoty základního profilu? Rozložení a další profily zůstanou nezměněné. + Smazat %1$s? Režimy, které jej používají, se vrátí k vestavěnému výchozímu profilu. Uložená rozložení a sdílená nastavení zůstanou dostupná. + Viditelnost + Platí pro všechny profily. Auto zobrazí ovládání hlavní obrazovky, když v režimu hry není připojen ovladač. + Upravit na obrazovce + Uložená rozložení… + Vyberte rozložení nebo si vytvořte vlastní + V menu relace vedlejší obrazovky vyberte Ovládání profilu. Volby Profil a Vedlejší obrazovka v menu ovladače určují, které ovládání se zobrazí. + Akce tlačítek + Sdíleno s %1$s. Úpravy se projeví i v těchto profilech. + Znovu použít nastavení + Použít nastavení z… + Zkopírovat z jiného profilu nebo ponechat nastavení sdílená + Udělat nezávislým + Ponechat aktuální nastavení a přestat sdílet změny + Rozložení ukládají prvky a jejich pozice. Každý profil může přiřadit vlastní akce. Upravujte v plné velikosti na cílové obrazovce. + Aktuální rozložení + Smazat nepoužívané rozložení %1$s a jeho uložené akce? + Přejmenovat aktuální rozložení + Nečitelná nastavení vstupu byla uložena do záložní kopie. Můžete dál upravovat obnovené profily. + Vlastnosti + Vlastnosti kliknutí + %1$s · Kliknutí + Tlačítka + Páčky, podložky a spouště + Skrýt nástroje + Ovladač + Odesílá vstup ovladače do Steam Input nebo do hry. + Tento prvek neodesílá vstup ovladače, myši ani klávesnice. + Kliknutí myší + Akce DroidDeck + Akce + Rychlost posunu: %1$d kroků/s + + Nový profil + + Nové rozložení + %1$s · Používá %2$d profilů. Změny platí pro všechny profily s tímto přiřazením. + Přejmenovat + Smazat + Než přiřadíte akce, přidejte do rozložení prvky. + Nastavení vstupu se nepodařilo uložit + Název + Začít od + Tlačítko + Páčka + Touchpad + Křížový ovladač + Spoušť + Hotovo + Zpět + + Přidat + Přetažením přesunete. Přetažením rohu změníte velikost. Klepněte na Vlastnosti pro přiřazení akce. + Úprava na vedlejší obrazovce + Znovu použít %1$s z jiného profilu. Ostatní zdroje ovládání zůstanou nezměněné. + Ponechat fyzické ovládání sdílené + Ve výchozím nastavení jsou všechna ovládání a vlastní rozložení nezávislé kopie. Sdílení propojuje pouze fyzické ovládání. + Použít tyto prvky a pozice. Sdílení udržuje budoucí změny geometrie v synchronizaci; akce tlačítek zůstávají nezávislé. Jiné rozložení začíná s nepřiřazenými akcemi. + Zkopírovat tato ovládání a akce, nebo je propojit, aby se budoucí úpravy projevily v obou profilech. + Ponechat sdílené + Nezávislá kopie + Spustit páčku v místě dotyku + Skrýt páčku, když se nepoužívá + Nástroje + Automaticky (%1$s) + Vlastní (%1$s) + Uložit jako nový profil + Ovládání profilu + Profil + Gesta touchpadu myši + Při přiřazení k ukazateli myši: klepnutím kliknete, podržením táhnete a dvěma prsty posouváte. + %1$s má přepsání rychlé nabídky. Vyberte Automaticky, chcete-li použít výchozí profil a všechny tři uložené části. + Vstup DroidDeck + Drženo, když je páčka vychýlena jakýmkoli směrem: stisk nad 55 %, uvolnění pod 35 %. Pomocí Směrových kláves přiřaďte každý směr zvlášť. Příkazy DroidDeck se spustí jednou za vychýlení. Kliknutí páčky se nastavuje zvlášť. + Drženo při dotyku touchpadu; uvolněno při zvednutí prstu. Příkazy DroidDeck se spustí jednou za dotyk. Kliknutí touchpadu se nastavuje zvlášť. + Drženo, když spoušť překročí 55 %; uvolněno pod 35 %. Příkazy DroidDeck se spustí jednou za stisk. + Směr posunu + Svisle + Vodorovně + Posouvat vodorovně + Měření + Zapněte záznam, použijte ovládání v běžící relaci, poté se vraťte a přečtěte výsledky. Měří pouze dobu odeslání DroidDeck, ne zpoždění displeje. Záznam končí při zavření procesu aplikace. + Ovládacích prvků: %1$d + Další uložená rozložení (%1$d) ▾ + Skrýt další uložená rozložení (%1$d) ▴ + Domů / Guide + Zpět · jedno klepnutí + Zpět · dvojité klepnutí + Zpět · dvakrát v Steam, jednou na ploše + V režimu Steam. Podržením Zpět se také otevře rychlý přístup. + Obnovit výchozí + Volba panelu se pamatuje. Plocha otevře druhý pracovní prostor; nepřepíná relaci ani její vstupní profil. + Virtuální ovladač + Typ ovladače, který vidí Steam nebo hra. + Dotyková obrazovka + Jak se zpracovávají dotyky na obrazovce hry. Tlačítka profilu si zachovávají přiřazené akce. + Kurzor dotyku + Zobrazí ukazatel pro přímé dotyky na obrazovce hry. + Dotknout se a podržet + Akce myši při podržení prstu na obrazovce hry. + Klepnutí tlačítka Zpět + První akce: jedno klepnutí. Druhá akce: dvojité klepnutí. + Přepínací tlačítko + Klepnutím podržíte, dalším klepnutím uvolníte. Otevření nabídky nebo přepnutí profilu tlačítko uvolní. + Tvar + Zaoblený + Kapsle + Kruh + Obdélník + Popisek tlačítka + Text + Importovaný obrázek + Samostatné diagonální klávesy + Přiřaďte klávesu každé diagonále. Prázdná diagonála stiskne dvě sousední směry. + Sousední směry + Vaše staré klávesy na obrazovce jsou uloženy níže jako importované profily. Vyberte jeden k použití nebo úpravě. Vaše aktuální volby profilu byly zachovány. + Staré klávesy na obrazovce se nepodařilo importovat automaticky. Původní nastavení bylo zachováno. + diff --git a/app/src/main/res/values-cs/input_strings.xml b/app/src/main/res/values-cs/input_strings.xml new file mode 100644 index 0000000000..6cd32d90b3 --- /dev/null +++ b/app/src/main/res/values-cs/input_strings.xml @@ -0,0 +1,38 @@ + + + Profily vstupu + Profily + Fyzický ovladač + Hlavní obrazovka + Vedlejší obrazovka + Nativní / Steam Input + Nativní: %1$s + Odeslat jiný povel ovladače + Zakázáno + Klávesa nebo kombinace kláves + Směrové klávesy + Pohyb ukazatele + Rychlost ukazatele: %1$d + Posun + Posun svisle + Levé tlačítko myši + Pravé tlačítko myši + Prostřední tlačítko myši + Otevřít nabídku DroidDeck + Zobrazit klávesnici + Otevřít nabídku Steam + Otevřít rychlý přístup Steam + Odebrat prvek + Přidat prvek + Tlačítka specifická pro zařízení + Přiřadit fyzické tlačítko + Uvolněte tlačítko a zvolte Upravit, Znovu nebo Zrušit. B nebo Zpět zruší po uvolnění. + Znovu + Stiskněte tlačítko, včetně tlačítka Zpět hlášeného jako klávesa. Klávesy hlasitosti a systémové klávesy Androidu jsou vyhrazené. Přiřazení platí jen pro toto zařízení. + Odebrat přiřazení + Diagnostika vstupu + Zaznamenávat dobu odeslání vstupu + Přečíst měření + Měří cestu od odeslání v Androidu po publikaci ve stávajícím vstupním přenosu. Nezahrnuje příchod přes Bluetooth, dotazování hosta, vykreslování ani zpoždění displeje. Záznam je ve výchozím nastavení vypnutý. + Použít běžné přiřazení vstupu + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 25f6cf966e..34afc84da9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -185,6 +185,7 @@ Grafické prostředí PowerVR se nepodařilo stáhnout. Zkontrolujte připojení a zkuste to znovu. DirectAudio se nepodařilo stáhnout, takže zvuk her v této relaci používá pomalejší cestu. Tento program + Relaci se nepodařilo vykreslit na obrazovku: %1$s. Místo černé obrazovky je zde důvod; podrobnosti jsou v protokolech relace. 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. @@ -389,6 +390,9 @@ Zde ještě nepodporováno Načítání komponent… Nepodařilo se nainstalovat: %1$s + Tato stažená data vyžadují aktualizaci. + Aktualizace je ve frontě. + Opakovat aktualizaci Staženo Stahuje se %1$s Instaluje se: %1$s @@ -419,6 +423,22 @@ Pouze interní Složka: %1$s Druhá knihovna + Další knihovny Steam + Složky, do kterých může Steam instalovat hry a odkud je spouští, každá pod svým názvem. Po odebrání zůstanou její hry na disku. + Přidat knihovnu + Přejmenovat + Název knihovny + Vyberte složku pro knihovnu + Nejvýše %1$d přidaných knihoven + Tato složka už je knihovnou nebo leží uvnitř jiné + %1$s · není k dispozici + Platí od další relace Steam + Nalezeno na tomto zařízení · %1$s · %2$s + Přidat + Najít knihovny v interním úložišti + Povolte přístup ke všem souborům, aby DroidDeck viděl knihovny Steam, které jiné aplikace uchovávají v interním úložišti + Povolit + Přidána %1$s, knihovna Steam uvnitř vybrané složky Hry, které streamují data z karty SD nebo sdíleného úložiště, mohou trhat. Diagnostika úložiště Zaznamenává výsledky alokace a vzorky časování úložiště do sdílených protokolů. Když je zapnuto, může zpomalit instalace. Použije se od příští relace. @@ -609,7 +629,10 @@ Vypne pomocníka Protonu pro navigaci gamepadem, který stojí výkon CPU v každé hře. Spustit proot bez seccomp Může opravit chyby s chybějícími systémovými voláními na některých jádrech. Může snížit výkon. + Spustit bez proot (experimentální) + Spustí linuxovou část přímo na Androidu. Platí pro další relaci. Vypněte, pokud se něco nespustí. Rychlá cesta proot + Bez proot se nepoužije. Vyžaduje filtr seccomp od proot. Rychlejší vyhledávání souborů a méně zadrhávání. Vypněte, pokud program nemůže najít své soubory. Kreslit kurzor v gamescope @@ -821,6 +844,7 @@ Zařízení podporováno Neověřené GPU GPU nepodporováno + GPU přes most Mali %1$s · %2$s %1$s: %2$s Pro %1$s není k dispozici kompatibilní grafický backend. Steam může zobrazit černou obrazovku. @@ -850,15 +874,38 @@ Relace Protokoly relace Uloženo po každé relaci + Rozšířená diagnostika pro další relaci + Zachytává podrobné protokoly pro jednu relaci. Může snížit výkon a zabrat více místa. Po spuštění relace se sama vypne; protokoly před sdílením zkontrolujte. Ladicí protokoly her Při dalším spuštění hry zahrnout diagnostiku Protonu, Wine a grafiky. Může snížit výkon a zabrat více úložiště. Pro ukládání ladicích protokolů her restartujte tuto relaci Protokolování se nepodařilo změnit. Zkontrolujte přepínač a zkuste to znovu. Nástroje pro ladění + Podrobné protokoly grafiky + Rozhraní Steam: vykreslování na GPU + S párem ovladačů Xclipse vykresluje Steam své stránky softwarově (vykreslování na GPU zobrazovalo poškozené dlaždice). Pokud na tomto telefonu vypadá správně, zapněte tuto možnost pro rychlejší rozhraní Steam. + sestaveno %1$s + %1$s byl aktualizován na nejnovější sestavení + Most Mali neprošel při poslední relaci na %1$s samotestem (obrázky nebo vykreslování), takže relace místo něj použila dvojici ovladačů PanVK. + Most Mali při poslední relaci na %1$s nenašel způsob, jak sdílet paměť s ovladačem, takže relace použila dvojici ovladačů PanVK. Na tomto telefonu most fungovat nemůže; jeho vypnutí zachová dvojici ovladačů PanVK. + Logy Proton, DXVK a ovladačů každé hry jsou v lozích relace. Vždy zapnuto, pokud GPU není Adreno. Protokoly poslední relace Uložené protokoly relací Uchovává nejnovějších %1$d Vymazat protokoly + Dostupné logy relací + Zatím žádné uložené logy relací. + Sdílené a uložené soubory ZIP obsahují vybranou relaci a související diagnostické údaje pro Steam, obchod, nástroje a Battle.net. + %1$s · %2$s + Aktuální relace + Sdílet + Uložit do zařízení + Smazat + Smazat logy relace? + Smazat %1$s? Akci nelze vrátit zpět. + Logy relace byly uloženy. + Logy relace se nepodařilo uložit. + Logy relace se nepodařilo smazat. Obnovit všechna nastavení Vrátí každé nastavení na výchozí hodnotu Obnovit @@ -885,6 +932,8 @@ Použít jako domovskou obrazovku DroidDeck může být domovská aplikace DroidDeck se nikdy nenabízí jako domovská aplikace + Tlačítko Domů otevírá + Stránka, která se zobrazí, když je DroidDeck aplikací Domů a stisknete tlačítko Domů V Přidat hry nastavte DroidDeck na Zahrnout Orientace Orientace launcheru @@ -898,15 +947,22 @@ Celá obrazovka Skryje stavový a navigační panel Androidu Zobrazí stavový a navigační panel Androidu + Spouštěč na dvou obrazovkách + Automaticky přesune sekce spouštěče (Steam, Knihovna, Obchody a ostatní) na druhou obrazovku handheldů, které ji mají vestavěnou. Zapnuto použije libovolný druhý displej. Vypnuto ponechá spouštěč na jedné obrazovce. + Relace na dvou obrazovkách + Automaticky připne nabídku ve hře na vestavěnou druhou obrazovku místo překryvného okna. Zapnuto použije libovolný druhý displej. Vypnuto ponechá nabídku na obrazovce hry; druhou obrazovku z ní můžete stejně vybrat. Automaticky Zapnuto Vypnuto Ovládání na spodní obrazovce ve hrách + Klávesnice systému Android pro textová pole Při spuštění relace otevře touchpad a klávesnici na druhé obrazovce. Psaní pro horní obrazovku Hotovo Výchozí domovská aplikace Vybrat domovskou aplikaci + Skrýt spouštěč z Nedávných aplikací, když je nečinný + Platí pouze tehdy, když je DroidDeck výchozí aplikací Domů a neběží žádná relace. Vybrat Aplikace Linuxu (beta) Soubory @@ -1021,6 +1077,149 @@ Testovací sestavy Vyzkoušejte opravu před jejím vydáním Momentálně žádné + Laboratorní sestavení + Laboratorní sestavení + Používá se + Pozastaveno poté, co Android znovu optimalizoval DroidDeck + Nenačteno: %1$s + Čeká na restart + Ponecháno + Pro jinou verzi + Znovu sestavit + Smaže toto sestavení ze zařízení + Restartovat na něm + Vypnout + Použít + Smazat + Smazat nyní + Restart se nepodařilo připravit: %1$s. V Nastavení spárujte bezdrátové ladění a zkuste to znovu. + Laboratorní sestavení nainstalováno + DroidDeck se restartoval na %1$s + Laboratorní sestavení pozastaveno + Android znovu optimalizoval aplikaci DroidDeck, takže %1$s není načteno. Otevřete Aktualizace a znovu na něm spusťte DroidDeck. + Laboratorní sestavení vypnuto + Bylo vytvořeno pro jinou verzi aplikace DroidDeck. Zůstává v Aktualizacích. + DroidDeck se na něm dvakrát nespustil. + Agent + Agent + Agent pracuje + Chcete-li používat agenta, nainstalujte Claude Code v uživatelském prostředí Linuxu. + Zeptejte se na hru, pád nebo úpravu aplikace DroidDeck + Odeslat + Nová konverzace + Zastavit + Úložiště + Odebrat + Odebrat nyní + Claude Code + Codex + Zdrojový kód DroidDeck + Mezipaměť stahování + Neodeslané změny se ztratí + Sestavení je znovu stáhnou. + Úvodní nastavení ho může znovu nainstalovat; přihlášení zůstanou zachována. + DroidDeck se znovu spustil na vašem laboratorním sestavení. Pokračujte tam, kde jste skončili. + Zeptejte se, proč se hra nespustí, požádejte o vysvětlení logu nebo úpravu aplikace DroidDeck a nechte změnu otestovat na tomto zařízení. + Chyba: %1$s + %1$s skončil (kód %2$d) + Zastaveno + Skončilo bez odpovědi + Zkusit znovu + Nastavování agenta + Znovu sestavte mé laboratorní sestavení %1$s pro nainstalovanou verzi aplikace DroidDeck a znovu na něm spusťte DroidDeck. + %1$s na vstupu · %2$s na výstupu + Přemýšlí + Myšlenka + Přemýšlí · %1$s + %1$s · %2$s + VSTUP + VÝSTUP + Probíhá… + Žádný výsledek: kolo skončilo dříve + Žádný výstup + Psaním zařadíte další zprávu do fronty + Zařadit do fronty + Další: %1$s + Neposílat + Přiložit + Odebrat + Výchozí + Náročnost uvažování + Provést + Přepracovat + Zatím se nic nezměnilo + Proveď plán. + Odeslat nyní + Zpráva + Více + Zavřít + Nejnovější + Pracuje + Kontext + %1$s z %2$s + Tato konverzace · %1$s + Využití se zobrazí po první odpovědi + %1$dhodinový limit + %1$dminutový limit + Týdenní limit + %1$d%% · obnoví se %2$s + + %1$d soubory + %1$d souboru + %1$d soubor + %1$d souborů + + Nejprve plán + Plán + Navrhne plán a nic nezmění + Konverzace + Zatím žádné konverzace + Právě teď + Smazat + Smaže ji i její přílohy + Procesy + V uživatelském prostoru Linuxu nic neběží + AGENT + Zastavit + Sestavení Labu + Připravují se sestavení Labu + %1$d%% · zbývá asi %2$s + zbývá asi %1$s + Zrušit + Zrušit sestavení + Spouští se + %1$d%% + Balí se + Restartuje se DroidDeck na něm + Hotovo + Selhalo: %1$s + Nastavit agenta + Nejprve v Nastavení nainstalujte běhové prostředí Linuxu. + Zkusit znovu + Začít chatovat + Připojení zařízení + Bezdrátové ladění, aby agent viděl a ovládal DroidDeck + Nainstalovat %1$s + Do linuxového uživatelského prostoru, s git, gh a adb + Přihlásit se k %1$s + Otevře prohlížeč + GitHub + Volitelné, pro otevírání pull requestů + Nástroje pro sestavení + Volitelné, pro sestavení Lab na tomto zařízení · asi 5 GB + Agent je připraven + Dokončete nastavení agenta + Přihlášeno k %1$s + Sestavení Lab + rychlá sestavení + Rychlá sestavení Lab + Předem zkompiluje tuto verzi, takže sestavení Lab trvají minuty · asi 20 minut jednorázově + Kompiluje se · %1$d%% · zbývá asi %2$s + Připravit + Bezdrátové ladění není dostupné; Spárovat ho zapne + Spárovat + Instalovat + Přihlásit se PR #%1$d Pro tuto kopii DroidDecku není sestavena Aktualizováno %1$s @@ -1268,6 +1467,14 @@ Aplikace Příprava Aktualizace + Více + Upravit karty + Karty + Zobrazeno + V nabídce Více + Skryto + Posunout %1$s nahoru + Posunout %1$s dolů %1$d%% Obnovit %1$s V každé relaci se zobrazí jako /root/ROMs. Vnitřní úložiště je v /root/Storage. @@ -1289,6 +1496,15 @@ Zrušit čekající Klávesnice Androidu Skrýt ✕ + Velikost na obrazovce + Podíl obrazovky, který klávesnice zabírá, včetně záhlaví. + Neprůhlednost + Snižte ji, abyste viděli hru za klávesnicí. + Skryté klávesy + Klávesy, které používáte zřídka, se na klávesnici nezobrazují. + Esc a řada funkčních kláves + Ins / Del / Home / End / PgUp / PgDn + Klávesy se šipkami Spustit %1$s Vyberte obrazovku. Druhá: %1$s. Druhá obrazovka už není dostupná. @@ -1824,7 +2040,24 @@ Terminál Rukojeti + trackpady Deck Přehled + Plocha + Spustit plochu + Plocha · %1$s + Touchpad + Přímý dotyk + Touchpad. Klepnutím přepnete na přímý dotyk + Přímý dotyk. Klepnutím přepnete na touchpad + Spouští se plocha KDE… + Plocha se zavřela. + Plochu se nepodařilo spustit. Její protokoly jsou ve složce bottom-desktop této relace. + Plocha je zavřená. Zatím tu není nic k zobrazení. + Prohodit obrazovky + Spodní obrazovka teď není volná + Herní obrazovka + Zobrazit hru na + Horní obrazovka + Spodní obrazovka Stahování Neprobíhá žádné stahování. Steam @@ -1859,6 +2092,20 @@ Palivo, t Hlavní %1$s t Rezerva %1$s t + Doba snímku + posledních %1$d s + průměrný snímek + 1% nejnižší hodnota + snímky nad 33 ms + %1$d / min + Hrajete %1$s + %1$d jader, až %2$s GHz + %1$d jader + hra + FPS z %1$d Hz + Červená značka označuje místo, kde HUD zobrazuje teplotu červeně. + celé zařízení + baterie Odesílat data pro palubní desku Automaticky Zapne to pro každou zde uvedenou hru, včetně her nalezených později. Hry, které vypnete, zůstanou vypnuté. @@ -1882,6 +2129,10 @@ Mikrofon je pro tuto hru vypnutý. Chcete-li mluvit, zapněte Mikrofon v nastavení Steamu v DroidDecku (Zvuk) a spusťte hru znovu. Hlasitost %1$d%% Statistiky ve hře + HUD na spodní obrazovce + Lišta na každé kartě + 1% a 0,1% nejnižší hodnoty + Teplota CPU FPS CPU GPU @@ -2056,6 +2307,7 @@ Spouštění relace… %1$d:%2$02d uplynulo · stále pracuje Stahování aktualizace klienta Steam · %1$d%% + Instaluje se aktualizace klienta Steam… Stahování klienta Steam · %1$s Instalace nástroje kompatibility už běží @@ -2132,11 +2384,29 @@ Kreslené obrysy plus zaostření. Není GPU Adreno + Systémový ovladač PowerVR: kompatibilita se liší podle zařízení + Experimentální: RADV nebo systémový ovladač Xclipse + Systémový PowerVR + Používá vestavěné ovladače pro tuto GPU + Pro běhové prostředí a zobrazení je vybrán systémový ovladač PowerVR. + Žádný otevřený ovladač zatím tento Mali nepokrývá: most Mali je zapnutý. + Tohle je testovací sestavení pro zařízení, která nemají Snapdragon: oficiální sestavení tady běží jen na Adreno, proto se přes něj neinstalují. Nová testovací sestavení jsou k dispozici na github.com/The412Banner/droiddeck-nonadreno-drivers. + Poslední relace skončila, protože Android ukončil DroidDeck, aby uvolnil paměť, nešlo o pád. Zavřete ostatní aplikace nebo snižte nastavení textur hry a zkuste to znovu. + Mali (Venus) + most Mali + Žádný otevřený ovladač zatím tento Mali nepokrývá: použije se %1$s na vlastním ovladači telefonu. + %1$s ještě nevyšel: do té doby se používá %2$s. + %1$s není dostupný a ovladač tohoto telefonu hlásí Vulkan %2$s (Venus potřebuje 1.2): použije se most Mali. + %1$s ještě nevyšel: do té doby je zapnutý most Mali. + Ve frontě: %1$s (čeká na jiný ovladač běhového prostředí) + DXVK dodává systémové běhové prostředí PowerVR. Ostatní balíčky DXVK lze uložit, ale s tímto ovladačem se nepoužijí. Podporováno Experimentální: jeho ovladače jsou testovací sestavení Experimentální podpora Adreno 850: vyžaduje kompatibilní experimentální ovladače displeje a her; na tomto zařízení neověřeno Pod testovaným hardwarem (Adreno 725 a novější): nemusí fungovat Nepodporováno: pro tento GPU není k dispozici kompatibilní grafický backend + Běží přes most Mali na vlastním ovladači Vulkan telefonu + S vypnutým mostem Mali není podporováno: Turnip potřebuje GPU Adreno (Snapdragon) Byl dosažen limit požadavků GitHubu - zkuste to později GitHub odpověděl HTTP %1$d @@ -2337,6 +2607,13 @@ Řazení Popisky postranního panelu Zobrazovat názvy pod ikonami postranního panelu. Vypněte pro užší panel. + Mazlíček agenta + DeeDee se zobrazuje nad spouštěčem a hrami a ukazuje, co agent dělá. + Nad ostatními aplikacemi + Umožněte DeeDee zobrazovat se nad všemi aplikacemi a otevírat v nich chat. + Povolit + DeeDee + Chat s DeeDee Zobrazení Větší karty Menší karty @@ -2628,6 +2905,11 @@ Vývojář Vodoznak s označením sestavení Zobrazit na obrazovce označení testovacího sestavení nebo sestavení Lab. Ve výchozím nastavení zapnuté. + Sdílet diagnostické balíčky + Relace a zařízení + Grafika + Hry a kompatibilita + Všechny balíčky Připraveno ke hraní Ještě není připraveno ke hraní runtime %1$s @@ -2666,6 +2948,9 @@ Zapněte achievementy GOG v nastavení obchodů Achievementy nejsou k dispozici; zkontrolujte protokoly relace Achievement odemčen + Mali (Venus): vypnuto + Mali (Venus): zapnuto + Ovladač na %1$s hlásí Vulkan %2$s. Mali (Venus) potřebuje Vulkan 1.2 nebo novější (na starších se gamescope nespustí), proto relace Venus přeskočí a použijí dvojici ovladačů PanVK. Vložit Levá páčka Pravá páčka @@ -3025,6 +3310,7 @@ Instalace VC++ a DirectX, které hry potřebují Spouští hry pro Linux x86 Nástroj Steamu + Steam to stahuje pro hry s anti-cheatem, i když je vypnutý. Když ho odeberete, jejich instalace uvízne na 0 % DroidDeck spouští hry bez tohoto prostředí Proton x86, který DroidDeck nedokáže spustit Výchozí pro všechny hry @@ -3153,6 +3439,8 @@ DroidDeck · %1$d fps 60 fps vypadá plynuleji, ale při spouštění Steamu víc zatěžuje procesor. Video vybrané přímo v nastavení Steamu se zde také zobrazí. Zvuk + Přeskočit úvodní video + Použije se 0,1sekundový černý klip jako úvodní video při spuštění aplikace Steam. Projeví se v příští relaci. Vlastní video MP4, MOV, MKV nebo WebM. Jiné formáty a soubory nad %1$d MB se v zařízení převedou na WebM 720p, nejvýše %2$d sekund. Importovat @@ -3614,6 +3902,7 @@ Ponechá Alt+Tab, klávesu Win a tlačítko Domů v aktivní relaci DroidDeck místo Androidu. Zapněte Jas v Příprava → Integrace se Steamem Most Mali: vypnuto + %1$s nemůže použít most Mali (potřebuje GPU Mali bez trasy přes systémový ovladač), takže tento přepínač tady nemá žádný účinek. Most Mali: zapnuto %1$s není Adreno. Experimentální most Vulkan je zapnutý: relace vykresluje přes vlastní ovladač telefonu. Počítejte s chybami; pošlete protokoly relace. Bezpečný režim @@ -3775,6 +4064,7 @@ Toto rozložení nelze importovat Šarlatový sníh + Bílé povrchy s červenými akcenty. Soundtracky Hudba @@ -3838,4 +4128,6 @@ Opakovat jednu Hlasitost V tomto soundtracku nejsou žádné zvukové soubory + Spuštění není dostupné + K otevření tohoto odkazu není k dispozici žádný webový prohlížeč. diff --git a/app/src/main/res/values-da/input_library.xml b/app/src/main/res/values-da/input_library.xml new file mode 100644 index 0000000000..f3fd6e80ac --- /dev/null +++ b/app/src/main/res/values-da/input_library.xml @@ -0,0 +1,132 @@ + + + Den valgte skærm er ikke tilgængelig. Tilslut den for at redigere dette layout i fuld størrelse. + Kassér ikke-gemte layoutændringer? + Dette layout bruges af %1$d profiler. Gemte ændringer gælder for alle. + Standardprofiler + Skrivebordstilstand + Spiltilstand + Standard for skrivebord og spil + Standard for spiltilstand + Standard for skrivebordstilstand + Enhedsindstillinger + Betjening + Knapper, stik, aftrækkere og ekstra taster + Kopiér profil + Nulstil handlinger + Nulstil handlingerne i %1$s til basisprofilens standardværdier? Layouts og andre profiler ændres ikke. + Slet %1$s? Tilstande, der bruger den, vender tilbage til deres indbyggede standardprofil. Gemte layouts og delte indstillinger forbliver tilgængelige. + Synlighed + Gælder for alle profiler. Auto viser hovedskærmens betjening, når der ikke er tilsluttet en controller i spiltilstand. + Rediger på skærmen + Gemte layouts… + Vælg et layout, eller opret dit eget + Vælg Profilbetjening i sekundærskærmens sessionsmenu. Valgene Profil og Sekundær skærm i controllermenuen bestemmer, hvilken betjening der vises. + Knaphandlinger + Delt med %1$s. Ændringer gælder også for disse profiler. + Genbrug indstillinger + Brug indstillinger fra… + Kopiér fra en anden profil, eller behold indstillingerne delt + Gør uafhængig + Behold den nuværende opsætning, og stop med at dele ændringer + Layouts gemmer elementer og deres placeringer. Hver profil kan tildele sine egne handlinger. Rediger i fuld størrelse på målskærmen. + Aktuelt layout + Slet det ubrugte layout %1$s og dets gemte handlinger? + Omdøb aktuelt layout + Ulæselige inputindstillinger blev gemt i en gendannelseskopi. Du kan fortsætte med at redigere de gendannede profiler. + Egenskaber + Egenskaber for klik + %1$s · Klik + Knapper + Styrepinde, pads og aftrækkere + Skjul værktøjer + Controller + Sender controllerinput til Steam Input eller spillet. + Dette element sender ingen input fra controller, mus eller tastatur. + Museklik + DroidDeck-handling + Handling + Rullehastighed: %1$d trin/s + + Ny profil + + Nyt layout + %1$s · Bruges af %2$d profiler. Ændringer gælder for alle profiler, der bruger disse tildelinger. + Omdøb + Slet + Tilføj elementer til layoutet, før du tildeler deres handlinger. + Kunne ikke gemme inputindstillinger + Navn + Start fra + Knap + Styrepind + Touchpad + Retningskryds + Aftrækker + Færdig + Fortryd + + Tilføj + Træk for at flytte. Træk i et hjørne for at ændre størrelse. Tryk på Egenskaber for at tildele en handling. + Redigeres på sekundærskærmen + Genbrug %1$s fra en anden profil. De øvrige kontrolkilder forbliver uændrede. + Behold fysisk betjening delt + Som standard er alle betjeninger og brugerdefinerede layouts uafhængige kopier. Deling linker kun den fysiske betjening. + Brug disse elementer og placeringer. Deling holder fremtidige geometriændringer synkroniserede; dine knaphandlinger forbliver uafhængige. Et andet layout starter med utildelte handlinger. + Kopiér disse betjeninger og handlinger, eller link dem, så fremtidige ændringer gælder for begge profiler. + Behold delt + Uafhængig kopi + Start stikket ved berøringspunktet + Skjul stikket, når det ikke bruges + Værktøjer + Auto (%1$s) + Brugerdefineret (%1$s) + Gem som ny profil + Profilbetjening + Profil + Musetouchpadbevægelser + Når tildelt musemarkøren: tryk for at klikke, hold for at trække, og rul med to fingre. + %1$s har en tilsidesættelse af hurtigmenuen. Vælg Auto for at bruge dens standardprofil og alle tre gemte dele. + DroidDeck-input + Holdes, mens styrepinden flyttes i en vilkårlig retning: tryk over 55 %, slip under 35 %. Brug Retningstaster til at tildele hver retning separat. DroidDeck-kommandoer kører én gang pr. udsving. Stikklikket konfigureres separat. + Holdes, mens du rører touchpadden; slippes, når du løfter fingeren. DroidDeck-kommandoer kører én gang pr. berøring. Touchpadklikket konfigureres separat. + Holdes, når aftrækkeren passerer 55 %; slippes under 35 %. DroidDeck-kommandoer kører én gang pr. tryk. + Rulleretning + Lodret + Vandret + Rul vandret + Målinger + Slå optagelse til, brug betjeningen i en kørende session, og vend så tilbage og læs resultaterne. Måler kun DroidDecks afsendelsestid, ikke skærmforsinkelse. Optagelsen slutter, når app-processen lukkes. + %1$d betjeninger + Andre gemte layouts (%1$d) ▾ + Skjul andre gemte layouts (%1$d) ▴ + Hjem / Guide + Tilbage · enkelt tryk + Tilbage · dobbelttryk + Tilbage · to gange i Steam, én gang på skrivebordet + I Steam-tilstand. Hvis du holder Tilbage, åbnes hurtigadgang også. + Gendan standard + Dit panelvalg huskes. Skrivebord åbner et andet arbejdsområde; det skifter ikke sessionen eller dens inputprofil. + Virtuel controller + Den controllertype, som Steam eller spillet ser. + Berøringsskærm + Hvordan berøringer på spilskærmen håndteres. Profilknapper beholder deres tildelte handlinger. + Berøringsmarkør + Viser en markør ved direkte berøringer på spilskærmen. + Rør og hold + Musehandling, når du holder en finger på spilskærmen. + Tryk på Tilbage-knappen + Første handling: enkelt tryk. Anden handling: dobbelttryk. + Skifteknap + Tryk for at holde, tryk igen for at slippe. Åbning af en menu eller skift af profil slipper knappen. + Form + Afrundet + Pille + Cirkel + Rektangel + Knapetiket + Tekst + Importeret billede + Separate diagonalknapper + Tildel en tast til hver diagonal. En tom diagonal trykker sine to naboretninger. + Naboretninger + Dine gamle skærmtaster er gemt som importerede profiler nedenfor. Vælg en for at bruge eller redigere den. Dine nuværende profilvalg er bevaret. + De gamle skærmtaster kunne ikke importeres automatisk. De oprindelige indstillinger er bevaret. + diff --git a/app/src/main/res/values-da/input_strings.xml b/app/src/main/res/values-da/input_strings.xml new file mode 100644 index 0000000000..2e4e23b45a --- /dev/null +++ b/app/src/main/res/values-da/input_strings.xml @@ -0,0 +1,38 @@ + + + Inputprofiler + Profiler + Fysisk controller + Hovedskærm + Sekundær skærm + Indbygget / Steam Input + Indbygget: %1$s + Send en anden controllerstyring + Deaktiveret + Tast eller tastekombination + Retningstaster + Flyt markøren + Markørhastighed: %1$d + Rul + Rul lodret + Venstre museknap + Højre museknap + Midterste museknap + Åbn DroidDeck-menuen + Vis tastatur + Åbn Steam-menuen + Åbn Steams hurtigadgang + Fjern kontrol + Tilføj kontrol + Enhedsspecifikke knapper + Tildel en fysisk knap + Slip knappen, og vælg Rediger, Prøv igen eller Annuller. B eller Tilbage annullerer efter slip. + Prøv igen + Tryk på en knap, også en Tilbage-knap der rapporteres som tast. Lydstyrke- og Android-systemtaster er reserveret. Tildelingen gælder kun denne enhed. + Fjern tildeling + Inputdiagnostik + Optag inputafsendelsestid + Læs målinger + Måler afsendelsen fra Android til offentliggørelse i den eksisterende inputtransport. Bluetoothankomst, gæstepolling, rendering og skærmforsinkelse er ikke medtaget. Optagelse er slået fra som standard. + Brug normal inputtildeling + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index fb5ef93135..c96ed3820e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -185,6 +185,7 @@ PowerVR-grafikmiljøet kunne ikke hentes. Tjek forbindelsen, og prøv igen. DirectAudio kunne ikke downloades, så spillyd bruger den langsommere vej i denne session. Dette program + Sessionen kunne ikke tegne på skærmen: %1$s. Denne skærm viser hvorfor i stedet for en sort skærm; sessionens logfiler indeholder detaljerne. 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. @@ -387,6 +388,9 @@ Ikke understøttet her endnu Indlæser komponenterne… Kunne ikke installere: %1$s + Denne download skal opdateres. + Opdatering sat i kø. + Prøv opdatering igen Downloadet Downloader %1$s Installerer: %1$s @@ -417,6 +421,22 @@ Kun internt Mappe: %1$s Andet bibliotek + Flere Steam-biblioteker + Mapper, som Steam kan installere i og spille fra, hver med sit eget navn. Hvis du fjerner et bibliotek, bliver spillene på disken. + Tilføj bibliotek + Omdøb + Bibliotekets navn + Vælg en mappe til biblioteket + Højst %1$d tilføjede biblioteker + Mappen er allerede et bibliotek eller ligger i et + %1$s · ikke tilgængelig + Gælder fra næste Steam-session + Fundet på denne enhed · %1$s · %2$s + Tilføj + Find biblioteker på den interne lagerplads + Tillad adgang til alle filer, så DroidDeck kan se Steam-biblioteker, som andre apps gemmer på den interne lagerplads + Tillad + Tilføjet %1$s, Steam-biblioteket i den mappe, du valgte Spil, der streamer data fra SD-kort eller delt lager, kan stamme. Lagerdiagnostik Registrerer allokeringsresultater og lagertider i Del logs. Kan gøre installationer langsommere, mens det er aktivt. Gælder fra næste session. @@ -605,7 +625,10 @@ Deaktiverer Protons gamepad-navigationshjælper, som koster CPU i hvert spil. Kør proot uden seccomp Kan afhjælpe fejl om manglende systemkald på nogle kerner. Kan reducere ydelsen. + Kør uden proot (eksperimentelt) + Starter Linux-delen direkte på Android. Gælder fra næste session. Slå fra, hvis noget ikke kan starte. proot-hurtigvej + Bruges ikke uden proot. Kræver prootets seccomp-filter. Hurtigere filopslag og mindre hak. Slå fra, hvis et program ikke kan finde sine filer. Tegn markøren i gamescope @@ -815,6 +838,7 @@ Enhed understøttet Utestet GPU GPU ikke understøttet + GPU via Mali-broen %1$s · %2$s %1$s: %2$s Ingen kompatibel grafikbackend er tilgængelig for %1$s. Steam kan vise en sort skærm. @@ -844,15 +868,38 @@ Session Sessionslogs Gemt efter hver session + Udvidet diagnostik til næste session + Indsamler detaljerede logfiler i én session. Kan reducere ydeevnen og bruge mere lagerplads. Slår sig selv fra, når sessionen starter; gennemgå logfilerne, før du deler dem. Fejlfindingslogs for spil Medtag Proton-, Wine- og grafikdiagnostik ved næste spilstart. Kan reducere ydelsen og bruge mere lagerplads. Genstart denne session for at gemme fejlfindingslogs for spil Kunne ikke opdatere logning. Tjek kontakten, og prøv igen. Fejlfindingsværktøjer + Detaljerede grafiklogfiler + Steam-brugerflade: GPU-tegning + Med Xclipse-driverparret tegner Steam sine sider i software (GPU-tegning gav ødelagte fliser). Slå til for en hurtigere Steam-brugerflade, hvis det ser rigtigt ud på denne telefon. + bygget %1$s + %1$s er opdateret til den nyeste build + Mali-broen bestod ikke sin selvtest på %1$s i den forrige session (billeder eller tegninger), så sessionen brugte PanVK-driverparret i stedet. + Mali-broen fandt ingen måde at dele hukommelse med driveren på %1$s i den forrige session, så sessionen brugte PanVK-driverparret i stedet. Broen kan ikke fungere på denne telefon; når den slås fra, bevares PanVK-parret. + Proton-, DXVK- og driverlogfilerne for hvert spil findes i sessionens logfiler. Altid til, når GPU\'en ikke er en Adreno. Seneste sessionslogs Gemte sessionslogs Gemmer de nyeste %1$d Ryd logs + Tilgængelige sessionslogfiler + Ingen gemte sessionslogfiler endnu. + Delte og gemte ZIP-filer indeholder den valgte session samt relaterede diagnostikdata for Steam, butikker, værktøjer og Battle.net. + %1$s · %2$s + Aktuel session + Del + Gem på enheden + Slet + Slet sessionslogfiler? + Slet %1$s? Dette kan ikke fortrydes. + Sessionslogfilerne er gemt. + Kunne ikke gemme sessionslogfilerne. + Kunne ikke slette sessionslogfilerne. Nulstil alle indstillinger Sæt hver indstilling tilbage til standardværdien Nulstil @@ -879,6 +926,8 @@ Brug som startskærm DroidDeck kan være Home-appen DroidDeck tilbydes aldrig som Home-app + Hjem-knappen åbner + Den side, der vises, når DroidDeck er startskærmsappen og du trykker på Hjem I Tilføj spil skal du sætte DroidDeck til Medtag Retning Launcherens retning @@ -892,15 +941,22 @@ Fuldskærm Skjuler Androids status- og navigationsbjælker Viser Androids status- og navigationsbjælker + Launcher til to skærme + Automatisk placerer launcherens sektioner (Steam, Bibliotek, Butikker og resten) på den anden skærm på håndholdte enheder med en indbygget anden skærm. Til bruger enhver ekstra skærm. Fra holder launcheren på én skærm. + Sessioner på to skærme + Automatisk fastgør spilmenuen på den indbyggede anden skærm i stedet for et pop-up-vindue. Til bruger enhver ekstra skærm. Fra holder menuen på spilskærmen; du kan stadig vælge en anden skærm fra menuen. Automatisk Til Fra Kontroller på nederste skærm i spil + Android-tastatur til tekstfelter Åbner pegefeltet og tastaturet på den anden skærm, når en session starter. Skriver til den øverste skærm Færdig Standard Home-app Vælg en Home-app + Skjul launcheren fra Seneste apps, mens den er inaktiv + Gælder kun, når DroidDeck er standardappen til startskærmen og ingen session kører. Vælg Linux-apps (beta) Filer @@ -1015,6 +1071,147 @@ Testbuilds Prøv en rettelse, før den udgives Ingen lige nu + Lab-build + Lab-builds + I brug + Sat på pause, efter at Android genoptimerede DroidDeck + Ikke indlæst: %1$s + Venter på genstart + Beholdt + Til en anden version + Genbyg + Sletter denne build fra enheden + Genstart med den + Slå fra + Brug + Slet + Slet nu + Kunne ikke forberede genstarten: %1$s. Par trådløs fejlfinding i Opsætning, og prøv igen. + Lab-build installeret + DroidDeck er genstartet med %1$s + Lab-build sat på pause + Android har genoptimeret DroidDeck, så %1$s ikke er indlæst. Åbn Opdateringer for at genstarte på den. + Lab-build slået fra + Den blev bygget til en anden version af DroidDeck. Den ligger stadig i Opdateringer. + DroidDeck startede ikke på den to gange + Agent + Agent + Agenten arbejder + Installer Claude Code i Linux-brugermiljøet for at bruge agenten. + Spørg om et spil, et nedbrud eller en ændring af DroidDeck + Send + Ny samtale + Stop + Lagring + Fjern + Fjern nu + Claude Code + Codex + DroidDeck-kildekode + Downloadcacher + Ændringer, der ikke er pushet, går tabt + Når der bygges, hentes de igen + Opsætningen kan installere det igen; logins bevares + DroidDeck er genstartet på din Lab-build. Fortsæt, hvor du slap. + Spørg, hvorfor et spil ikke starter, bed om en forklaring på en log, eller få den til at ændre DroidDeck og prøve ændringen på denne enhed. + Fejl: %1$s + %1$s sluttede (afslutningskode %2$d) + Stoppet + Afsluttet uden svar + Prøv igen + Sætter agenten op + Genopbyg min Lab-build %1$s til den installerede version af DroidDeck, og genstart på den. + %1$s ind · %2$s ud + Tænker + Tankegang + Tænker · %1$s + %1$s · %2$s + INPUT + OUTPUT + Kører… + Intet resultat: turen sluttede først + Intet output + Skriv for at sætte den næste besked i kø + Sæt i kø + Næste: %1$s + Send ikke + Vedhæft + Fjern + Standard + Ræsonneringsindsats + Gå i gang + Revider + Intet ændret endnu + Gå i gang med planen. + Send nu + Besked + Mere + Luk + Seneste + Arbejder + Kontekst + %1$s af %2$s + Denne samtale · %1$s + Forbruget vises efter det første svar + %1$d-timers grænse + %1$d-minutters grænse + Ugentlig grænse + %1$d%% · nulstilles %2$s + + %1$d fil + %1$d filer + + Planlæg først + Plan + Foreslår en plan uden at ændre noget + Samtaler + Ingen samtaler endnu + Lige nu + Slet + Sletter den og dens vedhæftede filer + Processer + Intet kører i Linux-brugerrummet + AGENT + Stop + Lab-build + Forbereder Lab-builds + %1$d%% · ca. %2$s tilbage + ca. %1$s tilbage + Annuller + Annuller build + Starter + %1$d%% + Pakker + Genstarter DroidDeck på den + Færdig + Mislykkedes: %1$s + Sæt agenten op + Installer Linux-runtime i Opsætning først. + Prøv igen + Begynd at chatte + Enhedsforbindelse + Trådløs fejlfinding, så agenten kan se og styre DroidDeck + Installer %1$s + I Linux-brugerrummet, med git, gh og adb + Log ind på %1$s + Åbner din browser + GitHub + Valgfrit, til at åbne pull requests + Byggeværktøjer + Valgfrit, til Lab-builds på denne enhed · ca. 5 GB + Agent klar + Fuldfør opsætningen af agenten + Logget ind på %1$s + Lab-builds + hurtige builds + Hurtige Lab-builds + Kompilerer denne version på forhånd, så Lab-builds tager minutter · ca. 20 minutter én gang + Kompilerer · %1$d%% · ca. %2$s tilbage + Forbered + Trådløs fejlfinding kan ikke nås; Par slår den til + Par + Installer + Log ind PR #%1$d Ikke bygget til denne kopi af DroidDeck Opdateret %1$s @@ -1254,6 +1451,14 @@ Apps Opsætning Opdateringer + Mere + Rediger faner + Faner + Vist + I Mere + Skjult + Flyt %1$s op + Flyt %1$s ned %1$d%% Genoptag %1$s Vises som /root/ROMs i hver session. Intern lagerplads er på /root/Storage. @@ -1275,6 +1480,15 @@ Annuller afventende Android-tastatur Skjul ✕ + Størrelse på skærmen + Den del af skærmen, tastaturet fylder, inklusive header. + Uigennemsigtighed + Sænk den for at se spillet bag tastaturet. + Skjulte taster + Taster, du sjældent bruger, vises ikke på tastaturet. + Esc og funktionsrækken + Ins / Del / Home / End / PgUp / PgDn + Piletaster Start %1$s Vælg en skærm. Sekundær: %1$s. Den sekundære skærm er ikke længere tilgængelig. @@ -1776,7 +1990,24 @@ Terminal Deck-greb + trackpads Dashboard + Skrivebord + Start skrivebordet + Skrivebord · %1$s + Pegefelt + Direkte berøring + Pegefelt. Tryk for direkte berøring + Direkte berøring. Tryk for pegefelt + Starter KDE-skrivebordet… + Skrivebordet blev lukket. + Skrivebordet kunne ikke starte. Logfilerne findes i denne sessions bottom-desktop-mappe. + Skrivebordet er lukket. Intet at vise her endnu. + Byt skærme + Den nederste skærm er ikke ledig lige nu + Spilskærm + Vis spillet på + Øverste skærm + Nederste skærm Downloads Ingen downloads i gang. Steam @@ -1811,6 +2042,20 @@ Brændstof, t Hoved %1$s t Reserve %1$s t + Billedtid + sidste %1$d s + gns. billede + 1 % low + billeder over 33 ms + %1$d / min + Spillet i %1$s + %1$d kerner, op til %2$s GHz + %1$d kerner + spil + FPS af %1$d Hz + Det røde mærke angiver, hvor HUD viser temperaturen i rødt. + hele enheden + batteri Send instrumentbrætdata Auto Slår det til for alle spil på listen her, også spil, der findes senere. Spil, du slår fra, forbliver slået fra. @@ -1834,6 +2079,10 @@ Mikrofonen er slået fra for dette spil. For at tale skal du slå Mikrofon til i DroidDecks Steam-indstillinger (Lyd) og starte spillet igen. Lydstyrke %1$d%% Statistik i spillet + HUD på nederste skærm + Stribe på alle faner + 1 % og 0,1 % lows + CPU-temperatur FPS CPU GPU @@ -2006,6 +2255,7 @@ Starter sessionen… %1$d:%2$02d forløbet · arbejder stadig Downloader Steam-klientopdateringen · %1$d%% + Anvender Steam-klientopdateringen… Downloader Steam-klienten · %1$s En installation af et kompatibilitetsværktøj er allerede i gang @@ -2082,11 +2332,29 @@ Toon-konturer plus skærpning. Ikke en Adreno-GPU + System-PowerVR-driver: Kompatibiliteten varierer afhængigt af enheden + Eksperimentelt: RADV eller systemets Xclipse-driver + System-PowerVR + Bruger de indbyggede drivere til denne GPU + Systemets PowerVR-driver er valgt til runtime og skærm. + Ingen åben driver understøtter denne Mali endnu: Mali-broen er slået til. + Dette er testbuildet til ikke-Snapdragon: de officielle builds her kører kun på Adreno, så de installeres ikke oven på det. Nye testbuilds findes på github.com/The412Banner/droiddeck-nonadreno-drivers. + Den sidste session sluttede, fordi Android lukkede DroidDeck for at frigøre hukommelse, ikke på grund af et nedbrud. Luk andre apps, eller sænk spillets teksturindstillinger, og prøv igen. + Mali (Venus) + Mali-broen + Ingen åben driver understøtter denne Mali endnu: %1$s bruges oven på telefonens egen driver. + %1$s er ikke udgivet endnu: %2$s bruges indtil da. + %1$s er ikke tilgængelig, og telefonens driver rapporterer Vulkan %2$s (Venus kræver 1.2): Mali-broen bruges. + %1$s er ikke udgivet endnu: Mali-broen er slået til indtil da. + I kø: %1$s (venter på en anden runtime-driver) + DXVK leveres af systemets PowerVR-runtime. Andre DXVK-pakker kan gemmes, men bliver ikke anvendt med denne driver. Understøttet Eksperimentel: dens drivere er testversioner Eksperimentel Adreno 850-understøttelse: kræver kompatible eksperimentelle skærm- og spildrivere; ikke bekræftet på denne enhed Under testet hardware (Adreno 725 og nyere): kører muligvis ikke Understøttes ikke: ingen kompatibel grafikbackend er tilgængelig for denne GPU + Kører via Mali-broen på telefonens egen Vulkan-driver + Understøttes ikke, når Mali-broen er slået fra: Turnip kræver en Adreno-GPU (Snapdragon) GitHubs hastighedsgrænse blev nået - forsøg igen senere GitHub svarede HTTP %1$d @@ -2287,6 +2555,13 @@ Sortér Sidepanelets etiketter Vis navne under ikonerne i sidepanelet. Slå fra for et smallere sidepanel. + Agentkæledyr + DeeDee svæver over launcheren og spil og viser, hvad agenten laver. + Over andre apps + Lad DeeDee svæve over alle apps og åbne chatten der + Tillad + DeeDee + Chat med DeeDee Visning Større kort Mindre kort @@ -2574,6 +2849,11 @@ Udvikler Vandmærke med buildmærkat Vis mærkatet for test- eller Lab-builden på skærmen. Aktiveret som standard. + Del diagnostikpakker + Session og enhed + Grafik + Spil og kompatibilitet + Alle pakker Klar til at spille Ikke klar til at spille endnu runtime %1$s @@ -2612,6 +2892,9 @@ Aktivér GOG-bedrifter i Butik-indstillinger Bedrifter ikke tilgængelige; se sessionslogs Bedrift låst op + Mali (Venus): fra + Mali (Venus): til + Driveren på %1$s rapporterer Vulkan %2$s. Mali (Venus) kræver Vulkan 1.2 eller nyere (gamescope starter ikke på ældre), så sessioner springer Venus over og bruger PanVK-driverparret i stedet. Indsæt Venstre stick Højre stick @@ -2967,6 +3250,7 @@ VC++- og DirectX-installationer, som spil kræver Kører Linux x86-spil Steam-værktøj + Steam downloader dette til spil, der leveres med anti-cheat, selv når det er slået fra. Fjernes det, går installationen i stå på 0 % DroidDeck kører spil uden dette kørselsmiljø Proton x86, som DroidDeck ikke kan køre Standard for alle spil @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps 60 fps ser mere flydende ud, men bruger mere CPU, mens Steam starter. En video valgt i Steams egne indstillinger vises også her. Lyd + Spring opstartsfilmen over + Brug et sort klip på 0,1 sekund som opstartsfilm i Steam. Gælder fra næste session. Din egen video MP4, MOV, MKV eller WebM. Andre formater og filer over %1$d MB konverteres til 720p-WebM på enheden, op til %2$d sekunder. Importér @@ -3538,6 +3824,7 @@ Holder Alt+Tab, Win-tasten og Hjem-knappen i en aktiv DroidDeck-session i stedet for Android. Slå Lysstyrke til under Opsætning → Steam-integration Mali-bro: fra + %1$s kan ikke bruge Mali-broen (den kræver en Mali-GPU uden en rute gennem systemdriveren), så denne kontakt har ingen virkning her. Mali-bro: til %1$s er ikke en Adreno. Den eksperimentelle Vulkan-bro er slået til: sessionen tegner gennem telefonens egen driver. Forvent fejl; send sessionslogfilerne. Sikker tilstand @@ -3697,6 +3984,7 @@ Dette layout kunne ikke importeres Skarlagensne + Hvide overflader med røde accenter. Soundtracks Musik @@ -3760,4 +4048,6 @@ Gentag én Lydstyrke Ingen lydfiler i dette soundtrack + Start er ikke tilgængelig + Der er ingen tilgængelig webbrowser til at åbne dette link. diff --git a/app/src/main/res/values-de/input_library.xml b/app/src/main/res/values-de/input_library.xml new file mode 100644 index 0000000000..8ba2b07f50 --- /dev/null +++ b/app/src/main/res/values-de/input_library.xml @@ -0,0 +1,132 @@ + + + Der gewählte Bildschirm ist nicht verfügbar. Verbinden Sie ihn, um dieses Layout in seiner tatsächlichen Größe zu bearbeiten. + Nicht gespeicherte Layoutänderungen verwerfen? + Dieses Layout wird von %1$d Profilen verwendet. Gespeicherte Änderungen gelten für alle. + Standardprofile + Desktop-Modus + Spielmodus + Standard für Desktop und Spiel + Standard für den Spielmodus + Standard für den Desktop-Modus + Geräteeinstellungen + Steuerung + Tasten, Sticks, Trigger und Zusatztasten + Profil kopieren + Aktionen zurücksetzen + Aktionen in %1$s auf die Standardwerte des Basisprofils zurücksetzen? Layouts und andere Profile bleiben unverändert. + %1$s löschen? Modi, die es verwenden, kehren zu ihrem integrierten Standardprofil zurück. Gespeicherte Layouts und geteilte Einstellungen bleiben verfügbar. + Sichtbarkeit + Gilt für alle Profile. Auto zeigt die Hauptbildschirm-Steuerung, wenn im Spielmodus kein Controller angeschlossen ist. + Auf dem Bildschirm bearbeiten + Gespeicherte Layouts… + Wählen Sie ein Layout oder erstellen Sie ein eigenes + Wählen Sie Profilsteuerung im Sitzungsmenü des Zweitbildschirms. Die Auswahl von Profil und Zweitbildschirm im Controller-Menü bestimmt die angezeigte Steuerung. + Tastenaktionen + Geteilt mit %1$s. Änderungen gelten auch für diese Profile. + Einstellungen wiederverwenden + Einstellungen übernehmen von… + Von einem anderen Profil kopieren oder Einstellungen geteilt lassen + Unabhängig machen + Aktuelle Einrichtung behalten und Änderungen nicht mehr teilen + Layouts speichern Elemente und ihre Positionen. Jedes Profil kann eigene Aktionen zuweisen. In voller Größe auf dem Zielbildschirm bearbeiten. + Aktuelles Layout + Das ungenutzte Layout %1$s und seine gespeicherten Aktionen löschen? + Aktuelles Layout umbenennen + Unlesbare Eingabeeinstellungen wurden in einer Wiederherstellungskopie gesichert. Sie können die wiederhergestellten Profile weiter bearbeiten. + Eigenschaften + Eigenschaften für Klick + %1$s · Klick + Tasten + Sticks, Pads und Trigger + Werkzeuge ausblenden + Controller + Controller-Eingaben an Steam Input oder das Spiel senden. + Dieses Element sendet keine Controller-, Maus- oder Tastatureingaben. + Mausklick + DroidDeck-Aktion + Aktion + Scrollgeschwindigkeit: %1$d Schritte/s + + Neues Profil + + Neues Layout + %1$s · Wird von %2$d Profilen verwendet. Änderungen gelten für jedes Profil mit diesen Zuweisungen. + Umbenennen + Löschen + Fügen Sie Elemente zum Layout hinzu, bevor Sie ihre Aktionen zuweisen. + Eingabeeinstellungen konnten nicht gespeichert werden + Name + Beginnen mit + Taste + Stick + Touchpad + Steuerkreuz + Trigger + Fertig + Rückgängig + + Hinzufügen + Zum Verschieben ziehen. An einer Ecke ziehen zum Größe ändern. Auf Eigenschaften tippen, um eine Aktion zuzuweisen. + Bearbeitung auf dem Zweitbildschirm + %1$s von einem anderen Profil wiederverwenden. Die anderen Steuerungsquellen bleiben unverändert. + Physische Steuerung geteilt lassen + Standardmäßig sind alle Steuerungen und benutzerdefinierten Layouts unabhängige Kopien. Teilen verknüpft nur die physische Steuerung. + Diese Elemente und Positionen verwenden. Teilen synchronisiert künftige Geometrieänderungen; deine Tastenaktionen bleiben unabhängig. Ein anderes Layout beginnt mit nicht zugewiesenen Aktionen. + Diese Steuerungen und Aktionen kopieren oder verknüpfen, sodass künftige Änderungen für beide Profile gelten. + Geteilt lassen + Unabhängige Kopie + Stick an der Berührungsstelle starten + Stick ausblenden, wenn nicht benutzt + Werkzeuge + Auto (%1$s) + Benutzerdefiniert (%1$s) + Als neues Profil speichern + Profilsteuerung + Profil + Maus-Touchpad-Gesten + Wenn dem Mauszeiger zugewiesen: Tippen zum Klicken, Halten zum Ziehen, mit zwei Fingern scrollen. + %1$s hat eine Schnellmenü-Überschreibung. Wähle dort Auto, um sein Standardprofil und alle drei gespeicherten Teile zu verwenden. + DroidDeck Input + Gehalten, während der Stick in eine beliebige Richtung bewegt wird: drücken über 55 %, loslassen unter 35 %. Mit Richtungstasten jede Richtung einzeln zuweisen. DroidDeck-Aktionen laufen einmal pro Ausschlag. Der Stick-Klick wird separat konfiguriert. + Gehalten, während das Touchpad berührt wird; losgelassen beim Abheben des Fingers. DroidDeck-Aktionen laufen einmal pro Berührung. Der Touchpad-Klick wird separat konfiguriert. + Gehalten, wenn der Trigger 55 % überschreitet; losgelassen unter 35 %. DroidDeck-Aktionen laufen einmal pro Druck. + Scrollrichtung + Vertikal + Horizontal + Horizontal scrollen + Messwerte + Aktiviere die Aufzeichnung, benutze die Steuerung in einer laufenden Sitzung und lies dann die Ergebnisse. Misst nur die DroidDeck-Dispatch-Zeit, nicht die Anzeigelatenz. Die Aufzeichnung endet beim Schließen des App-Prozesses. + %1$d Steuerelemente + Andere gespeicherte Layouts (%1$d) ▾ + Andere gespeicherte Layouts ausblenden (%1$d) ▴ + Home / Guide + Zurück · einmal tippen + Zurück · zweimal tippen + Zurück · zweimal in Steam, einmal im Desktop + Im Steam-Modus. Halten von Zurück öffnet auch den Schnellzugriff. + Auf Standard zurücksetzen + Ihre Panel-Auswahl wird gespeichert. Desktop öffnet einen zweiten Arbeitsbereich; es wechselt weder die Sitzung noch ihr Eingabeprofil. + Virtueller Controller + Der von Steam oder dem Spiel erkannte Controller-Typ. + Touchscreen + Wie Berührungen auf dem Spielbildschirm behandelt werden. Profiltasten behalten ihre zugewiesenen Aktionen. + Touch-Cursor + Zeigt einen Zeiger für direkte Berührungen auf dem Spielbildschirm. + Berühren und halten + Mausaktion beim Halten eines Fingers auf dem Spielbildschirm. + Zurück-Taste tippen + Erste Aktion: einmal tippen. Zweite Aktion: zweimal tippen. + Umschalttaste + Tippen zum Halten, erneut tippen zum Loslassen. Das Öffnen eines Menüs oder ein Profilwechsel lässt die Taste los. + Form + Abgerundet + Pille + Kreis + Rechteck + Tastenbezeichnung + Text + Importiertes Bild + Getrennte Diagonaltasten + Weisen Sie jeder Diagonale eine Taste zu. Eine leere Diagonale drückt ihre beiden Nachbarrichtungen. + Benachbarte Richtungen + Ihre alten Bildschirmtasten sind unten als importierte Profile gespeichert. Wählen Sie eines zum Verwenden oder Bearbeiten. Ihre aktuellen Profilauswahlen bleiben erhalten. + Die alten Bildschirmtasten konnten nicht automatisch importiert werden. Die ursprünglichen Einstellungen wurden beibehalten. + diff --git a/app/src/main/res/values-de/input_strings.xml b/app/src/main/res/values-de/input_strings.xml new file mode 100644 index 0000000000..b37b9c2b71 --- /dev/null +++ b/app/src/main/res/values-de/input_strings.xml @@ -0,0 +1,38 @@ + + + Eingabeprofile + Profile + Physischer Controller + Hauptbildschirm + Zweitbildschirm + Nativ / Steam Input + Nativ: %1$s + Andere Controller-Steuerung senden + Deaktiviert + Taste oder Tastenkombination + Richtungstasten + Zeiger bewegen + Zeigergeschwindigkeit: %1$d + Scrollen + Vertikal scrollen + Linke Maustaste + Rechte Maustaste + Mittlere Maustaste + DroidDeck-Menü öffnen + Tastatur anzeigen + Steam-Menü öffnen + Steam-Schnellzugriff öffnen + Steuerung entfernen + Steuerung hinzufügen + Gerätespezifische Tasten + Physische Taste zuweisen + Taste loslassen, dann Bearbeiten, Wiederholen oder Abbrechen wählen. B oder Zurück bricht nach dem Loslassen ab. + Wiederholen + Taste drücken, auch eine als Tastaturtaste gemeldete Zurück-Taste. Lautstärke- und Android-Systemtasten sind reserviert. Die Zuweisung gilt nur für dieses Gerät. + Zuweisung entfernen + Eingabediagnose + Eingabe-Dispatch-Zeit aufzeichnen + Messwerte lesen + Misst den Android-Dispatch bis zur Veröffentlichung im vorhandenen Eingabetransport. Bluetooth-Ankunft, Gast-Polling, Rendering und Anzeigelatenz sind ausgenommen. Die Aufzeichnung ist standardmäßig aus. + Normale Eingabezuweisung verwenden + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 05bac55919..134515a891 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -185,6 +185,7 @@ Die PowerVR-Grafikumgebung konnte nicht heruntergeladen werden. Prüfe die Verbindung und versuch es erneut. DirectAudio konnte nicht heruntergeladen werden, daher nutzt der Spielton in dieser Sitzung den langsameren Weg. Dieses Programm + Die Sitzung konnte nicht auf den Bildschirm zeichnen: %1$s. Auf diesem Bildschirm sehen Sie den Grund statt eines schwarzen Bildschirms; die Details finden Sie in den Sitzungsprotokollen. 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. @@ -387,6 +388,9 @@ Hier noch nicht unterstützt Komponenten werden geladen… Installation fehlgeschlagen: %1$s + Dieser Download benötigt ein Update. + Update in der Warteschlange. + Aktualisierung erneut versuchen Heruntergeladen %1$s wird heruntergeladen Wird installiert: %1$s @@ -417,6 +421,22 @@ Nur intern Ordner: %1$s Zweite Bibliothek + Weitere Steam-Bibliotheken + Ordner, in denen Steam Spiele installieren und von denen aus es sie starten kann, jeweils unter eigenem Namen. Beim Entfernen eines Ordners bleiben dessen Spiele auf dem Datenträger. + Bibliothek hinzufügen + Umbenennen + Bibliotheksname + Ordner für die Bibliothek auswählen + Höchstens %1$d hinzugefügte Bibliotheken + Dieser Ordner ist bereits eine Bibliothek oder liegt innerhalb einer + %1$s · nicht verfügbar + Gilt ab der nächsten Steam-Sitzung + Auf diesem Gerät gefunden · %1$s · %2$s + Hinzufügen + Bibliotheken im internen Speicher finden + Zugriff auf alle Dateien erlauben, damit DroidDeck Steam-Bibliotheken sehen kann, die andere Apps im internen Speicher ablegen + Zulassen + %1$s hinzugefügt, die Steam-Bibliothek im ausgewählten Ordner Spiele, die Daten von der SD-Karte oder aus dem gemeinsamen Speicher streamen, können ruckeln. Speicherdiagnose Zeichnet Zuweisungsergebnisse und stichprobenartige Speicher-Timings für „Logs teilen“ auf. Kann Installationen verlangsamen, solange aktiv. Gilt ab der nächsten Sitzung. @@ -605,7 +625,10 @@ Deaktiviert Protons Gamepad-Navigationshilfe, die in jedem Spiel CPU-Leistung kostet. proot ohne seccomp ausführen Kann Fehler wegen fehlender Syscalls auf manchen Kerneln beheben. Kann die Leistung mindern. + Ohne proot ausführen (experimentell) + Startet die Linux-Umgebung direkt unter Android. Gilt ab der nächsten Sitzung. Bei Startproblemen deaktivieren. proot-Schnellpfad + Wird ohne proot nicht verwendet. Benötigt den seccomp-Filter von proot. Schnellere Dateisuche und weniger Ruckler. Deaktivieren, wenn ein Programm seine Dateien nicht findet. Zeiger in gamescope zeichnen @@ -815,6 +838,7 @@ Gerät unterstützt Ungetestete GPU GPU nicht unterstützt + GPU über die Mali-Bridge %1$s · %2$s %1$s: %2$s Für %1$s ist kein kompatibles Grafik-Backend verfügbar. Steam zeigt möglicherweise einen schwarzen Bildschirm. @@ -844,15 +868,38 @@ Sitzung Sitzungslogs Nach jeder Sitzung gespeichert + Erweiterte Diagnose für die nächste Sitzung + Zeichnet für eine Sitzung detaillierte Protokolle auf. Kann die Leistung verringern und mehr Speicherplatz beanspruchen. Schaltet sich beim Start der Sitzung selbst ab; Protokolle vor dem Teilen prüfen. Spiel-Debug-Logs Beim nächsten Spielstart Diagnosen von Proton, Wine und Grafik einschließen. Kann die Leistung mindern und mehr Speicher belegen. Starte diese Sitzung neu, um Spiel-Debug-Logs zu speichern Protokollierung konnte nicht aktualisiert werden. Prüfe den Schalter und versuch es erneut. Debugging-Tools + Detaillierte Grafik-Protokolle + Steam-Oberfläche: Zeichnen mit der GPU + Mit dem Xclipse-Treiberpaar zeichnet Steam seine Seiten per Software (Zeichnen mit der GPU zeigte fehlerhafte Kacheln). Für eine schnellere Steam-Oberfläche einschalten, wenn die Darstellung auf diesem Telefon stimmt. + erstellt am %1$s + %1$s auf den neuesten Build aktualisiert + Die Mali-Bridge hat ihren Selbsttest in der letzten Sitzung auf %1$s nicht bestanden (Bilder oder Zeichnungen), daher verwendete die Sitzung stattdessen das PanVK-Treiberpaar. + Die Mali-Bridge fand in der letzten Sitzung auf %1$s keinen Weg, Speicher mit dem Treiber zu teilen, daher verwendete die Sitzung stattdessen das PanVK-Treiberpaar. Die Bridge kann auf diesem Telefon nicht funktionieren; beim Ausschalten bleibt das PanVK-Paar aktiv. + Die Proton-, DXVK- und Treiberprotokolle jedes Spiels in den Protokollen der Sitzung. Immer aktiv, wenn die GPU kein Adreno ist. Neueste Sitzungslogs Gespeicherte Sitzungslogs Behält die neuesten %1$d Logs löschen + Verfügbare Sitzungsprotokolle + Noch keine gespeicherten Sitzungsprotokolle. + Geteilte und gespeicherte ZIPs enthalten die ausgewählte Sitzung sowie zugehörige Diagnosen von Steam, Store, Tools und Battle.net. + %1$s · %2$s + Aktuelle Sitzung + Teilen + Auf Gerät speichern + Löschen + Sitzungsprotokolle löschen? + %1$s löschen? Dies kann nicht rückgängig gemacht werden. + Sitzungsprotokolle gespeichert. + Sitzungsprotokolle konnten nicht gespeichert werden. + Sitzungsprotokolle konnten nicht gelöscht werden. Offlinemodus Melde dich zuerst bei Steam an Launcher @@ -871,6 +918,8 @@ Als Startbildschirm verwenden DroidDeck kann die Startbildschirm-App sein DroidDeck wird nie als Startbildschirm-App angeboten + Home-Taste öffnet + Die Seite, die beim Drücken von Home angezeigt wird, wenn DroidDeck die Start-App ist Stelle DroidDeck unter „Spiele hinzufügen“ auf „Einschließen“ Ausrichtung Launcher-Ausrichtung @@ -884,15 +933,22 @@ Vollbild Blendet die Status- und Navigationsleiste von Android aus Zeigt die Status- und Navigationsleiste von Android an + Dual-Screen-Launcher + Bei Automatisch liegen die Launcher-Bereiche (Steam, Bibliothek, Shops und die übrigen) auf dem zweiten Bildschirm von Handhelds mit integriertem zweitem Bildschirm. Ein nutzt einen beliebigen zweiten Bildschirm. Aus belässt den Launcher auf einem Bildschirm. + Dual-Screen-Sitzungen + Bei Automatisch wird das In-Game-Menü auf dem integrierten zweiten Bildschirm angedockt statt als Pop-over angezeigt. Ein nutzt einen beliebigen zweiten Bildschirm. Aus belässt das Menü auf dem Spielbildschirm; du kannst von dort weiterhin einen zweiten Bildschirm auswählen. Automatisch Ein Aus Steuerung auf dem unteren Bildschirm in Spielen + Android-Tastatur für Textfelder Öffnet beim Start einer Sitzung Trackpad und Tastatur auf dem zweiten Bildschirm. Eingabe für den oberen Bildschirm Fertig Standard-Startbildschirm-App Startbildschirm-App auswählen + Launcher im Leerlauf aus „Zuletzt verwendet“ ausblenden + Gilt nur, wenn DroidDeck die Standard-Start-App ist und keine Sitzung läuft. Auswählen Linux-Apps (Beta) Dateien @@ -1007,6 +1063,147 @@ Test-Builds Einen Fix vor dem Release ausprobieren Derzeit keine + Lab-Build + Lab-Builds + In Verwendung + Pausiert, nachdem Android DroidDeck neu optimiert hat + Nicht geladen: %1$s + Warten auf einen Neustart + Behalten + Für eine andere Version + Neu erstellen + Löscht diesen Build vom Gerät + Damit neu starten + Deaktivieren + Verwenden + Löschen + Jetzt löschen + Neustart konnte nicht vorbereitet werden: %1$s. Kopple das drahtlose Debugging in der Einrichtung und versuche es erneut. + Lab-Build installiert + DroidDeck wurde mit %1$s neu gestartet + Lab-Build pausiert + Android hat DroidDeck neu optimiert, daher ist %1$s nicht geladen. Öffne Updates, um damit neu zu starten. + Lab-Build deaktiviert + Er wurde für eine andere Version von DroidDeck erstellt. Er bleibt in Updates erhalten. + DroidDeck ist damit zweimal nicht gestartet + Agent + Agent + Agent arbeitet + Installiere Claude Code in der Linux-Umgebung, um den Agenten zu verwenden. + Frag nach einem Spiel, einem Absturz oder einer Änderung an DroidDeck + Senden + Neues Gespräch + Anhalten + Speicher + Entfernen + Jetzt entfernen + Claude Code + Codex + DroidDeck-Quellcode + Download-Caches + Nicht gepushte Änderungen gehen verloren + Builds laden diese erneut herunter + Das Setup kann es erneut installieren; Anmeldungen bleiben erhalten + DroidDeck wurde auf deinem Lab-Build neu gestartet. Mach dort weiter, wo du aufgehört hast. + Frag, warum ein Spiel nicht startet, lass dir ein Log erklären oder ändere DroidDeck und teste die Änderung auf diesem Gerät. + Fehlgeschlagen: %1$s + %1$s beendet (Exit-Code %2$d) + Angehalten + Ohne Antwort beendet + Erneut versuchen + Agent wird eingerichtet + Erstelle meinen Lab-Build %1$s für die installierte Version von DroidDeck neu und starte darauf neu. + %1$s rein · %2$s raus + Denkt nach + Gedanke + Denkt nach · %1$s + %1$s · %2$s + EINGABE + AUSGABE + Wird ausgeführt… + Kein Ergebnis: Der Durchlauf endete zuvor + Keine Ausgabe + Tippen, um die nächste Nachricht einzureihen + Einreihen + Als Nächstes: %1$s + Nicht senden + Anhängen + Entfernen + Standard + Denkaufwand + Ausführen + Überarbeiten + Noch nichts geändert + Führe den Plan aus. + Jetzt senden + Nachricht + Mehr + Schließen + Neueste + Arbeitet + Kontext + %1$s von %2$s + Diese Unterhaltung · %1$s + Der Verbrauch wird nach der ersten Antwort angezeigt + %1$d-Stunden-Limit + %1$d-Minuten-Limit + Wöchentliches Limit + %1$d%% · wird %2$s zurückgesetzt + + %1$d Datei + %1$d Dateien + + Zuerst planen + Plan + Schlägt einen Plan vor, ohne etwas zu ändern + Unterhaltungen + Noch keine Unterhaltungen + Gerade eben + Löschen + Löscht sie und ihre Anhänge + Prozesse + Im Linux-Userland läuft nichts + AGENT + Beenden + Lab-Build + Lab-Builds werden vorbereitet + %1$d%% · noch etwa %2$s + noch etwa %1$s + Abbrechen + Build abbrechen + Wird gestartet + %1$d%% + Wird gepackt + DroidDeck wird darauf neu gestartet + Fertig + Fehlgeschlagen: %1$s + Agent einrichten + Installiere die Linux-Laufzeit zuerst in der Einrichtung. + Erneut versuchen + Chat starten + Geräteverbindung + Drahtloses Debugging, damit der Agent DroidDeck sehen und steuern kann + %1$s installieren + In das Linux-Userland, mit git, gh und adb + Bei %1$s anmelden + Öffnet deinen Browser + GitHub + Optional, um Pull Requests zu erstellen + Build-Tools + Optional, für Lab-Builds auf diesem Gerät · etwa 5 GB + Agent bereit + Agent-Einrichtung abschließen + Bei %1$s angemeldet + Lab-Builds + schnelle Builds + Schnelle Lab-Builds + Kompiliert diese Version vorab, damit Lab-Builds nur Minuten dauern · einmalig etwa 20 Minuten + Kompilierung läuft · %1$d%% · noch etwa %2$s + Vorbereiten + Wireless-Debugging ist nicht erreichbar; Koppeln schaltet es ein + Koppeln + Installieren + Anmelden PR #%1$d Nicht für diese Kopie von DroidDeck gebaut Aktualisiert: %1$s @@ -1246,6 +1443,14 @@ Apps Einrichtung Updates + Mehr + Tabs bearbeiten + Tabs + Angezeigt + In „Mehr“ + Ausgeblendet + %1$s nach oben verschieben + %1$s nach unten verschieben %1$d %% %1$s fortsetzen Erscheint in jeder Sitzung als /root/ROMs. Der interne Speicher liegt unter /root/Storage. @@ -1267,6 +1472,15 @@ Vormerkung abbrechen Android-Tastatur Ausblenden ✕ + Größe auf dem Bildschirm + Anteil des Bildschirms, den die Tastatur einnimmt, inklusive Kopfzeile. + Deckkraft + Verringern, um das Spiel hinter der Tastatur zu sehen. + Ausgeblendete Tasten + Tasten, die du selten nutzt, bleiben auf der Tastatur ausgeblendet. + Esc- und Funktionstastenreihe + Ins / Del / Home / End / PgUp / PgDn + Pfeiltasten %1$s starten Wähle einen Bildschirm. Zweitbildschirm: %1$s. Der Zweitbildschirm ist nicht mehr verfügbar. @@ -1768,7 +1982,24 @@ Terminal Deck-Griffe + Trackpads Dashboard + Desktop + Desktop starten + Desktop · %1$s + Trackpad + Direkte Berührung + Trackpad. Für direkte Berührung tippen + Direkte Berührung. Für Trackpad tippen + KDE-Desktop wird gestartet… + Der Desktop wurde beendet. + Der Desktop konnte nicht gestartet werden. Die Protokolle liegen im Ordner bottom-desktop dieser Sitzung. + Der Desktop ist geschlossen. Hier gibt es noch nichts anzuzeigen. + Bildschirme tauschen + Der untere Bildschirm ist gerade nicht frei + Spielbildschirm + Spiel anzeigen auf + Oberer Bildschirm + Unterer Bildschirm Downloads Keine laufenden Downloads. Steam @@ -1803,6 +2034,20 @@ Treibstoff, t Haupttank %1$s t Reserve %1$s t + Framezeit + letzte %1$d s + Ø Frame + 1 % Low + Frames über 33 ms + %1$d / min + Spielzeit %1$s + %1$d Kerne, bis zu %2$s GHz + %1$d Kerne + Spiel + FPS bei %1$d Hz + Die rote Markierung kennzeichnet die Stelle, an der das HUD die Temperatur rot anzeigt. + ganzes Gerät + Akku Dashboard-Daten senden Automatisch Schaltet es für jedes hier aufgeführte Spiel ein, auch für später gefundene Spiele. Spiele, die du ausschaltest, bleiben aus. @@ -1826,6 +2071,10 @@ Das Mikro ist für dieses Spiel aus. Um zu sprechen, aktiviere „Mikrofon“ in den Steam-Einstellungen von DroidDeck (Audio) und starte das Spiel neu. Lautstärke %1$d%% Spielstatistiken + HUD für den unteren Bildschirm + Leiste auf jedem Tab + 1 %- und 0,1 %-Lows + CPU-Temperatur FPS CPU GPU @@ -1998,6 +2247,7 @@ Sitzung wird gestartet… %1$d:%2$02d vergangen · läuft noch Update des Steam-Clients wird heruntergeladen · %1$d %% + Steam-Client-Update wird angewendet… Steam-Client wird heruntergeladen · %1$s Es läuft bereits die Installation eines Kompatibilitätstools @@ -2074,11 +2324,29 @@ Cartoon-Konturen plus Schärfung. Keine Adreno-GPU + System-PowerVR-Treiber: Kompatibilität hängt vom Gerät ab + Experimentell: RADV oder der System-Xclipse-Treiber + System-PowerVR + Verwendet die integrierten Treiber für diese GPU + Der System-PowerVR-Treiber ist für Runtime und Anzeige ausgewählt. + Für dieses Mali gibt es noch keinen Open-Source-Treiber: Die Mali-Brücke ist aktiv. + Dies ist der Non-Snapdragon-Test-Build: Die offiziellen Builds hier laufen nur auf Adreno und werden deshalb nicht über diesen Build installiert. Neue Test-Builds gibt es auf github.com/The412Banner/droiddeck-nonadreno-drivers. + Die letzte Sitzung endete, weil Android DroidDeck beendet hat, um Speicher freizugeben, nicht wegen eines Absturzes. Schließe andere Apps oder senke die Textureinstellungen des Spiels und versuche es erneut. + Mali (Venus) + die Mali-Brücke + Für dieses Mali gibt es noch keinen Open-Source-Treiber: %1$s wird mit dem geräteeigenen Treiber verwendet. + %1$s ist noch nicht veröffentlicht: Bis dahin wird %2$s verwendet. + %1$s ist nicht verfügbar, und der Treiber dieses Telefons meldet Vulkan %2$s (Venus benötigt 1.2): Die Mali-Brücke wird verwendet. + %1$s ist noch nicht veröffentlicht: Die Mali-Brücke bleibt bis dahin aktiviert. + In Warteschlange: %1$s (wartet auf einen anderen Runtime-Treiber) + DXVK wird von der PowerVR-Runtime des Systems bereitgestellt. Andere DXVK-Pakete können zwar gespeichert, mit diesem Treiber aber nicht angewendet werden. Unterstützt Experimentell: Die Treiber sind Test-Builds Experimentelle Adreno-850-Unterstützung: erfordert kompatible experimentelle Anzeige- und Spieltreiber; auf diesem Gerät nicht geprüft Unter der getesteten Hardware (Adreno 725 und neuer): läuft eventuell nicht Nicht unterstützt: Für diese GPU ist kein kompatibles Grafik-Backend verfügbar + Läuft über die Mali-Brücke mit dem eigenen Vulkan-Treiber des Telefons + Bei deaktivierter Mali-Brücke nicht unterstützt: Turnip benötigt eine Adreno-GPU (Snapdragon) Das Rate-Limit von GitHub wurde erreicht - versuche es später erneut GitHub antwortete mit HTTP %1$d @@ -2279,6 +2547,13 @@ Sortieren Seitenleisten-Beschriftungen Namen unter den Symbolen der Seitenleiste anzeigen. Ausschalten für eine schmalere Seitenleiste. + Agenten-Begleiter + DeeDee schwebt über dem Launcher und Spielen und zeigt, was der Agent gerade tut. + Über anderen Apps + DeeDee über allen Apps schweben lassen und den Chat dort öffnen + Erlauben + DeeDee + Mit DeeDee chatten Anzeige Größere Karten Kleinere Karten @@ -2563,6 +2838,11 @@ Entwickler Build-Kennzeichnung als Wasserzeichen Kennzeichnung des Test- oder Lab-Builds auf dem Bildschirm anzeigen. Standardmäßig aktiviert. + Diagnose-Pakete teilen + Sitzung und Gerät + Grafik + Spiele und Kompatibilität + Alle Pakete Bereit zum Spielen Noch nicht bereit zum Spielen Laufzeit %1$s @@ -2601,6 +2881,9 @@ Aktiviere GOG-Erfolge in den Store-Einstellungen Erfolge nicht verfügbar; Sitzungsprotokolle prüfen Erfolg freigeschaltet + Mali (Venus): aus + Mali (Venus): ein + Der Treiber auf %1$s meldet Vulkan %2$s. Mali (Venus) benötigt Vulkan 1.2 oder neuer (gamescope startet mit älteren Versionen nicht), daher wird Venus in Sitzungen übersprungen und stattdessen das PanVK-Treiberpaar verwendet. Einfügen Linker Stick Rechter Stick @@ -2967,6 +3250,7 @@ VC++- und DirectX-Installationsprogramme, die Spiele anfordern Linux-x86-Spiele ausführen Steam-Werkzeuge + Steam lädt dies für Spiele herunter, die Anti-Cheat mitliefern, selbst wenn Anti-Cheat deaktiviert ist. Wird es entfernt, bleibt die Installation dieser Spiele bei 0 % hängen DroidDeck führt Spiele ohne diese Laufzeit aus x86-Proton, das DroidDeck nicht ausführen kann Standard für alle Spiele @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps 60 fps wirkt flüssiger, braucht aber mehr CPU, während Steam startet. Ein in Steam selbst gewähltes Video erscheint hier ebenfalls. Ton + Startvideo überspringen + Ein schwarzes Video von 0,1 Sekunden als Steam-Startvideo verwenden. Gilt ab der nächsten Sitzung. Eigenes Video MP4, MOV, MKV oder WebM. Andere Formate und Dateien über %1$d MB werden auf dem Gerät in 720p-WebM umgewandelt, bis %2$d Sekunden. Importieren @@ -3538,6 +3824,7 @@ Hält Alt+Tab, die Win-Taste und die Home-Taste in einer aktiven DroidDeck-Sitzung statt bei Android. Aktiviere Helligkeit unter Einrichtung → Steam-Integration Mali-Brücke: aus + %1$s kann die Mali-Brücke nicht nutzen (sie benötigt eine Mali-GPU ohne Systemtreiber-Route), daher hat dieser Schalter hier keine Wirkung. Mali-Brücke: an %1$s ist kein Adreno. Die experimentelle Vulkan-Brücke ist an: Die Sitzung zeichnet über den eigenen Treiber des Telefons. Rechne mit Fehlern und sende die Sitzungsprotokolle. Sicherer Modus @@ -3697,6 +3984,7 @@ Dieses Layout konnte nicht importiert werden Scharlachroter Schnee + Weiße Oberflächen mit roten Akzenten. Soundtracks Musik @@ -3760,4 +4048,6 @@ Titel wiederholen Lautstärke Keine Audiodateien in diesem Soundtrack + Start nicht verfügbar + Es ist kein Webbrowser verfügbar, um diesen Link zu öffnen. diff --git a/app/src/main/res/values-el/input_library.xml b/app/src/main/res/values-el/input_library.xml new file mode 100644 index 0000000000..c9f40579e3 --- /dev/null +++ b/app/src/main/res/values-el/input_library.xml @@ -0,0 +1,132 @@ + + + Η επιλεγμένη οθόνη δεν είναι διαθέσιμη. Συνδέστε την για να επεξεργαστείτε αυτή τη διάταξη στο πραγματικό της μέγεθος. + Απόρριψη μη αποθηκευμένων αλλαγών διάταξης; + Αυτή η διάταξη χρησιμοποιείται από %1$d προφίλ. Οι αποθηκευμένες αλλαγές ισχύουν για όλα. + Προεπιλεγμένα προφίλ + Λειτουργία επιφάνειας εργασίας + Λειτουργία παιχνιδιού + Προεπιλογή για επιφάνεια εργασίας και παιχνίδι + Προεπιλογή για λειτουργία παιχνιδιού + Προεπιλογή για λειτουργία επιφάνειας εργασίας + Ρυθμίσεις συσκευής + Χειριστήρια + Κουμπιά, μοχλοί, σκανδάλες και επιπλέον πλήκτρα + Αντιγραφή προφίλ + Επαναφορά ενεργειών + Επαναφορά των ενεργειών στο %1$s στις προεπιλογές του βασικού προφίλ; Οι διατάξεις και τα άλλα προφίλ παραμένουν ίδια. + Διαγραφή του %1$s; Οι λειτουργίες που το χρησιμοποιούν επιστρέφουν στο ενσωματωμένο προεπιλεγμένο προφίλ. Οι αποθηκευμένες διατάξεις και οι κοινές ρυθμίσεις παραμένουν διαθέσιμες. + Ορατότητα + Ισχύει για όλα τα προφίλ. Το Auto εμφανίζει τα χειριστήρια της κύριας οθόνης όταν δεν είναι συνδεδεμένο χειριστήριο σε λειτουργία παιχνιδιού. + Επεξεργασία στην οθόνη + Αποθηκευμένες διατάξεις… + Επιλέξτε διάταξη ή δημιουργήστε τη δική σας + Επιλέξτε Χειριστήρια προφίλ στο μενού συνεδρίας της δευτερεύουσας οθόνης. Οι επιλογείς Προφίλ και Δευτερεύουσα οθόνη στο μενού χειριστηρίου καθορίζουν ποια χειριστήρια εμφανίζονται. + Ενέργειες κουμπιών + Κοινόχρηστο με %1$s. Οι αλλαγές ισχύουν και για αυτά τα προφίλ. + Επαναχρησιμοποίηση ρυθμίσεων + Χρήση ρυθμίσεων από… + Αντιγραφή από άλλο προφίλ ή διατήρηση κοινών ρυθμίσεων + Δημιουργία ανεξάρτητου + Διατήρηση τρέχουσας ρύθμισης και διακοπή κοινής χρήσης αλλαγών + Οι διατάξεις αποθηκεύουν στοιχεία και θέσεις. Κάθε προφίλ μπορεί να ορίσει τις δικές του ενέργειες. Επεξεργαστείτε σε πλήρες μέγεθος στην οθόνη προορισμού. + Τρέχουσα διάταξη + Διαγραφή της αχρησιμοποίητης διάταξης %1$s και των αποθηκευμένων ενεργειών της; + Μετονομασία τρέχουσας διάταξης + Οι μη αναγνώσιμες ρυθμίσεις εισόδου διατηρήθηκαν σε αντίγραφο ανάκτησης. Μπορείτε να συνεχίσετε την επεξεργασία των προφίλ που ανακτήθηκαν. + Ιδιότητες + Ιδιότητες κλικ + %1$s · Κλικ + Κουμπιά + Μοχλοί, πλακίδια και σκανδάλες + Απόκρυψη εργαλείων + Χειριστήριο + Στέλνει την είσοδο του χειριστηρίου στο Steam Input ή στο παιχνίδι. + Αυτό το στοιχείο δεν στέλνει είσοδο χειριστηρίου, ποντικιού ή πληκτρολογίου. + Κλικ ποντικιού + Ενέργεια DroidDeck + Ενέργεια + Ταχύτητα κύλισης: %1$d βήματα/s + + Νέο προφίλ + + Νέα διάταξη + %1$s · Χρησιμοποιείται από %2$d προφίλ. Οι αλλαγές ισχύουν για κάθε προφίλ με αυτές τις αντιστοιχίσεις. + Μετονομασία + Διαγραφή + Προσθέστε στοιχεία στη διάταξη πριν αντιστοιχίσετε τις ενέργειές τους. + Δεν ήταν δυνατή η αποθήκευση των ρυθμίσεων εισόδου + Όνομα + Έναρξη από + Κουμπί + Μοχλός + Touchpad + Σταυρός + Σκανδάλη + Τέλος + Αναίρεση + + Προσθήκη + Σύρετε για μετακίνηση. Σύρετε μια γωνία για αλλαγή μεγέθους. Πατήστε Ιδιότητες για αντιστοίχιση ενέργειας. + Επεξεργασία στη δευτερεύουσα οθόνη + Επαναχρήση του %1$s από άλλο προφίλ. Οι άλλες πηγές χειρισμού παραμένουν ίδιες. + Διατήρηση κοινών φυσικών χειριστηρίων + Από προεπιλογή, όλα τα χειριστήρια και οι προσαρμοσμένες διατάξεις είναι ανεξάρτητα αντίγραφα. Η κοινή χρήση συνδέει μόνο τα φυσικά χειριστήρια. + Χρήση αυτών των στοιχείων και θέσεων. Η κοινή χρήση συγχρονίζει τις μελλοντικές αλλαγές γεωμετρίας· οι ενέργειες των κουμπιών παραμένουν ανεξάρτητες. Μια διαφορετική διάταξη ξεκινά με μη αντιστοιχισμένες ενέργειες. + Αντιγραφή αυτών των χειριστηρίων και ενεργειών ή σύνδεσή τους ώστε οι μελλοντικές αλλαγές να ισχύουν και για τα δύο προφίλ. + Διατήρηση κοινόχρηστου + Ανεξάρτητο αντίγραφο + Έναρξη μοχλού στο σημείο αφής + Απόκρυψη μοχλού όταν δεν χρησιμοποιείται + Εργαλεία + Αυτόματο (%1$s) + Προσαρμοσμένο (%1$s) + Αποθήκευση ως νέο προφίλ + Χειριστήρια προφίλ + Προφίλ + Χειρονομίες touchpad ποντικιού + Όταν αντιστοιχιστεί στον δείκτη του ποντικιού: πατήστε για κλικ, κρατήστε για μεταφορά και κυλήστε με δύο δάχτυλα. + Το %1$s έχει παράκαμψη γρήγορου μενού. Επιλέξτε Αυτόματο εκεί για να χρησιμοποιήσετε το προεπιλεγμένο προφίλ και τα τρία αποθηκευμένα μέρη. + Είσοδος DroidDeck + Κρατείται όσο ο μοχλός κινείται προς οποιαδήποτε κατεύθυνση: πάτημα πάνω από 55%, απελευθέρωση κάτω από 35%. Χρησιμοποιήστε Πλήκτρα κατεύθυνσης για κάθε κατεύθυνση ξεχωριστά. Οι εντολές DroidDeck εκτελούνται μία φορά ανά εκτροπή. Το κλικ του μοχλού ρυθμίζεται ξεχωριστά. + Κρατείται όσο αγγίζετε το touchpad· απελευθερώνεται όταν σηκώσετε το δάχτυλο. Οι εντολές DroidDeck εκτελούνται μία φορά ανά άγγιγμα. Το κλικ του touchpad ρυθμίζεται ξεχωριστά. + Κρατείται όταν η σκανδάλη περάσει το 55%· απελευθερώνεται κάτω από 35%. Οι εντολές DroidDeck εκτελούνται μία φορά ανά πάτημα. + Κατεύθυνση κύλισης + Κατακόρυφα + Οριζόντια + Οριζόντια κύλιση + Μετρήσεις + Ενεργοποιήστε την καταγραφή, χρησιμοποιήστε τα χειριστήρια σε ενεργή συνεδρία και μετά επιστρέψτε και διαβάστε τα αποτελέσματα. Μετρά μόνο τον χρόνο αποστολής του DroidDeck, όχι την καθυστέρηση οθόνης. Η καταγραφή τελειώνει όταν κλείσει η διεργασία της εφαρμογής. + %1$d χειριστήρια + Άλλες αποθηκευμένες διατάξεις (%1$d) ▾ + Απόκρυψη άλλων αποθηκευμένων διατάξεων (%1$d) ▴ + Αρχική / Guide + Πίσω · ένα πάτημα + Πίσω · διπλό πάτημα + Πίσω · δύο φορές στο Steam, μία στην επιφάνεια εργασίας + Σε λειτουργία Steam. Το κράτημα του Πίσω ανοίγει και τη γρήγορη πρόσβαση. + Επαναφορά στις προεπιλογές + Η επιλογή πίνακα απομνημονεύεται. Η επιφάνεια εργασίας ανοίγει δεύτερο χώρο εργασίας· δεν αλλάζει τη συνεδρία ούτε το προφίλ εισόδου της. + Εικονικό χειριστήριο + Ο τύπος χειριστηρίου που βλέπουν το Steam ή το παιχνίδι. + Οθόνη αφής + Πώς χειρίζονται τα αγγίγματα στην οθόνη του παιχνιδιού. Τα κουμπιά του προφίλ διατηρούν τις αντιστοιχισμένες ενέργειες. + Δείκτης αφής + Εμφανίζει δείκτη για άμεσα αγγίγματα στην οθόνη του παιχνιδιού. + Άγγιγμα και κράτημα + Ενέργεια ποντικιού όταν κρατάτε το δάχτυλό σας στην οθόνη του παιχνιδιού. + Πατήματα του κουμπιού Πίσω + Πρώτη ενέργεια: ένα πάτημα. Δεύτερη ενέργεια: διπλό πάτημα. + Κουμπί εναλλαγής + Πατήστε για κράτημα, πατήστε ξανά για απελευθέρωση. Το άνοιγμα μενού ή η αλλαγή προφίλ απελευθερώνει το κουμπί. + Σχήμα + Στρογγυλεμένο + Κάψουλα + Κύκλος + Ορθογώνιο + Ετικέτα κουμπιού + Κείμενο + Εισαγόμενη εικόνα + Ξεχωριστά διαγώνια πλήκτρα + Αντιστοιχίστε πλήκτρο σε κάθε διαγώνιο. Η κενή διαγώνιος πατά τις δύο γειτονικές κατευθύνσεις. + Γειτονικές κατευθύνσεις + Τα παλιά πλήκτρα οθόνης αποθηκεύτηκαν ως εισαγόμενα προφίλ παρακάτω. Επιλέξτε ένα για χρήση ή επεξεργασία. Οι τρέχουσες επιλογές προφίλ διατηρήθηκαν. + Τα παλιά πλήκτρα οθόνης δεν μπόρεσαν να εισαχθούν αυτόματα. Οι αρχικές ρυθμίσεις διατηρήθηκαν. + diff --git a/app/src/main/res/values-el/input_strings.xml b/app/src/main/res/values-el/input_strings.xml new file mode 100644 index 0000000000..58b5bce713 --- /dev/null +++ b/app/src/main/res/values-el/input_strings.xml @@ -0,0 +1,38 @@ + + + Προφίλ εισόδου + Προφίλ + Φυσικό χειριστήριο + Κύρια οθόνη + Δευτερεύουσα οθόνη + Εγγενές / Steam Input + Εγγενές: %1$s + Αποστολή άλλης εντολής χειριστηρίου + Απενεργοποιημένο + Πλήκτρο ή συνδυασμός πλήκτρων + Πλήκτρα κατεύθυνσης + Μετακίνηση δείκτη + Ταχύτητα δείκτη: %1$d + Κύλιση + Κατακόρυφη κύλιση + Αριστερό κουμπί ποντικιού + Δεξί κουμπί ποντικιού + Μεσαίο κουμπί ποντικιού + Άνοιγμα μενού DroidDeck + Εμφάνιση πληκτρολογίου + Άνοιγμα μενού Steam + Άνοιγμα γρήγορης πρόσβασης Steam + Αφαίρεση στοιχείου + Προσθήκη στοιχείου + Κουμπιά ειδικά για τη συσκευή + Αντιστοίχιση φυσικού κουμπιού + Αφήστε το κουμπί και επιλέξτε Επεξεργασία, Επανάληψη ή Ακύρωση. Το B ή το Πίσω ακυρώνει αφού αφήσετε το κουμπί. + Επανάληψη + Πατήστε ένα κουμπί, ακόμη και Πίσω που αναφέρεται ως πλήκτρο. Τα πλήκτρα έντασης και τα πλήκτρα συστήματος Android είναι δεσμευμένα. Η αντιστοίχιση ισχύει μόνο για αυτή τη συσκευή. + Αφαίρεση αντιστοίχισης + Διάγνωση εισόδου + Καταγραφή χρόνου αποστολής εισόδου + Ανάγνωση μετρήσεων + Μετρά την αποστολή από το Android έως τη δημοσίευση στη μεταφορά εισόδου. Δεν περιλαμβάνει άφιξη Bluetooth, δειγματοληψία επισκέπτη, απόδοση και καθυστέρηση οθόνης. Η καταγραφή είναι απενεργοποιημένη από προεπιλογή. + Χρήση κανονικής αντιστοίχισης εισόδου + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 365dea32bb..acb11e1eec 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -185,6 +185,7 @@ Δεν ήταν δυνατή η λήψη του γραφικού περιβάλλοντος PowerVR. Ελέγξτε τη σύνδεση και δοκιμάστε ξανά. Δεν ήταν δυνατή η λήψη του DirectAudio, οπότε ο ήχος των παιχνιδιών χρησιμοποιεί την πιο αργή διαδρομή σε αυτή τη συνεδρία. Αυτό το πρόγραμμα + Η συνεδρία δεν μπόρεσε να σχεδιάσει στην οθόνη: %1$s. Αυτή η οθόνη δείχνει τον λόγο αντί να είναι μαύρη· οι λεπτομέρειες βρίσκονται στα αρχεία καταγραφής της συνεδρίας. Δεν ήταν δυνατή η λήψη του πελάτη Steam. Το δίκτυο ή το VPN σας ίσως αποκλείει τους διακομιστές του Steam· ελέγξτε τη σύνδεση και δοκιμάστε ξανά. Δεν ήταν δυνατή η ρύθμιση του πελάτη Steam. Ελέγξτε τη σύνδεση και τον ελεύθερο χώρο αποθήκευσης και δοκιμάστε ξανά. Το %1$s είναι χτισμένο για υπολογιστές x86 και εκτελείται μέσω FEX, το οποίο δεν έχει εγκατασταθεί ακόμα. Εκκινήστε το Steam μία φορά ενώ είστε συνδεδεμένοι και αφήστε το να κάνει λήψη του FEX και του Steam Linux Runtime, μετά εκκινήστε αυτό ξανά. @@ -387,6 +388,9 @@ Δεν υποστηρίζεται ακόμα εδώ Φόρτωση των στοιχείων… Δεν ήταν δυνατή η εγκατάσταση: %1$s + Αυτή η λήψη χρειάζεται ενημέρωση. + Η ενημέρωση μπήκε στην ουρά. + Επανάληψη ενημέρωσης Λήφθηκε Λήψη %1$s Εγκατάσταση: %1$s @@ -417,6 +421,22 @@ Μόνο εσωτερική αποθήκευση Φάκελος: %1$s Δεύτερη βιβλιοθήκη + Περισσότερες βιβλιοθήκες Steam + Φάκελοι στους οποίους το Steam μπορεί να εγκαθιστά και να εκκινεί παιχνίδια, ο καθένας με το δικό του όνομα. Αν αφαιρέσετε κάποιον, τα παιχνίδια παραμένουν στον δίσκο. + Προσθήκη βιβλιοθήκης + Μετονομασία + Όνομα βιβλιοθήκης + Επιλέξτε έναν φάκελο για τη βιβλιοθήκη + Το πολύ %1$d πρόσθετες βιβλιοθήκες + Αυτός ο φάκελος είναι ήδη βιβλιοθήκη ή βρίσκεται μέσα σε μία + %1$s · μη διαθέσιμο + Ισχύει από την επόμενη συνεδρία Steam + Βρέθηκε σε αυτή τη συσκευή · %1$s · %2$s + Προσθήκη + Εύρεση βιβλιοθηκών στον εσωτερικό χώρο αποθήκευσης + Επιτρέψτε την πρόσβαση σε όλα τα αρχεία, ώστε το DroidDeck να βλέπει τις βιβλιοθήκες Steam που άλλες εφαρμογές διατηρούν στον εσωτερικό χώρο αποθήκευσης + Να επιτραπεί + Προστέθηκε %1$s, η βιβλιοθήκη Steam μέσα στον φάκελο που επιλέξατε Παιχνίδια που μεταδίδουν δεδομένα από κάρτα SD ή κοινόχρηστο χώρο αποθήκευσης μπορεί να κολλάνε. Διαγνωστικά αποθηκευτικού χώρου Καταγράφει αποτελέσματα κατανομής και δειγματοληπτικούς χρόνους αποθήκευσης στην Κοινή χρήση αρχείων καταγραφής. Μπορεί να επιβραδύνει τις εγκαταστάσεις όσο είναι ενεργό. Εφαρμόζεται στην επόμενη συνεδρία. @@ -605,7 +625,10 @@ Απενεργοποιεί τον βοηθό πλοήγησης με χειριστήριο του Proton, που κοστίζει CPU σε κάθε παιχνίδι. Εκτέλεση του proot χωρίς seccomp Μπορεί να διορθώσει σφάλματα απόντων syscall σε ορισμένους πυρήνες. Μπορεί να μειώσει την απόδοση. + Εκτέλεση χωρίς proot (πειραματικό) + Εκκινεί το σκέλος Linux απευθείας στο Android. Ισχύει για την επόμενη συνεδρία. Απενεργοποιήστε το αν κάτι δεν εκκινείται. Ταχεία διαδρομή proot + Δεν χρησιμοποιείται χωρίς proot. Απαιτεί το φίλτρο seccomp του proot. Ταχύτερη αναζήτηση αρχείων και λιγότερα κολλήματα. Απενεργοποιήστε το αν ένα πρόγραμμα δεν μπορεί να βρει τα αρχεία του. Σχεδίαση του δείκτη μέσα στο gamescope @@ -815,6 +838,7 @@ Η συσκευή υποστηρίζεται Μη δοκιμασμένη GPU Η GPU δεν υποστηρίζεται + GPU μέσω γέφυρας Mali %1$s · %2$s %1$s: %2$s Δεν υπάρχει συμβατό υποσύστημα γραφικών για %1$s. Το Steam μπορεί να εμφανίσει μαύρη οθόνη. @@ -844,15 +868,38 @@ Συνεδρία Αρχεία καταγραφής συνεδρίας Αποθηκεύονται μετά από κάθε συνεδρία + Ενισχυμένα διαγνωστικά για την επόμενη συνεδρία + Καταγράφει λεπτομερή αρχεία καταγραφής για μία συνεδρία. Ενδέχεται να μειώσει τις επιδόσεις και να χρησιμοποιήσει περισσότερο χώρο. Απενεργοποιείται αυτόματα με την έναρξη της συνεδρίας· ελέγξτε τα αρχεία καταγραφής πριν τα μοιραστείτε. Αρχεία καταγραφής εντοπισμού σφαλμάτων παιχνιδιών Συμπερίληψη διαγνωστικών Proton, Wine και γραφικών στην επόμενη εκκίνηση παιχνιδιού. Μπορεί να μειώσει την απόδοση και να χρησιμοποιήσει περισσότερο χώρο. Επανεκκινήστε αυτή τη συνεδρία για να αποθηκεύσετε αρχεία καταγραφής εντοπισμού σφαλμάτων παιχνιδιών Δεν ήταν δυνατή η ενημέρωση της καταγραφής. Ελέγξτε τον διακόπτη και δοκιμάστε ξανά. Εργαλεία εντοπισμού σφαλμάτων + Λεπτομερή αρχεία καταγραφής γραφικών + Διεπαφή Steam: σχεδίαση με GPU + Με το ζεύγος προγραμμάτων οδήγησης Xclipse, το Steam σχεδιάζει τις σελίδες του μέσω λογισμικού (η σχεδίαση με GPU εμφάνιζε σπασμένα πλακίδια). Ενεργοποιήστε το για ταχύτερη διεπαφή Steam, αν φαίνεται σωστή σε αυτό το τηλέφωνο. + δημιουργήθηκε %1$s + %1$s ενημερώθηκε στην πιο πρόσφατη έκδοση + Η γέφυρα Mali απέτυχε στον αυτοέλεγχό της στο %1$s κατά την προηγούμενη συνεδρία (εικόνες ή κλήσεις σχεδίασης), οπότε η συνεδρία χρησιμοποίησε στη θέση της το ζεύγος οδηγών PanVK. + Η γέφυρα Mali δεν βρήκε τρόπο να μοιραστεί μνήμη με τον οδηγό στο %1$s κατά την προηγούμενη συνεδρία, οπότε η συνεδρία χρησιμοποίησε στη θέση της το ζεύγος οδηγών PanVK. Η γέφυρα δεν μπορεί να λειτουργήσει σε αυτό το τηλέφωνο· η απενεργοποίησή της διατηρεί το ζεύγος PanVK. + Τα αρχεία καταγραφής Proton, DXVK και οδηγών κάθε παιχνιδιού προστίθενται στα αρχεία καταγραφής της συνεδρίας. Πάντα ενεργό όταν η GPU δεν είναι Adreno. Πιο πρόσφατα αρχεία καταγραφής συνεδρίας Αποθηκευμένα αρχεία καταγραφής συνεδρίας Διατηρεί τα %1$d πιο πρόσφατα Εκκαθάριση αρχείων καταγραφής + Διαθέσιμα αρχεία καταγραφής συνεδριών + Δεν υπάρχουν ακόμη αποθηκευμένα αρχεία καταγραφής συνεδρίας. + Τα αρχεία ZIP που κοινοποιούνται ή αποθηκεύονται περιλαμβάνουν την επιλεγμένη συνεδρία και τα σχετικά διαγνωστικά Steam, καταστήματος, εργαλείων και Battle.net. + %1$s · %2$s + Τρέχουσα συνεδρία + Κοινοποίηση + Αποθήκευση στη συσκευή + Διαγραφή + Διαγραφή αρχείων καταγραφής συνεδρίας; + Διαγραφή του %1$s; Δεν μπορεί να αναιρεθεί. + Τα αρχεία καταγραφής συνεδρίας αποθηκεύτηκαν. + Δεν ήταν δυνατή η αποθήκευση των αρχείων καταγραφής συνεδρίας. + Δεν ήταν δυνατή η διαγραφή των αρχείων καταγραφής συνεδρίας. Επαναφορά όλων των ρυθμίσεων Επαναφέρει κάθε ρύθμιση στην προεπιλεγμένη τιμή Επαναφορά @@ -879,6 +926,8 @@ Χρήση ως αρχική οθόνη Το DroidDeck μπορεί να είναι η εφαρμογή αρχικής οθόνης Το DroidDeck δεν προτείνεται ποτέ ως εφαρμογή αρχικής οθόνης + Το κουμπί Αρχικής οθόνης ανοίγει + Η σελίδα που εμφανίζεται όταν το DroidDeck είναι η εφαρμογή Αρχικής οθόνης και πατάτε το κουμπί Αρχικής οθόνης Στην Προσθήκη παιχνιδιών, ορίστε το DroidDeck σε Συμπερίληψη Προσανατολισμός Προσανατολισμός launcher @@ -892,15 +941,22 @@ Πλήρης οθόνη Αποκρύπτει τις γραμμές κατάστασης και πλοήγησης του Android Εμφανίζει τις γραμμές κατάστασης και πλοήγησης του Android + Εκκινητής διπλής οθόνης + Η επιλογή Αυτόματα τοποθετεί τις ενότητες του εκκινητή (Steam, Βιβλιοθήκη, Καταστήματα και τις υπόλοιπες) στη δεύτερη οθόνη των φορητών κονσολών με ενσωματωμένη δεύτερη οθόνη. Η επιλογή Ενεργό χρησιμοποιεί οποιαδήποτε δεύτερη οθόνη. Η επιλογή Ανενεργό κρατά τον εκκινητή σε μία οθόνη. + Συνεδρίες διπλής οθόνης + Η επιλογή Αυτόματα τοποθετεί το μενού εντός παιχνιδιού στην ενσωματωμένη δεύτερη οθόνη αντί για αναδυόμενο παράθυρο. Η επιλογή Ενεργό χρησιμοποιεί οποιαδήποτε δεύτερη οθόνη. Η επιλογή Ανενεργό διατηρεί το μενού στην οθόνη του παιχνιδιού· μπορείτε ακόμη να επιλέξετε δεύτερη οθόνη από αυτό. Αυτόματο Ενεργό Ανενεργό Χειριστήρια κάτω οθόνης στα παιχνίδια + Πληκτρολόγιο Android για πεδία κειμένου Ανοίγει την επιφάνεια αφής και το πληκτρολόγιο στη δεύτερη οθόνη όταν ξεκινά μια συνεδρία. Πληκτρολόγηση για την πάνω οθόνη Τέλος Προεπιλεγμένη εφαρμογή αρχικής οθόνης Επιλογή εφαρμογής αρχικής οθόνης + Απόκρυψη του εκκινητή από τα Πρόσφατα κατά την αδράνεια + Ισχύει μόνο όταν το DroidDeck είναι η προεπιλεγμένη εφαρμογή Αρχικής οθόνης και δεν εκτελείται καμία συνεδρία. Επιλογή Εφαρμογές Linux (beta) Αρχεία @@ -1015,6 +1071,147 @@ Δοκιμαστικά builds Δοκιμάστε μια διόρθωση πριν κυκλοφορήσει Κανένα προς το παρόν + Πειραματική έκδοση + Πειραματικές εκδόσεις + Σε χρήση + Σε παύση μετά την εκ νέου βελτιστοποίηση του DroidDeck από το Android + Δεν φορτώθηκε: %1$s + Αναμονή για επανεκκίνηση + Διατηρήθηκε + Για άλλη έκδοση + Επαναδημιουργία + Διαγράφει αυτήν την έκδοση από τη συσκευή + Επανεκκίνηση με αυτήν + Απενεργοποίηση + Χρήση + Διαγραφή + Διαγραφή τώρα + Δεν ήταν δυνατή η προετοιμασία της επανεκκίνησης: %1$s. Κάντε σύζευξη με ασύρματο εντοπισμό σφαλμάτων στη Ρύθμιση και δοκιμάστε ξανά. + Εγκαταστάθηκε πειραματική έκδοση + Το DroidDeck επανεκκινήθηκε με το %1$s + Η έκδοση Lab σε παύση + Το Android βελτιστοποίησε ξανά το DroidDeck, οπότε το %1$s δεν είναι φορτωμένο. Άνοιξε τις Ενημερώσεις για να επανεκκινήσεις με αυτό. + Η έκδοση Lab απενεργοποιήθηκε + Δημιουργήθηκε για άλλη έκδοση του DroidDeck. Διατηρείται στις Ενημερώσεις. + Το DroidDeck δεν ξεκίνησε με αυτό δύο φορές + Πράκτορας + Πράκτορας + Ο πράκτορας εργάζεται + Εγκατέστησε το Claude Code στο περιβάλλον χρήστη του Linux για να χρησιμοποιήσεις τον πράκτορα. + Ρώτησε για ένα παιχνίδι, ένα σφάλμα ή μια αλλαγή στο DroidDeck + Αποστολή + Νέα συνομιλία + Διακοπή + Αποθηκευτικός χώρος + Αφαίρεση + Αφαίρεση τώρα + Claude Code + Codex + Πηγαίος κώδικας DroidDeck + Προσωρινή μνήμη λήψεων + Οι αλλαγές που δεν έχουν ανέβει χάνονται + Οι εκδόσεις τα κατεβάζουν ξανά + Η ρύθμιση μπορεί να το ξαναεγκαταστήσει· οι συνδέσεις διατηρούνται + Το DroidDeck επανεκκινήθηκε με την έκδοση Lab σου. Συνέχισε από εκεί που σταμάτησες. + Ρώτησέ το γιατί ένα παιχνίδι δεν ξεκινά, ζήτησέ του να εξηγήσει ένα αρχείο καταγραφής ή να αλλάξει το DroidDeck και να δοκιμάσει την αλλαγή σε αυτή τη συσκευή. + Απέτυχε: %1$s + %1$s τερματίστηκε (κωδικός εξόδου %2$d) + Διακόπηκε + Τερματίστηκε χωρίς απάντηση + Επανάληψη + Γίνεται ρύθμιση του πράκτορα + Ξαναδημιούργησε τη δική μου έκδοση Lab %1$s για την εγκατεστημένη έκδοση του DroidDeck και επανεκκίνησε με αυτήν. + %1$s είσοδος · %2$s έξοδος + Σκέφτεται + Σκέψη + Σκέφτεται · %1$s + %1$s · %2$s + ΕΙΣΟΔΟΣ + ΕΞΟΔΟΣ + Εκτελείται… + Χωρίς αποτέλεσμα: ο γύρος έληξε πρώτα + Χωρίς έξοδο + Γράψτε για να προσθέσετε το επόμενο μήνυμα στην ουρά + Στην ουρά + Επόμενο: %1$s + Να μην σταλεί + Επισύναψη + Αφαίρεση + Προεπιλογή + Προσπάθεια συλλογισμού + Προχώρηση + Αναθεώρηση + Δεν έχει αλλάξει τίποτα ακόμη + Προχώρησε με το σχέδιο. + Αποστολή τώρα + Μήνυμα + Περισσότερα + Κλείσιμο + Πιο πρόσφατο + Σε εργασία + Πλαίσιο + %1$s από %2$s + Αυτή η συνομιλία · %1$s + Η χρήση εμφανίζεται μετά την πρώτη απάντηση + Όριο %1$d ωρών + Όριο %1$d λεπτών + Εβδομαδιαίο όριο + %1$d%% · επαναφέρεται %2$s + + %1$d αρχείο + %1$d αρχεία + + Πρώτα σχέδιο + Σχέδιο + Προτείνει σχέδιο χωρίς να αλλάξει τίποτα + Συνομιλίες + Δεν υπάρχουν ακόμη συνομιλίες + Μόλις τώρα + Διαγραφή + Διαγράφει τη συνομιλία και τα συνημμένα της + Διεργασίες + Δεν εκτελείται τίποτα στο περιβάλλον χρήστη Linux + ΠΡΑΚΤΟΡΑΣ + Διακοπή + Κατασκευή Lab + Προετοιμασία κατασκευών Lab + %1$d%% · περίπου %2$s ακόμη + περίπου %1$s ακόμη + Ακύρωση + Ακύρωση κατασκευής + Έναρξη + %1$d%% + Συσκευασία + Επανεκκίνηση του DroidDeck σε αυτό + Ολοκληρώθηκε + Απέτυχε: %1$s + Ρύθμιση του πράκτορα + Εγκαταστήστε πρώτα το περιβάλλον εκτέλεσης Linux στο Setup. + Επανάληψη + Έναρξη συνομιλίας + Σύνδεση συσκευής + Ασύρματη αποσφαλμάτωση, ώστε ο πράκτορας να βλέπει και να ελέγχει το DroidDeck + Εγκατάσταση %1$s + Μέσα στο περιβάλλον χρήστη Linux, με git, gh και adb + Σύνδεση στο %1$s + Ανοίγει το πρόγραμμα περιήγησής σας + GitHub + Προαιρετικό, για άνοιγμα pull requests + Εργαλεία μεταγλώττισης + Προαιρετικό, για μεταγλωττίσεις Lab σε αυτή τη συσκευή · περίπου 5 GB + Ο Agent είναι έτοιμος + Ολοκληρώστε τη ρύθμιση του Agent + Συνδεδεμένος στο %1$s + Μεταγλωττίσεις Lab + γρήγορες μεταγλωττίσεις + Γρήγορες μεταγλωττίσεις Lab + Μεταγλωττίζει εκ των προτέρων αυτή την έκδοση, ώστε οι μεταγλωττίσεις Lab να διαρκούν λεπτά · περίπου 20 λεπτά μία φορά + Μεταγλώττιση · %1$d%% · περίπου %2$s ακόμη + Προετοιμασία + Η ασύρματη αποσφαλμάτωση δεν είναι προσβάσιμη · η Σύζευξη την ενεργοποιεί + Σύζευξη + Εγκατάσταση + Σύνδεση PR #%1$d Δεν έχει κατασκευαστεί για αυτή την έκδοση του DroidDeck Ενημερώθηκε %1$s @@ -1254,6 +1451,14 @@ Εφαρμογές Ρύθμιση Ενημερώσεις + Περισσότερα + Επεξεργασία καρτελών + Καρτέλες + Εμφανής + Στα Περισσότερα + Κρυφή + Μετακινήστε %1$s προς τα πάνω + Μετακινήστε %1$s προς τα κάτω %1$d%% Συνέχιση %1$s Εμφανίζεται ως /root/ROMs σε κάθε συνεδρία. Ο εσωτερικός χώρος αποθήκευσης βρίσκεται στο /root/Storage. @@ -1275,6 +1480,15 @@ Ακύρωση σε εκκρεμότητα Πληκτρολόγιο Android Απόκρυψη ✕ + Μέγεθος στην οθόνη + Ποσοστό της οθόνης που καταλαμβάνει το πληκτρολόγιο, συμπεριλαμβανομένης της κεφαλίδας. + Αδιαφάνεια + Μειώστε την για να βλέπετε το παιχνίδι πίσω από το πληκτρολόγιο. + Κρυφά πλήκτρα + Τα πλήκτρα που χρησιμοποιείτε σπάνια δεν εμφανίζονται στο πληκτρολόγιο. + Esc και σειρά λειτουργιών + Ins / Del / Home / End / PgUp / PgDn + Πλήκτρα βελών Εκκίνηση %1$s Επιλέξτε οθόνη. Δευτερεύουσα: %1$s. Η δευτερεύουσα οθόνη δεν είναι πλέον διαθέσιμη. @@ -1776,7 +1990,24 @@ Τερματικό Λαβές Deck + πινακίδες αφής Πίνακας ελέγχου + Επιφάνεια εργασίας + Εκκίνηση επιφάνειας εργασίας + Επιφάνεια εργασίας · %1$s + Επιφάνεια αφής + Άμεση αφή + Επιφάνεια αφής. Πατήστε για άμεση αφή + Άμεση αφή. Πατήστε για επιφάνεια αφής + Εκκίνηση της επιφάνειας εργασίας KDE… + Η επιφάνεια εργασίας έκλεισε. + Η επιφάνεια εργασίας δεν μπόρεσε να εκκινηθεί. Τα αρχεία καταγραφής βρίσκονται στον φάκελο bottom-desktop αυτής της συνεδρίας. + Η επιφάνεια εργασίας είναι κλειστή. Δεν υπάρχει τίποτα για εμφάνιση ακόμα. + Εναλλαγή οθονών + Η κάτω οθόνη δεν είναι διαθέσιμη αυτή τη στιγμή + Οθόνη παιχνιδιού + Εμφάνιση του παιχνιδιού στην + Επάνω οθόνη + Κάτω οθόνη Λήψεις Δεν εκτελούνται λήψεις. Steam @@ -1811,6 +2042,20 @@ Καύσιμο, t Κύριο %1$s t Εφεδρικό %1$s t + Χρόνος καρέ + τελευταία %1$d s + μέσο καρέ + 1% χαμηλά + καρέ πάνω από 33 ms + %1$d / min + Σε παιχνίδι εδώ και %1$s + %1$d πυρήνες, έως %2$s GHz + %1$d πυρήνες + παιχνίδι + FPS στα %1$d Hz + Η κόκκινη ένδειξη είναι το σημείο όπου το HUD εμφανίζει τη θερμοκρασία με κόκκινο. + ολόκληρη η συσκευή + μπαταρία Αποστολή δεδομένων πίνακα Αυτόματα Το ενεργοποιεί για κάθε παιχνίδι της λίστας, μαζί και όσα βρεθούν αργότερα. Τα παιχνίδια που απενεργοποιείτε παραμένουν ανενεργά. @@ -1834,6 +2079,10 @@ Το μικρόφωνο είναι απενεργοποιημένο για αυτό το παιχνίδι. Για να μιλήσετε, ενεργοποιήστε το Μικρόφωνο στις ρυθμίσεις Steam του DroidDeck (Ήχος) και ξεκινήστε ξανά το παιχνίδι. Ένταση %1$d%% Στατιστικά παιχνιδιού + HUD κάτω οθόνης + Λωρίδα σε κάθε καρτέλα + 1% και 0,1% χαμηλά + Θερμοκρασία CPU FPS CPU GPU @@ -2006,6 +2255,7 @@ Εκκίνηση της συνεδρίας… %1$d:%2$02d πέρασαν · ακόμα σε εξέλιξη Λήψη της ενημέρωσης του πελάτη Steam · %1$d%% + Εφαρμογή της ενημέρωσης του πελάτη Steam… Λήψη του πελάτη Steam · %1$s Μια εγκατάσταση εργαλείου συμβατότητας εκτελείται ήδη @@ -2082,11 +2332,29 @@ Περιγράμματα τύπου toon συν όξυνση. Δεν είναι GPU Adreno + Πρόγραμμα οδήγησης PowerVR του συστήματος: η συμβατότητα διαφέρει ανά συσκευή + Πειραματικό: RADV ή το πρόγραμμα οδήγησης Xclipse του συστήματος + PowerVR συστήματος + Χρησιμοποιεί τα ενσωματωμένα προγράμματα οδήγησης για αυτή την GPU + Έχει επιλεγεί ο οδηγός PowerVR του συστήματος για το περιβάλλον εκτέλεσης και την οθόνη. + Κανένας οδηγός ανοιχτού κώδικα δεν υποστηρίζει ακόμη αυτό το Mali: η γέφυρα Mali είναι ενεργοποιημένη. + Πρόκειται για τη δοκιμαστική έκδοση για συσκευές χωρίς Snapdragon: οι επίσημες εκδόσεις εδώ λειτουργούν μόνο σε Adreno, επομένως δεν εγκαθίστανται πάνω από αυτήν. Οι νέες δοκιμαστικές εκδόσεις βρίσκονται στο github.com/The412Banner/droiddeck-nonadreno-drivers. + Η τελευταία συνεδρία τερματίστηκε επειδή το Android έκλεισε το DroidDeck για να ελευθερώσει μνήμη, όχι λόγω σφάλματος. Κλείστε άλλες εφαρμογές ή χαμηλώστε τις ρυθμίσεις υφών του παιχνιδιού και δοκιμάστε ξανά. + Mali (Venus) + η γέφυρα Mali + Κανένας οδηγός ανοιχτού κώδικα δεν υποστηρίζει ακόμη αυτό το Mali: χρησιμοποιείται το %1$s, πάνω στον ενσωματωμένο οδηγό του τηλεφώνου. + Το %1$s δεν έχει κυκλοφορήσει ακόμη: χρησιμοποιείται το %2$s μέχρι να κυκλοφορήσει. + Το %1$s δεν είναι διαθέσιμο και ο οδηγός αυτού του τηλεφώνου αναφέρει Vulkan %2$s (το Venus χρειάζεται 1.2): χρησιμοποιείται η γέφυρα Mali. + Το %1$s δεν έχει κυκλοφορήσει ακόμη: η γέφυρα Mali είναι ενεργοποιημένη μέχρι να κυκλοφορήσει. + Σε ουρά: %1$s (περιμένει διαφορετικό οδηγό για το περιβάλλον εκτέλεσης) + Το DXVK παρέχεται από το περιβάλλον εκτέλεσης PowerVR του συστήματος. Άλλα πακέτα DXVK μπορούν να αποθηκευτούν, αλλά δεν εφαρμόζονται με αυτόν τον οδηγό. Υποστηρίζεται Πειραματικό: τα προγράμματα οδήγησής του είναι δοκιμαστικές εκδόσεις Πειραματική υποστήριξη Adreno 850: απαιτεί συμβατά πειραματικά προγράμματα οδήγησης οθόνης και παιχνιδιών· δεν έχει επαληθευτεί σε αυτή τη συσκευή Κάτω από το δοκιμασμένο υλικό (Adreno 725 και νεότερα): ίσως να μην εκτελεστεί Δεν υποστηρίζεται: δεν υπάρχει συμβατό υποσύστημα γραφικών για αυτήν την GPU + Λειτουργεί μέσω της γέφυρας Mali, πάνω στον ενσωματωμένο οδηγό Vulkan του τηλεφώνου + Δεν υποστηρίζεται με τη γέφυρα Mali απενεργοποιημένη: το Turnip χρειάζεται GPU Adreno (Snapdragon) Το όριο ρυθμού του GitHub ξεπεράστηκε - δοκιμάστε ξανά αργότερα Το GitHub απάντησε με HTTP %1$d @@ -2287,6 +2555,13 @@ Ταξινόμηση Ετικέτες πλαϊνής γραμμής Εμφάνιση ονομάτων κάτω από τα εικονίδια της πλαϊνής γραμμής. Απενεργοποιήστε για πιο λεπτή πλαϊνή γραμμή. + Κατοικίδιο του πράκτορα + Το DeeDee εμφανίζεται πάνω από τον εκκινητή και τα παιχνίδια και δείχνει τι κάνει ο πράκτορας. + Πάνω από άλλες εφαρμογές + Αφήστε το DeeDee να εμφανίζεται πάνω από κάθε εφαρμογή και να ανοίγει εκεί τη συνομιλία + Να επιτρέπεται + DeeDee + Συνομιλία με DeeDee Προβολή Μεγαλύτερες κάρτες Μικρότερες κάρτες @@ -2574,6 +2849,11 @@ Προγραμματιστής Υδατογράφημα ετικέτας έκδοσης Εμφάνιση της ετικέτας δοκιμαστικής έκδοσης ή έκδοσης Lab στην οθόνη. Ενεργό από προεπιλογή. + Κοινοποίηση πακέτων διαγνωστικών + Συνεδρία και συσκευή + Γραφικά + Παιχνίδια και συμβατότητα + Όλα τα πακέτα Έτοιμο για παιχνίδι Δεν είναι ακόμα έτοιμο για παιχνίδι runtime %1$s @@ -2612,6 +2892,9 @@ Ενεργοποιήστε τα επιτεύγματα GOG στις ρυθμίσεις καταστημάτων Τα επιτεύγματα δεν είναι διαθέσιμα· ελέγξτε τα αρχεία καταγραφής της συνεδρίας Το επίτευγμα ξεκλειδώθηκε + Mali (Venus): απενεργοποιημένο + Mali (Venus): ενεργοποιημένο + Ο οδηγός στο %1$s αναφέρει Vulkan %2$s. Το Mali (Venus) χρειάζεται Vulkan 1.2 ή νεότερο (το gamescope δεν ξεκινά σε παλιότερες εκδόσεις), επομένως οι συνεδρίες παρακάμπτουν το Venus και χρησιμοποιούν στη θέση του το ζεύγος οδηγών PanVK. Επικόλληση Αριστερό στικ Δεξί στικ @@ -2967,6 +3250,7 @@ Εγκαταστάσεις VC++ και DirectX που χρειάζονται τα παιχνίδια Τρέχει παιχνίδια Linux x86 Εργαλείο Steam + Το Steam κατεβάζει αυτό το στοιχείο για παιχνίδια που περιλαμβάνουν anti-cheat, ακόμη και όταν είναι απενεργοποιημένο. Η αφαίρεσή του κολλάει την εγκατάστασή τους στο 0% Το DroidDeck τρέχει παιχνίδια χωρίς αυτό το περιβάλλον Proton x86, που το DroidDeck δεν μπορεί να τρέξει Προεπιλογή για όλα τα παιχνίδια @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps Τα 60 fps φαίνονται πιο ομαλά, αλλά επιβαρύνουν περισσότερο τον επεξεργαστή όσο ξεκινά το Steam. Ένα βίντεο που επιλέχθηκε στις ρυθμίσεις του Steam εμφανίζεται κι εδώ. Ήχος + Παράλειψη ταινίας εκκίνησης + Χρησιμοποιεί ένα μαύρο κλιπ 0,1 δευτερολέπτου ως ταινία εκκίνησης του Steam. Εφαρμόζεται στην επόμενη συνεδρία. Δικό σας βίντεο MP4, MOV, MKV ή WebM. Άλλες μορφές και αρχεία πάνω από %1$d MB μετατρέπονται στη συσκευή σε WebM 720p, έως %2$d δευτερόλεπτα. Εισαγωγή @@ -3538,6 +3824,7 @@ Διατηρεί τα Alt+Tab, το πλήκτρο Win και το κουμπί Αρχικής στην ενεργή συνεδρία DroidDeck αντί για το Android. Ενεργοποιήστε τη Φωτεινότητα στη Ρύθμιση → Ενσωμάτωση Steam Γέφυρα Mali: ανενεργή + Το %1$s δεν μπορεί να χρησιμοποιήσει τη γέφυρα Mali (χρειάζεται GPU Mali χωρίς διαδρομή οδηγού συστήματος), επομένως αυτός ο διακόπτης δεν έχει καμία επίδραση εδώ. Γέφυρα Mali: ενεργή Η %1$s δεν είναι Adreno. Η πειραματική γέφυρα Vulkan είναι ενεργή: η συνεδρία σχεδιάζει μέσω του προγράμματος οδήγησης του ίδιου του τηλεφώνου. Αναμένετε σφάλματα· στείλτε τα αρχεία καταγραφής της συνεδρίας. Ασφαλής λειτουργία @@ -3697,6 +3984,7 @@ Δεν ήταν δυνατή η εισαγωγή αυτής της διάταξης Κατακόκκινο χιόνι + Λευκές επιφάνειες με κόκκινες λεπτομέρειες. Soundtrack Μουσική @@ -3760,4 +4048,6 @@ Επανάληψη ενός Ένταση Δεν υπάρχουν αρχεία ήχου σε αυτό το soundtrack + Η εκκίνηση δεν είναι διαθέσιμη + Δεν είναι διαθέσιμο πρόγραμμα περιήγησης ιστού για το άνοιγμα αυτού του συνδέσμου. diff --git a/app/src/main/res/values-es/input_library.xml b/app/src/main/res/values-es/input_library.xml new file mode 100644 index 0000000000..fe2ee17896 --- /dev/null +++ b/app/src/main/res/values-es/input_library.xml @@ -0,0 +1,132 @@ + + + La pantalla seleccionada no está disponible. Conéctala para editar este diseño a su tamaño real. + ¿Descartar los cambios de diseño sin guardar? + Este diseño lo usan %1$d perfiles. Los cambios guardados se aplican a todos. + Perfiles predeterminados + Modo escritorio + Modo juego + Predeterminado para escritorio y juego + Predeterminado para el modo juego + Predeterminado para el modo escritorio + Ajustes del dispositivo + Controles + Botones, sticks, gatillos y teclas extra + Copiar perfil + Restablecer acciones + ¿Restablecer las acciones de %1$s a los valores predeterminados de su perfil base? Los diseños y otros perfiles no cambiarán. + ¿Eliminar %1$s? Los modos que lo usan volverán a su perfil predeterminado integrado. Los diseños guardados y los ajustes compartidos seguirán disponibles. + Visibilidad + Se aplica a todos los perfiles. Auto muestra los controles de la pantalla principal cuando no hay mando conectado en el modo juego. + Editar en pantalla + Diseños guardados… + Elige un diseño o crea el tuyo + Elige Controles de perfil en el menú de sesión de la pantalla secundaria. Los selectores de Perfil y Pantalla secundaria del menú del mando eligen los controles que se muestran. + Acciones de botones + Compartido con %1$s. Las ediciones también se aplican a esos perfiles. + Reutilizar ajustes + Usar ajustes de… + Copiar de otro perfil o mantener los ajustes compartidos + Hacer independiente + Mantener la configuración actual y dejar de compartir cambios + Los diseños guardan elementos y sus posiciones. Cada perfil puede asignar sus propias acciones. Edita a tamaño completo en la pantalla de destino. + Diseño actual + ¿Eliminar el diseño sin usar %1$s y sus acciones guardadas? + Renombrar el diseño actual + La configuración de entrada ilegible se guardó en una copia de recuperación. Puede seguir editando los perfiles restaurados. + Propiedades + Propiedades del clic + %1$s · Clic + Botones + Sticks, pads y gatillos + Ocultar herramientas + Mando + Envía la entrada del mando a Steam Input o al juego. + Este elemento no envía entrada de mando, ratón ni teclado. + Clic del ratón + Acción de DroidDeck + Acción + Velocidad de desplazamiento: %1$d pasos/s + + Perfil nuevo + + Diseño nuevo + %1$s · Lo usan %2$d perfiles. Los cambios se aplican a todos los perfiles que usan estas asignaciones. + Cambiar nombre + Eliminar + Añade elementos al diseño antes de asignar sus acciones. + No se pudo guardar la configuración de entrada + Nombre + Empezar desde + Botón + Stick + Panel táctil + Cruceta + Gatillo + Listo + Deshacer + + Añadir + Arrastra para mover. Arrastra una esquina para cambiar el tamaño. Toca Propiedades para asignar una acción. + Editando en la pantalla secundaria + Reutilizar %1$s de otro perfil. Las demás fuentes de control no cambiarán. + Mantener compartidos los controles físicos + Por defecto, todos los controles y diseños personalizados son copias independientes. Compartir solo vincula los controles físicos. + Usar estos elementos y posiciones. Compartir mantiene sincronizados los cambios futuros de geometría; tus acciones de botón siguen siendo independientes. Un diseño distinto empieza con acciones sin asignar. + Copiar estos controles y acciones, o vincularlos para que los cambios futuros se apliquen a ambos perfiles. + Mantener compartido + Copia independiente + Iniciar el stick en el punto de toque + Ocultar el stick cuando no se use + Herramientas + Auto (%1$s) + Personalizado (%1$s) + Guardar como perfil nuevo + Controles del perfil + Perfil + Gestos del panel táctil del ratón + Si se asigna al puntero del ratón: toca para hacer clic, mantén para arrastrar y desplaza con dos dedos. + %1$s tiene una anulación del menú rápido. Selecciona Auto allí para usar su perfil predeterminado y sus tres partes guardadas. + Entrada de DroidDeck + Se mantiene mientras el stick se mueve en cualquier dirección: se pulsa por encima del 55 %, se suelta por debajo del 35 %. Usa Teclas de dirección para asignar cada dirección por separado. Los comandos de DroidDeck se ejecutan una vez por desvío. El clic del stick se configura aparte. + Se mantiene mientras se toca el panel táctil; se suelta al levantar el dedo. Los comandos de DroidDeck se ejecutan una vez por toque. El clic del panel se configura aparte. + Se mantiene cuando el gatillo supera el 55 %; se suelta por debajo del 35 %. Los comandos de DroidDeck se ejecutan una vez por pulsación. + Dirección de desplazamiento + Vertical + Horizontal + Desplazar horizontalmente + Mediciones + Activa la grabación, usa los controles en una sesión en marcha y luego vuelve y lee los resultados. Mide solo el tiempo de envío de DroidDeck, no la latencia de pantalla. La grabación termina al cerrar el proceso de la app. + %1$d controles + Otros diseños guardados (%1$d) ▾ + Ocultar otros diseños guardados (%1$d) ▴ + Inicio / Guía + Atrás · un toque + Atrás · doble toque + Atrás · dos veces en Steam, una en escritorio + En modo Steam. Mantener Atrás también abre el acceso rápido. + Restaurar valores predeterminados + Tu elección de panel se recuerda. Escritorio abre un segundo espacio de trabajo; no cambia la sesión ni su perfil de entrada. + Mando virtual + El tipo de mando que ven Steam o el juego. + Pantalla táctil + Cómo se manejan los toques en la pantalla del juego. Los botones del perfil mantienen sus acciones asignadas. + Cursor táctil + Muestra un puntero para toques directos en la pantalla del juego. + Tocar y mantener + Acción del ratón al mantener un dedo en la pantalla del juego. + Toques del botón Atrás + Primera acción: un toque. Segunda acción: doble toque. + Botón de alternar + Toca para mantener, toca de nuevo para soltar. Abrir un menú o cambiar de perfil suelta el botón. + Forma + Redondeada + Píldora + Círculo + Rectángulo + Etiqueta del botón + Texto + Imagen importada + Teclas diagonales separadas + Asigna una tecla a cada diagonal. Una diagonal vacía pulsa sus dos direcciones vecinas. + Direcciones vecinas + Tus antiguas teclas en pantalla se guardaron como perfiles importados abajo. Selecciona uno para usarlo o editarlo. Se mantuvieron tus selecciones de perfil actuales. + Las antiguas teclas en pantalla no se pudieron importar automáticamente. Se conservó la configuración original. + diff --git a/app/src/main/res/values-es/input_strings.xml b/app/src/main/res/values-es/input_strings.xml new file mode 100644 index 0000000000..e6e5a5bec5 --- /dev/null +++ b/app/src/main/res/values-es/input_strings.xml @@ -0,0 +1,38 @@ + + + Perfiles de entrada + Perfiles + Mando físico + Pantalla principal + Pantalla secundaria + Nativo / Steam Input + Nativo: %1$s + Enviar otro control del mando + Desactivado + Tecla o combinación de teclas + Teclas de dirección + Mover el puntero + Velocidad del puntero: %1$d + Desplazar + Desplazar verticalmente + Botón izquierdo del ratón + Botón derecho del ratón + Botón central del ratón + Abrir el menú de DroidDeck + Mostrar el teclado + Abrir el menú de Steam + Abrir el acceso rápido de Steam + Quitar control + Añadir control + Botones específicos del dispositivo + Asignar un botón físico + Suelta el botón y elige Editar, Reintentar o Cancelar. B o Atrás cancela tras soltarlo. + Reintentar + Pulsa un botón, incluido un botón Atrás informado como tecla. Las teclas de volumen y del sistema Android están reservadas. La asignación solo se aplica a este dispositivo. + Quitar asignación + Diagnóstico de entrada + Registrar el tiempo de envío de entrada + Leer mediciones + Mide el envío de Android hasta su publicación en el transporte de entrada existente. No incluye la llegada por Bluetooth, el sondeo del invitado, el renderizado ni la latencia de pantalla. La grabación está desactivada de forma predeterminada. + Usar la asignación de entrada normal + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8a8a54960e..224a8f59cb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -185,6 +185,7 @@ No se pudo descargar el entorno gráfico de PowerVR. Comprueba la conexión e inténtalo de nuevo. No se ha podido descargar DirectAudio, así que el audio de los juegos usa la ruta más lenta en esta sesión. Este programa + La sesión no pudo dibujar en la pantalla: %1$s. En lugar de mostrarse una pantalla negra, esta pantalla explica el motivo; los registros de la sesión contienen los detalles. 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. @@ -388,6 +389,9 @@ Aún no compatible aquí Cargando los componentes… No se pudo instalar: %1$s + Esta descarga necesita una actualización. + Actualización en cola. + Reintentar actualización Descargado Descargando %1$s Instalando: %1$s @@ -418,6 +422,22 @@ Solo interno Carpeta: %1$s Segunda biblioteca + Más bibliotecas de Steam + Carpetas en las que Steam puede instalar juegos y desde las que puede ejecutarlos, cada una con su propio nombre. Al eliminar una, sus juegos permanecen en el disco. + Añadir biblioteca + Cambiar nombre + Nombre de la biblioteca + Selecciona una carpeta para la biblioteca + Como máximo %1$d bibliotecas añadidas + Esa carpeta ya es una biblioteca o está dentro de una + %1$s · no disponible + Se aplicará a partir de la próxima sesión de Steam + Encontradas en este dispositivo · %1$s · %2$s + Añadir + Buscar bibliotecas en el almacenamiento interno + Permite el acceso a todos los archivos para que DroidDeck pueda ver las bibliotecas de Steam que otras aplicaciones guardan en el almacenamiento interno + Permitir + Se añadió %1$s, la biblioteca de Steam dentro de la carpeta que seleccionaste Los juegos que cargan recursos desde la SD o el almacenamiento compartido pueden ir a tirones. Diagnóstico de almacenamiento Registra los resultados de asignación y muestras de tiempos de almacenamiento en Compartir registros. Puede ralentizar las instalaciones mientras esté activado. Se aplica en la próxima sesión. @@ -607,7 +627,10 @@ Desactiva el asistente de navegación con mando de Proton, que consume CPU en cada juego. Ejecutar proot sin seccomp Puede corregir errores de syscalls ausentes en algunos kernels. Puede reducir el rendimiento. + Ejecutar sin proot (experimental) + Inicia el entorno Linux directamente en Android. Se aplicará en la próxima sesión. Desactiva esta opción si algo no arranca. Ruta rápida de proot + No se usa sin proot. Requiere el filtro seccomp de proot. Búsquedas de archivos más rápidas y menos tirones. Desactívalo si un programa no encuentra sus archivos. Dibujar el cursor dentro de gamescope @@ -818,6 +841,7 @@ Dispositivo compatible GPU sin probar GPU no compatible + GPU a través del puente Mali %1$s · %2$s %1$s: %2$s No hay un motor gráfico compatible disponible; %1$s puede mostrar una pantalla negra @@ -847,15 +871,38 @@ Sesión Registros de sesión Se guardan tras cada sesión + Diagnósticos mejorados para la próxima sesión + Captura registros detallados durante una sesión. Puede reducir el rendimiento y ocupar más espacio de almacenamiento. Se desactiva automáticamente al iniciar la sesión; revisa los registros antes de compartirlos. Registros de depuración de juegos Incluye diagnósticos de Proton, Wine y gráficos en el próximo inicio de un juego. Puede reducir el rendimiento y usar más almacenamiento. Reinicia esta sesión para guardar los registros de depuración de juegos No se ha podido actualizar el registro. Comprueba el interruptor y vuelve a intentarlo. Herramientas de depuración + Registros detallados de gráficos + Interfaz de Steam: dibujo con GPU + Con el par de controladores Xclipse, Steam dibuja sus páginas por software (el dibujo con GPU mostraba teselas corruptas). Activa esta opción para una interfaz de Steam más rápida si se ve bien en este teléfono. + compilado el %1$s + %1$s actualizado a la compilación más reciente + El puente Mali no superó la autoprueba en %1$s durante la última sesión (imágenes o dibujos), por lo que la sesión usó el par de controladores PanVK en su lugar. + El puente Mali no encontró forma de compartir memoria con el controlador en %1$s durante la última sesión, por lo que la sesión usó el par de controladores PanVK en su lugar. El puente no puede funcionar en este teléfono; desactivarlo mantiene el par PanVK. + Los registros de Proton, DXVK y de los controladores de cada juego se incluyen en los registros de la sesión. Siempre activado cuando la GPU no es Adreno. Últimos registros de sesión Registros de sesión guardados Conserva los %1$d más recientes Borrar registros + Registros de sesión disponibles + Todavía no hay registros de sesión guardados. + Los ZIP compartidos y guardados incluyen la sesión seleccionada y los diagnósticos relacionados de Steam, la tienda, las herramientas y Battle.net. + %1$s · %2$s + Sesión actual + Compartir + Guardar en el dispositivo + Eliminar + ¿Eliminar registros de sesión? + ¿Eliminar %1$s? Esta acción no se puede deshacer. + Registros de sesión guardados. + No se pudieron guardar los registros de sesión. + No se pudieron eliminar los registros de sesión. Restablecer todos los ajustes Devuelve cada ajuste a su valor predeterminado Restablecer @@ -882,6 +929,8 @@ Usar como pantalla de inicio DroidDeck puede ser la app de inicio DroidDeck nunca se ofrece como app de inicio + El botón de inicio abre + La página que se muestra cuando DroidDeck es la aplicación de inicio y pulsas el botón de inicio. En Añadir juegos, pon DroidDeck en Incluir Orientación Orientación del launcher @@ -895,15 +944,22 @@ Pantalla completa Oculta las barras de estado y navegación de Android Muestra las barras de estado y navegación de Android + Lanzador de doble pantalla + Automático coloca las secciones del lanzador (Steam, Biblioteca, Tiendas y el resto) en la segunda pantalla de las consolas portátiles que la llevan integrada. Activado usa cualquier segunda pantalla. Desactivado mantiene el lanzador en una sola pantalla. + Sesiones de doble pantalla + Automático acopla el menú dentro del juego en la segunda pantalla integrada en lugar de una ventana emergente. Activado usa cualquier segunda pantalla. Desactivado mantiene el menú en la pantalla del juego; desde él todavía puedes elegir una segunda pantalla. Automático Activado Desactivado Controles en la pantalla inferior en juegos + Teclado Android para campos de texto Abre el trackpad y el teclado en la segunda pantalla al iniciar una sesión. Escribiendo en la pantalla superior Hecho App de inicio predeterminada Elige una app de inicio + Ocultar el lanzador de Recientes cuando esté inactivo + Solo se aplica cuando DroidDeck es la aplicación de inicio predeterminada y no hay ninguna sesión en curso. Elegir Apps de Linux (beta) Archivos @@ -1018,6 +1074,148 @@ Versiones de prueba Prueba una corrección antes de su publicación Ninguna por ahora + Compilación de laboratorio + Compilaciones de laboratorio + En uso + En pausa después de que Android reoptimizara DroidDeck + No cargada: %1$s + Esperando un reinicio + Conservada + Para otra versión + Recompilar + Elimina esta compilación del dispositivo + Reiniciar con esta + Desactivar + Usar + Eliminar + Eliminar ahora + No se pudo preparar el reinicio: %1$s. Empareja la depuración inalámbrica en Configuración y vuelve a intentarlo. + Compilación de laboratorio instalada + DroidDeck se reinició con %1$s + Compilación de laboratorio en pausa + Android volvió a optimizar DroidDeck, por lo que %1$s no se ha cargado. Abre Actualizaciones para reiniciar con ella. + Compilación de laboratorio desactivada + Se compiló para otra versión de DroidDeck. Se conserva en Actualizaciones. + DroidDeck no se inició en dos ocasiones con esa compilación. + Agente + Agente + El agente está trabajando + Instala Claude Code en el espacio de usuario de Linux para usar el agente. + Pregunta sobre un juego, un fallo o un cambio en DroidDeck + Enviar + Nueva conversación + Detener + Almacenamiento + Quitar + Quitar ahora + Claude Code + Codex + Código fuente de DroidDeck + Cachés de descarga + Se pierden los cambios que no se han subido + Las compilaciones vuelven a descargarlos + El asistente de configuración puede volver a instalarlo; se conservan los inicios de sesión + DroidDeck se ha reiniciado con tu compilación de laboratorio. Continúa donde lo dejaste. + Pregúntale por qué un juego no arranca, que explique un registro o que cambie DroidDeck y pruebe el cambio en este dispositivo. + Error: %1$s + %1$s terminó (código de salida %2$d) + Detenido + Terminó sin respuesta + Reintentar + Configurando el agente + Recompila mi compilación de laboratorio %1$s para la versión instalada de DroidDeck y reinicia con ella. + %1$s de entrada · %2$s de salida + Pensando + Pensamiento + Pensando · %1$s + %1$s · %2$s + ENTRADA + SALIDA + Ejecutando… + Sin resultado: el turno terminó antes + Sin salida + Escribe para encolar el siguiente mensaje + Encolar + Siguiente: %1$s + No enviar + Adjuntar + Quitar + Predeterminado + Esfuerzo de razonamiento + Adelante + Revisar + Aún no hay cambios + Adelante con el plan. + Enviar ahora + Mensaje + Más + Cerrar + Más reciente + Trabajando + Contexto + %1$s de %2$s + Esta conversación · %1$s + El uso se muestra después de la primera respuesta + Límite de %1$d horas + Límite de %1$d minutos + Límite semanal + %1$d%% · se restablece %2$s + + %1$d de archivos + %1$d archivo + %1$d archivos + + Planificar primero + Planificar + Propone un plan sin cambiar nada + Conversaciones + Aún no hay conversaciones + Ahora mismo + Eliminar + Elimina la conversación y sus adjuntos + Procesos + No hay nada en ejecución en el espacio de usuario de Linux + AGENTE + Detener + Compilación de Lab + Preparando compilaciones de Lab + %1$d%% · quedan aprox. %2$s + quedan aprox. %1$s + Cancelar + Cancelar compilación + Iniciando + %1$d%% + Empaquetando + Reiniciando DroidDeck en él + Listo + Falló: %1$s + Configurar el agente + Instala primero el entorno de ejecución de Linux en Configuración. + Reintentar + Empezar a chatear + Conexión del dispositivo + Depuración inalámbrica para que el agente pueda ver y controlar DroidDeck + Instalar %1$s + En el espacio de usuario de Linux, con git, gh y adb + Iniciar sesión en %1$s + Abre el navegador + GitHub + Opcional, para abrir solicitudes de incorporación de cambios + Herramientas de compilación + Opcional, para compilaciones de Lab en este dispositivo · unos 5 GB + Agente listo + Termina de configurar el agente + Sesión iniciada en %1$s + Compilaciones de Lab + compilaciones rápidas + Compilaciones rápidas de Lab + Compila esta versión con antelación, así las compilaciones de Lab se hacen en minutos · unos 20 minutos una sola vez + Compilando · %1$d%% · quedan unos %2$s + Preparar + No se puede acceder a la depuración inalámbrica; Emparejar la activa + Emparejar + Instalar + Iniciar sesión PR #%1$d No compilada para esta copia de DroidDeck Actualizada %1$s @@ -1261,6 +1459,14 @@ Apps Configuración Actualizar + Más + Editar pestañas + Pestañas + Visible + En Más + Oculta + Mover %1$s hacia arriba + Mover %1$s hacia abajo %1$d%% Reanudar %1$s Aparece como /root/ROMs en cada sesión. El almacenamiento interno está en /root/Storage. @@ -1282,6 +1488,15 @@ Cancelar en cola Teclado de Android Ocultar ✕ + Tamaño en pantalla + Proporción de la pantalla que ocupa el teclado, cabecera incluida. + Opacidad + Redúcela para ver el juego detrás del teclado. + Teclas ocultas + Las teclas que apenas usas no aparecen en el teclado. + Esc y fila de teclas de función + Ins / Supr / Inicio / Fin / RePág / AvPág + Teclas de dirección Iniciar %1$s Elige una pantalla. Secundaria: %1$s. La pantalla secundaria ya no está disponible. @@ -1800,7 +2015,24 @@ Terminal Agarres de Deck + trackpads Panel + Escritorio + Iniciar el escritorio + Escritorio · %1$s + Panel táctil + Toque directo + Panel táctil. Toca para cambiar a toque directo + Toque directo. Toca para cambiar al panel táctil + Iniciando el escritorio KDE… + El escritorio se cerró. + No se pudo iniciar el escritorio. Los registros están en la carpeta bottom-desktop de esta sesión. + El escritorio está cerrado. Todavía no hay nada que mostrar aquí. + Intercambiar pantallas + La pantalla inferior no está disponible ahora mismo + Pantalla del juego + Mostrar el juego en + Pantalla superior + Pantalla inferior Descargas No hay descargas en curso. Steam @@ -1835,6 +2067,20 @@ Combustible, t Principal %1$s t Reserva %1$s t + Tiempo de fotograma + últimos %1$d s + fotograma medio + Mínimo del 1 % + fotogramas de más de 33 ms + %1$d / min + Jugando desde hace %1$s + %1$d núcleos, hasta %2$s GHz + %1$d núcleos + juego + FPS de %1$d Hz + La marca roja señala el punto en el que el HUD muestra la temperatura en rojo. + todo el dispositivo + batería Enviar datos al panel Automático Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados. @@ -1858,6 +2104,10 @@ El micro está desactivado en este juego. Para hablar, activa Micrófono en los ajustes de Steam de DroidDeck (Audio) y vuelve a iniciar el juego. Volumen %1$d%% Estadísticas del juego + HUD de la pantalla inferior + Barra en todas las pestañas + Mínimos del 1 % y el 0,1 % + Temperatura de la CPU FPS CPU GPU @@ -2031,6 +2281,7 @@ Iniciando la sesión… %1$d:%2$02d transcurridos · sigue en marcha Descargando la actualización del cliente de Steam · %1$d%% + Aplicando la actualización del cliente de Steam… Descargando el cliente de Steam · %1$s Ya se está instalando una herramienta de compatibilidad @@ -2107,11 +2358,29 @@ Contornos toon más nitidez. La GPU no es Adreno + Controlador PowerVR del sistema: la compatibilidad varía según el dispositivo + Experimental: RADV o el controlador Xclipse del sistema + PowerVR del sistema + Usa los controladores integrados para esta GPU + Se ha seleccionado el controlador PowerVR del sistema para el entorno de ejecución y la pantalla. + Aún no hay ningún controlador de código abierto que admita este Mali: el puente Mali está activado. + Esta es la compilación de prueba para dispositivos sin Snapdragon: las compilaciones oficiales de aquí solo funcionan en Adreno, así que no se instalan sobre ella. Las nuevas compilaciones de prueba están en github.com/The412Banner/droiddeck-nonadreno-drivers. + La última sesión terminó porque Android cerró DroidDeck para liberar memoria, no por un fallo. Cierra otras aplicaciones o reduce los ajustes de texturas del juego y vuelve a intentarlo. + Mali (Venus) + el puente Mali + Aún no hay ningún controlador de código abierto que admita este Mali: se usa %1$s, sobre el controlador propio del teléfono. + %1$s aún no se ha publicado: se usa %2$s hasta que se publique. + %1$s no está disponible y el controlador de este teléfono informa de Vulkan %2$s (Venus necesita 1.2): se usa el puente Mali. + %1$s aún no se ha publicado: el puente Mali está activado hasta que se publique. + En cola: %1$s (a la espera de otro controlador del entorno de ejecución) + DXVK lo proporciona el entorno de ejecución PowerVR del sistema. Se pueden guardar otros paquetes de DXVK, pero no se aplican con este controlador. Compatible Experimental: sus controladores son versiones de prueba Compatibilidad experimental con Adreno 850: requiere controladores experimentales de pantalla y de juegos compatibles; no verificada en este dispositivo Por debajo del hardware probado (Adreno 725 y posteriores): puede que no funcione No compatible: no hay un motor gráfico compatible disponible para esta GPU + Se ejecuta a través del puente Mali, sobre el controlador Vulkan propio del teléfono + No se admite con el puente Mali desactivado: Turnip necesita una GPU Adreno (Snapdragon) Se alcanzó el límite de solicitudes de GitHub - inténtalo más tarde GitHub respondió HTTP %1$d @@ -2312,6 +2581,13 @@ Ordenar Etiquetas de la barra lateral Muestra los nombres debajo de los iconos de la barra lateral. Desactívalo para una barra lateral más estrecha. + Mascota del agente + DeeDee flota sobre el lanzador y los juegos y muestra lo que está haciendo el agente. + Sobre otras aplicaciones + Permite que DeeDee flote sobre todas las aplicaciones y abra su chat allí + Permitir + DeeDee + Chat con DeeDee Vista Tarjetas más grandes Tarjetas más pequeñas @@ -2598,6 +2874,11 @@ Desarrollador Marca de agua de compilación Muestra en pantalla la etiqueta de la versión de prueba o Lab. Activada de forma predeterminada. + Compartir paquetes de diagnóstico + Sesión y dispositivo + Gráficos + Juegos y compatibilidad + Todos los paquetes Listo para jugar Aún no está listo para jugar runtime %1$s @@ -2636,6 +2917,9 @@ Activa los logros de GOG en los ajustes de tiendas Logros no disponibles; revisa los registros de la sesión Logro desbloqueado + Mali (Venus): desactivado + Mali (Venus): activado + El controlador de %1$s informa de Vulkan %2$s. Mali (Venus) necesita Vulkan 1.2 o posterior (gamescope no se inicia en versiones anteriores), así que las sesiones omiten Venus y usan en su lugar el par de controladores PanVK. Pegar Stick izquierdo Stick derecho @@ -2996,6 +3280,7 @@ Instaladores de VC++ y DirectX que piden los juegos Ejecuta juegos Linux x86 Herramienta de Steam + Steam descarga esto para los juegos que incluyen sistema antitrampas, incluso cuando está desactivado. Al eliminarlo, su instalación se queda atascada en el 0 % DroidDeck ejecuta juegos sin este runtime Proton x86, que DroidDeck no puede ejecutar Predeterminado para todos los juegos @@ -3115,6 +3400,8 @@ DroidDeck · %1$d fps 60 fps se ve más fluido pero usa más CPU mientras Steam se inicia. Un vídeo elegido en los ajustes de Steam también aparece aquí. Sonido + Omitir vídeo de inicio + Usa un clip negro de 0,1 segundos como vídeo de inicio de Steam. Se aplicará en la próxima sesión. Tu propio vídeo MP4, MOV, MKV o WebM. Otros formatos y archivos de más de %1$d MB se convierten a WebM 720p en el dispositivo, hasta %2$d segundos. Importar @@ -3576,6 +3863,7 @@ Mantiene Alt+Tab, la tecla Win y el botón Inicio en una sesión activa de DroidDeck en lugar de Android. Activa Brillo en Configuración → Integración con Steam Puente Mali: desactivado + %1$s no puede usar el puente Mali (necesita una GPU Mali sin ruta de controlador del sistema), así que este interruptor no tiene efecto aquí. Puente Mali: activado %1$s no es una Adreno. El puente Vulkan experimental está activado: la sesión dibuja a través del propio controlador del teléfono. Espera errores; envía los registros de la sesión. Modo seguro @@ -3736,6 +4024,7 @@ No se ha podido importar esta disposición Nieve escarlata + Superficies blancas con acentos rojos. Bandas sonoras Música @@ -3799,4 +4088,6 @@ Repetir una Volumen No hay archivos de audio en esta banda sonora + Inicio no disponible + No hay ningún navegador web disponible para abrir este enlace. diff --git a/app/src/main/res/values-fi/input_library.xml b/app/src/main/res/values-fi/input_library.xml new file mode 100644 index 0000000000..846dae260f --- /dev/null +++ b/app/src/main/res/values-fi/input_library.xml @@ -0,0 +1,132 @@ + + + Valittu näyttö ei ole käytettävissä. Yhdistä se, niin voit muokata tätä asettelua täydessä koossa. + Hylätäänkö tallentamattomat asettelumuutokset? + Tämä asettelu on käytössä %1$d profiilissa. Tallennetut muutokset koskevat kaikkia. + Oletusprofiilit + Työpöytätila + Pelitila + Oletus työpöydälle ja pelille + Oletus pelitilalle + Oletus työpöytätilalle + Laitteen asetukset + Ohjaimet + Painikkeet, tikut, liipaisimet ja lisänäppäimet + Kopioi profiili + Nollaa toiminnot + Nollataanko kohteen %1$s toiminnot perusprofiilin oletuksiin? Asettelut ja muut profiilit pysyvät ennallaan. + Poistetaanko %1$s? Sitä käyttävät tilat palaavat sisäänrakennettuun oletusprofiiliin. Tallennetut asettelut ja jaetut asetukset säilyvät. + Näkyvyys + Koskee kaikkia profiileja. Auto näyttää päänäytön ohjaimet, kun pelitilassa ei ole ohjainta kytkettynä. + Muokkaa näytöllä + Tallennetut asettelut… + Valitse asettelu tai luo oma + Valitse Profiilin ohjaimet toissijaisen näytön istuntovalikosta. Ohjainvalikon Profiili- ja Toissijainen näyttö -valinnat määräävät näytettävät ohjaimet. + Painikkeiden toiminnot + Jaettu kohteen %1$s kanssa. Muutokset koskevat myös näitä profiileja. + Käytä asetuksia uudelleen + Käytä asetuksia kohteesta… + Kopioi toisesta profiilista tai pidä asetukset jaettuina + Tee itsenäiseksi + Säilytä nykyinen kokoonpano ja lopeta muutosten jakaminen + Asettelut tallentavat elementit ja niiden sijainnit. Jokainen profiili voi määrittää omat toimintonsa. Muokkaa täydessä koossa kohdenäytöllä. + Nykyinen asettelu + Poistetaanko käyttämätön asettelu %1$s ja sen tallennetut toiminnot? + Nimeä nykyinen asettelu uudelleen + Lukukelvottomat syöttöasetukset tallennettiin palautuskopioon. Voit jatkaa palautettujen profiilien muokkaamista. + Ominaisuudet + Napsautuksen ominaisuudet + %1$s · Napsautus + Painikkeet + Tikut, alustat ja liipaisimet + Piilota työkalut + Ohjain + Lähettää ohjaimen syötteen Steam Inputille tai pelille. + Tämä elementti ei lähetä ohjaimen, hiiren tai näppäimistön syötettä. + Hiiren napsautus + DroidDeck-toiminto + Toiminto + Vieritysnopeus: %1$d askelta/s + + Uusi profiili + + Uusi asettelu + %1$s · Käytössä %2$d profiilissa. Muutokset koskevat kaikkia profiileja, jotka käyttävät näitä määrityksiä. + Nimeä uudelleen + Poista + Lisää elementtejä asetteluun ennen toimintojen määrittämistä. + Syöttöasetusten tallentaminen epäonnistui + Nimi + Aloita + Painike + Tikku + Kosketuslevy + Ristikko-ohjain + Liipaisin + Valmis + Kumoa + + Lisää + Vedä siirtääksesi. Vedä kulmasta muuttaaksesi kokoa. Napauta Ominaisuudet määrittääksesi toiminnon. + Muokataan toissijaisella näytöllä + Käytä uudelleen %1$s toisesta profiilista. Muut ohjauslähteet pysyvät ennallaan. + Pidä fyysiset ohjaimet jaettuina + Oletuksena kaikki ohjaimet ja mukautetut asettelut ovat itsenäisiä kopioita. Jakaminen linkittää vain fyysiset ohjaimet. + Käytä näitä elementtejä ja sijainteja. Jakaminen pitää tulevat geometriamuutokset synkronissa; painiketoiminnot pysyvät itsenäisinä. Eri asettelu alkaa määrittämättömillä toiminnoilla. + Kopioi nämä ohjaimet ja toiminnot tai linkitä ne, jotta tulevat muutokset koskevat molempia profiileja. + Pidä jaettuna + Itsenäinen kopio + Aloita tikku kosketuskohdasta + Piilota tikku, kun sitä ei käytetä + Työkalut + Automaattinen (%1$s) + Mukautettu (%1$s) + Tallenna uutena profiilina + Profiilin ohjaimet + Profiili + Hiiren kosketuslevyn eleet + Kun määritetty hiiren osoittimelle: napauta klikataksesi, pidä painettuna vetääksesi ja vieritä kahdella sormella. + Kohteella %1$s on pikavalikon ohitus. Valitse Automaattinen käyttääksesi sen oletusprofiilia ja kaikkia kolmea tallennettua osaa. + DroidDeck-syöte + Pidetään, kun tikkua liikutetaan mihin tahansa suuntaan: painetaan yli 55 %:ssa, vapautetaan alle 35 %:ssa. Määritä jokainen suunta erikseen Suuntanäppäimillä. DroidDeck-komennot suoritetaan kerran poikkeamaa kohti. Tikun napsautus määritetään erikseen. + Pidetään kosketuslevyn kosketuksen ajan; vapautetaan, kun nostat sormen. DroidDeck-komennot suoritetaan kerran kosketusta kohti. Kosketuslevyn napsautus määritetään erikseen. + Pidetään, kun liipaisin ylittää 55 %; vapautetaan alle 35 %:ssa. DroidDeck-komennot suoritetaan kerran painallusta kohti. + Vierityssuunta + Pystysuora + Vaakasuora + Vieritä vaakasuunnassa + Mittaukset + Ota tallennus käyttöön, käytä ohjaimia käynnissä olevassa istunnossa ja palaa sitten lukemaan tulokset. Mittaa vain DroidDeckin lähetysajan, ei näytön viivettä. Tallennus päättyy, kun sovelluksen prosessi sulkeutuu. + %1$d ohjainta + Muut tallennetut asettelut (%1$d) ▾ + Piilota muut tallennetut asettelut (%1$d) ▴ + Koti / Guide + Takaisin · yksi napautus + Takaisin · kaksoisnapautus + Takaisin · kahdesti Steamissa, kerran työpöydällä + Steam-tilassa. Takaisin-painikkeen pitäminen avaa myös pikakäytön. + Palauta oletukset + Paneelivalintasi muistetaan. Työpöytä avaa toisen työtilan; se ei vaihda istuntoa tai sen syöttöprofiilia. + Virtuaaliohjain + Ohjaintyyppi, jonka Steam tai peli näkee. + Kosketusnäyttö + Miten pelinäytön kosketuksia käsitellään. Profiilin painikkeet säilyttävät määritetyt toimintonsa. + Kosketuskursori + Näyttää osoittimen suorille kosketuksille pelinäytöllä. + Kosketa ja pidä + Hiiren toiminto, kun pidät sormea pelinäytöllä. + Takaisin-painikkeen napautukset + Ensimmäinen toiminto: yksi napautus. Toinen toiminto: kaksoisnapautus. + Vaihtopainike + Napauta pitääksesi, napauta uudelleen vapauttaaksesi. Valikon avaaminen tai profiilin vaihto vapauttaa painikkeen. + Muoto + Pyöristetty + Kapseli + Ympyrä + Suorakaide + Painikkeen nimiö + Teksti + Tuotu kuva + Erilliset vinonäppäimet + Määritä näppäin jokaiselle vinolle. Tyhjä vino painaa kahta viereistä suuntaa. + Viereiset suunnat + Vanhat näyttönäppäimesi on tallennettu alle tuotuina profiileina. Valitse yksi käyttääksesi tai muokataksesi sitä. Nykyiset profiilivalintasi on säilytetty. + Vanhoja näyttönäppäimiä ei voitu tuoda automaattisesti. Alkuperäiset asetukset on säilytetty. + diff --git a/app/src/main/res/values-fi/input_strings.xml b/app/src/main/res/values-fi/input_strings.xml new file mode 100644 index 0000000000..945b606896 --- /dev/null +++ b/app/src/main/res/values-fi/input_strings.xml @@ -0,0 +1,38 @@ + + + Syöttöprofiilit + Profiilit + Fyysinen ohjain + Päänäyttö + Toissijainen näyttö + Alkuperäinen / Steam Input + Alkuperäinen: %1$s + Lähetä toinen ohjaimen komento + Pois käytöstä + Näppäin tai näppäinyhdistelmä + Suuntanäppäimet + Siirrä osoitinta + Osoittimen nopeus: %1$d + Vieritä + Vieritä pystysuunnassa + Hiiren vasen painike + Hiiren oikea painike + Hiiren keskimmäinen painike + Avaa DroidDeck-valikko + Näytä näppäimistö + Avaa Steam-valikko + Avaa Steamin pikakäyttö + Poista ohjain + Lisää ohjain + Laittekohtaiset painikkeet + Määritä fyysinen painike + Vapauta painike ja valitse Muokkaa, Yritä uudelleen tai Peruuta. B tai Takaisin peruuttaa vapauttamisen jälkeen. + Yritä uudelleen + Paina painiketta, myös näppäimeksi ilmoitettua Takaisin-painiketta. Äänenvoimakkuus- ja Android-järjestelmänäppäimet on varattu. Määritys koskee vain tätä laitetta. + Poista määritys + Syötteen diagnostiikka + Tallenna syötteen lähetysaika + Lue mittaukset + Mittaa lähetyksen Androidista julkaisuun olemassa olevaan syöttökanavaan. Bluetoothin saapuminen, vieraan kysely, renderöinti ja näytön viive eivät sisälly. Tallennus on oletuksena pois. + Käytä tavallista syöttömääritystä + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 31d93c64a3..c1aa0d9083 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -185,6 +185,7 @@ PowerVR-grafiikkaympäristöä ei voitu ladata. Tarkista yhteys ja yritä uudelleen. DirectAudiota ei voitu ladata, joten pelin ääni käyttää tässä istunnossa hitaampaa reittiä. Tämä ohjelma + Istunto ei pystynyt piirtämään näytölle: %1$s. Mustan ruudun sijaan tämä näyttö kertoo syyn. Tarkemmat tiedot ovat istuntolokeissa. 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. @@ -387,6 +388,9 @@ Ei tueta tässä vielä Ladataan komponentteja… Asennus epäonnistui: %1$s + Tämä lataus tarvitsee päivityksen. + Päivitys jonossa. + Yritä päivittää uudelleen Ladattu Ladataan: %1$s Asennetaan: %1$s @@ -417,6 +421,22 @@ Vain sisäinen Kansio: %1$s Toinen kirjasto + Lisää Steam-kirjastoja + Kansioita, joihin Steam voi asentaa pelejä ja joista niitä voi käynnistää, kukin omalla nimellään. Kirjaston poistaminen luettelosta säilyttää pelit levyllä. + Lisää kirjasto + Nimeä uudelleen + Kirjaston nimi + Valitse kirjastolle kansio + Enintään %1$d lisättyä kirjastoa + Kansio on jo kirjasto tai sijaitsee toisen kirjaston sisällä + %1$s · ei käytettävissä + Otetaan käyttöön seuraavassa Steam-istunnossa + Löytyi tältä laitteelta · %1$s · %2$s + Lisää + Etsi kirjastoja sisäisestä tallennustilasta + Salli käyttöoikeus kaikkiin tiedostoihin, jotta DroidDeck näkee Steam-kirjastot, jotka muut sovellukset säilyttävät sisäisessä tallennustilassa + Salli + Lisätty %1$s, valitsemasi kansion sisällä oleva Steam-kirjasto Pelit, jotka striimaavat materiaalia SD-kortilta tai jaetulta tallennustilalta, voivat nykiä. Tallennustilan diagnostiikka Tallentaa varaustulokset ja otetut tallennustilan ajoitusnäytteet Jaa lokit -toimintoon. Voi hidastaa asennuksia käytössä ollessaan. Tulee voimaan seuraavassa istunnossa. @@ -605,7 +625,10 @@ Poistaa käytöstä Protonin ohjaimen navigointiavustimen, joka kuluttaa suoritintehoa jokaisessa pelissä. Suorita proot ilman seccompia Voi korjata puuttuvan järjestelmäkutsun virheitä joissakin ytimissä. Voi heikentää suorituskykyä. + Suorita ilman prootia (kokeellinen) + Käynnistää Linux-puolen suoraan Android-alustalla. Muutos tulee voimaan seuraavassa istunnossa. Poista käytöstä, jos jokin ei käynnisty. proot-pikareitti + Ei ole käytössä ilman prootia Vaatii prootin seccomp-suodattimen. Nopeampi tiedostojen hakeminen ja vähemmän nykimistä. Poista käytöstä, jos ohjelma ei löydä tiedostojaan. Piirrä osoitin gamescopessa @@ -815,6 +838,7 @@ Laite tuettu Testaamaton GPU GPU ei ole tuettu + GPU Mali-sillan kautta %1$s · %2$s %1$s: %2$s GPU:lle %1$s ei ole saatavilla yhteensopivaa grafiikkataustajärjestelmää. Steam saattaa näyttää mustan ruudun. @@ -844,15 +868,38 @@ Istunto Istunnon lokit Tallennetaan joka istunnon jälkeen + Tehostettu diagnostiikka seuraavaa istuntoa varten + Kerää yhden istunnon ajalta yksityiskohtaiset lokit. Voi heikentää suorituskykyä ja viedä enemmän tallennustilaa. Kytkeytyy pois päältä istunnon alkaessa; tarkista lokit ennen jakamista. Pelien vianmäärityslokit Sisällytä Protonin, Winen ja grafiikan diagnostiikka seuraavaan pelin käynnistykseen. Voi heikentää suorituskykyä ja käyttää enemmän tallennustilaa. Käynnistä tämä istunto uudelleen tallentaaksesi pelien vianmäärityslokit Lokitusta ei voitu päivittää. Tarkista kytkin ja yritä uudelleen. Vianmääritystyökalut + Yksityiskohtaiset grafiikkalokit + Steam-käyttöliittymä: GPU-piirto + Xclipse-ajuriparin kanssa Steam piirtää sivunsa ohjelmistollisesti (GPU-piirto näytti rikkinäisiä laattoja). Ota käyttöön nopeampaa Steam-käyttöliittymää varten, jos käyttöliittymä näyttää tässä puhelimessa virheettömältä. + rakennettu %1$s + %1$s päivitetty uusimpaan koontiversioon + Mali-silta epäonnistui itsetestissään laitteella %1$s edellisessä istunnossa (kuvat tai piirrot), joten istunto käytti sen sijaan PanVK-ajuriparia. + Mali-silta ei löytänyt tapaa jakaa muistia ajurin kanssa laitteella %1$s edellisessä istunnossa, joten istunto käytti sen sijaan PanVK-ajuriparia. Silta ei voi toimia tässä puhelimessa; kun se kytketään pois päältä, PanVK-pari säilyy käytössä. + Jokaisen pelin Proton-, DXVK- ja ajurilokit istunnon lokeissa. Aina päällä, kun GPU ei ole Adreno. Viimeisimmät istunnon lokit Tallennetut istunnon lokit Säilyttää %1$d uusinta Tyhjennä lokit + Saatavilla olevat istuntolokit + Tallennettuja istuntolokeja ei ole vielä. + Jaetut ja tallennetut ZIP-paketit sisältävät valitun istunnon sekä siihen liittyvät Steam-, kauppa-, työkalu- ja Battle.net-diagnostiikkatiedot. + %1$s · %2$s + Nykyinen istunto + Jaa + Tallenna laitteeseen + Poista + Poistetaanko istuntolokit? + Poistetaanko %1$s? Tätä ei voi perua. + Istuntolokit tallennettu. + Istuntolokeja ei voitu tallentaa. + Istuntolokeja ei voitu poistaa. Palauta kaikki asetukset Palauta jokainen asetus oletusarvoon Palauta @@ -879,6 +926,8 @@ Käytä Aloitusnäyttönä DroidDeck voi olla kotisovellus DroidDeckiä ei koskaan tarjota kotisovellukseksi + Koti-painike avaa + Sivu, joka näytetään, kun DroidDeck on Koti-sovellus ja painat Koti-painiketta Aseta Lisää pelejä -kohdassa DroidDeck tilaan Sisällytä Suunta Käynnistimen suunta @@ -892,15 +941,22 @@ Koko näyttö Piilottaa Androidin tila- ja navigointipalkit Näyttää Androidin tila- ja navigointipalkit + Kahden näytön käynnistin + Automaattinen siirtää käynnistimen osiot (Steam, Kirjasto, Kaupat ja muut) käsikonsolin sisäänrakennetulle toiselle näytölle. Päällä käyttää mitä tahansa toista näyttöä. Pois päältä pitää käynnistimen yhdellä näytöllä. + Kahden näytön istunnot + Automaattinen kiinnittää pelinsisäisen valikon sisäänrakennetulle toiselle näytölle ponnahdusikkunan sijaan. Päällä käyttää mitä tahansa toista näyttöä. Pois päältä pitää valikon pelinäytöllä; voit silti valita toisen näytön valikosta. Automaattinen Päällä Pois Alanäytön ohjaimet peleissä + Android-näppäimistö tekstikentille Avaa kosketuslevyn ja näppäimistön toiselle näytölle, kun istunto alkaa. Kirjoitus yläruudulle Valmis Oletuskotisovellus Valitse kotisovellus + Piilota käynnistin Viimeisimmistä sovelluksista, kun se on käyttämättömänä + Koskee vain, kun DroidDeck on oletus-Koti-sovellus eikä istunto ole käynnissä. Valitse Linux-sovellukset (beta) Tiedostot @@ -1015,6 +1071,147 @@ Testibuildit Kokeile korjausta ennen sen julkaisua Ei yhtään juuri nyt + Lab-koontiversio + Lab-koontiversiot + Käytössä + Keskeytetty, kun Android optimoi DroidDeckin uudelleen + Ei ladattu: %1$s + Odotetaan uudelleenkäynnistystä + Säilytetty + Toista versiota varten + Rakenna uudelleen + Poistaa tämän koontiversion laitteesta + Käynnistä uudelleen sillä + Kytke pois päältä + Käytä + Poista + Poista nyt + Uudelleenkäynnistystä ei voitu valmistella: %1$s. Parita langaton virheenkorjaus Asetuksissa ja yritä uudelleen. + Lab-koontiversio asennettu + DroidDeck käynnistyi uudelleen koontiversiolla %1$s + Lab-versio tauolla + Android optimoi DroidDeckin uudelleen, joten %1$s ei ole ladattu. Avaa Päivitykset käynnistääksesi DroidDeck sillä uudelleen. + Lab-versio poistettu käytöstä + Se rakennettiin DroidDeckin toiselle versiolle. Se on tallessa Päivityksissä. + DroidDeck ei käynnistynyt sillä kahdesti + Agentti + Agentti + Agentti työskentelee + Asenna Claude Code Linux-ympäristöön käyttääksesi agenttia. + Kysy pelistä, kaatumisesta tai DroidDeckin muuttamisesta + Lähetä + Uusi keskustelu + Pysäytä + Tallennustila + Poista + Poista nyt + Claude Code + Codex + DroidDeckin lähdekoodi + Latausvälimuistit + Muutokset, joita ei ole työnnetty, katoavat + Koontiversiot lataavat nämä uudelleen + Käyttöönotto voi asentaa sen uudelleen; kirjautumiset säilyvät + DroidDeck käynnistyi uudelleen Lab-versiollasi. Jatka siitä, mihin jäit. + Pyydä kertomaan, miksi peli ei käynnisty, selittämään loki tai muuttamaan DroidDeckiä ja kokeilemaan muutosta tällä laitteella. + Epäonnistui: %1$s + %1$s päättyi (poistumiskoodi %2$d) + Pysäytetty + Päättyi ilman vastausta + Yritä uudelleen + Otetaan agenttia käyttöön + Rakenna Lab-versio %1$s uudelleen DroidDeckin asennetulle versiolle ja käynnistä DroidDeck sillä uudelleen. + %1$s sisään · %2$s ulos + Ajattelee + Ajatus + Ajattelee · %1$s + %1$s · %2$s + SYÖTE + TULOSTE + Suoritetaan… + Ei tulosta: vuoro päättyi ensin + Ei tulostetta + Kirjoita lisätäksesi seuraavan viestin jonoon + Jono + Seuraava: %1$s + Älä lähetä + Liitä + Poista + Oletus + Päättelyteho + Aloita + Muokkaa + Ei muutoksia vielä + Aloita suunnitelman toteutus. + Lähetä nyt + Viesti + Lisää + Sulje + Uusin + Työskentelee + Konteksti + %1$s %2$s:sta + Tämä keskustelu · %1$s + Käyttö näkyy ensimmäisen vastauksen jälkeen + %1$d tunnin aikaraja + %1$d minuutin aikaraja + Viikkoraja + %1$d%% · nollautuu %2$s + + %1$d tiedosto + %1$d tiedostoa + + Suunnittele ensin + Suunnittele + Ehdottaa suunnitelmaa muuttamatta mitään + Keskustelut + Ei vielä keskusteluja + Juuri nyt + Poista + Poistaa sen ja sen liitteet + Prosessit + Linuxin käyttäjätilassa ei ole mitään käynnissä + AGENTTI + Pysäytä + Lab-koonti + Valmistellaan Lab-koonteja + %1$d%% · noin %2$s jäljellä + noin %1$s jäljellä + Peruuta + Peruuta koonti + Käynnistetään + %1$d%% + Pakataan + Käynnistetään DroidDeck uudelleen siinä + Valmis + Epäonnistui: %1$s + Määritä agentti + Asenna Linux-suoritusympäristö ensin Setupissa. + Yritä uudelleen + Aloita keskustelu + Laiteyhteys + Langaton virheenkorjaus, jotta agentti näkee DroidDeckin ja voi ohjata sitä + Asenna %1$s + Linux-käyttäjätilaan, mukana git, gh ja adb + Kirjaudu sisään palveluun %1$s + Avaa selaimen + GitHub + Valinnainen, vetopyyntöjen avaamista varten + Käännöstyökalut + Valinnainen, Lab-koontiversioille tällä laitteella · noin 5 Gt + Agentti valmis + Viimeistele agentin käyttöönotto + Kirjautunut sisään palveluun %1$s + Lab-koontiversiot + nopeat koontiversiot + Nopeat Lab-koontiversiot + Kääntää tämän version etukäteen, joten Lab-koontiversiot valmistuvat minuuteissa · noin 20 minuuttia vain kerran + Käännetään · %1$d%% · noin %2$s jäljellä + Valmistele + Langaton virheenkorjaus ei ole tavoitettavissa; Parita ottaa sen käyttöön + Parita + Asenna + Kirjaudu sisään PR #%1$d Ei rakennettu tälle DroidDeck-kopiolle Päivitettiin %1$s @@ -1254,6 +1451,14 @@ Sovellukset Asetukset Päivitykset + Lisää + Muokkaa välilehtiä + Välilehdet + Näkyvissä + Lisää-valikossa + Piilotettu + Siirrä %1$s ylös + Siirrä %1$s alas %1$d %% Jatka: %1$s Näkyy sessiossa polussa /root/ROMs. Sisäinen tallennustila on /root/Storage. @@ -1275,6 +1480,15 @@ Peruuta jonotus Android-näppäimistö Piilota ✕ + Koko näytöllä + Näytön osuus, jonka näppäimistö vie, yläpalkki mukaan lukien. + Peittävyys + Laske sitä, jotta peli näkyy näppäimistön takaa. + Piilotetut näppäimet + Harvoin käyttämäsi näppäimet pysyvät pois näppäimistöstä. + Esc ja funktiorivi + Ins / Del / Home / End / PgUp / PgDn + Nuolinäppäimet Käynnistä %1$s Valitse näyttö. Toinen näyttö: %1$s. Toinen näyttö ei ole enää käytettävissä. @@ -1776,7 +1990,24 @@ Pääte Deck-kahvat + kosketuslevyt Kojelauta + Työpöytä + Käynnistä työpöytä + Työpöytä · %1$s + Kosketuslevy + Suora kosketus + Kosketuslevy. Napauta vaihtaaksesi suoraan kosketukseen + Suora kosketus. Napauta vaihtaaksesi kosketuslevyyn + Käynnistetään KDE-työpöytää… + Työpöytä sulkeutui. + Työpöydän käynnistys epäonnistui. Sen lokit ovat tämän istunnon bottom-desktop-kansiossa. + Työpöytä on suljettu. Täällä ei ole vielä mitään näytettävää. + Vaihda näytöt + Alanäyttö ei ole juuri nyt vapaana + Pelinäyttö + Näytä peli + Ylänäyttö + Alanäyttö Lataukset Latauksia ei ole käynnissä. Steam @@ -1811,6 +2042,20 @@ Polttoaine, t Päätankki %1$s t Varatankki %1$s t + Kehysaika + viimeiset %1$d s + keskim. kehys + alin 1 % + yli 33 ms:n kehykset + %1$d / min + Pelattu %1$s + %1$d ydintä, enintään %2$s GHz + %1$d ydintä + peli + %1$d Hz:n FPS + Punainen merkki on kohta, jossa HUD alkaa näyttää lämpötilan punaisena. + koko laite + akku Lähetä kojelaudan tiedot Automaattinen Kytkee sen päälle jokaiselle tässä luetellulle pelille, myös myöhemmin löytyville. Pois kytkemäsi pelit pysyvät pois päältä. @@ -1834,6 +2079,10 @@ Mikrofoni on pois päältä tässä pelissä. Jos haluat puhua, kytke Mikrofoni päälle DroidDeckin Steam-asetuksissa (Ääni) ja käynnistä peli uudelleen. Äänenvoimakkuus %1$d %% Pelinsisäiset tilastot + Alanäytön HUD + Palkki kaikilla välilehdillä + alimmat 1 % ja 0,1 % + CPU:n lämpötila FPS CPU GPU @@ -2006,6 +2255,7 @@ Käynnistetään istuntoa… %1$d:%2$02d kulunut · yhä käynnissä Ladataan Steam-asiakasohjelman päivitystä · %1$d %% + Asennetaan Steam-asiakasohjelman päivitystä… Ladataan Steam-asiakasohjelmaa · %1$s Yhteensopivuustyökalun asennus on jo käynnissä @@ -2082,11 +2332,29 @@ Sarjakuvamaiset ääriviivat ja terävöinti. Ei Adreno-grafiikkapiiri + Järjestelmän PowerVR-ajuri: yhteensopivuus vaihtelee laitteen mukaan + Kokeellinen: RADV tai järjestelmän Xclipse-ajuri + Järjestelmän PowerVR + Käyttää tämän GPU:n omia ajureita + Järjestelmän PowerVR-ajuri on valittu ajonajalle ja näytölle. + Mikään avoin ajuri ei vielä tue tätä Mali-mallia: Mali-silta on käytössä. + Tämä on ei-Snapdragon-testiversio: viralliset versiot toimivat täällä vain Adreno-laitteilla, joten niitä ei asenneta sen päälle. Uudet testiversiot löytyvät osoitteesta github.com/The412Banner/droiddeck-nonadreno-drivers. + Edellinen istunto päättyi, koska Android sulki DroidDeck-sovelluksen vapauttaakseen muistia; kyse ei ollut kaatumisesta. Sulje muut sovellukset tai alenna pelin tekstuuriasetuksia ja yritä uudelleen. + Mali (Venus) + Mali-silta + Mikään avoin ajuri ei vielä tue tätä Mali-mallia: %1$s on käytössä puhelimen oman ajurin päällä. + %1$s ei ole vielä julkaistu: %2$s on käytössä julkaisuun asti. + %1$s ei ole saatavilla, ja tämän puhelimen ajuri ilmoittaa Vulkan-versioksi %2$s (Venus vaatii Vulkan 1.2:n): Mali-silta on käytössä. + %1$s ei ole vielä julkaistu: Mali-silta on käytössä julkaisuun asti. + Jonossa: %1$s (odottaa eri ajuria ajonajalle) + DXVK tulee järjestelmän PowerVR-ajonajalta. Muut DXVK-paketit voidaan tallentaa, mutta niitä ei oteta käyttöön tämän ajurin kanssa. Tuettu Kokeellinen: sen ajurit ovat testiversioita Kokeellinen Adreno 850 -tuki: vaatii yhteensopivat kokeelliset näyttö- ja peliajurit; ei vahvistettu tällä laitteella Testatun laitteiston alapuolella (Adreno 725 ja uudemmat): ei välttämättä toimi Ei tuettu: tälle GPU:lle ei ole saatavilla yhteensopivaa grafiikkataustajärjestelmää + Toimii Mali-sillan kautta puhelimen omalla Vulkan-ajurilla + Ei tuettu, kun Mali-silta on pois päältä: Turnip toimii vain Adreno (Snapdragon) -grafiikkasuorittimella GitHubin käyttörajoitus tuli vastaan - yritä myöhemmin uudelleen GitHub vastasi HTTP %1$d @@ -2287,6 +2555,13 @@ Järjestä Sivupalkin nimikkeet Näytä nimet sivupalkin kuvakkeiden alla. Poista käytöstä kapeampaa sivupalkkia varten. + Agenttilemmikki + DeeDee leijuu käynnistimen ja pelien päällä ja näyttää, mitä agentti tekee. + Muiden sovellusten päällä + Anna DeeDee:n leijua kaikkien sovellusten päällä ja avata keskustelunsa siellä + Salli + DeeDee + Keskustele DeeDee:n kanssa Näkymä Suuremmat kortit Pienemmät kortit @@ -2574,6 +2849,11 @@ Kehittäjä Koontiversion vesileima Näytä testi- tai Lab-version tunniste näytöllä. Käytössä oletusarvoisesti. + Jaa diagnostiikkapaketit + Istunto ja laite + Grafiikka + Pelit ja yhteensopivuus + Kaikki paketit Valmis pelattavaksi Ei vielä valmis pelattavaksi ajoympäristö %1$s @@ -2612,6 +2892,9 @@ Ota GOG-saavutukset käyttöön kauppa-asetuksissa Saavutukset ei käytettävissä; tarkista istunnon lokit Saavutus avattu + Mali (Venus): pois päältä + Mali (Venus): päällä + Laitteella %1$s käytössä oleva ajuri ilmoittaa Vulkan-versioksi %2$s. Mali (Venus) vaatii Vulkan 1.2:n tai uudemman (gamescope ei käynnisty vanhemmilla versioilla), joten istunnot ohittavat Venus-vaihtoehdon ja käyttävät sen sijaan PanVK-ajuriparia. Liitä Vasen tatti Oikea tatti @@ -2967,6 +3250,7 @@ Pelien tarvitsemat VC++- ja DirectX-asennukset Ajaa Linux x86 -pelejä Steam-työkalu + Steam lataa tämän peleille, joissa on huijauksenesto, vaikka se on pois päältä. Sen poistaminen jumittaa niiden asennuksen 0 %:iin. DroidDeck ajaa pelejä ilman tätä ajonaikaympäristöä Proton x86, jota DroidDeck ei pysty ajamaan Oletus kaikille peleille @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps 60 fps näyttää sulavammalta, mutta kuormittaa suoritinta enemmän Steamin käynnistyessä. Steamin omista asetuksista valittu video näkyy myös täällä. Ääni + Ohita käynnistysvideo + Käytä 0,1 sekunnin mustaa leikettä Steam-käynnistysvideona. Otetaan käyttöön seuraavassa istunnossa. Oma video MP4, MOV, MKV tai WebM. Muut muodot ja yli %1$d Mt:n tiedostot muunnetaan laitteella 720p-WebM-muotoon, enintään %2$d sekuntia. Tuo @@ -3538,6 +3824,7 @@ Pitää Alt+Tabin, Win-näppäimen ja Koti-painikkeen aktiivisessa DroidDeck-istunnossa Androidin sijaan. Ota Kirkkaus käyttöön kohdassa Käyttöönotto → Steam-integraatio Mali-silta: pois + %1$s ei voi käyttää Mali-siltaa (se vaatii Mali-GPU:n, jolla ei ole järjestelmäajurireittiä), joten tällä kytkimellä ei ole vaikutusta tässä. Mali-silta: päällä %1$s ei ole Adreno. Kokeellinen Vulkan-silta on päällä: istunto piirtää puhelimen oman ajurin kautta. Odota virheitä; lähetä istunnon lokit. Turvatila @@ -3697,6 +3984,7 @@ Tätä asettelua ei voitu tuoda Helakanpunainen lumi + Valkoiset pinnat punaisin korostuksin. Soundtrackit Musiikki @@ -3760,4 +4048,6 @@ Toista yksi Äänenvoimakkuus Tässä soundtrackissa ei ole äänitiedostoja + Käynnistäminen ei ole mahdollista + Tämän linkin avaamiseen ei ole käytettävissä verkkoselainta. diff --git a/app/src/main/res/values-fr/input_library.xml b/app/src/main/res/values-fr/input_library.xml new file mode 100644 index 0000000000..4e899b637f --- /dev/null +++ b/app/src/main/res/values-fr/input_library.xml @@ -0,0 +1,132 @@ + + + L\'écran sélectionné n\'est pas disponible. Connectez-le pour modifier cette disposition à sa taille réelle. + Abandonner les modifications de disposition non enregistrées ? + Cette disposition est utilisée par %1$d profils. Les modifications enregistrées s\'appliquent à tous. + Profils par défaut + Mode bureau + Mode jeu + Par défaut pour le bureau et le jeu + Par défaut pour le mode jeu + Par défaut pour le mode bureau + Réglages de l\'appareil + Contrôles + Boutons, sticks, gâchettes et touches supplémentaires + Copier le profil + Réinitialiser les actions + Réinitialiser les actions de %1$s sur les valeurs par défaut de son profil de base ? Les dispositions et les autres profils resteront inchangés. + Supprimer %1$s ? Les modes qui l\'utilisent reviendront à leur profil par défaut intégré. Les dispositions enregistrées et les réglages partagés resteront disponibles. + Visibilité + S\'applique à tous les profils. Auto affiche les contrôles de l\'écran principal lorsqu\'aucune manette n\'est connectée en mode jeu. + Modifier à l\'écran + Dispositions enregistrées… + Choisissez une disposition ou créez la vôtre + Choisissez Contrôles du profil dans le menu de session de l\'écran secondaire. Les sélecteurs Profil et Écran secondaire du menu de la manette choisissent les contrôles à afficher. + Actions des boutons + Partagé avec %1$s. Les modifications s\'appliquent aussi à ces profils. + Réutiliser les réglages + Utiliser les réglages de… + Copier depuis un autre profil ou garder les réglages partagés + Rendre indépendant + Conserver la configuration actuelle et cesser de partager les modifications + Les dispositions stockent les éléments et leurs positions. Chaque profil peut assigner ses propres actions. Modifiez à taille réelle sur l\'écran cible. + Disposition actuelle + Supprimer la disposition inutilisée %1$s et ses actions enregistrées ? + Renommer la disposition actuelle + Les réglages d\'entrée illisibles ont été conservés dans une copie de récupération. Vous pouvez continuer à modifier les profils restaurés. + Propriétés + Propriétés du clic + %1$s · Clic + Boutons + Sticks, pavés et gâchettes + Masquer les outils + Manette + Envoie l\'entrée de la manette à Steam Input ou au jeu. + Cet élément n\'envoie aucune entrée de manette, de souris ou de clavier. + Clic de souris + Action DroidDeck + Action + Vitesse de défilement : %1$d crans/s + + Nouveau profil + + Nouvelle disposition + %1$s · Utilisé par %2$d profils. Les modifications s\'appliquent à tous les profils utilisant ces affectations. + Renommer + Supprimer + Ajoutez des éléments à la disposition avant d\'assigner leurs actions. + Impossible d\'enregistrer les réglages d\'entrée + Nom + Partir de + Bouton + Stick + Pavé tactile + Croix directionnelle + Gâchette + Terminé + Annuler + + Ajouter + Faites glisser pour déplacer. Faites glisser un coin pour redimensionner. Touchez Propriétés pour assigner une action. + Modification sur l\'écran secondaire + Réutiliser %1$s d\'un autre profil. Les autres sources de contrôle resteront inchangées. + Garder les contrôles physiques partagés + Par défaut, tous les contrôles et dispositions personnalisées sont des copies indépendantes. Le partage ne lie que les contrôles physiques. + Utiliser ces éléments et positions. Le partage synchronise les futures modifications de géométrie ; vos actions de bouton restent indépendantes. Une autre disposition démarre avec des actions non assignées. + Copier ces contrôles et actions, ou les lier pour que les futures modifications s\'appliquent aux deux profils. + Garder partagé + Copie indépendante + Démarrer le stick au point de contact + Masquer le stick lorsqu\'il n\'est pas utilisé + Outils + Auto (%1$s) + Personnalisé (%1$s) + Enregistrer comme nouveau profil + Contrôles du profil + Profil + Gestes du pavé tactile de la souris + Si assigné au pointeur de la souris : toucher pour cliquer, maintenir pour faire glisser, défiler avec deux doigts. + %1$s a une dérogation de menu rapide. Sélectionnez Auto pour utiliser son profil par défaut et ses trois parties enregistrées. + Entrée DroidDeck + Maintenu lorsque le stick est déplacé dans n\'importe quelle direction : appui au-dessus de 55 %, relâchement sous 35 %. Utilisez Touches de direction pour assigner chaque direction séparément. Les commandes DroidDeck s\'exécutent une fois par déflexion. Le clic du stick se configure séparément. + Maintenu pendant le contact avec le pavé tactile ; relâché au lever du doigt. Les commandes DroidDeck s\'exécutent une fois par contact. Le clic du pavé se configure séparément. + Maintenu lorsque la gâchette dépasse 55 % ; relâché sous 35 %. Les commandes DroidDeck s\'exécutent une fois par pression. + Direction du défilement + Vertical + Horizontal + Défiler horizontalement + Mesures + Activez l\'enregistrement, utilisez les contrôles dans une session en cours, puis revenez et lisez les résultats. Mesure uniquement le délai d\'envoi de DroidDeck, pas la latence d\'affichage. L\'enregistrement s\'arrête à la fermeture du processus de l\'app. + %1$d contrôles + Autres dispositions enregistrées (%1$d) ▾ + Masquer les autres dispositions enregistrées (%1$d) ▴ + Accueil / Guide + Retour · appui simple + Retour · appui double + Retour · deux fois dans Steam, une fois sur le bureau + En mode Steam. Maintenir Retour ouvre aussi l\'accès rapide. + Rétablir par défaut + Votre choix de panneau est mémorisé. Le bureau ouvre un second espace de travail ; il ne change ni la session ni son profil d\'entrée. + Manette virtuelle + Le type de manette vu par Steam ou le jeu. + Écran tactile + Comment les touchers sur l\'écran du jeu sont gérés. Les boutons du profil gardent leurs actions assignées. + Curseur tactile + Affiche un pointeur pour les touchers directs sur l\'écran du jeu. + Toucher et maintenir + Action de la souris en maintenant un doigt sur l\'écran du jeu. + Appuis du bouton Retour + Première action : appui simple. Deuxième action : appui double. + Bouton à bascule + Touchez pour maintenir, touchez encore pour relâcher. Ouvrir un menu ou changer de profil relâche le bouton. + Forme + Arrondie + Pilule + Cercle + Rectangle + Libellé du bouton + Texte + Image importée + Touches diagonales séparées + Assignez une touche à chaque diagonale. Une diagonale vide presse ses deux directions voisines. + Directions voisines + Vos anciennes touches à l\'écran sont enregistrées comme profils importés ci-dessous. Sélectionnez-en un pour l\'utiliser ou le modifier. Vos sélections de profil actuelles ont été conservées. + Les anciennes touches à l\'écran n\'ont pas pu être importées automatiquement. Les réglages d\'origine ont été conservés. + diff --git a/app/src/main/res/values-fr/input_strings.xml b/app/src/main/res/values-fr/input_strings.xml new file mode 100644 index 0000000000..eb2182ad4d --- /dev/null +++ b/app/src/main/res/values-fr/input_strings.xml @@ -0,0 +1,38 @@ + + + Profils d\'entrée + Profils + Manette physique + Écran principal + Écran secondaire + Natif / Steam Input + Natif : %1$s + Envoyer une autre commande de manette + Désactivé + Touche ou combinaison de touches + Touches directionnelles + Déplacer le pointeur + Vitesse du pointeur : %1$d + Défiler + Défiler verticalement + Bouton gauche de la souris + Bouton droit de la souris + Bouton central de la souris + Ouvrir le menu DroidDeck + Afficher le clavier + Ouvrir le menu Steam + Ouvrir l\'accès rapide Steam + Supprimer le contrôle + Ajouter un contrôle + Boutons propres à l\'appareil + Assigner un bouton physique + Relâchez le bouton, puis choisissez Modifier, Réessayer ou Annuler. B ou Retour annule après le relâchement. + Réessayer + Appuyez sur un bouton, y compris un bouton Retour signalé comme touche. Les touches de volume et du système Android sont réservées. L\'assignation ne s\'applique qu\'à cet appareil. + Supprimer l\'assignation + Diagnostic des entrées + Enregistrer le délai d\'envoi des entrées + Lire les mesures + Mesure l\'envoi Android jusqu\'à sa publication dans le transport d\'entrée existant. Cela exclut l\'arrivée Bluetooth, l\'interrogation de l\'invité, le rendu et la latence d\'affichage. L\'enregistrement est désactivé par défaut. + Utiliser l\'assignation d\'entrée normale + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 404440df8e..5544d8f5fd 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -185,6 +185,7 @@ L\'environnement graphique PowerVR n\'a pas pu être téléchargé. Vérifiez la connexion et réessayez. Impossible de télécharger DirectAudio ; l\'audio des jeux utilise le chemin plus lent pour cette session. Ce programme + La session n\'a pas pu dessiner à l\'écran : %1$s. Cet écran affiche la raison au lieu d\'un écran noir ; les journaux de la session contiennent les détails. 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. @@ -388,6 +389,9 @@ Pas encore pris en charge ici Chargement des composants… Installation impossible : %1$s + Ce téléchargement nécessite une mise à jour. + Mise à jour en file d\'attente. + Réessayer la mise à jour Téléchargé Téléchargement de %1$s Installation : %1$s @@ -418,6 +422,22 @@ Stockage interne uniquement Dossier : %1$s Bibliothèque secondaire + Autres bibliothèques Steam + Dossiers où Steam peut installer des jeux et les lancer, chacun sous son propre nom. Le retirer conserve ses jeux sur le disque. + Ajouter une bibliothèque + Renommer + Nom de la bibliothèque + Choisir un dossier pour la bibliothèque + %1$d bibliothèques ajoutées au maximum + Ce dossier est déjà utilisé comme bibliothèque ou se trouve dans une bibliothèque existante + %1$s · indisponible + Prend effet à la prochaine session Steam + Trouvé sur cet appareil · %1$s · %2$s + Ajouter + Rechercher des bibliothèques sur le stockage interne + Autoriser l\'accès à tous les fichiers pour que DroidDeck puisse voir les bibliothèques Steam que d\'autres applications conservent sur le stockage interne + Autoriser + Ajout de %1$s, la bibliothèque Steam située dans le dossier choisi Les jeux lisant des ressources depuis une carte SD ou un stockage partagé peuvent saccader. Diagnostic du stockage Enregistre les résultats d\'allocation et des mesures de temps du stockage dans « Partager les journaux ». Peut ralentir les installations lorsqu\'il est activé. Prendra effet à la prochaine session. @@ -607,7 +627,10 @@ Désactive l\'assistant de navigation à la manette de Proton, qui consomme du CPU dans chaque jeu. Exécuter proot sans seccomp Peut corriger certaines erreurs d\'appels système manquants sur certains noyaux, mais peut réduire les performances. + Exécuter sans proot (expérimental) + Démarre la partie Linux directement sur Android. Prend effet à la prochaine session. Désactivez cette option si un élément ne démarre pas. Chemin rapide proot + Non utilisé sans proot. Nécessite le filtre seccomp de proot. Recherche de fichiers plus rapide, moins de saccades. Désactivez cette option si un programme ne trouve pas ses fichiers. Dessiner le curseur dans gamescope @@ -818,6 +841,7 @@ Appareil pris en charge GPU non testé GPU non pris en charge + GPU via le pont Mali %1$s · %2$s %1$s : %2$s Aucun moteur graphique compatible n’est disponible ; %1$s peut afficher un écran noir. @@ -847,15 +871,38 @@ Session Journaux de session Enregistré après chaque fin de session + Diagnostics avancés pour la prochaine session + Enregistre des journaux détaillés pour une session. Peut réduire les performances et utiliser plus de stockage. Se désactive au démarrage de la session ; consultez les journaux avant de les partager. Journaux de débogage des jeux Inclure les diagnostics Proton, Wine et graphiques au prochain lancement d\'un jeu. Peut réduire les performances et utiliser plus de stockage. Redémarrez cette session pour enregistrer les journaux de débogage des jeux Impossible de modifier la journalisation. Vérifiez l\'interrupteur et réessayez. Outils de débogage + Journaux graphiques détaillés + Interface Steam : rendu GPU + Avec la paire de pilotes Xclipse, Steam dessine ses pages en logiciel : le rendu GPU produisait des tuiles corrompues. Activez cette option pour accélérer l\'interface Steam si l\'affichage est correct sur ce téléphone. + compilé le %1$s + %1$s mis à jour vers la dernière version + La passerelle Mali a échoué à son auto-test sur %1$s lors de la dernière session (images ou appels de dessin). La session a donc utilisé la paire de pilotes PanVK à la place. + La passerelle Mali n\'a trouvé aucun moyen de partager la mémoire avec le pilote sur %1$s lors de la dernière session. La session a donc utilisé la paire de pilotes PanVK à la place. La passerelle ne peut pas fonctionner sur ce téléphone. La désactiver conserve la paire PanVK. + Les journaux Proton, DXVK et des pilotes de chaque jeu sont inclus dans les journaux de la session. Toujours activé lorsque le GPU n\'est pas un Adreno. Derniers journaux de session Journaux de session enregistrés Conserver les %1$d plus récents Effacer les journaux + Journaux de session disponibles + Aucun journal de session enregistré pour le moment. + Les fichiers ZIP partagés et enregistrés incluent la session sélectionnée ainsi que les diagnostics associés de Steam, de la boutique, des outils et de Battle.net. + %1$s · %2$s + Session en cours + Partager + Enregistrer sur l\'appareil + Supprimer + Supprimer les journaux de session ? + Supprimer %1$s ? Cette action est irréversible. + Journaux de session enregistrés. + Impossible d\'enregistrer les journaux de session. + Impossible de supprimer les journaux de session. Réinitialiser tous les paramètres Remet chaque paramètre à sa valeur par défaut Réinitialiser @@ -882,6 +929,8 @@ Utiliser comme écran d\'accueil DroidDeck peut être utilisé comme application d\'écran d\'accueil DroidDeck ne sera pas proposé comme application d\'écran d\'accueil + Le bouton Accueil ouvre + La page affichée lorsque DroidDeck est l’application Accueil et que vous appuyez sur le bouton Accueil Dans Ajouter des jeux, réglez DroidDeck sur Inclure Orientation Orientation du lanceur @@ -895,15 +944,22 @@ Plein écran Masquer la barre d\'état et la barre de navigation Android Afficher la barre d\'état et la barre de navigation Android + Lanceur double écran + Automatique place les sections du lanceur (Steam, Bibliothèque, Boutiques et les autres) sur le second écran intégré des consoles portables qui en sont équipées. Activé utilise n\'importe quel écran secondaire. Désactivé conserve le lanceur sur un seul écran. + Sessions double écran + Automatique ancre le menu en jeu sur le second écran intégré au lieu d\'un menu flottant. Activé utilise n\'importe quel écran secondaire. Désactivé garde le menu sur l\'écran du jeu. Vous pouvez toujours sélectionner un second écran depuis ce menu. Automatique Activé Désactivé Commandes sur l\'écran du bas en jeu + Clavier Android pour les champs de texte Ouvre le pavé tactile et le clavier sur le second écran au démarrage d\'une session. Saisie pour l\'écran du haut Terminé Application d\'écran d\'accueil par défaut Choisir l\'application d\'écran d\'accueil + Masquer le lanceur des Applications récentes pendant l’inactivité + S’applique uniquement lorsque DroidDeck est l’application Accueil par défaut et qu’aucune session n’est en cours. Choisir Applications Linux (bêta) Fichiers @@ -1018,6 +1074,147 @@ Versions de test Essayer un correctif avant sa publication officielle Aucun pour le moment + Version labo + Versions labo + En cours d\'utilisation + En pause après la réoptimisation de DroidDeck par Android + Non chargée : %1$s + En attente d\'un redémarrage + Conservée + Pour une autre version + Reconstruire + Supprime cette version de l\'appareil + Redémarrer avec cette version + Désactiver + Utiliser + Supprimer + Supprimer maintenant + Impossible de préparer le redémarrage : %1$s. Associez le débogage sans fil dans la section Configuration, puis réessayez. + Version labo installée + DroidDeck a redémarré sur %1$s + Version Lab en pause + Android a réoptimisé DroidDeck, %1$s n\'est donc pas chargé. Ouvrez Mises à jour pour redémarrer dessus. + Version Lab désactivée + Elle a été créée pour une autre version de DroidDeck. Elle est conservée dans Mises à jour. + DroidDeck n\'a pas démarré dessus à deux reprises + Agent + Agent + L\'agent travaille + Installez Claude Code dans l\'environnement utilisateur Linux pour utiliser l\'agent. + Posez une question sur un jeu, un plantage ou une modification de DroidDeck + Envoyer + Nouvelle conversation + Arrêter + Stockage + Supprimer + Supprimer maintenant + Claude Code + Codex + Code source de DroidDeck + Caches de téléchargement + Les modifications non envoyées sont perdues + Les builds les retéléchargent + La configuration peut le réinstaller ; les connexions sont conservées + DroidDeck a redémarré sur votre version Lab. Reprenez là où vous en étiez. + Demandez-lui de trouver pourquoi un jeu ne démarre pas, d\'expliquer un journal ou de modifier DroidDeck et de tester la modification sur cet appareil. + Échec : %1$s + %1$s s\'est terminé (code %2$d) + Arrêté + Terminé sans réponse + Réessayer + Configuration de l\'agent + Reconstruisez ma version Lab %1$s pour la version installée de DroidDeck et redémarrez dessus. + %1$s en entrée · %2$s en sortie + Réflexion en cours + Réflexion + Réflexion en cours · %1$s + %1$s · %2$s + ENTRÉE + SORTIE + En cours… + Aucun résultat : le tour a pris fin avant + Aucune sortie + Tapez pour mettre le prochain message en attente + Mettre en attente + Suivant : %1$s + Ne pas envoyer + Joindre + Supprimer + Par défaut + Effort de raisonnement + Exécuter + Réviser + Rien n’a encore changé + Exécute le plan. + Envoyer maintenant + Message + Plus + Fermer + Dernier + En cours + Contexte + %1$s sur %2$s + Cette conversation · %1$s + L’utilisation s’affiche après la première réponse + Limite de %1$d heures + Limite de %1$d minutes + Limite hebdomadaire + %1$d%% · se réinitialise %2$s + + %1$d fichier + %1$d fichiers + + Planifier d\'abord + Plan + Propose un plan sans rien modifier + Conversations + Aucune conversation pour l\'instant + À l\'instant + Supprimer + Supprime la conversation et ses pièces jointes + Processus + Rien ne s\'exécute dans l\'espace utilisateur Linux + AGENT + Arrêter + Compilation Lab + Préparation des compilations Lab + %1$d%% · il reste environ %2$s + il reste environ %1$s + Annuler + Annuler la compilation + Démarrage + %1$d%% + Empaquetage + Redémarrage de DroidDeck sur celui-ci + Terminé + Échec : %1$s + Configurer l\'agent + Installez d\'abord l\'environnement d\'exécution Linux dans Configuration. + Réessayer + Commencer à discuter + Connexion à l\'appareil + Débogage sans fil, pour que l\'agent puisse voir et piloter DroidDeck + Installer %1$s + Dans l\'espace utilisateur Linux, avec git, gh et adb + Se connecter à %1$s + Ouvre votre navigateur + GitHub + Facultatif, pour ouvrir des pull requests + Outils de compilation + Facultatif, pour les compilations Lab sur cet appareil · environ 5 Go + Agent prêt + Terminez la configuration de l\'agent + Connecté à %1$s + Compilations Lab + compilations rapides + Compilations Lab rapides + Compile cette version à l\'avance, pour que les compilations Lab ne prennent que quelques minutes · environ 20 minutes, une seule fois + Compilation en cours · %1$d%% · il reste environ %2$s + Préparer + Le débogage sans fil n\'est pas accessible ; « Associer » l\'active + Associer + Installer + Se connecter PR #%1$d Non compilé pour cette copie de DroidDeck %1$s mis à jour @@ -1261,6 +1458,14 @@ Applications Configuration Mises à jour + Plus + Modifier les onglets + Onglets + Affiché + Dans Plus + Masqué + Déplacer %1$s vers le haut + Déplacer %1$s vers le bas %1$d%% Reprendre %1$s Affiché comme /root/ROMs dans chaque session. Le stockage interne se trouve dans /root/Storage. @@ -1282,6 +1487,15 @@ Annuler la file d\'attente Clavier Android Masquer ✕ + Taille à l\'écran + Part de l\'écran occupée par le clavier, y compris l\'en-tête. + Opacité + Réduisez-la pour voir le jeu derrière le clavier. + Touches masquées + Les touches que vous utilisez rarement ne s\'affichent pas sur le clavier. + Échap et rangée des touches de fonction + Ins / Suppr / Début / Fin / PgPréc / PgSuiv + Touches fléchées Lancer %1$s Choisir l\'écran. Écran secondaire : %1$s. L\'écran secondaire n\'est plus disponible. @@ -1800,7 +2014,24 @@ Terminal Poignées Deck + pavés tactiles Tableau de bord + Bureau + Démarrer le bureau + Bureau · %1$s + Pavé tactile + Tactile direct + Pavé tactile. Touchez pour passer en tactile direct + Tactile direct. Touchez pour passer au pavé tactile + Démarrage du bureau KDE… + Le bureau vient de se fermer. + Impossible de démarrer le bureau. Ses journaux se trouvent dans le dossier bottom-desktop de cette session. + Le bureau est fermé. Rien à afficher pour l\'instant. + Permuter les écrans + Écran du bas occupé pour le moment + Écran du jeu + Afficher le jeu sur + Écran du haut + Écran du bas Téléchargements Aucun téléchargement en cours. Steam @@ -1835,6 +2066,20 @@ Carburant, t Principal %1$s t Réserve %1$s t + Temps par image + %1$d dernières s + image moyenne + 1 % les plus bas + images de plus de 33 ms + %1$d / min + En jeu depuis %1$s + %1$d cœurs, %2$s GHz au maximum + %1$d cœurs + jeu + FPS de %1$d Hz + Le repère rouge indique où le HUD affiche la température en rouge. + appareil entier + batterie Envoyer les données du tableau de bord Automatique L\'active pour chaque jeu listé ici, y compris les jeux trouvés plus tard. Les jeux que vous désactivez restent désactivés. @@ -1858,6 +2103,10 @@ Le micro est désactivé pour ce jeu. Pour parler, activez Microphone dans les paramètres Steam de DroidDeck (Audio), puis relancez le jeu. Volume %1$d %% Statistiques en jeu + HUD de l\'écran du bas + Bande sur tous les onglets + 1 % et 0,1 % les plus bas + Température du CPU FPS CPU GPU @@ -2031,6 +2280,7 @@ Démarrage de la session… %1$d:%2$02d écoulées · toujours en cours Téléchargement de la mise à jour du client Steam · %1$d%% + Application de la mise à jour du client Steam… Téléchargement du client Steam · %1$s Une installation d\'outil de compatibilité est déjà en cours @@ -2107,11 +2357,29 @@ Contours façon dessin animé et netteté accrue. GPU non Adreno + Pilote système PowerVR : la compatibilité varie selon chaque appareil + Expérimental : RADV ou le pilote système Xclipse + PowerVR système + Utilise les pilotes intégrés de ce GPU + Le pilote PowerVR du système est sélectionné pour le runtime et l\'affichage. + Aucun pilote libre ne prend encore en charge ce Mali : le pont Mali est activé. + Ceci est la version de test non-Snapdragon : les versions officielles disponibles ici ne fonctionnent que sur Adreno, elles ne sont donc pas installées par-dessus celle-ci. Les nouvelles versions de test se trouvent sur github.com/The412Banner/droiddeck-nonadreno-drivers. + La dernière session s\'est terminée parce qu\'Android a fermé DroidDeck pour libérer de la mémoire, et non à cause d\'un plantage. Fermez les autres applications ou réduisez les paramètres de texture du jeu, puis réessayez. + Mali (Venus) + le pont Mali + Aucun pilote libre ne prend encore en charge ce Mali : %1$s est utilisé, sur le pilote du téléphone. + %1$s n\'est pas encore publié : %2$s est utilisé en attendant. + %1$s n\'est pas disponible, et le pilote de ce téléphone indique Vulkan %2$s (Venus nécessite 1.2) : le pont Mali est utilisé. + %1$s n\'est pas encore publié : le pont Mali reste activé en attendant. + En file d\'attente : %1$s (en attente d\'un pilote de runtime différent) + DXVK est fourni par le runtime PowerVR du système. Les autres paquets DXVK peuvent être stockés mais ne sont pas appliqués avec ce pilote. Pris en charge Expérimental : ses pilotes sont des versions de test Prise en charge expérimentale de l\'Adreno 850 : nécessite des pilotes d\'affichage et de jeu expérimentaux compatibles ; non vérifiée sur cet appareil En dessous du matériel testé (Adreno 725 et plus récent) : risque de ne pas fonctionner Non pris en charge : aucun moteur graphique compatible n’est disponible pour ce GPU + Passe par le pont Mali, sur le pilote Vulkan du téléphone + Non pris en charge lorsque le pont Mali est désactivé : Turnip nécessite un GPU Adreno (Snapdragon) Limite de requêtes GitHub atteinte - réessayez plus tard GitHub a répondu HTTP %1$d @@ -2312,6 +2580,13 @@ Trier Libellés de la barre latérale Afficher les noms sous les icônes de la barre latérale. Désactivez pour une barre latérale plus fine. + Compagnon de l’agent + DeeDee flotte au-dessus du lanceur et des jeux et montre ce que fait l’agent. + Au-dessus des autres applications + Autorise DeeDee à flotter au-dessus de toutes les applications et à y ouvrir sa discussion + Autoriser + DeeDee + Discuter avec DeeDee Affichage Cartes plus grandes Cartes plus petites @@ -2598,6 +2873,11 @@ Développeur Filigrane de version Afficher le libellé de la version de test ou Lab à l’écran. Activé par défaut. + Partager les lots de diagnostics + Session et appareil + Graphiques + Jeux et compatibilité + Tous les lots Prêt à jouer Pas encore prêt à jouer environnement d\'exécution %1$s @@ -2636,6 +2916,9 @@ Activez les succès GOG dans les paramètres des boutiques Succès indisponibles ; consultez les journaux de session Succès débloqué + Mali (Venus) : désactivé + Mali (Venus) : activé + Le pilote de %1$s indique Vulkan %2$s. Mali (Venus) nécessite Vulkan 1.2 ou une version plus récente (gamescope ne démarre pas sur les versions plus anciennes) ; les sessions ignorent donc Venus et utilisent à la place la paire de pilotes PanVK. Coller Stick gauche Stick droit @@ -2996,6 +3279,7 @@ Programmes d\'installation VC++ et DirectX demandés par les jeux Exécute les jeux Linux x86 Outil Steam + Steam télécharge cet outil pour les jeux livrés avec un anti-triche, même lorsque celui-ci est désactivé. Le supprimer bloque leur installation à 0 %. DroidDeck exécute les jeux sans cet environnement d\'exécution Proton x86, que DroidDeck ne peut pas exécuter Par défaut pour tous les jeux @@ -3115,6 +3399,8 @@ DroidDeck · %1$d i/s 60 i/s est plus fluide mais sollicite davantage le processeur pendant le démarrage de Steam. Une vidéo choisie dans les paramètres de Steam apparaît aussi ici. Son + Ignorer la vidéo de démarrage + Utilise un clip noir de 0,1 seconde comme vidéo de démarrage de Steam. S’applique à la prochaine session. Votre propre vidéo MP4, MOV, MKV ou WebM. Les autres formats et les fichiers de plus de %1$d Mo sont convertis en WebM 720p sur l\'appareil, jusqu\'à %2$d secondes. Importer @@ -3576,6 +3862,7 @@ Garde Alt+Tab, la touche Win et le bouton Accueil dans une session DroidDeck active plutôt que dans Android. Activez Luminosité dans Paramètres → Intégration Steam Pont Mali : désactivé + %1$s ne peut pas utiliser le pont Mali (il faut un GPU Mali sans route de pilote système) ; ce commutateur n\'a donc aucun effet ici. Pont Mali : activé %1$s n\'est pas un Adreno. Le pont Vulkan expérimental est activé : la session dessine via le pilote du téléphone lui-même. Attendez-vous à des bugs ; envoyez les journaux de session. Mode sans échec @@ -3736,6 +4023,7 @@ Impossible d’importer cette disposition Neige écarlate + Surfaces blanches avec des accents rouges. Bandes originales Musique @@ -3799,4 +4087,6 @@ Répéter une piste Volume Aucun fichier audio dans cette bande originale + Lancement indisponible + Aucun navigateur Web n’est disponible pour ouvrir ce lien. diff --git a/app/src/main/res/values-hi/input_library.xml b/app/src/main/res/values-hi/input_library.xml new file mode 100644 index 0000000000..81147024d8 --- /dev/null +++ b/app/src/main/res/values-hi/input_library.xml @@ -0,0 +1,132 @@ + + + अ-पठनीय इनपुट सेटिंग्स को रिकवरी प्रति में सुरक्षित रखा गया। आप बहाल किए गए प्रोफ़ाइल को संपादित करना जारी रख सकते हैं। + गुण + क्लिक गुण + %1$s · क्लिक + बटन + स्टिक, पैड और ट्रिगर + टूल छिपाएँ + कंट्रोलर + कंट्रोलर इनपुट Steam Input या गेम को भेजें। + यह तत्व कंट्रोलर, माउस या कीबोर्ड इनपुट नहीं भेजता। + माउस क्लिक + DroidDeck क्रिया + क्रिया + स्क्रॉल गति: %1$d चरण/से + + नया प्रोफ़ाइल + + नया लेआउट + %1$s · %2$d प्रोफ़ाइल द्वारा उपयोग। बदलाव इन बाइंडिंग का उपयोग करने वाले हर प्रोफ़ाइल पर लागू होते हैं। + नाम बदलें + हटाएँ + क्रियाएँ असाइन करने से पहले लेआउट में तत्व जोड़ें। + इनपुट सेटिंग्स सहेजी नहीं जा सकीं + नाम + से शुरू करें + बटन + स्टिक + टचपैड + डी-पैड + ट्रिगर + हो गया + पूर्ववत करें + + जोड़ें + खींचकर ले जाएँ। कोने से खींचकर आकार बदलें। क्रिया असाइन करने के लिए गुण पर टैप करें। + दूसरी स्क्रीन पर संपादन + चयनित डिस्प्ले उपलब्ध नहीं है। इस लेआउट को उसके वास्तविक आकार में संपादित करने के लिए इसे कनेक्ट करें। + सहेजे न गए लेआउट बदलाव छोड़ें? + यह लेआउट %1$d प्रोफ़ाइल द्वारा उपयोग किया जाता है। सहेजे गए बदलाव सभी पर लागू होते हैं। + डिफ़ॉल्ट प्रोफ़ाइल + डेस्कटॉप मोड + गेम मोड + डेस्कटॉप और गेम के लिए डिफ़ॉल्ट + गेम मोड के लिए डिफ़ॉल्ट + डेस्कटॉप मोड के लिए डिफ़ॉल्ट + डिवाइस सेटिंग्स + नियंत्रण + बटन, स्टिक, ट्रिगर और अतिरिक्त कुंजियाँ + प्रोफ़ाइल कॉपी करें + क्रियाएँ रीसेट करें + %1$s में क्रियाओं को उसके आधार प्रोफ़ाइल डिफ़ॉल्ट पर रीसेट करें? लेआउट और अन्य प्रोफ़ाइल अपरिवर्तित रहेंगे। + %1$s हटाएँ? इसका उपयोग करने वाले मोड अपने अंतर्निहित डिफ़ॉल्ट प्रोफ़ाइल पर लौटेंगे। सहेजे गए लेआउट और साझा सेटिंग्स उपलब्ध रहेंगी। + दृश्यता + सभी प्रोफ़ाइल पर लागू। गेम मोड में कंट्रोलर कनेक्ट न होने पर Auto मुख्य स्क्रीन के नियंत्रण दिखाता है। + स्क्रीन पर संपादित करें + सहेजे गए लेआउट… + लेआउट चुनें या अपना बनाएँ + दूसरी स्क्रीन के सत्र मेनू में प्रोफ़ाइल नियंत्रण चुनें। कंट्रोलर मेनू में प्रोफ़ाइल और दूसरी स्क्रीन चयनकर्ता तय करते हैं कि कौन से नियंत्रण दिखें। + बटन क्रियाएँ + %1$s के साथ साझा। संपादन उन प्रोफ़ाइल पर भी लागू होते हैं। + सेटिंग्स पुनः उपयोग करें + सेटिंग्स यहाँ से लें… + किसी अन्य प्रोफ़ाइल से कॉपी करें या सेटिंग्स साझा रखें + स्वतंत्र बनाएँ + वर्तमान सेटअप रखें और बदलाव साझा करना बंद करें + लेआउट तत्व और उनकी स्थिति संग्रहीत करते हैं। प्रत्येक प्रोफ़ाइल अपनी क्रियाएँ असाइन कर सकता है। लक्ष्य स्क्रीन पर पूर्ण आकार में संपादित करें। + वर्तमान लेआउट + अप्रयुक्त लेआउट %1$s और उसकी सहेजी गई क्रियाएँ हटाएँ? + वर्तमान लेआउट का नाम बदलें + किसी अन्य प्रोफ़ाइल से %1$s का पुनः उपयोग करें। अन्य नियंत्रण स्रोत अपरिवर्तित रहेंगे। + भौतिक नियंत्रण साझा रखें + डिफ़ॉल्ट रूप से सभी नियंत्रण और कस्टम लेआउट स्वतंत्र प्रतियाँ हैं। साझा करना केवल भौतिक नियंत्रण जोड़ता है। + ये तत्व और स्थितियाँ उपयोग करें। साझा करने से भविष्य के ज्यामिति बदलाव सिंक रहते हैं; आपकी बटन क्रियाएँ स्वतंत्र रहती हैं। भिन्न लेआउट बिना असाइन क्रियाओं से शुरू होता है। + इन नियंत्रणों और क्रियाओं को कॉपी करें, या लिंक करें ताकि भविष्य के बदलाव दोनों प्रोफ़ाइल पर लागू हों। + साझा रखें + स्वतंत्र प्रति + स्पर्श स्थान से स्टिक शुरू करें + उपयोग में न हो तो स्टिक छिपाएँ + टूल + Auto (%1$s) + कस्टम (%1$s) + नए प्रोफ़ाइल के रूप में सहेजें + प्रोफ़ाइल नियंत्रण + प्रोफ़ाइल + माउस टचपैड इशारे + माउस पॉइंटर पर असाइन होने पर: क्लिक के लिए टैप करें, खींचने के लिए दबाए रखें, और दो उँगलियों से स्क्रॉल करें। + %1$s में क्विक-मेन्यू ओवरराइड है। वहाँ Auto चुनें ताकि उसका डिफ़ॉल्ट प्रोफ़ाइल और तीनों सहेजे भाग उपयोग हों। + DroidDeck इनपुट + स्टिक को किसी भी दिशा में हिलाने पर दबा रहता है: 55% से ऊपर दबाएँ, 35% से नीचे छोड़ें। प्रत्येक दिशा अलग असाइन करने के लिए दिशा कुंजियाँ उपयोग करें। DroidDeck क्रियाएँ प्रति झुकाव एक बार चलती हैं। स्टिक क्लिक अलग से सेट होता है। + टचपैड छूने पर दबा रहता है; उँगली उठाने पर छूटता है। DroidDeck क्रियाएँ प्रति स्पर्श एक बार चलती हैं। टचपैड क्लिक अलग से सेट होता है। + ट्रिगर 55% पार करने पर दबा रहता है; 35% से नीचे छूटता है। DroidDeck क्रियाएँ प्रति दबाव एक बार चलती हैं। + स्क्रॉल दिशा + लंबवत + क्षैतिज + क्षैतिज स्क्रॉल करें + माप + रिकॉर्डिंग सक्षम करें, चालू सत्र में नियंत्रण उपयोग करें, फिर लौटकर परिणाम पढ़ें। केवल DroidDeck प्रेषण समय मापता है, डिस्प्ले विलंब नहीं। ऐप प्रक्रिया बंद होने पर रिकॉर्डिंग समाप्त होती है। + %1$d नियंत्रण + अन्य सहेजे गए लेआउट (%1$d) ▾ + अन्य सहेजे गए लेआउट छिपाएँ (%1$d) ▴ + होम / Guide + वापस · एक टैप + वापस · दो टैप + वापस · Steam में दो बार, डेस्कटॉप में एक बार + Steam मोड में। वापस दबाए रखने से क्विक एक्सेस भी खुलता है। + डिफ़ॉल्ट पर पुनर्स्थापित करें + आपका पैनल चयन याद रखा जाता है। डेस्कटॉप दूसरा कार्यक्षेत्र खोलता है; यह सत्र या उसका इनपुट प्रोफ़ाइल नहीं बदलता। + वर्चुअल कंट्रोलर + Steam या गेम द्वारा देखा जाने वाला कंट्रोलर प्रकार। + टचस्क्रीन + गेम स्क्रीन पर स्पर्श कैसे संभाले जाते हैं। प्रोफ़ाइल बटन अपनी असाइन की गई क्रियाएँ रखते हैं। + टच कर्सर + गेम स्क्रीन पर सीधे स्पर्श के लिए पॉइंटर दिखाएँ। + स्पर्श करें और दबाए रखें + गेम स्क्रीन पर उँगली दबाए रखने पर माउस क्रिया। + वापस बटन टैप + पहली क्रिया: एक टैप। दूसरी क्रिया: दो टैप। + टॉगल बटन + दबाए रखने के लिए टैप करें, छोड़ने के लिए फिर टैप करें। मेन्यू खोलने या प्रोफ़ाइल बदलने पर बटन छूट जाता है। + आकार + गोल + गोली + वृत्त + आयत + बटन लेबल + टेक्स्ट + आयातित छवि + अलग विकर्ण कुंजियाँ + प्रत्येक विकर्ण को कुंजी असाइन करें। खाली विकर्ण अपने दो पड़ोसी दिशाओं को दबाता है। + पड़ोसी दिशाएँ + आपकी पुरानी स्क्रीन कुंजियाँ नीचे आयातित प्रोफ़ाइल के रूप में सहेजी गई हैं। उपयोग या संपादन के लिए एक चुनें। आपके वर्तमान प्रोफ़ाइल चयन रखे गए हैं। + पुरानी स्क्रीन कुंजियाँ स्वचालित रूप से आयात नहीं हो सकीं। मूल सेटिंग्स रखी गई हैं। + diff --git a/app/src/main/res/values-hi/input_strings.xml b/app/src/main/res/values-hi/input_strings.xml new file mode 100644 index 0000000000..4a0fb0a0f2 --- /dev/null +++ b/app/src/main/res/values-hi/input_strings.xml @@ -0,0 +1,38 @@ + + + इनपुट प्रोफ़ाइल + प्रोफ़ाइल + भौतिक कंट्रोलर + मुख्य स्क्रीन + दूसरी स्क्रीन + मूल / Steam Input + मूल: %1$s + कंट्रोलर का दूसरा नियंत्रण भेजें + बंद + कुंजी या कुंजी संयोजन + दिशा कुंजियाँ + पॉइंटर हिलाएँ + पॉइंटर गति: %1$d + स्क्रॉल + लंबवत स्क्रॉल + माउस का बायाँ बटन + माउस का दायाँ बटन + माउस का मध्य बटन + DroidDeck मेन्यू खोलें + कीबोर्ड दिखाएँ + Steam मेन्यू खोलें + Steam त्वरित पहुँच खोलें + नियंत्रण हटाएँ + नियंत्रण जोड़ें + डिवाइस-विशिष्ट बटन + भौतिक बटन असाइन करें + बटन छोड़ें, फिर संपादित करें, पुनः प्रयास करें या रद्द करें चुनें। छोड़ने के बाद B या वापस रद्द करता है। + पुनः प्रयास करें + कोई बटन दबाएँ, जिसमें कुंजी के रूप में रिपोर्ट होने वाला वापस बटन भी शामिल है। वॉल्यूम और Android सिस्टम कुंजियाँ आरक्षित हैं। असाइनमेंट केवल इस डिवाइस पर लागू होता है। + असाइनमेंट हटाएँ + इनपुट निदान + इनपुट भेजने का समय रिकॉर्ड करें + माप पढ़ें + Android से मौजूदा इनपुट ट्रांसपोर्ट में प्रकाशन तक मापता है। इसमें Bluetooth आगमन, गेस्ट पोलिंग, रेंडरिंग और डिस्प्ले विलंब शामिल नहीं हैं। रिकॉर्डिंग डिफ़ॉल्ट रूप से बंद है। + सामान्य इनपुट असाइनमेंट का उपयोग करें + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index a14eca1439..da5307b714 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -185,6 +185,7 @@ PowerVR ग्राफ़िक्स एनवायरमेंट डाउनलोड नहीं हो सका। कनेक्शन जाँचें और फिर कोशिश करें। DirectAudio डाउनलोड नहीं हो सका, इसलिए इस सेशन में गेम ऑडियो धीमा पाथ इस्तेमाल करता है। यह प्रोग्राम + सत्र स्क्रीन पर ड्रॉ नहीं कर सका: %1$s। काली स्क्रीन के बजाय यह स्क्रीन कारण दिखाती है; पूरा विवरण सत्र लॉग में है। Steam क्लाइंट डाउनलोड नहीं हो सका। हो सकता है आपका नेटवर्क या VPN Steam के सर्वर ब्लॉक कर रहा हो; कनेक्शन जांचें और फिर से कोशिश करें। Steam क्लाइंट सेट अप नहीं हो सका। कनेक्शन और खाली स्टोरेज जांचें, फिर से कोशिश करें। %1$s x86 पीसी के लिए बना है और FEX के ज़रिए चलता है, जो अभी इंस्टॉल नहीं है। साइन इन रहते हुए Steam एक बार शुरू करें और इसे FEX और Steam Linux Runtime डाउनलोड करने दें, फिर इसे फिर से शुरू करें। @@ -387,6 +388,9 @@ अभी यहां समर्थित नहीं कॉम्पोनेंट लोड हो रहे हैं… इंस्टॉल नहीं हो सका: %1$s + इस डाउनलोड को अपडेट की ज़रूरत है। + अपडेट कतार में है। + अपडेट फिर से करें डाउनलोड हो गया %1$s डाउनलोड हो रहा है इंस्टॉल हो रहा है: %1$s @@ -417,6 +421,22 @@ केवल इंटरनल फ़ोल्डर: %1$s दूसरी लाइब्रेरी + और Steam लाइब्रेरीज़ + वे फ़ोल्डर जिनमें Steam गेम इंस्टॉल कर सकता है और जहाँ से चला सकता है, हर एक अपने नाम के साथ। किसी को हटाने पर उसके गेम डिस्क पर बने रहते हैं। + लाइब्रेरी जोड़ें + नाम बदलें + लाइब्रेरी का नाम + लाइब्रेरी के लिए फ़ोल्डर चुनें + अधिकतम %1$d लाइब्रेरीज़ जोड़ी जा सकती हैं + यह फ़ोल्डर पहले से लाइब्रेरी है या किसी लाइब्रेरी के अंदर है + %1$s · उपलब्ध नहीं + अगले Steam सत्र से लागू होगा + इस डिवाइस पर पाया गया · %1$s · %2$s + जोड़ें + आंतरिक स्टोरेज में लाइब्रेरीज़ खोजें + सभी फ़ाइलों तक पहुँच दें ताकि DroidDeck उन Steam लाइब्रेरीज़ को देख सके जो दूसरे ऐप आंतरिक स्टोरेज में रखते हैं + अनुमति दें + %1$s को जोड़ा गया, आपके चुने फ़ोल्डर के अंदर मौजूद Steam लाइब्रेरी SD या शेयर्ड स्टोरेज से एसेट स्ट्रीम करने वाले गेम अटक सकते हैं। स्टोरेज डायग्नोस्टिक्स Share logs में एलोकेशन नतीजे और सैंपल किए स्टोरेज टाइमिंग रिकॉर्ड करें। चालू रहते हुए इंस्टॉल धीमे हो सकते हैं। अगले सेशन से लागू होता है। @@ -605,7 +625,10 @@ Proton के गेमपैड नेविगेशन हेल्पर को बंद करता है, जो हर गेम में CPU खर्च करता है। proot को seccomp के बिना चलाएं कुछ कर्नेल पर missing-syscall एरर ठीक कर सकता है। परफ़ॉर्मेंस घटा सकता है। + proot के बिना चलाएँ (प्रयोगात्मक) + Linux हिस्सा सीधे Android पर शुरू होता है। अगले सत्र से लागू होगा। अगर कुछ शुरू न हो तो इसे बंद कर दें। proot फ़ास्ट पाथ + proot के बिना इसका उपयोग नहीं होता। proot के seccomp फ़िल्टर की ज़रूरत है। तेज़ फ़ाइल लुकअप और कम अटकाव। अगर कोई प्रोग्राम अपनी फ़ाइलें न खोज पाए तो इसे बंद करें। gamescope के अंदर कर्सर बनाएं @@ -815,6 +838,7 @@ डिवाइस समर्थित अनटेस्टेड GPU GPU समर्थित नहीं + Mali ब्रिज के ज़रिए GPU %1$s · %2$s %1$s: %2$s %1$s के लिए कोई संगत ग्राफ़िक्स बैकएंड उपलब्ध नहीं है। Steam काली स्क्रीन दिखा सकता है। @@ -844,15 +868,38 @@ सेशन सेशन लॉग हर सेशन के बाद सेव होता है + अगले सत्र के लिए उन्नत डायग्नॉस्टिक्स + एक सत्र के लिए विस्तृत लॉग कैप्चर करता है। प्रदर्शन कम हो सकता है और ज़्यादा स्टोरेज लग सकती है। सत्र शुरू होते ही यह अपने आप बंद हो जाता है; शेयर करने से पहले लॉग जाँच लें। गेम डीबग लॉग अगली बार गेम लॉन्च होने पर Proton, Wine और ग्राफ़िक्स डायग्नोस्टिक्स शामिल करें। परफ़ॉर्मेंस घटा सकता है और ज़्यादा स्टोरेज ले सकता है। गेम डीबग लॉग सेव करने के लिए यह सेशन रीस्टार्ट करें लॉगिंग अपडेट नहीं हो सकी। स्विच जांचें और फिर कोशिश करें। डिबगिंग टूल + विस्तृत ग्राफ़िक्स लॉग + Steam इंटरफ़ेस: GPU ड्रॉइंग + Xclipse ड्राइवर जोड़ी के साथ, Steam अपने पेज सॉफ़्टवेयर से ड्रॉ करता है (GPU ड्रॉइंग में टाइलें टूटी हुई दिखीं)। अगर इस फ़ोन पर ठीक दिखे, तो तेज़ Steam इंटरफ़ेस के लिए इसे चालू करें। + %1$s पर निर्मित + %1$s को नवीनतम बिल्ड पर अपडेट किया गया + पिछले सत्र में %1$s पर Mali ब्रिज की स्व-जाँच (इमेज या ड्रॉ) विफल रही, इसलिए सत्र में इसके बजाय PanVK ड्राइवर जोड़ी का इस्तेमाल किया गया। + पिछले सत्र में %1$s पर Mali ब्रिज को ड्राइवर के साथ मेमोरी साझा करने का कोई तरीका नहीं मिला, इसलिए सत्र में इसके बजाय PanVK ड्राइवर जोड़ी का इस्तेमाल किया गया। यह ब्रिज इस फ़ोन पर काम नहीं कर सकता; इसे बंद रखने से PanVK जोड़ी ही बनी रहती है। + हर गेम के Proton, DXVK और ड्राइवर लॉग सत्र के लॉग में मिलते हैं। GPU Adreno न होने पर यह हमेशा चालू रहता है। नवीनतम सेशन लॉग सेव किए सेशन लॉग सबसे नए %1$d रखता है लॉग हटाएं + उपलब्ध सत्र लॉग + अभी तक कोई सहेजा गया सत्र लॉग नहीं है। + साझा की गई और सहेजी गई ZIP फ़ाइलों में चुना गया सत्र और उससे जुड़े Steam, स्टोर, टूल और Battle.net के निदान डेटा शामिल होते हैं। + %1$s · %2$s + वर्तमान सत्र + साझा करें + डिवाइस में सहेजें + हटाएँ + सत्र लॉग हटाएँ? + %1$s हटाएँ? इसे पूर्ववत नहीं किया जा सकता। + सत्र लॉग सहेज लिए गए। + सत्र लॉग सहेजे नहीं जा सके। + सत्र लॉग हटाए नहीं जा सके। सभी सेटिंग रीसेट करें हर सेटिंग को डिफ़ॉल्ट मान पर लौटाएँ रीसेट करें @@ -879,6 +926,8 @@ होम स्क्रीन के तौर पर इस्तेमाल करें DroidDeck होम ऐप हो सकता है DroidDeck को होम ऐप के तौर पर कभी नहीं दिखाया जाता + होम बटन खोलता है + जब DroidDeck होम ऐप हो और आप होम बटन दबाएँ, तब दिखने वाला पेज। गेम जोड़ें में DroidDeck को शामिल करें पर सेट करें ओरिएंटेशन लॉन्चर ओरिएंटेशन @@ -892,15 +941,22 @@ फ़ुलस्क्रीन Android स्टेटस और नेविगेशन बार छिपाता है Android स्टेटस और नेविगेशन बार दिखाता है + डुअल स्क्रीन लॉन्चर + स्वचालित पर, बिल्ट-इन दूसरी स्क्रीन वाले हैंडहेल्ड में लॉन्चर के सेक्शन (Steam, लाइब्रेरी, स्टोर्स और बाकी) दूसरी स्क्रीन पर चले जाते हैं। चालू पर कोई भी दूसरी डिस्प्ले इस्तेमाल होती है। बंद पर लॉन्चर एक ही स्क्रीन पर रहता है। + डुअल स्क्रीन सत्र + स्वचालित पर इन-गेम मेन्यू पॉप-ओवर की जगह बिल्ट-इन दूसरी स्क्रीन पर डॉक हो जाता है। चालू पर कोई भी दूसरी डिस्प्ले इस्तेमाल होती है। बंद पर मेन्यू गेम वाली स्क्रीन पर ही रहता है; फिर भी आप मेन्यू से दूसरी स्क्रीन चुन सकते हैं। ऑटोमैटिक चालू बंद गेम में नीचे की स्क्रीन के कंट्रोल + टेक्स्ट फ़ील्ड के लिए Android कीबोर्ड सेशन शुरू होने पर दूसरी स्क्रीन पर ट्रैकपैड और कीबोर्ड खोलता है। ऊपर की स्क्रीन के लिए टाइपिंग हो गया डिफ़ॉल्ट होम ऐप होम ऐप चुनें + निष्क्रिय अवस्था में लॉन्चर को हाल के ऐप्स से छिपाएँ + यह तभी लागू होता है जब DroidDeck डिफ़ॉल्ट होम ऐप हो और कोई सत्र न चल रहा हो। चुनें Linux ऐप (बीटा) फ़ाइलें @@ -1015,6 +1071,147 @@ टेस्ट बिल्ड रिलीज़ होने से पहले किसी फ़िक्स को आज़माएं अभी कोई नहीं + लैब बिल्ड + लैब बिल्ड्स + इस्तेमाल में + Android के DroidDeck को दोबारा ऑप्टिमाइज़ करने के बाद इसे रोक दिया गया + लोड नहीं हुआ: %1$s + रीस्टार्ट की प्रतीक्षा में + रखा गया + किसी दूसरे वर्ज़न के लिए + फिर से बनाएँ + इस बिल्ड को डिवाइस से हटाता है + इसी पर रीस्टार्ट करें + बंद करें + इस्तेमाल करें + हटाएँ + अभी हटाएँ + रीस्टार्ट तैयार नहीं किया जा सका: %1$s। सेटअप में वायरलेस डिबगिंग पेयर करें और फिर कोशिश करें। + लैब बिल्ड इंस्टॉल हो गया + DroidDeck %1$s पर रीस्टार्ट हुआ + लैब बिल्ड रोका गया + Android ने DroidDeck को दोबारा ऑप्टिमाइज़ किया, इसलिए %1$s लोड नहीं हुआ। उसी पर फिर से शुरू करने के लिए अपडेट्स खोलें। + लैब बिल्ड बंद कर दिया गया + यह DroidDeck के किसी दूसरे वर्जन के लिए बनाया गया था। इसे अपडेट्स में रखा गया है। + DroidDeck इस पर दो बार शुरू नहीं हुआ + एजेंट + एजेंट + एजेंट काम कर रहा है + एजेंट इस्तेमाल करने के लिए Linux यूज़रलैंड में Claude Code इंस्टॉल करें। + किसी गेम, क्रैश या DroidDeck में बदलाव के बारे में पूछें + भेजें + नई बातचीत + रोकें + स्टोरेज + हटाएँ + अभी हटाएँ + Claude Code + Codex + DroidDeck सोर्स + डाउनलोड कैश + जो बदलाव पुश नहीं किए गए, वे खो जाएँगे + बिल्ड इन्हें फिर से डाउनलोड करेंगे + सेटअप इसे दोबारा इंस्टॉल कर सकता है; साइन-इन सुरक्षित रहेंगे + DroidDeck आपके लैब बिल्ड पर फिर से शुरू हो गया। जहाँ छोड़ा था, वहीं से जारी रखें। + इससे पूछें कि कोई गेम क्यों शुरू नहीं होता, कोई लॉग समझाए, या DroidDeck में बदलाव करे और उसे इस डिवाइस पर आज़माए। + विफल: %1$s + %1$s समाप्त हुआ (एग्ज़िट %2$d) + रोक दिया गया + बिना जवाब के समाप्त हुआ + फिर से कोशिश करें + एजेंट सेट अप हो रहा है + DroidDeck के इंस्टॉल किए गए वर्जन के लिए मेरा लैब बिल्ड %1$s दोबारा बनाएँ और उसी पर फिर से शुरू करें। + %1$s इन · %2$s आउट + सोच रहा है + विचार + सोच रहा है · %1$s + %1$s · %2$s + इनपुट + आउटपुट + चल रहा है… + कोई परिणाम नहीं: बारी पहले खत्म हो गई + कोई आउटपुट नहीं + अगला संदेश कतार में जोड़ने के लिए टाइप करें + कतार में जोड़ें + अगला: %1$s + न भेजें + संलग्न करें + हटाएँ + डिफ़ॉल्ट + सोचने का स्तर + आगे बढ़ें + संशोधित करें + अभी तक कुछ नहीं बदला + योजना के साथ आगे बढ़ें। + अभी भेजें + संदेश + अधिक + बंद करें + नवीनतम + काम चल रहा है + संदर्भ + %1$s, कुल %2$s में से + यह बातचीत · %1$s + पहले जवाब के बाद उपयोग दिखेगा + %1$d-घंटे की सीमा + %1$d-मिनट की सीमा + साप्ताहिक सीमा + %1$d%% · रीसेट: %2$s + + %1$d फ़ाइल + %1$d फ़ाइलें + + पहले योजना बनाएँ + योजना + कुछ भी बदले बिना योजना पेश करता है + बातचीतें + अभी तक कोई बातचीत नहीं + अभी-अभी + मिटाएँ + इसे और इसकी संलग्न फ़ाइलें मिटा देता है + प्रोसेस + Linux यूज़रलैंड में कुछ नहीं चल रहा है + एजेंट + रोकें + लैब बिल्ड + लैब बिल्ड तैयार किए जा रहे हैं + %1$d%% · लगभग %2$s बचा है + लगभग %1$s बचा है + रद्द करें + बिल्ड रद्द करें + शुरू हो रहा है + %1$d%% + पैकेजिंग + इस पर DroidDeck फिर से शुरू किया जा रहा है + पूरा हुआ + विफल: %1$s + एजेंट सेट अप करें + पहले सेट अप में Linux रनटाइम इंस्टॉल करें। + फिर से कोशिश करें + बातचीत शुरू करें + डिवाइस कनेक्शन + वायरलेस डिबगिंग, ताकि एजेंट DroidDeck को देख और नियंत्रित कर सके + %1$s इंस्टॉल करें + Linux यूज़रलैंड में, git, gh और adb के साथ + %1$s में साइन इन करें + आपका ब्राउज़र खुलता है + GitHub + वैकल्पिक, पुल रिक्वेस्ट खोलने के लिए + बिल्ड टूल्स + वैकल्पिक, इस डिवाइस पर Lab बिल्ड के लिए · लगभग 5 GB + Agent तैयार + Agent की सेटअप पूरी करें + %1$s में साइन इन किया हुआ है + Lab बिल्ड + तेज़ बिल्ड + तेज़ Lab बिल्ड + इस वर्ज़न को पहले से कंपाइल करता है, जिससे Lab बिल्ड में कुछ मिनट लगते हैं · एक बार लगभग 20 मिनट + कंपाइल हो रहा है · %1$d%% · लगभग %2$s बाकी + तैयार करें + वायरलेस डिबगिंग से कनेक्ट नहीं हो पा रहा; पेयर करने से यह चालू हो जाता है + पेयर करें + इंस्टॉल करें + साइन इन करें PR #%1$d DroidDeck की इस कॉपी के लिए नहीं बना %1$s को अपडेट किया गया @@ -1254,6 +1451,14 @@ ऐप सेटअप अपडेट + अधिक + टैब्स संपादित करें + टैब्स + दिखाया जाए + अधिक में + छिपाया जाए + %1$s को ऊपर ले जाएँ + %1$s को नीचे ले जाएँ %1$d%% %1$s फिर से शुरू करें हर सेशन में /root/ROMs के रूप में दिखता है। इंटरनल स्टोरेज /root/Storage पर है। @@ -1275,6 +1480,15 @@ पेंडिंग रद्द करें Android कीबोर्ड छिपाएं ✕ + स्क्रीन पर आकार + कीबोर्ड स्क्रीन का कितना हिस्सा घेरता है, हेडर समेत। + अपारदर्शिता + कीबोर्ड के पीछे गेम दिखाने के लिए इसे घटाएँ। + छिपी कुंजियाँ + जिन कुंजियों का आप कम इस्तेमाल करते हैं, वे कीबोर्ड पर नहीं रहतीं। + Esc और फ़ंक्शन पंक्ति + Ins / Del / Home / End / PgUp / PgDn कुंजियाँ + तीर कुंजियाँ %1$s लॉन्च करें स्क्रीन चुनें। सेकेंडरी: %1$s। सेकेंडरी डिस्प्ले अब उपलब्ध नहीं है। @@ -1776,7 +1990,24 @@ टर्मिनल Deck ग्रिप + ट्रैकपैड डैशबोर्ड + डेस्कटॉप + डेस्कटॉप शुरू करें + डेस्कटॉप · %1$s + ट्रैकपैड + डायरेक्ट टच + ट्रैकपैड। डायरेक्ट टच के लिए टैप करें + डायरेक्ट टच। ट्रैकपैड के लिए टैप करें + KDE डेस्कटॉप शुरू हो रहा है… + डेस्कटॉप बंद हो गया। + डेस्कटॉप शुरू नहीं हो सका। इसके लॉग इस सत्र के bottom-desktop फ़ोल्डर में हैं। + डेस्कटॉप बंद है। यहां दिखाने के लिए अभी कुछ नहीं है। + स्क्रीनें बदलें + निचली स्क्रीन अभी उपलब्ध नहीं है + गेम स्क्रीन + गेम किस स्क्रीन पर दिखाएँ + ऊपरी स्क्रीन + निचली स्क्रीन डाउनलोड कोई डाउनलोड नहीं चल रहा है। Steam @@ -1811,6 +2042,20 @@ फ़्यूल, t मुख्य %1$s t रिज़र्व %1$s t + फ़्रेम समय + पिछले %1$d सेकंड + औसत फ़्रेम + 1 प्रतिशत न्यूनतम + 33 ms से अधिक समय वाले फ़्रेम + %1$d / मिनट + %1$s से खेल रहे हैं + %1$d कोर, %2$s GHz तक + %1$d कोर + गेम + %1$d Hz का FPS + लाल निशान वह बिंदु है जहाँ HUD तापमान को लाल रंग में दिखाता है। + पूरा डिवाइस + बैटरी डैशबोर्ड डेटा भेजें ऑटोमैटिक यहां दिए हर गेम के लिए इसे चालू करता है, बाद में मिलने वाले गेम भी शामिल हैं। जिन गेम को आप बंद करते हैं, वे बंद ही रहते हैं। @@ -1834,6 +2079,10 @@ इस गेम के लिए माइक बंद है। बात करने के लिए DroidDeck की Steam सेटिंग (ऑडियो) में माइक्रोफ़ोन चालू करें और गेम फिर से शुरू करें। वॉल्यूम %1$d%% इन-गेम आंकड़े + निचली स्क्रीन HUD + हर टैब पर स्ट्रिप + 1% और 0.1% न्यूनतम + CPU तापमान FPS CPU GPU @@ -2006,6 +2255,7 @@ सेशन शुरू हो रहा है… %1$d:%2$02d बीत गया · अभी भी काम हो रहा है Steam क्लाइंट अपडेट डाउनलोड हो रहा है · %1$d%% + Steam क्लाइंट अपडेट लागू किया जा रहा है… Steam क्लाइंट डाउनलोड हो रहा है · %1$s एक कम्पैटिबिलिटी टूल इंस्टॉल पहले से चल रहा है @@ -2082,11 +2332,29 @@ टून आउटलाइन के साथ शार्पनिंग। Adreno GPU नहीं है + सिस्टम PowerVR ड्राइवर: संगतता डिवाइस के अनुसार अलग-अलग होती है + प्रायोगिक: RADV या सिस्टम Xclipse ड्राइवर + सिस्टम PowerVR + इस GPU के अंतर्निहित ड्राइवरों का उपयोग करता है + रनटाइम और डिस्प्ले के लिए सिस्टम का PowerVR ड्राइवर चुना गया है। + इस Mali के लिए अभी कोई ओपन ड्राइवर नहीं है: Mali ब्रिज चालू है। + यह गैर-Snapdragon टेस्ट बिल्ड है: यहाँ के आधिकारिक बिल्ड केवल Adreno पर चलते हैं, इसलिए उन्हें इसके ऊपर इंस्टॉल नहीं किया जाता। नए टेस्ट बिल्ड github.com/The412Banner/droiddeck-nonadreno-drivers पर मिलते हैं। + पिछला सत्र इसलिए खत्म हुआ क्योंकि Android ने मेमोरी खाली करने के लिए DroidDeck को बंद कर दिया था, यह कोई क्रैश नहीं था। दूसरे ऐप बंद करें या गेम की टेक्सचर सेटिंग कम करें, फिर दोबारा कोशिश करें। + Mali (Venus) + Mali ब्रिज + इस Mali के लिए अभी कोई ओपन ड्राइवर नहीं है: फ़ोन के अपने ड्राइवर पर %1$s इस्तेमाल होता है। + %1$s अभी तक जारी नहीं हुआ है: तब तक %2$s इस्तेमाल होता है। + %1$s उपलब्ध नहीं है, और इस फ़ोन का ड्राइवर Vulkan %2$s बताता है (Venus को 1.2 चाहिए): Mali ब्रिज इस्तेमाल होता है। + %1$s अभी तक जारी नहीं हुआ है: तब तक Mali ब्रिज चालू रहेगा। + कतार में: %1$s (अलग रनटाइम ड्राइवर की प्रतीक्षा में) + सिस्टम का PowerVR रनटाइम DXVK उपलब्ध कराता है। दूसरे DXVK पैकेज सहेजे जा सकते हैं, लेकिन इस ड्राइवर के साथ लागू नहीं होते। समर्थित एक्सपेरिमेंटल: इसके ड्राइवर टेस्ट बिल्ड हैं प्रयोगात्मक Adreno 850 समर्थन: कम्पैटिबल प्रयोगात्मक डिस्प्ले और गेम ड्राइवर चाहिए; इस डिवाइस पर जांचा नहीं गया जांचे गए हार्डवेयर से नीचे (Adreno 725 और नए): यह शायद न चले समर्थित नहीं: इस GPU के लिए कोई संगत ग्राफ़िक्स बैकएंड उपलब्ध नहीं है + Mali ब्रिज से होकर, फ़ोन के अपने Vulkan ड्राइवर पर चलता है + Mali ब्रिज बंद होने पर यह समर्थित नहीं है: Turnip के लिए Adreno (Snapdragon) GPU ज़रूरी है GitHub की रेट लिमिट पार हो गई - बाद में फिर कोशिश करें GitHub ने HTTP %1$d जवाब दिया @@ -2287,6 +2555,13 @@ क्रमबद्ध करें साइडबार लेबल साइडबार आइकन के नीचे नाम दिखाएं। पतले साइडबार के लिए बंद करें। + एजेंट पेट + DeeDee लॉन्चर और गेम्स पर दिखाई देता है और बताता है कि एजेंट क्या कर रहा है। + अन्य ऐप्स के ऊपर दिखाएँ + DeeDee को हर ऐप के ऊपर दिखने दें और वहीं इसकी चैट खोलें + अनुमति दें + DeeDee + DeeDee के साथ चैट करें डिस्प्ले बड़े कार्ड छोटे कार्ड @@ -2574,6 +2849,11 @@ डेवलपर बिल्ड लेबल वॉटरमार्क स्क्रीन पर टेस्ट या Lab बिल्ड लेबल दिखाएँ। डिफ़ॉल्ट रूप से चालू। + डायग्नॉस्टिक बंडल शेयर करें + सत्र और डिवाइस + ग्राफ़िक्स + गेम और संगतता + सभी बंडल खेलने के लिए तैयार अभी खेलने के लिए तैयार नहीं रनटाइम %1$s @@ -2612,6 +2892,9 @@ Stores सेटिंग में GOG उपलब्धियां चालू करें उपलब्धियां उपलब्ध नहीं; सेशन लॉग देखें उपलब्धि अनलॉक हुई + Mali (Venus): बंद + Mali (Venus): चालू + %1$s पर मौजूद ड्राइवर Vulkan %2$s बताता है। Mali (Venus) को Vulkan 1.2 या नया चाहिए (पुराने पर gamescope शुरू नहीं होता), इसलिए सत्र Venus छोड़कर उसकी जगह PanVK ड्राइवरों की जोड़ी इस्तेमाल करते हैं। पेस्ट करें बायां स्टिक दायां स्टिक @@ -2967,6 +3250,7 @@ गेम को ज़रूरी VC++ और DirectX इंस्टॉल Linux x86 गेम चलाता है Steam टूल + Steam इसे उन गेम्स के लिए डाउनलोड करता है जिनमें एंटी-चीट शामिल है, भले ही वह बंद हो। इसे हटाने से उनकी इंस्टॉलेशन 0% पर रुक जाती है। DroidDeck इस रनटाइम के बिना गेम चलाता है Proton x86, जिसे DroidDeck नहीं चला सकता सभी गेम के लिए डिफ़ॉल्ट @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps 60 fps ज़्यादा स्मूथ दिखता है, लेकिन Steam शुरू होते समय CPU ज़्यादा इस्तेमाल करता है। Steam की अपनी सेटिंग्स में चुना गया वीडियो यहाँ भी दिखता है। आवाज़ + बूट मूवी छोड़ें + Steam की स्टार्टअप मूवी के रूप में 0.1 सेकंड की काली क्लिप इस्तेमाल करें। अगले सत्र से लागू होगा। अपना वीडियो MP4, MOV, MKV या WebM. दूसरे फ़ॉर्मैट और %1$d MB से बड़ी फ़ाइलें डिवाइस पर 720p WebM में बदली जाती हैं, %2$d सेकंड तक। इंपोर्ट करें @@ -3538,6 +3824,7 @@ Alt+Tab, Win कुंजी और होम बटन को Android के बजाय सक्रिय DroidDeck सत्र में रखता है। Setup → Steam इंटीग्रेशन में ब्राइटनेस चालू करें Mali ब्रिज: बंद + %1$s Mali ब्रिज इस्तेमाल नहीं कर सकता (इसे ऐसा Mali GPU चाहिए जिसके पास सिस्टम ड्राइवर का रास्ता न हो), इसलिए यहाँ इस स्विच का कोई असर नहीं है। Mali ब्रिज: चालू %1$s Adreno नहीं है। प्रायोगिक Vulkan ब्रिज चालू है: सत्र फ़ोन के अपने ड्राइवर से ड्रॉ करता है। बग की उम्मीद रखें; सत्र लॉग भेजें। सुरक्षित मोड @@ -3697,6 +3984,7 @@ यह लेआउट इम्पोर्ट नहीं किया जा सका किरमिज़ी बर्फ + लाल रंग की झलकियों वाली सफ़ेद सतहें। साउंडट्रैक संगीत @@ -3760,4 +4048,6 @@ एक दोहराएँ वॉल्यूम इस साउंडट्रैक में कोई ऑडियो फ़ाइल नहीं है + लॉन्च उपलब्ध नहीं + इस लिंक को खोलने के लिए कोई वेब ब्राउज़र उपलब्ध नहीं है। diff --git a/app/src/main/res/values-hu/input_library.xml b/app/src/main/res/values-hu/input_library.xml new file mode 100644 index 0000000000..ceeaeaf94e --- /dev/null +++ b/app/src/main/res/values-hu/input_library.xml @@ -0,0 +1,132 @@ + + + Az olvashatatlan beviteli beállításokat helyreállítási másolatban őriztük meg. A visszaállított profilok szerkesztését folytathatja. + Tulajdonságok + Kattintás tulajdonságai + %1$s · Kattintás + Gombok + Karok, felületek és ravaszok + Eszközök elrejtése + Vezérlő + Vezérlő bemenet küldése a Steam Inputnak vagy a játéknak. + Ez az elem nem küld vezérlő-, egér- vagy billentyűzetbemenetet. + Egérkattintás + DroidDeck művelet + Művelet + Görgetési sebesség: %1$d lépés/mp + + Új profil + + Új elrendezés + %1$s · %2$d profil használja. A módosítások minden ilyen hozzárendelést használó profilra érvényesek. + Átnevezés + Törlés + Adjon elemeket az elrendezéshez, mielőtt hozzárendeli a műveleteiket. + Nem sikerült menteni a beviteli beállításokat + Név + Kiindulás + Gomb + Kar + Érintőfelület + Kereszt + Ravasz + Kész + Visszavonás + + Hozzáadás + Húzza az áthelyezéshez. Húzza a sarkát az átméretezéshez. Koppintson a Tulajdonságokra művelet hozzárendeléséhez. + Szerkesztés a másodlagos képernyőn + A kiválasztott kijelző nem érhető el. Csatlakoztassa, hogy ezt az elrendezést valós méretben szerkessze. + Elveti a nem mentett elrendezésmódosításokat? + Ezt az elrendezést %1$d profil használja. A mentett módosítások mindegyikre érvényesek. + Alapértelmezett profilok + Asztali mód + Játékmód + Alapértelmezett asztalihoz és játékhoz + Alapértelmezett játékmódhoz + Alapértelmezett asztali módhoz + Eszközbeállítások + Vezérlők + Gombok, karok, ravaszok és további gombok + Profil másolása + Műveletek visszaállítása + Visszaállítja a(z) %1$s műveleteit az alap profil alapértékeire? Az elrendezések és más profilok változatlanok maradnak. + Törli: %1$s? A használó módok visszatérnek beépített alapértelmezett profiljukhoz. A mentett elrendezések és megosztott beállítások elérhetők maradnak. + Láthatóság + Minden profilra érvényes. Az Auto a fő képernyő vezérlőit mutatja, ha játékmódban nincs vezérlő csatlakoztatva. + Szerkesztés a képernyőn + Mentett elrendezések… + Válasszon elrendezést, vagy hozzon létre sajátot + Válassza a Profil vezérlőit a másodlagos képernyő munkamenet-menüjében. A vezérlő menüjében a Profil és a Másodlagos képernyő választó dönti el, mely vezérlők jelenjenek meg. + Gombműveletek + Megosztva ezzel: %1$s. A szerkesztések azokra a profilokra is érvényesek. + Beállítások újrafelhasználása + Beállítások innen… + Másolás másik profilból, vagy a beállítások megosztva tartása + Függetlenné tétel + A jelenlegi beállítás megtartása és a módosítások megosztásának leállítása + Az elrendezések elemeket és pozícióikat tárolják. Minden profil saját műveleteket rendelhet. Teljes méretben szerkessze a célképernyőn. + Jelenlegi elrendezés + Törli a nem használt %1$s elrendezést és mentett műveleteit? + Jelenlegi elrendezés átnevezése + %1$s újrafelhasználása másik profilból. A többi vezérlőforrás változatlan marad. + Fizikai vezérlők megosztva tartása + Alapértelmezés szerint minden vezérlő és egyéni elrendezés független másolat. A megosztás csak a fizikai vezérlőket kapcsolja össze. + Ezen elemek és pozíciók használata. A megosztás szinkronban tartja a jövőbeli geometriai módosításokat; a gombműveletek függetlenek maradnak. Egy másik elrendezés hozzá nem rendelt műveletekkel indul. + Ezen vezérlők és műveletek másolása vagy összekapcsolása, hogy a jövőbeli módosítások mindkét profilra érvényesek legyenek. + Megosztva tartás + Független másolat + Kar indítása az érintési ponttól + Kar elrejtése, ha nincs használatban + Eszközök + Automatikus (%1$s) + Egyéni (%1$s) + Mentés új profilként + Profil vezérlői + Profil + Egér érintőfelület-gesztusok + Ha az egérkurzorhoz van rendelve: koppintson a kattintáshoz, tartsa nyomva a húzáshoz, és két ujjal görgessen. + A(z) %1$s gyorsmenü-felülírással rendelkezik. Válassza ott az Automatikust, hogy az alapértelmezett profilját és mindhárom mentett részét használja. + DroidDeck bemenet + Nyomva tartva, amíg a kart bármely irányba mozgatja: nyomás 55% felett, elengedés 35% alatt. Az Iránybillentyűkkel külön rendelhető minden irány. A DroidDeck parancsok kitérésenként egyszer futnak. A kar kattintása külön állítható. + Nyomva tartva az érintőfelület érintése közben; az ujj felemelésekor elengedve. A DroidDeck parancsok érintésenként egyszer futnak. Az érintőfelület kattintása külön állítható. + Nyomva tartva, amikor a ravasz átlépi az 55%-ot; 35% alatt elengedve. A DroidDeck parancsok nyomásonként egyszer futnak. + Görgetési irány + Függőleges + Vízszintes + Vízszintes görgetés + Mérések + Kapcsolja be a rögzítést, használja a vezérlőket egy futó munkamenetben, majd térjen vissza és olvassa le az eredményeket. Csak a DroidDeck küldési idejét méri, a kijelző késleltetését nem. A rögzítés az alkalmazás folyamatának bezárásakor ér véget. + %1$d vezérlő + Egyéb mentett elrendezések (%1$d) ▾ + Egyéb mentett elrendezések elrejtése (%1$d) ▴ + Home / Guide + Vissza · egy koppintás + Vissza · dupla koppintás + Vissza · kétszer Steam módban, egyszer asztali módban + Steam módban. A Vissza nyomva tartása a gyorselérést is megnyitja. + Visszaállítás alapértelmezettre + A panelválasztás megjegyződik. Az asztali mód második munkateret nyit; nem váltja a munkamenetet vagy annak beviteli profilját. + Virtuális vezérlő + A Steam vagy a játék által látott vezérlőtípus. + Érintőképernyő + Hogyan kezelődnek a játék képernyőjén történő érintések. A profilgombok megtartják hozzárendelt műveleteiket. + Érintéskurzor + Mutatót jelenít meg a játék képernyőjén történő közvetlen érintésekhez. + Érintés és nyomva tartás + Egér művelet, amikor ujját a játék képernyőjén tartja. + Vissza gomb koppintásai + Első művelet: egy koppintás. Második művelet: dupla koppintás. + Kapcsológomb + Koppintson a tartáshoz, koppintson újra az elengedéshez. Menü megnyitása vagy profilváltás elengedi a gombot. + Forma + Lekerekített + Kapszula + Kör + Téglalap + Gombcímke + Szöveg + Importált kép + Külön átlós gombok + Rendeljen gombot minden átlóhoz. Az üres átló a két szomszédos irányt nyomja. + Szomszédos irányok + A régi képernyőgombok lent importált profilként vannak mentve. Válasszon egyet használathoz vagy szerkesztéshez. A jelenlegi profilválasztások megmaradtak. + A régi képernyőgombokat nem sikerült automatikusan importálni. Az eredeti beállítások megmaradtak. + diff --git a/app/src/main/res/values-hu/input_strings.xml b/app/src/main/res/values-hu/input_strings.xml new file mode 100644 index 0000000000..1fb45dd72a --- /dev/null +++ b/app/src/main/res/values-hu/input_strings.xml @@ -0,0 +1,38 @@ + + + Beviteli profilok + Profilok + Fizikai vezérlő + Fő képernyő + Másodlagos képernyő + Natív / Steam Input + Natív: %1$s + Másik vezérlőparancs küldése + Letiltva + Billentyű vagy billentyűkombináció + Iránybillentyűk + Mutató mozgatása + Mutató sebessége: %1$d + Görgetés + Függőleges görgetés + Bal egérgomb + Jobb egérgomb + Középső egérgomb + DroidDeck menü megnyitása + Billentyűzet megjelenítése + Steam menü megnyitása + Steam gyorselérés megnyitása + Vezérlőelem eltávolítása + Vezérlőelem hozzáadása + Eszközspecifikus gombok + Fizikai gomb hozzárendelése + Engedje el a gombot, majd válassza a Szerkesztés, Újra vagy Mégse lehetőséget. A B vagy a Vissza elengedés után megszakítja. + Újra + Nyomjon meg egy gombot, beleértve a billentyűként jelentett Vissza gombot is. A hangerő- és Android rendszergombok foglaltak. A hozzárendelés csak erre az eszközre érvényes. + Hozzárendelés eltávolítása + Bemeneti diagnosztika + Bemenetküldési idő rögzítése + Mérések beolvasása + Az Androidról a meglévő bemeneti átvitelbe történő közzétételig mér. Nem tartalmazza a Bluetooth-érkezést, a vendég lekérdezését, a renderelést és a kijelző késleltetését. A rögzítés alapértelmezés szerint ki van kapcsolva. + Normál bemeneti hozzárendelés használata + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1e1ca4e228..3778e08320 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -185,6 +185,7 @@ A PowerVR grafikus környezetet nem sikerült letölteni. Ellenőrizd a kapcsolatot, és próbáld újra. A DirectAudio nem tölthető le, ezért a játékhang ebben a munkamenetben a lassabb útvonalat használja. Ez a program + A munkamenet nem tudta megjeleníteni a képet a képernyőn: %1$s. Fekete képernyő helyett ez a képernyő mutatja az okot; a részletek a munkamenet naplóiban találhatók. 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. @@ -387,6 +388,9 @@ Itt még nem támogatott Összetevők betöltése… Nem sikerült telepíteni: %1$s + Ehhez a letöltéshez frissítés szükséges. + A frissítés várólistára került. + Frissítés újra Letöltve %1$s letöltése Telepítés: %1$s @@ -417,6 +421,22 @@ Csak belső Mappa: %1$s Második könyvtár + További Steam-könyvtárak + Mappák, amelyekbe a Steam telepíteni, illetve amelyekből futtatni tud, mindegyik saját név alatt. Egy mappa eltávolítása meghagyja a játékait a tárhelyen. + Könyvtár hozzáadása + Átnevezés + Könyvtár neve + Válasszon mappát a könyvtárnak + Legfeljebb %1$d hozzáadott könyvtár + Ez a mappa már könyvtár, vagy egy könyvtáron belül van + %1$s · nem érhető el + A következő Steam-munkamenettől érvényes + Megtalálva ezen az eszközön · %1$s · %2$s + Hozzáadás + Könyvtárak keresése a belső tárhelyen + Engedélyezze az összes fájl elérését, hogy a DroidDeck láthassa a más alkalmazások által a belső tárhelyen tartott Steam-könyvtárakat + Engedélyezés + Hozzáadva: %1$s, a kiválasztott mappában lévő Steam-könyvtár Az SD-kártyáról vagy megosztott tárhelyről streamelő játékok akadhatnak. Tárhely-diagnosztika Rögzíti a foglalási eredményeket és a mintavételezett tárhelyidőzítéseket a megosztott naplókban. Bekapcsolva lassíthatja a telepítéseket. A következő munkamenettől érvényes. @@ -605,7 +625,10 @@ Kikapcsolja a Proton kontroller-navigációs segédjét, amely minden játékban CPU-t használ. A proot futtatása seccomp nélkül Javíthatja a hiányzó szisztémahívás-hibákat egyes kerneleken. Csökkentheti a teljesítményt. + Futtatás proot nélkül (kísérleti) + A Linux részt közvetlenül az Androidon indítja. A következő munkamenettől érvényes. Kapcsolja ki, ha valami nem indul el. proot gyors útvonal + Proot nélkül nem használható. A proot seccomp-szűrőjét igényli. Gyorsabb fájlkeresés és kevesebb akadás. Kapcsolja ki, ha egy program nem találja a fájljait. A kurzor rajzolása a gamescope-on belül @@ -815,6 +838,7 @@ Az eszköz támogatott Nem tesztelt GPU A GPU nem támogatott + GPU Mali-hídon keresztül %1$s · %2$s %1$s: %2$s Nincs kompatibilis grafikus háttérrendszer ehhez: %1$s. A Steam fekete képernyőt jeleníthet meg. @@ -844,15 +868,38 @@ Munkamenet Munkamenet-naplók Minden munkamenet után mentve + Részletes diagnosztika a következő munkamenethez + Egy munkamenetről részletes naplókat készít. Csökkentheti a teljesítményt és több tárhelyet használhat. A munkamenet indításakor magától kikapcsol; megosztás előtt nézze át a naplókat. Játék-hibakeresési naplók Proton-, Wine- és grafikai diagnosztika a következő játékindításkor. Csökkentheti a teljesítményt, és több tárhelyet használ. Indítsa újra ezt a munkamenetet a játék-hibakeresési naplók mentéséhez Nem sikerült frissíteni a naplózást. Ellenőrizze a kapcsolót, és próbálja újra. Hibakeresési eszközök + Részletes grafikai naplók + Steam felület: GPU-rajzolás + Az Xclipse illesztőprogram-párral a Steam szoftveresen rajzolja az oldalait (a GPU-rajzolás hibás csempéket eredményezett). Kapcsolja be a gyorsabb Steam-felületért, ha ezen a telefonon jól néz ki. + készült: %1$s + %1$s frissült a legújabb buildre + A Mali-híd %1$s esetén a legutóbbi munkamenetben nem ment át az önteszten (képek vagy rajzolási műveletek), ezért a munkamenet helyette a PanVK illesztőprogram-párt használta. + A Mali-híd %1$s esetén a legutóbbi munkamenetben nem talált módot arra, hogy memóriát osszon meg az illesztőprogrammal, ezért a munkamenet helyette a PanVK illesztőprogram-párt használta. A híd nem tud működni ezen a telefonon; a kikapcsolásával a PanVK pár marad használatban. + Az egyes játékok Proton-, DXVK- és illesztőprogram-naplói a munkamenet naplóiban találhatók. Mindig be van kapcsolva, ha a GPU nem Adreno. Legutóbbi munkamenet-naplók Mentett munkamenet-naplók A legújabb %1$d-t tartja meg Naplók törlése + Elérhető munkamenetnaplók + Még nincsenek mentett munkamenetnaplók. + A megosztott és mentett ZIP-fájlok tartalmazzák a kiválasztott munkamenetet, valamint a kapcsolódó Steam-, áruház-, eszköz- és Battle.net-diagnosztikai adatokat. + %1$s · %2$s + Aktuális munkamenet + Megosztás + Mentés az eszközre + Törlés + Munkamenetnaplók törlése? + %1$s törlése? Ez nem vonható vissza. + Munkamenetnaplók mentve. + Nem sikerült menteni a munkamenetnaplókat. + Nem sikerült törölni a munkamenetnaplókat. Minden beállítás visszaállítása Minden beállítást visszaállít az alapértékre Visszaállítás @@ -879,6 +926,8 @@ Használat kezdőképernyőként A DroidDeck lehet a kezdőképernyő alkalmazás A DroidDeck soha nem jelenik meg kezdőképernyő alkalmazásként + A Kezdőlap gomb megnyitja + A lap, amely akkor jelenik meg, ha a DroidDeck a kezdőlap-alkalmazás, és megnyomod a Kezdőlap gombot A Játékok hozzáadása részben állítsd a DroidDecket Belefoglalásra Tájolás Az indító tájolása @@ -892,15 +941,22 @@ Teljes képernyő Elrejti az Android állapot- és navigációs sávokat Megjeleníti az Android állapot- és navigációs sávokat + Kétképernyős indító + Az Automatikus mód a beépített második képernyővel rendelkező kézi eszközökön a második képernyőre helyezi az indító szakaszait (Steam, Könyvtár, Áruházak és a többi). A Be mód bármely második kijelzőt használ. A Ki mód egy képernyőn tartja az indítót. + Kétképernyős munkamenetek + Az Automatikus mód a felugró panel helyett a beépített második képernyőre dokkolja a játékon belüli menüt. A Be mód bármely második kijelzőt használ. A Ki mód a játék képernyőjén tartja a menüt; a menüből továbbra is kiválasztható egy második képernyő. Automatikus Be Ki Alsó képernyős vezérlők játékokban + Android-billentyűzet a szövegmezőkhöz Munkamenet indításakor megnyitja az érintőpadot és a billentyűzetet a második képernyőn. Gépelés a felső képernyőre Kész Alapértelmezett kezdőképernyő alkalmazás Válasszon kezdőképernyő alkalmazást + Az indító elrejtése a Legutóbbiak közül üresjáratban + Csak akkor érvényes, ha a DroidDeck az alapértelmezett kezdőlap-alkalmazás, és nem fut munkamenet. Kiválasztás Linux-alkalmazások (béta) Fájlok @@ -1015,6 +1071,147 @@ Teszt buildek Próbáljon ki egy javítást a kiadása előtt Jelenleg nincs + Kísérleti build + Kísérleti buildek + Használatban + Szüneteltetve, miután az Android újraoptimalizálta a DroidDeck alkalmazást + Nincs betöltve: %1$s + Újraindításra vár + Megtartva + Másik verzióhoz + Újraépítés + Törli ezt a buildet az eszközről + Újraindítás ezzel + Kikapcsolás + Használat + Törlés + Törlés most + Nem sikerült előkészíteni az újraindítást: %1$s. Párosítsa a vezeték nélküli hibakeresést a Beállításokban, és próbálja újra. + Kísérleti build telepítve + A DroidDeck ezzel indult újra: %1$s + A Lab build szüneteltetve + Az Android újraoptimalizálta a DroidDeck alkalmazást, ezért %1$s nincs betöltve. Nyissa meg a Frissítések elemet, és indítsa újra azon. + A Lab build kikapcsolva + A DroidDeck egy másik verziójához készült. A Frissítések tartalmazza. + A DroidDeck kétszer nem indult el rajta + Ügynök + Ügynök + Az ügynök dolgozik + Az ügynök használatához telepítse a Claude Code alkalmazást a Linux felhasználói terébe. + Kérdezzen egy játékról, egy összeomlásról vagy a DroidDeck módosításáról + Küldés + Új beszélgetés + Leállítás + Tárhely + Eltávolítás + Eltávolítás most + Claude Code + Codex + DroidDeck forráskódja + Letöltési gyorsítótárak + A fel nem küldött módosítások elvesznek + A buildek újra letöltik őket + A telepítő újra feltelepítheti; a bejelentkezések megmaradnak + A DroidDeck a Lab build használatával indult újra. Folytassa ott, ahol abbahagyta. + Kérdezze meg, miért nem indul el egy játék, kérjen magyarázatot egy naplóhoz, vagy módosíttassa a DroidDeck alkalmazást, és próbálja ki a változtatást ezen az eszközön. + Hiba: %1$s + %1$s befejeződött (kilépés: %2$d) + Leállítva + Válasz nélkül ért véget + Újrapróbálás + Az ügynök beállítása + Építse újra a Lab build %1$s verziót a DroidDeck telepített kiadásához, és indítsa újra rajta. + %1$s be · %2$s ki + Gondolkodik + Gondolat + Gondolkodik · %1$s + %1$s · %2$s + BEMENET + KIMENET + Fut… + Nincs eredmény: a beszélgetési forduló előbb ért véget + Nincs kimenet + Gépelj a következő üzenet sorba állításához + Sorba állítás + Következő: %1$s + Ne küldd el + Csatolás + Eltávolítás + Alapértelmezett + Gondolkodási erőfeszítés + Mehet + Átdolgozás + Még semmi sem változott + Hajtsd végre a tervet. + Küldés most + Üzenet + Továbbiak + Bezárás + Legújabb + Dolgozik + Kontextus + %1$s / %2$s + Ez a beszélgetés · %1$s + A használati adatok az első válasz után jelennek meg + %1$d órás korlát + %1$d perces korlát + Heti korlát + %1$d%% · visszaáll %2$s + + %1$d fájl + %1$d fájl + + Tervezz először + Tervezés + Tervet javasol, semmit sem változtat + Beszélgetések + Még nincs beszélgetés + Épp most + Törlés + Törli a beszélgetést és a mellékleteit + Folyamatok + Semmi sem fut a Linux-felhasználói térben + ÁGENS + Leállítás + Laboratóriumi build + Laboratóriumi buildek előkészítése + %1$d%% · körülbelül %2$s van hátra + körülbelül %1$s van hátra + Mégse + Build megszakítása + Indítás + %1$d%% + Csomagolás + DroidDeck újraindítása rajta + Kész + Sikertelen: %1$s + Az ágens beállítása + Először telepítsd a Linux-futtatókörnyezetet a Beállításban. + Próbáld újra + Kezdj beszélgetni + Eszközcsatlakozás + Vezeték nélküli hibakeresés, hogy az ágens lássa és vezérelje a DroidDeck alkalmazást + Telepítsd: %1$s + A Linux felhasználói térbe, git, gh és adb támogatással + Bejelentkezés ide: %1$s + Megnyitja a böngészőt + GitHub + Nem kötelező, pull requestek nyitásához + Fordítóeszközök + Nem kötelező, a Lab-fordításokhoz ezen az eszközön · kb. 5 GB + Az agent készen áll + Fejezd be az agent beállítását + Bejelentkezve ide: %1$s + Lab-fordítások + gyors fordítások + Gyors Lab-fordítások + Előre lefordítja ezt a verziót, így a Lab-fordítások percek alatt elkészülnek · egyszeri kb. 20 perc + Fordítás · %1$d%% · kb. %2$s van hátra + Előkészítés + A vezeték nélküli hibakeresés nem érhető el; a Párosítás bekapcsolja + Párosítás + Telepítés + Bejelentkezés PR #%1$d Nincs buildelve ehhez a DroidDeck-másolathoz Frissítve: %1$s @@ -1254,6 +1451,14 @@ Alkalmazások Beállítás Frissítések + Továbbiak + Fülek szerkesztése + Fülek + Látható + A Továbbiakban + Rejtett + %1$s mozgatása felfelé + %1$s mozgatása lefelé %1$d%% %1$s folytatása Minden munkamenetben /root/ROMs néven jelenik meg. A belső tárhely itt található: /root/Storage. @@ -1275,6 +1480,15 @@ Várakozó megszakítása Android billentyűzet Elrejtés ✕ + Méret a képernyőn + A képernyő hányadát foglalja el a billentyűzet, a fejlécet is beleszámítva. + Átlátszatlanság + Csökkentsd, hogy lásd a billentyűzet mögötti játékot. + Rejtett billentyűk + A ritkán használt billentyűk nem jelennek meg a billentyűzeten. + Esc és a funkcióbillentyűk sora + Ins / Del / Home / End / PgUp / PgDn + Nyílbillentyűk %1$s indítása Válasszon képernyőt. Másodlagos: %1$s. A másodlagos kijelző már nem elérhető. @@ -1776,7 +1990,24 @@ Terminál Deck fogók + érintőpadok Irányítópult + Asztal + Az asztal indítása + Asztal · %1$s + Érintőpad + Közvetlen érintés + Érintőpad. Koppintás a közvetlen érintésre váltáshoz + Közvetlen érintés. Koppintás az érintőpadra váltáshoz + A KDE asztal indítása… + Az asztal bezárult. + Az asztal nem indult el. A naplói a munkamenet bottom-desktop mappájában találhatók. + Az asztal zárva van. Itt még nincs mit megjeleníteni. + Képernyők felcserélése + Az alsó képernyő jelenleg nem használható + Játékképernyő + A játék megjelenítése: + Felső képernyő + Alsó képernyő Letöltések Nincs folyamatban lévő letöltés. Steam @@ -1811,6 +2042,20 @@ Üzemanyag, t Fő %1$s t Tartalék %1$s t + Képkockaidő + elmúlt %1$d mp + átlagos képkockaidő + 1%-os minimum + 33 ms feletti képkockák + %1$d / perc + Játék ideje: %1$s + %1$d mag, akár %2$s GHz + %1$d mag + játék + %1$d Hz-es FPS + A piros jelölés jelzi, hol jeleníti meg pirosan a HUD a hőmérsékletet. + teljes eszköz + akkumulátor Műszerfal-adatok küldése Automatikus Bekapcsolja az itt felsorolt összes játéknál, a később talált játékokat is beleértve. A kikapcsolt játékok kikapcsolva maradnak. @@ -1834,6 +2079,10 @@ A mikrofon ki van kapcsolva ennél a játéknál. A beszédhez kapcsolja be a Mikrofon opciót a DroidDeck Steam-beállításaiban (Hang), majd indítsa újra a játékot. Hangerő %1$d%% Játékon belüli statisztikák + HUD az alsó képernyőn + Sáv minden lapon + 1%- és 0,1%-os minimumok + CPU-hőmérséklet FPS CPU GPU @@ -2006,6 +2255,7 @@ A munkamenet indítása… %1$d:%2$02d eltelt · még dolgozik A Steam-kliens frissítésének letöltése · %1$d%% + A Steam-kliens frissítésének alkalmazása… A Steam-kliens letöltése · %1$s Már fut egy kompatibilitási eszköz telepítése @@ -2082,11 +2332,29 @@ Rajzfilmes körvonalak plusz élesítés. Nem Adreno GPU + A rendszer PowerVR-illesztőprogramja: a kompatibilitás eszközönként változó + Kísérleti: RADV vagy a rendszer Xclipse-illesztőprogramja + Rendszer PowerVR + A GPU beépített illesztőprogramjait használja + A rendszer PowerVR illesztőprogramja van kiválasztva a futtatókörnyezethez és a megjelenítéshez. + Ezt a Mali-t még egyetlen nyílt illesztőprogram sem támogatja: a Mali híd be van kapcsolva. + Ez a nem Snapdragon tesztváltozat: az itteni hivatalos változatok csak Adreno-n futnak, ezért nem települnek rá. Az új tesztváltozatok a github.com/The412Banner/droiddeck-nonadreno-drivers címen érhetők el. + Az előző munkamenet azért ért véget, mert az Android memória felszabadítása miatt bezárta a DroidDeck alkalmazást, nem pedig összeomlás történt. Zárj be más alkalmazásokat, vagy csökkentsd a játék textúrabeállításait, majd próbáld újra. + Mali (Venus) + a Mali híd + Ezt a Mali-t még egyetlen nyílt illesztőprogram sem támogatja: %1$s van használatban, a telefon saját illesztőprogramján. + %1$s még nincs kiadva: addig %2$s van használatban. + %1$s nem érhető el, és a telefon illesztőprogramja Vulkan %2$s verziót jelez (a Venus 1.2-t igényel): a Mali híd van használatban. + %1$s még nincs kiadva: addig a Mali híd be van kapcsolva. + Várólistán: %1$s (egy másik futtatókörnyezet-illesztőprogramra vár) + A DXVK-t a rendszer PowerVR futtatókörnyezete biztosítja. Más DXVK-csomagok tárolhatók, de ezzel az illesztőprogrammal nem kerülnek alkalmazásra. Támogatott Kísérleti: az illesztőprogramjai teszt buildek Kísérleti Adreno 850-támogatás: kompatibilis kísérleti kijelző- és játék-illesztőprogramokat igényel; ezen az eszközön nincs ellenőrizve A tesztelt hardver alatt (Adreno 725 és újabb): lehet, hogy nem fut Nem támogatott: nincs kompatibilis grafikus háttérrendszer ehhez a GPU-hoz + A Mali hídon keresztül, a telefon saját Vulkan illesztőprogramján fut + Nem támogatott, ha a Mali híd ki van kapcsolva: a Turnip Adreno (Snapdragon) GPU-t igényel A GitHub korlátja elérve – próbálja újra később A GitHub HTTP %1$d választ adott @@ -2287,6 +2555,13 @@ Rendezés Oldalsáv-feliratok Nevek megjelenítése az oldalsáv ikonjai alatt. Kapcsolja ki a keskenyebb oldalsávhoz. + Az ügynök kisállata + A DeeDee az indító és a játékok felett lebeg, és megmutatja, mit csinál az ügynök. + Más alkalmazások felett + Engedd, hogy DeeDee minden alkalmazás felett lebegjen és ott nyissa meg a csevegést + Engedélyezés + DeeDee + Csevegés DeeDee-vel Megjelenítés Nagyobb kártyák Kisebb kártyák @@ -2574,6 +2849,11 @@ Fejlesztő Buildcímke vízjelként A tesztbuild vagy Lab-build címkéjének megjelenítése a képernyőn. Alapértelmezés szerint bekapcsolva. + Diagnosztikai csomagok megosztása + Munkamenet és eszköz + Grafika + Játékok és kompatibilitás + Összes csomag Készen áll a játékra Még nem áll készen a játékra futtatókörnyezet: %1$s @@ -2612,6 +2892,9 @@ Kapcsold be a GOG-eredményeket a Store-beállításokban Eredmények nem elérhetők; nézd meg a munkamenet-naplókat Eredmény feloldva + Mali (Venus): ki + Mali (Venus): be + %1$s illesztőprogramja Vulkan %2$s verziót jelez. A Mali (Venus) legalább Vulkan 1.2-t igényel (régebbi verziókon a gamescope nem indul el), ezért a munkamenetek kihagyják a Venust, és helyette a PanVK illesztőprogrampárt használják. Beillesztés Bal kar Jobb kar @@ -2967,6 +3250,7 @@ A játékokhoz szükséges VC++ és DirectX telepítések Linux x86-os játékokat futtat Steam-eszköz + A Steam ezt azokhoz a játékokhoz tölti le, amelyek csalás elleni védelmet tartalmaznak, akkor is, ha ki van kapcsolva. Ha eltávolítod, a telepítésük 0%-nál elakad. A DroidDeck e futtatókörnyezet nélkül futtat játékokat Proton x86, amit a DroidDeck nem tud futtatni Alapértelmezett minden játéknak @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps A 60 fps simább, de jobban terheli a processzort a Steam indulása közben. A Steam saját beállításaiban választott videó itt is megjelenik. Hang + Indítási videó kihagyása + Egy 0,1 másodperces fekete klipet használ a Steam indítási videójaként. A következő munkamenetben lép érvénybe. Saját videó MP4, MOV, MKV vagy WebM. Más formátumokat és a %1$d MB-nál nagyobb fájlokat az eszköz 720p WebM-re alakítja, legfeljebb %2$d másodpercig. Importálás @@ -3538,6 +3824,7 @@ Az Alt+Tab, a Win billentyű és a Kezdőlap gomb az aktív DroidDeck-munkamenetben marad az Android helyett. Kapcsolja be a Fényerőt itt: Beállítás → Steam-integráció Mali híd: ki + %1$s nem használhatja a Mali hidat (ehhez olyan Mali GPU kell, amelyhez nincs rendszer-illesztőprogramos útvonal), ezért ennek a kapcsolónak itt nincs hatása. Mali híd: be A(z) %1$s nem Adreno. A kísérleti Vulkan híd be van kapcsolva: a munkamenet a telefon saját illesztőprogramján keresztül rajzol. Hibákra számíts; küldd el a munkamenet naplóit. Biztonságos mód @@ -3697,6 +3984,7 @@ Ez az elrendezés nem importálható Skarlátvörös hó + Fehér felületek piros kiemelésekkel. Soundtrackek Zene @@ -3760,4 +4048,6 @@ Egy ismétlése Hangerő Nincs hangfájl ebben a soundtrackben + Indítás nem elérhető + Nincs elérhető webböngésző a hivatkozás megnyitásához. diff --git a/app/src/main/res/values-in/input_library.xml b/app/src/main/res/values-in/input_library.xml new file mode 100644 index 0000000000..f24780d5cc --- /dev/null +++ b/app/src/main/res/values-in/input_library.xml @@ -0,0 +1,132 @@ + + + Setelan input yang tidak terbaca disimpan dalam salinan pemulihan. Anda dapat terus mengedit profil yang dipulihkan. + Properti + Properti klik + %1$s · Klik + Tombol + Stik, pad, dan pemicu + Sembunyikan alat + Pengontrol + Kirim input pengontrol ke Steam Input atau game. + Elemen ini tidak mengirim input pengontrol, mouse, atau keyboard. + Klik mouse + Tindakan DroidDeck + Tindakan + Kecepatan gulir: %1$d langkah/dtk + + Profil baru + + Tata letak baru + %1$s · Digunakan oleh %2$d profil. Perubahan berlaku untuk setiap profil yang memakai penetapan ini. + Ganti nama + Hapus + Tambahkan elemen ke tata letak sebelum menetapkan tindakannya. + Tidak dapat menyimpan setelan input + Nama + Mulai dari + Tombol + Stik + Touchpad + D-pad + Pemicu + Selesai + Urungkan + + Tambah + Seret untuk memindahkan. Seret sudut untuk mengubah ukuran. Ketuk Properti untuk menetapkan tindakan. + Mengedit di layar sekunder + Layar yang dipilih tidak tersedia. Hubungkan untuk mengedit tata letak ini pada ukuran sebenarnya. + Buang perubahan tata letak yang belum disimpan? + Tata letak ini digunakan oleh %1$d profil. Perubahan tersimpan berlaku untuk semuanya. + Profil bawaan + Mode desktop + Mode game + Bawaan untuk desktop dan game + Bawaan untuk mode game + Bawaan untuk mode desktop + Setelan perangkat + Kontrol + Tombol, stik, pemicu, dan tombol tambahan + Salin profil + Atur ulang tindakan + Atur ulang tindakan di %1$s ke bawaan profil dasarnya? Tata letak dan profil lain tidak berubah. + Hapus %1$s? Mode yang memakainya akan kembali ke profil bawaan bawaannya. Tata letak tersimpan dan setelan bersama tetap tersedia. + Visibilitas + Berlaku untuk semua profil. Auto menampilkan kontrol layar utama saat tidak ada pengontrol terhubung di mode game. + Edit di layar + Tata letak tersimpan… + Pilih tata letak atau buat sendiri + Pilih Kontrol profil di menu sesi layar sekunder. Pemilih Profil dan Layar sekunder di menu pengontrol menentukan kontrol yang ditampilkan. + Tindakan tombol + Dibagikan dengan %1$s. Edit juga berlaku untuk profil tersebut. + Gunakan ulang setelan + Gunakan setelan dari… + Salin dari profil lain atau biarkan setelan dibagikan + Jadikan mandiri + Pertahankan pengaturan saat ini dan berhenti membagikan perubahan + Tata letak menyimpan elemen dan posisinya. Setiap profil dapat menetapkan tindakannya sendiri. Edit pada ukuran penuh di layar target. + Tata letak saat ini + Hapus tata letak yang tidak terpakai %1$s dan tindakan tersimpannya? + Ganti nama tata letak saat ini + Gunakan ulang %1$s dari profil lain. Sumber kontrol lain tetap tidak berubah. + Biarkan kontrol fisik dibagikan + Secara bawaan, semua kontrol dan tata letak khusus adalah salinan independen. Berbagi hanya menautkan kontrol fisik. + Gunakan elemen dan posisi ini. Berbagi menjaga perubahan geometri mendatang tetap sinkron; tindakan tombol Anda tetap independen. Tata letak berbeda dimulai dengan tindakan yang belum ditetapkan. + Salin kontrol dan tindakan ini, atau tautkan agar perubahan mendatang berlaku untuk kedua profil. + Biarkan dibagikan + Salinan independen + Mulai stik di posisi sentuh + Sembunyikan stik saat tidak digunakan + Alat + Otomatis (%1$s) + Khusus (%1$s) + Simpan sebagai profil baru + Kontrol profil + Profil + Gestur touchpad mouse + Jika ditetapkan ke penunjuk mouse: ketuk untuk klik, tahan untuk menyeret, dan gulir dengan dua jari. + %1$s memiliki penggantian menu cepat. Pilih Otomatis di sana untuk memakai profil bawaan dan ketiga bagian tersimpannya. + Input DroidDeck + Ditahan saat stik digerakkan ke segala arah: tekan di atas 55%, lepas di bawah 35%. Gunakan Tombol arah untuk menetapkan tiap arah secara terpisah. Perintah DroidDeck berjalan sekali per defleksi. Klik stik diatur terpisah. + Ditahan saat menyentuh touchpad; dilepas saat jari diangkat. Perintah DroidDeck berjalan sekali per sentuhan. Klik touchpad diatur terpisah. + Ditahan saat pemicu melewati 55%; dilepas di bawah 35%. Perintah DroidDeck berjalan sekali per penekanan. + Arah gulir + Vertikal + Horizontal + Gulir horizontal + Pengukuran + Aktifkan perekaman, gunakan kontrol dalam sesi berjalan, lalu kembali dan baca hasilnya. Hanya mengukur waktu pengiriman DroidDeck, bukan latensi layar. Perekaman berakhir saat proses aplikasi ditutup. + %1$d kontrol + Tata letak tersimpan lain (%1$d) ▾ + Sembunyikan tata letak tersimpan lain (%1$d) ▴ + Beranda / Guide + Kembali · satu ketuk + Kembali · ketuk dua kali + Kembali · dua kali di Steam, sekali di desktop + Di mode Steam. Menahan Kembali juga membuka akses cepat. + Pulihkan ke bawaan + Pilihan panel Anda diingat. Desktop membuka ruang kerja kedua; tidak mengganti sesi atau profil inputnya. + Pengontrol virtual + Jenis pengontrol yang dilihat Steam atau game. + Layar sentuh + Cara sentuhan di layar game ditangani. Tombol profil tetap memakai tindakan yang ditetapkan. + Kursor sentuh + Tampilkan penunjuk untuk sentuhan langsung di layar game. + Sentuh dan tahan + Tindakan mouse saat menahan jari di layar game. + Ketukan tombol Kembali + Tindakan pertama: satu ketuk. Tindakan kedua: dua ketuk. + Tombol sakelar + Ketuk untuk menahan, ketuk lagi untuk melepas. Membuka menu atau mengganti profil melepas tombol. + Bentuk + Membulat + Pil + Lingkaran + Persegi panjang + Label tombol + Teks + Gambar yang diimpor + Tombol diagonal terpisah + Tetapkan tombol untuk setiap diagonal. Diagonal kosong menekan dua arah tetangganya. + Arah tetangga + Tombol layar lama Anda disimpan sebagai profil impor di bawah. Pilih satu untuk dipakai atau diedit. Pilihan profil Anda saat ini dipertahankan. + Tombol layar lama tidak dapat diimpor otomatis. Setelan asli dipertahankan. + diff --git a/app/src/main/res/values-in/input_strings.xml b/app/src/main/res/values-in/input_strings.xml new file mode 100644 index 0000000000..c115e8a9e2 --- /dev/null +++ b/app/src/main/res/values-in/input_strings.xml @@ -0,0 +1,38 @@ + + + Profil input + Profil + Pengontrol fisik + Layar utama + Layar sekunder + Asli / Steam Input + Asli: %1$s + Kirim kontrol pengontrol lain + Dinonaktifkan + Tombol atau kombinasi tombol + Tombol arah + Gerakkan penunjuk + Kecepatan penunjuk: %1$d + Gulir + Gulir vertikal + Tombol kiri mouse + Tombol kanan mouse + Tombol tengah mouse + Buka menu DroidDeck + Tampilkan keyboard + Buka menu Steam + Buka akses cepat Steam + Hapus kontrol + Tambah kontrol + Tombol khusus perangkat + Tetapkan tombol fisik + Lepaskan tombol, lalu pilih Edit, Coba lagi, atau Batal. B atau Kembali membatalkan setelah dilepas. + Coba lagi + Tekan tombol, termasuk tombol Kembali yang dilaporkan sebagai tombol keyboard. Tombol volume dan sistem Android dicadangkan. Penetapan hanya berlaku untuk perangkat ini. + Hapus penetapan + Diagnostik input + Catat waktu pengiriman input + Baca pengukuran + Mengukur pengiriman dari Android hingga publikasi ke transport input yang ada. Tidak termasuk kedatangan Bluetooth, polling tamu, rendering, dan latensi layar. Perekaman mati secara default. + Gunakan penetapan input normal + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1f23d84b1b..b8208ba633 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -185,6 +185,7 @@ Lingkungan grafis PowerVR tidak dapat diunduh. Periksa koneksi dan coba lagi. DirectAudio tidak dapat diunduh, jadi audio gim menggunakan jalur yang lebih lambat di sesi ini. Program ini + Sesi gagal menampilkan gambar ke layar: %1$s. Layar ini menunjukkan alasannya, bukan layar hitam; rinciannya ada di log sesi. 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. @@ -386,6 +387,9 @@ Belum didukung di sini Memuat komponen… Tidak dapat menginstal: %1$s + Unduhan ini perlu diperbarui. + Pembaruan mengantre. + Coba lagi pembaruan Terunduh Mengunduh %1$s Menginstal: %1$s @@ -416,6 +420,22 @@ Hanya internal Folder: %1$s Pustaka kedua + Pustaka Steam lainnya + Folder yang bisa dipakai Steam untuk memasang dan menjalankan game, masing-masing dengan namanya sendiri. Menghapus satu folder tidak menghapus game yang ada di penyimpanan. + Tambah pustaka + Ganti nama + Nama pustaka + Pilih folder untuk pustaka + Maksimal %1$d pustaka tambahan + Folder itu sudah menjadi pustaka atau berada di dalam pustaka lain + %1$s · tidak tersedia + Berlaku mulai sesi Steam berikutnya + Ditemukan di perangkat ini · %1$s · %2$s + Tambah + Temukan pustaka di penyimpanan internal + Izinkan akses semua file agar DroidDeck dapat melihat pustaka Steam yang disimpan aplikasi lain di penyimpanan internal + Izinkan + Ditambahkan %1$s, pustaka Steam di dalam folder yang Anda pilih Gim yang melakukan streaming aset dari SD atau penyimpanan bersama dapat tersendat. Diagnostik penyimpanan Mencatat hasil alokasi dan waktu penyimpanan yang disampel di Bagikan log. Dapat memperlambat instalasi saat diaktifkan. Berlaku pada sesi berikutnya. @@ -603,7 +623,10 @@ Menonaktifkan bantuan navigasi gamepad milik Proton, yang menggunakan CPU di setiap gim. Jalankan proot tanpa seccomp Dapat memperbaiki galat syscall yang hilang pada beberapa kernel. Dapat mengurangi performa. + Jalankan tanpa proot (eksperimental) + Menjalankan sisi Linux langsung di Android. Berlaku untuk sesi berikutnya. Nonaktifkan jika ada yang gagal dimulai. Jalur cepat proot + Tidak digunakan tanpa proot. Memerlukan filter seccomp milik proot. Pencarian file lebih cepat dan lebih sedikit tersendat. Nonaktifkan jika program tidak dapat menemukan filenya. Gambar kursor di dalam gamescope @@ -812,6 +835,7 @@ Perangkat didukung GPU belum diuji GPU tidak didukung + GPU melalui jembatan Mali %1$s · %2$s %1$s: %2$s Tidak ada backend grafis yang kompatibel untuk %1$s. Steam mungkin menampilkan layar hitam. @@ -841,15 +865,38 @@ Sesi Log sesi Disimpan setelah setiap sesi + Diagnostik lanjutan untuk sesi berikutnya + Merekam log rinci untuk satu sesi. Dapat menurunkan performa dan menggunakan lebih banyak penyimpanan. Nonaktif dengan sendirinya saat sesi dimulai; tinjau log sebelum membagikannya. Log debug gim Sertakan diagnostik Proton, Wine, dan grafis pada peluncuran gim berikutnya. Dapat mengurangi performa dan memakai lebih banyak penyimpanan. Mulai ulang sesi ini untuk menyimpan log debug gim Tidak dapat memperbarui pencatatan log. Periksa tombolnya lalu coba lagi. Alat debug + Log grafis rinci + Antarmuka Steam: rendering GPU + Dengan pasangan driver Xclipse, Steam menggambar halamannya secara perangkat lunak (rendering GPU menampilkan ubin yang rusak). Aktifkan untuk antarmuka Steam yang lebih cepat jika tampilannya terlihat benar di ponsel ini. + dibuat %1$s + %1$s diperbarui ke build terbaru + Jembatan Mali gagal uji mandiri pada %1$s saat sesi terakhir (gambar atau perintah menggambar), sehingga sesi tersebut menggunakan pasangan driver PanVK sebagai gantinya. + Jembatan Mali tidak menemukan cara berbagi memori dengan driver pada %1$s saat sesi terakhir, sehingga sesi tersebut menggunakan pasangan driver PanVK sebagai gantinya. Jembatan ini tidak dapat berfungsi di ponsel ini; menonaktifkannya membuat pasangan PanVK tetap dipakai. + Log Proton, DXVK, dan driver setiap game disertakan dalam log sesi. Selalu aktif bila GPU bukan Adreno. Log sesi terbaru Log sesi tersimpan Menyimpan %1$d terbaru Hapus log + Log sesi yang tersedia + Belum ada log sesi tersimpan. + File ZIP yang dibagikan maupun disimpan menyertakan sesi yang dipilih beserta diagnostik terkait Steam, toko, alat, dan Battle.net. + %1$s · %2$s + Sesi saat ini + Bagikan + Simpan ke perangkat + Hapus + Hapus log sesi? + Hapus %1$s? Tindakan ini tidak dapat dibatalkan. + Log sesi tersimpan. + Tidak dapat menyimpan log sesi. + Tidak dapat menghapus log sesi. Setel ulang semua setelan Kembalikan setiap setelan ke nilai bawaannya Setel ulang @@ -876,6 +923,8 @@ Gunakan sebagai Layar Utama DroidDeck dapat menjadi aplikasi Utama DroidDeck tidak pernah ditawarkan sebagai aplikasi Utama + Tombol Beranda membuka + Halaman yang ditampilkan saat DroidDeck menjadi aplikasi Beranda dan Anda menekan tombol Beranda Di Tambahkan Game, setel DroidDeck ke Sertakan Orientasi Orientasi peluncur @@ -889,15 +938,22 @@ Layar penuh Menyembunyikan bilah status dan navigasi Android Menampilkan bilah status dan navigasi Android + Peluncur layar ganda + Otomatis menempatkan bagian peluncur (Steam, Pustaka, Toko, dan bagian lainnya) pada layar kedua bawaan perangkat genggam. Aktif memakai layar kedua mana pun. Nonaktif membuat peluncur tetap di satu layar saja. + Sesi layar ganda + Otomatis menempatkan menu dalam game di layar kedua bawaan alih-alih sebagai pop-over. Aktif memakai layar kedua mana pun. Nonaktif menjaga menu tetap di layar game; Anda masih dapat memilih layar kedua dari menu tersebut. Otomatis Aktif Nonaktif Kontrol layar bawah dalam game + Keyboard Android untuk kolom teks Membuka trackpad dan keyboard di layar kedua saat sesi dimulai. Mengetik untuk layar atas Selesai Aplikasi Utama default Pilih aplikasi Utama + Sembunyikan peluncur dari Aplikasi terbaru saat tidak aktif + Hanya berlaku saat DroidDeck menjadi aplikasi Beranda default dan tidak ada sesi yang berjalan. Pilih Aplikasi Linux (beta) File @@ -1012,6 +1068,147 @@ Build pengujian Coba perbaikan sebelum dirilis Tidak ada saat ini + Build Lab + Build Lab + Sedang digunakan + Dijeda setelah Android mengoptimalkan ulang DroidDeck + Tidak dimuat: %1$s + Menunggu mulai ulang + Dipertahankan + Untuk versi lain + Bangun ulang + Menghapus build ini dari perangkat + Mulai ulang dengan build ini + Nonaktifkan + Gunakan + Hapus + Hapus sekarang + Tidak dapat menyiapkan mulai ulang: %1$s. Pasangkan debug nirkabel di Penyiapan lalu coba lagi. + Build Lab terpasang + DroidDeck dimulai ulang pada %1$s + Build Lab dijeda + Android mengoptimalkan ulang DroidDeck, sehingga %1$s tidak dimuat. Buka Pembaruan untuk memulai ulang dengannya. + Build Lab dinonaktifkan + Build itu dibuat untuk versi DroidDeck lain. Disimpan di Pembaruan. + DroidDeck gagal dimulai dengannya dua kali. + Agen + Agen + Agen sedang bekerja + Pasang Claude Code di lingkungan pengguna Linux untuk menggunakan agen. + Tanyakan tentang sebuah game, crash, atau perubahan pada DroidDeck + Kirim + Percakapan baru + Hentikan + Penyimpanan + Hapus + Hapus sekarang + Claude Code + Codex + Kode sumber DroidDeck + Cache unduhan + Perubahan yang tidak di-push akan hilang + Build akan mengunduhnya lagi + Penyiapan dapat memasangnya lagi; sesi login tetap tersimpan + DroidDeck dimulai ulang pada build Lab Anda. Lanjutkan dari mana Anda berhenti. + Tanyakan mengapa sebuah game tidak bisa dijalankan, minta penjelasan sebuah log, atau minta untuk mengubah DroidDeck lalu coba perubahannya di perangkat ini. + Gagal: %1$s + %1$s berakhir (kode keluar %2$d) + Dihentikan + Berakhir tanpa balasan + Coba lagi + Menyiapkan agen + Buat ulang build Lab %1$s saya untuk versi DroidDeck yang terpasang, lalu mulai ulang dengannya. + %1$s masuk · %2$s keluar + Sedang berpikir + Pemikiran + Sedang berpikir · %1$s + %1$s · %2$s + MASUKAN + KELUARAN + Sedang berjalan… + Tidak ada hasil: giliran berakhir lebih dulu + Tidak ada keluaran + Ketik untuk mengantrekan pesan berikutnya + Antrekan + Berikutnya: %1$s + Jangan kirim + Lampirkan + Hapus + Default + Upaya penalaran + Jalankan + Revisi + Belum ada perubahan + Jalankan rencana ini. + Kirim sekarang + Pesan + Lainnya + Tutup + Terbaru + Sedang bekerja + Konteks + %1$s dari %2$s + Percakapan ini · %1$s + Penggunaan muncul setelah balasan pertama + Batas %1$d jam + Batas %1$d menit + Batas mingguan + %1$d%% · diatur ulang %2$s + + %1$d berkas + %1$d berkas + + Rencanakan dulu + Rencana + Mengusulkan rencana tanpa mengubah apa pun + Percakapan + Belum ada percakapan + Baru saja + Hapus + Menghapusnya beserta lampirannya + Proses + Tidak ada yang berjalan di ruang pengguna Linux + AGEN + Hentikan + Build Lab + Menyiapkan build Lab + %1$d%% · sekitar %2$s lagi + sekitar %1$s lagi + Batalkan + Batalkan build + Memulai + %1$d%% + Mengemas + Memulai ulang DroidDeck pada build tersebut + Selesai + Gagal: %1$s + Siapkan agen + Instal runtime Linux di Penyiapan terlebih dahulu. + Coba lagi + Mulai mengobrol + Koneksi perangkat + Debugging nirkabel, agar agen dapat melihat dan mengendalikan DroidDeck + Instal %1$s + Ke dalam userland Linux, beserta git, gh, dan adb + Masuk ke %1$s + Membuka browser Anda + GitHub + Opsional, untuk membuka pull request + Alat build + Opsional, untuk build Lab di perangkat ini · sekitar 5 GB + Agen siap + Selesaikan penyiapan agen + Sudah masuk ke %1$s + Build Lab + build cepat + Build Lab cepat + Mengompilasi versi ini lebih dulu, agar build Lab hanya butuh beberapa menit · sekitar 20 menit, cukup sekali + Mengompilasi · %1$d%% · sekitar %2$s tersisa + Siapkan + Debug nirkabel tidak dapat dijangkau; Pasangkan menyalakannya + Pasangkan + Pasang + Masuk PR #%1$d Tidak dibuat untuk salinan DroidDeck ini Diperbarui %1$s @@ -1247,6 +1444,14 @@ Aplikasi Penyiapan Pembaruan + Lainnya + Edit tab + Tab + Ditampilkan + Di Lainnya + Disembunyikan + Pindahkan %1$s ke atas + Pindahkan %1$s ke bawah %1$d%% Lanjutkan %1$s Muncul sebagai /root/ROMs di setiap sesi. Penyimpanan internal berada di /root/Storage. @@ -1268,6 +1473,15 @@ Batalkan antrean Keyboard Android Sembunyikan ✕ + Ukuran di layar + Porsi layar yang dipakai keyboard, termasuk header. + Opasitas + Turunkan agar game di belakang keyboard terlihat. + Tombol tersembunyi + Tombol yang jarang dipakai tidak ditampilkan di keyboard. + Baris Esc dan fungsi + Ins / Del / Home / End / PgUp / PgDn + Tombol panah Luncurkan %1$s Pilih layar. Sekunder: %1$s. Layar sekunder tidak lagi tersedia. @@ -1752,7 +1966,24 @@ Terminal Pegangan Deck + trackpad Dasbor + Desktop + Mulai desktop + Desktop · %1$s + Trackpad + Sentuhan langsung + Trackpad. Ketuk untuk sentuhan langsung + Sentuhan langsung. Ketuk untuk trackpad + Memulai desktop KDE… + Desktop ditutup. + Desktop tidak dapat dimulai. Log-nya ada di folder bottom-desktop sesi ini. + Desktop tertutup. Belum ada yang bisa ditampilkan di sini. + Tukar layar + Layar bawah sedang tidak tersedia + Layar game + Tampilkan game di + Layar atas + Layar bawah Unduhan Tidak ada unduhan yang berjalan. Steam @@ -1787,6 +2018,20 @@ Bahan bakar, t Utama %1$s t Cadangan %1$s t + Waktu frame + %1$d s terakhir + rata-rata frame + 1% terendah + frame di atas 33 ms + %1$d / min + Bermain selama %1$s + %1$d inti, hingga %2$s GHz + %1$d inti + game + FPS dari %1$d Hz + Tanda merah adalah batas saat HUD menampilkan suhu berwarna merah. + seluruh perangkat + baterai Kirim data dasbor Otomatis Mengaktifkannya untuk setiap gim yang tercantum di sini, termasuk gim yang ditemukan nanti. Gim yang Anda matikan tetap mati. @@ -1810,6 +2055,10 @@ Mik mati untuk gim ini. Untuk berbicara, aktifkan Mikrofon di setelan Steam DroidDeck (Audio) lalu mulai gim lagi. Volume %1$d%% Statistik dalam gim + HUD layar bawah + Strip di setiap tab + 1% dan 0,1% terendah + Suhu CPU FPS CPU GPU @@ -1981,6 +2230,7 @@ Memulai sesi… %1$d:%2$02d berlalu · masih berjalan Mengunduh pembaruan klien Steam · %1$d%% + Menerapkan pembaruan klien Steam… Mengunduh klien Steam · %1$s Instalasi alat kompatibilitas sedang berjalan @@ -2057,11 +2307,29 @@ Garis luar toon ditambah penajaman. Bukan GPU Adreno + Driver PowerVR sistem: kompatibilitas berbeda tiap perangkat + Eksperimental: RADV atau driver Xclipse sistem + PowerVR sistem + Menggunakan driver bawaan untuk GPU ini + Driver PowerVR sistem dipilih untuk runtime dan tampilan. + Belum ada driver terbuka yang mendukung Mali ini: jembatan Mali aktif. + Ini adalah build uji non-Snapdragon: build resmi di sini hanya berjalan di Adreno, jadi build resmi tidak dipasang menggantikannya. Build uji baru tersedia di github.com/The412Banner/droiddeck-nonadreno-drivers. + Sesi terakhir berakhir karena Android menutup DroidDeck untuk membebaskan memori, bukan karena crash. Tutup aplikasi lain atau turunkan pengaturan tekstur game, lalu coba lagi. + Mali (Venus) + jembatan Mali + Belum ada driver terbuka yang mendukung Mali ini: %1$s digunakan, dengan driver bawaan ponsel. + %1$s belum dirilis: %2$s digunakan sampai rilisnya. + %1$s tidak tersedia, dan driver ponsel ini melaporkan Vulkan %2$s (Venus membutuhkan 1.2): jembatan Mali digunakan. + %1$s belum dirilis: jembatan Mali aktif sampai rilisnya. + Diantrekan: %1$s (menunggu driver runtime yang berbeda) + DXVK disediakan oleh runtime PowerVR sistem. Paket DXVK lain bisa disimpan, tetapi tidak diterapkan dengan driver ini. Didukung Eksperimental: drivernya adalah build uji Dukungan eksperimental Adreno 850: memerlukan driver tampilan dan driver gim eksperimental yang kompatibel; belum diverifikasi di perangkat ini Di bawah perangkat keras yang diuji (Adreno 725 dan lebih baru): mungkin tidak dapat berjalan Tidak didukung: tidak ada backend grafis yang kompatibel untuk GPU ini + Berjalan lewat jembatan Mali, dengan driver Vulkan bawaan ponsel + Tidak didukung saat jembatan Mali nonaktif: Turnip membutuhkan GPU Adreno (Snapdragon) Batas kecepatan GitHub tercapai - coba lagi nanti GitHub merespons HTTP %1$d @@ -2262,6 +2530,13 @@ Urutkan Label bilah samping Tampilkan nama di bawah ikon bilah samping. Nonaktifkan untuk bilah samping yang lebih ramping. + Peliharaan agen + DeeDee melayang di atas peluncur dan game serta menampilkan apa yang sedang dilakukan agen. + Di atas aplikasi lain + Izinkan DeeDee melayang di atas semua aplikasi dan membuka obrolannya di sana + Izinkan + DeeDee + Chat dengan DeeDee Tampilan Kartu lebih besar Kartu lebih kecil @@ -2547,6 +2822,11 @@ Developer Tanda air label build Tampilkan label build pengujian atau Lab di layar. Aktif secara default. + Bagikan paket diagnostik + Sesi dan perangkat + Grafis + Game dan kompatibilitas + Semua paket Siap bermain Belum siap bermain runtime %1$s @@ -2585,6 +2865,9 @@ Aktifkan pencapaian GOG di setelan Stores Pencapaian tidak tersedia; periksa log sesi Pencapaian terbuka + Mali (Venus): nonaktif + Mali (Venus): aktif + Driver pada %1$s melaporkan Vulkan %2$s. Mali (Venus) membutuhkan Vulkan 1.2 atau lebih baru (gamescope tidak berjalan di versi yang lebih lama), jadi sesi tidak memakai Venus dan menggunakan pasangan driver PanVK sebagai gantinya. Tempel Stik kiri Stik kanan @@ -2938,6 +3221,7 @@ Instalan VC++ dan DirectX yang dibutuhkan gim Menjalankan gim Linux x86 Alat Steam + Steam mengunduh ini untuk game yang menyertakan anti-cheat, bahkan saat anti-cheat tidak aktif. Menghapusnya membuat instalasi game tersebut mandek di 0% DroidDeck menjalankan gim tanpa runtime ini Proton x86, yang tidak bisa dijalankan DroidDeck Bawaan untuk semua gim @@ -3048,6 +3332,8 @@ DroidDeck · %1$d fps 60 fps terlihat lebih mulus tetapi memakai lebih banyak CPU saat Steam dimulai. Video yang dipilih di pengaturan Steam sendiri juga muncul di sini. Suara + Lewati video pembukaan + Gunakan klip hitam berdurasi 0,1 detik sebagai video pembukaan Steam. Berlaku pada sesi berikutnya. Video sendiri MP4, MOV, MKV, atau WebM. Format lain dan file di atas %1$d MB dikonversi ke WebM 720p di perangkat, hingga %2$d detik. Impor @@ -3509,6 +3795,7 @@ Menjaga Alt+Tab, tombol Win, dan tombol Beranda tetap di sesi DroidDeck yang aktif, bukan di Android. Aktifkan Kecerahan di Penyiapan → Integrasi Steam Jembatan Mali: mati + %1$s tidak dapat menggunakan jembatan Mali (jembatan ini membutuhkan GPU Mali tanpa jalur driver sistem), sehingga sakelar ini tidak berpengaruh di sini. Jembatan Mali: nyala %1$s bukan Adreno. Jembatan Vulkan eksperimental menyala: sesi menggambar melalui driver ponsel itu sendiri. Bersiaplah menemui bug; kirim log sesi. Mode aman @@ -3667,6 +3954,7 @@ Tata letak ini tidak dapat diimpor Salju Kirmizi + Permukaan putih dengan aksen merah. Soundtrack Musik @@ -3730,4 +4018,6 @@ Ulangi satu Volume Tidak ada file audio di soundtrack ini + Peluncuran tidak tersedia + Tidak ada browser web yang tersedia untuk membuka tautan ini. diff --git a/app/src/main/res/values-it/input_library.xml b/app/src/main/res/values-it/input_library.xml new file mode 100644 index 0000000000..87061db293 --- /dev/null +++ b/app/src/main/res/values-it/input_library.xml @@ -0,0 +1,132 @@ + + + Il display selezionato non è disponibile. Collegalo per modificare questo layout alle sue dimensioni reali. + Ignorare le modifiche al layout non salvate? + Questo layout è usato da %1$d profili. Le modifiche salvate valgono per tutti. + Profili predefiniti + Modalità desktop + Modalità gioco + Predefinito per desktop e gioco + Predefinito per la modalità gioco + Predefinito per la modalità desktop + Impostazioni del dispositivo + Controlli + Pulsanti, stick, grilletti e tasti extra + Copia profilo + Reimposta azioni + Reimpostare le azioni in %1$s ai valori predefiniti del profilo base? I layout e gli altri profili restano invariati. + Eliminare %1$s? Le modalità che lo usano torneranno al profilo predefinito integrato. I layout salvati e le impostazioni condivise resteranno disponibili. + Visibilità + Vale per tutti i profili. Auto mostra i controlli dello schermo principale quando in modalità gioco non è collegato un controller. + Modifica su schermo + Layout salvati… + Scegli un layout o creane uno tuo + Scegli Controlli profilo nel menu sessione dello schermo secondario. I selettori Profilo e Schermo secondario nel menu del controller scelgono i controlli da mostrare. + Azioni dei pulsanti + Condiviso con %1$s. Le modifiche valgono anche per quei profili. + Riusa impostazioni + Usa impostazioni da… + Copia da un altro profilo o mantieni le impostazioni condivise + Rendi indipendente + Mantieni la configurazione attuale e smetti di condividere le modifiche + I layout memorizzano elementi e posizioni. Ogni profilo può assegnare le proprie azioni. Modifica a dimensione piena sullo schermo di destinazione. + Layout attuale + Eliminare il layout non usato %1$s e le sue azioni salvate? + Rinomina il layout attuale + Le impostazioni di input illeggibili sono state salvate in una copia di ripristino. Puoi continuare a modificare i profili ripristinati. + Proprietà + Proprietà del clic + %1$s · Clic + Pulsanti + Stick, pad e grilletti + Nascondi strumenti + Controller + Invia l\'input del controller a Steam Input o al gioco. + Questo elemento non invia input di controller, mouse o tastiera. + Clic del mouse + Azione DroidDeck + Azione + Velocità di scorrimento: %1$d passi/s + + Nuovo profilo + + Nuovo layout + %1$s · Usato da %2$d profili. Le modifiche valgono per ogni profilo che usa queste assegnazioni. + Rinomina + Elimina + Aggiungi elementi al layout prima di assegnare le loro azioni. + Impossibile salvare le impostazioni di input + Nome + Parti da + Pulsante + Stick + Touchpad + Croce direzionale + Grilletto + Fatto + Annulla + + Aggiungi + Trascina per spostare. Trascina un angolo per ridimensionare. Tocca Proprietà per assegnare un\'azione. + Modifica sullo schermo secondario + Riusa %1$s da un altro profilo. Le altre sorgenti di controllo restano invariate. + Mantieni condivisi i controlli fisici + Per impostazione predefinita, tutti i controlli e i layout personalizzati sono copie indipendenti. La condivisione collega solo i controlli fisici. + Usa questi elementi e posizioni. La condivisione mantiene sincronizzate le future modifiche alla geometria; le azioni dei pulsanti restano indipendenti. Un layout diverso parte con azioni non assegnate. + Copia questi controlli e azioni, oppure collegali così che le modifiche future valgano per entrambi i profili. + Mantieni condiviso + Copia indipendente + Avvia lo stick nel punto toccato + Nascondi lo stick quando non è in uso + Strumenti + Auto (%1$s) + Personalizzato (%1$s) + Salva come nuovo profilo + Controlli profilo + Profilo + Gesti del touchpad del mouse + Se assegnato al puntatore del mouse: tocca per fare clic, tieni premuto per trascinare e scorri con due dita. + %1$s ha una sostituzione del menu rapido. Seleziona Auto per usare il suo profilo predefinito e tutte e tre le parti salvate. + Input DroidDeck + Mantenuto mentre lo stick è mosso in qualsiasi direzione: pressione sopra il 55%, rilascio sotto il 35%. Usa Tasti direzionali per assegnare ogni direzione separatamente. I comandi DroidDeck vengono eseguiti una volta per deflessione. Il clic dello stick si configura a parte. + Mantenuto mentre tocchi il touchpad; rilasciato quando sollevi il dito. I comandi DroidDeck vengono eseguiti una volta per tocco. Il clic del touchpad si configura a parte. + Mantenuto quando il grilletto supera il 55%; rilasciato sotto il 35%. I comandi DroidDeck vengono eseguiti una volta per pressione. + Direzione di scorrimento + Verticale + Orizzontale + Scorri orizzontalmente + Misurazioni + Attiva la registrazione, usa i controlli in una sessione attiva, poi torna e leggi i risultati. Misura solo il tempo di invio di DroidDeck, non la latenza dello schermo. La registrazione termina alla chiusura del processo dell\'app. + %1$d controlli + Altri layout salvati (%1$d) ▾ + Nascondi altri layout salvati (%1$d) ▴ + Home / Guida + Indietro · tocco singolo + Indietro · doppio tocco + Indietro · due volte in Steam, una su desktop + In modalità Steam. Tenere premuto Indietro apre anche l\'accesso rapido. + Ripristina i valori predefiniti + La scelta del pannello viene ricordata. Desktop apre un secondo spazio di lavoro; non cambia la sessione né il suo profilo di input. + Controller virtuale + Il tipo di controller visto da Steam o dal gioco. + Touchscreen + Come vengono gestiti i tocchi sullo schermo di gioco. I pulsanti del profilo mantengono le azioni assegnate. + Cursore tattile + Mostra un puntatore per i tocchi diretti sullo schermo di gioco. + Tocca e tieni premuto + Azione del mouse quando tieni un dito sullo schermo di gioco. + Tocchi del pulsante Indietro + Prima azione: tocco singolo. Seconda azione: doppio tocco. + Pulsante a interruttore + Tocca per tenere premuto, tocca di nuovo per rilasciare. Aprire un menu o cambiare profilo rilascia il pulsante. + Forma + Arrotondata + Pillola + Cerchio + Rettangolo + Etichetta del pulsante + Testo + Immagine importata + Tasti diagonali separati + Assegna un tasto a ogni diagonale. Una diagonale vuota preme le due direzioni vicine. + Direzioni vicine + I tuoi vecchi tasti a schermo sono salvati come profili importati qui sotto. Selezionane uno per usarlo o modificarlo. Le selezioni di profilo attuali sono state mantenute. + I vecchi tasti a schermo non sono stati importati automaticamente. Le impostazioni originali sono state conservate. + diff --git a/app/src/main/res/values-it/input_strings.xml b/app/src/main/res/values-it/input_strings.xml new file mode 100644 index 0000000000..a5e401d1c8 --- /dev/null +++ b/app/src/main/res/values-it/input_strings.xml @@ -0,0 +1,38 @@ + + + Profili di input + Profili + Controller fisico + Schermo principale + Schermo secondario + Nativo / Steam Input + Nativo: %1$s + Invia un altro controllo del controller + Disattivato + Tasto o combinazione di tasti + Tasti direzionali + Sposta il puntatore + Velocità del puntatore: %1$d + Scorri + Scorri verticalmente + Tasto sinistro del mouse + Tasto destro del mouse + Tasto centrale del mouse + Apri il menu DroidDeck + Mostra tastiera + Apri il menu Steam + Apri l\'accesso rapido di Steam + Rimuovi controllo + Aggiungi controllo + Tasti specifici del dispositivo + Assegna un tasto fisico + Rilascia il tasto, poi scegli Modifica, Riprova o Annulla. B o Indietro annulla dopo il rilascio. + Riprova + Premi un tasto, incluso un tasto Indietro segnalato come tasto di tastiera. I tasti volume e di sistema Android sono riservati. L\'assegnazione vale solo per questo dispositivo. + Rimuovi assegnazione + Diagnostica input + Registra il tempo di invio dell\'input + Leggi le misurazioni + Misura l\'invio di Android fino alla pubblicazione nel trasporto di input esistente. Esclude l\'arrivo Bluetooth, il polling dell\'ospite, il rendering e la latenza dello schermo. La registrazione è disattivata per impostazione predefinita. + Usa l\'assegnazione di input normale + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ddb13b488c..e4b446af4b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -185,6 +185,7 @@ Non è stato possibile scaricare l\'ambiente grafico PowerVR. Controlla la connessione e riprova. Impossibile scaricare DirectAudio, quindi l\'audio dei giochi usa il percorso più lento in questa sessione. Questo programma + La sessione non è riuscita a disegnare sullo schermo: %1$s. Questa schermata mostra il motivo al posto di una schermata nera; i log della sessione contengono i dettagli. 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. @@ -388,6 +389,9 @@ Non ancora supportato qui Caricamento dei componenti… Impossibile installare: %1$s + Questo download richiede un aggiornamento. + Aggiornamento in coda. + Riprova aggiornamento Scaricato Download di %1$s Installazione: %1$s @@ -418,6 +422,22 @@ Solo memoria interna Cartella: %1$s Seconda libreria + Altre librerie Steam + Cartelle in cui Steam può installare e da cui può avviare i giochi, ciascuna con il proprio nome. Rimuoverne una lascia i suoi giochi sul disco. + Aggiungi libreria + Rinomina + Nome libreria + Scegli una cartella per la libreria + Al massimo %1$d librerie aggiunte + La cartella è già una libreria o si trova all\'interno di una + %1$s · non disponibile + Si applica dalla prossima sessione di Steam + Trovate su questo dispositivo · %1$s · %2$s + Aggiungi + Trova librerie nella memoria interna + Consenti l\'accesso a tutti i file affinché DroidDeck possa vedere le librerie Steam che altre app conservano nella memoria interna + Consenti + Aggiunta %1$s, la libreria Steam contenuta nella cartella scelta I giochi che caricano risorse in streaming dalla SD o dalla memoria condivisa potrebbero scattare. Diagnostica archiviazione Registra i risultati delle allocazioni e campioni dei tempi di archiviazione in Condividi log. Mentre è attiva può rallentare le installazioni. Si applica dalla prossima sessione. @@ -607,7 +627,10 @@ Disattiva l\'assistente di navigazione con gamepad di Proton, che consuma CPU in ogni gioco. Esegui proot senza seccomp Può risolvere errori di syscall mancanti su alcuni kernel. Può ridurre le prestazioni. + Esegui senza proot (sperimentale) + Avvia la parte Linux direttamente su Android. Si applica alla sessione successiva. Disattivala se qualcosa non si avvia. Percorso veloce di proot + Non utilizzato senza proot. Richiede il filtro seccomp di proot. Ricerca dei file più veloce e meno scatti. Disattivalo se un programma non trova i suoi file. Disegna il cursore in gamescope @@ -818,6 +841,7 @@ Dispositivo supportato GPU non testata GPU non supportata + GPU tramite bridge Mali %1$s · %2$s %1$s: %2$s Nessun backend grafico compatibile disponibile per %1$s. Steam potrebbe mostrare una schermata nera. @@ -847,15 +871,38 @@ Sessione Log della sessione Salvati dopo ogni sessione + Diagnostica avanzata per la prossima sessione + Acquisisce log dettagliati per una sessione. Può ridurre le prestazioni e occupare più spazio di archiviazione. Si disattiva automaticamente all\'avvio della sessione; controlla i log prima di condividerli. Log di debug dei giochi Includi la diagnostica di Proton, Wine e grafica al prossimo avvio di un gioco. Può ridurre le prestazioni e occupare più spazio. Riavvia questa sessione per salvare i log di debug dei giochi Impossibile aggiornare i log. Controlla l\'interruttore e riprova. Strumenti di debug + Log grafici dettagliati + Interfaccia Steam: rendering GPU + Con la coppia di driver Xclipse, Steam disegna le pagine via software (il rendering GPU mostrava riquadri danneggiati). Attivala per un\'interfaccia Steam più veloce, se su questo telefono appare corretta. + compilato %1$s + Aggiornamento di %1$s alla build più recente + Il bridge Mali non ha superato il test automatico su %1$s nella sessione precedente (immagini o draw), quindi è stata usata la coppia di driver PanVK. + Il bridge Mali non ha trovato alcun modo per condividere la memoria con il driver su %1$s nella sessione precedente, quindi è stata usata la coppia di driver PanVK. Il bridge non può funzionare su questo telefono; disattivarlo mantiene la coppia PanVK. + I log di Proton, DXVK e driver di ogni gioco vengono inclusi nei log della sessione. Sempre attivo quando la GPU non è una Adreno. Log dell\'ultima sessione Log delle sessioni salvati Conserva i %1$d più recenti Cancella log + Log di sessione disponibili + Ancora nessun log di sessione salvato. + Gli ZIP condivisi e salvati includono la sessione selezionata e i dati diagnostici correlati a Steam, agli store, agli strumenti e a Battle.net. + %1$s · %2$s + Sessione corrente + Condividi + Salva sul dispositivo + Elimina + Eliminare i log di sessione? + Eliminare %1$s? Questa operazione non può essere annullata. + Log di sessione salvati. + Impossibile salvare i log di sessione. + Impossibile eliminare i log di sessione. Modalità offline Accedi prima a Steam Launcher @@ -874,6 +921,8 @@ Usa come schermata Home DroidDeck può essere l\'app Home DroidDeck non viene mai proposta come app Home + Il pulsante Home apre + La pagina mostrata quando DroidDeck è l\'app Home e premi il pulsante Home In Aggiungi giochi, imposta DroidDeck su Includi Orientamento Orientamento del launcher @@ -887,15 +936,22 @@ Schermo intero Nasconde la barra di stato e la barra di navigazione di Android Mostra la barra di stato e la barra di navigazione di Android + Launcher a doppio schermo + Automatico colloca le sezioni del launcher (Steam, Libreria, Store e le altre) sullo schermo secondario integrato delle console portatili che ne hanno uno. Con Attivo si usa qualsiasi display secondario. Con Disattivo il launcher resta su un solo schermo. + Sessioni a doppio schermo + Automatico aggancia il menu di gioco allo schermo secondario integrato invece di aprirlo come finestra a comparsa. Con Attivo si usa qualsiasi display secondario. Con Disattivo il menu resta sullo schermo del gioco; da lì puoi comunque scegliere uno schermo secondario. Automatico Attivo Disattivo Controlli sullo schermo inferiore nei giochi + Tastiera Android per i campi di testo Apre il trackpad e la tastiera sul secondo schermo all\'avvio di una sessione. Digitazione per lo schermo superiore Fine App Home predefinita Scegli un\'app Home + Nascondi il launcher dalla schermata Recenti quando è inattivo + Si applica solo quando DroidDeck è l\'app Home predefinita e nessuna sessione è in corso. Scegli App Linux (beta) File @@ -1010,6 +1066,147 @@ Build di test Prova una correzione prima che venga rilasciata Nessuna al momento + Build lab + Build lab + In uso + In pausa dopo che Android ha riottimizzato DroidDeck + Non caricata: %1$s + In attesa di un riavvio + Mantenuta + Per una versione diversa + Ricostruisci + Elimina questa build dal dispositivo + Riavvia con questa build + Disattiva + Usa + Elimina + Elimina ora + Impossibile preparare il riavvio: %1$s. Abbina il debug wireless in Configurazione e riprova. + Build lab installata + DroidDeck riavviato con %1$s + Build Lab in pausa + Android ha riottimizzato DroidDeck, quindi %1$s non è caricata. Apri Aggiornamenti per riavviare con essa. + Build Lab disattivata + È stata compilata per un\'altra versione di DroidDeck. È conservata in Aggiornamenti. + DroidDeck non si è avviato con essa due volte + Agente + Agente + L\'agente sta lavorando + Installa Claude Code nella userland Linux per usare l\'agente. + Chiedi di un gioco, di un arresto anomalo o di una modifica a DroidDeck + Invia + Nuova conversazione + Interrompi + Archiviazione + Rimuovi + Rimuovi ora + Claude Code + Codex + Sorgenti di DroidDeck + Cache dei download + Le modifiche non inviate vanno perse + Le build le scaricano di nuovo + La configurazione può reinstallarlo; gli accessi vengono mantenuti + DroidDeck è ripartito con la tua build Lab. Riprendi da dove avevi lasciato. + Chiedigli perché un gioco non si avvia, di spiegarti un log o di apportare una modifica a DroidDeck e provarla su questo dispositivo. + Non riuscito: %1$s + %1$s terminato (uscita %2$d) + Interrotto + Terminato senza risposta + Riprova + Configurazione dell\'agente in corso + Ricompila la mia build Lab %1$s per la versione installata di DroidDeck e riavvia con essa. + %1$s in entrata · %2$s in uscita + Sto pensando + Pensiero + Sto pensando · %1$s + %1$s · %2$s + INGRESSO + USCITA + In esecuzione… + Nessun risultato: il turno è terminato prima + Nessun output + Digita per mettere in coda il messaggio successivo + Metti in coda + Prossimo: %1$s + Non inviare + Allega + Rimuovi + Predefinito + Livello di ragionamento + Procedi + Rivedi + Ancora nessuna modifica + Procedi con il piano. + Invia ora + Messaggio + Altro + Chiudi + Più recente + In elaborazione + Contesto + %1$s su %2$s + Questa conversazione · %1$s + L\'utilizzo viene mostrato dopo la prima risposta + Limite di %1$d ore + Limite di %1$d minuti + Limite settimanale + %1$d%% · si reimposta %2$s + + %1$d file + %1$d file + + Pianifica prima + Piano + Propone un piano senza modificare nulla + Conversazioni + Ancora nessuna conversazione + Proprio ora + Elimina + La elimina insieme ai suoi allegati + Processi + Nessun processo in esecuzione nello spazio utente Linux + AGENTE + Ferma + Compilazione Lab + Preparazione delle build Lab + %1$d%% · circa %2$s rimanenti + circa %1$s rimanenti + Annulla + Annulla la compilazione + Avvio + %1$d%% + Creazione del pacchetto + Riavvio di DroidDeck sul dispositivo + Completato + Non riuscito: %1$s + Configura l\'agente + Installa prima il runtime Linux in Configurazione. + Riprova + Inizia a chattare + Connessione al dispositivo + Debug wireless, così l\'agente può vedere e controllare DroidDeck + Installa %1$s + Nell\'ambiente utente Linux, con git, gh e adb + Accedi a %1$s + Apre il browser + GitHub + Facoltativo, per aprire le pull request + Strumenti di compilazione + Facoltativo, per le compilazioni Lab su questo dispositivo · circa 5 GB + Agente pronto + Completa la configurazione dell\'agente + Accesso effettuato a %1$s + Compilazioni Lab + compilazioni rapide + Compilazioni Lab rapide + Questa versione viene compilata in anticipo, così le compilazioni Lab richiedono minuti · circa 20 minuti una sola volta + Compilazione in corso · %1$d%% · circa %2$s rimanenti + Prepara + Il debug wireless non è raggiungibile; Associa lo attiva + Associa + Installa + Accedi PR #%1$d Non compilata per questa copia di DroidDeck Aggiornato %1$s @@ -1253,6 +1450,14 @@ App Configurazione Aggiornamenti + Altro + Modifica schede + Schede + Visibile + Nella sezione Altro + Nascosta + Sposta %1$s in alto + Sposta %1$s in basso %1$d%% Riprendi %1$s Appare come /root/ROMs in ogni sessione. La memoria interna si trova in /root/Storage. @@ -1274,6 +1479,15 @@ Togli dalla coda Tastiera Android Nascondi ✕ + Dimensioni sullo schermo + Porzione dello schermo occupata dalla tastiera, intestazione inclusa. + Opacità + Riducila per vedere il gioco dietro la tastiera. + Tasti nascosti + I tasti che usi raramente non compaiono sulla tastiera. + Esc e riga dei tasti funzione + Ins / Canc / Home / Fine / PgSu / PgGiù + Tasti freccia Avvia %1$s Scegli uno schermo. Secondario: %1$s. Lo schermo secondario non è più disponibile. @@ -1792,7 +2006,24 @@ Terminale Impugnature Deck + trackpad Dashboard + Desktop + Avvia il desktop + Desktop · %1$s + Trackpad + Tocco diretto + Trackpad. Tocca per il tocco diretto + Tocco diretto. Tocca per il Trackpad + Avvio del desktop KDE… + Il desktop si è chiuso. + Non è stato possibile avviare il desktop. I log si trovano nella cartella bottom-desktop di questa sessione. + Il desktop è chiuso. Ancora niente da mostrare qui. + Scambia schermi + Lo schermo inferiore non è libero al momento + Schermo di gioco + Mostra il gioco su + Schermo superiore + Schermo inferiore Download Nessun download in corso. Steam @@ -1827,6 +2058,20 @@ Carburante, t Principale %1$s t Riserva %1$s t + Tempo di frame + ultimi %1$d s + frame medio + Minimo 1% + frame oltre 33 ms + %1$d / min + In gioco da %1$s + %1$d core, fino a %2$s GHz + %1$d core + gioco + FPS a %1$d Hz + Il segno rosso indica dove l\'HUD mostra la temperatura in rosso. + intero dispositivo + batteria Invia dati al cruscotto Automatico Lo attiva per ogni gioco elencato qui, compresi i giochi trovati in seguito. I giochi che disattivi restano disattivati. @@ -1850,6 +2095,10 @@ Il microfono è disattivato per questo gioco. Per parlare, attiva Microfono nelle impostazioni Steam di DroidDeck (Audio) e riavvia il gioco. Volume %1$d%% Statistiche di gioco + HUD dello schermo inferiore + Barra su ogni scheda + Minimi 1% e 0,1% + Temperatura CPU FPS CPU GPU @@ -2023,6 +2272,7 @@ Avvio della sessione… %1$d:%2$02d trascorsi · ancora in corso Download dell\'aggiornamento del client Steam · %1$d%% + Applicazione dell\'aggiornamento del client Steam… Download del client Steam · %1$s È già in corso l\'installazione di uno strumento di compatibilità @@ -2099,11 +2349,29 @@ Contorni da cartone animato più nitidezza. Non è una GPU Adreno + Driver PowerVR di sistema: la compatibilità varia in base al dispositivo + Sperimentale: RADV o il driver Xclipse di sistema + PowerVR di sistema + Usa i driver integrati per questa GPU + Il driver PowerVR di sistema è selezionato per il runtime e lo schermo. + Nessun driver open supporta ancora questa Mali: il bridge Mali è attivo. + Questa è la build di test non-Snapdragon: le build ufficiali qui funzionano solo su Adreno, quindi non vengono installate al suo posto. Le nuove build di test sono su github.com/The412Banner/droiddeck-nonadreno-drivers. + La sessione precedente è terminata perché Android ha chiuso DroidDeck per liberare memoria, non per un arresto anomalo. Chiudi le altre app o riduci le impostazioni delle texture del gioco, poi riprova. + Mali (Venus) + il bridge Mali + Nessun driver open supporta ancora questa Mali: viene usato %1$s, sul driver del telefono. + %1$s non è ancora pubblicato: fino ad allora viene usato %2$s. + %1$s non è disponibile e il driver di questo telefono segnala Vulkan %2$s (Venus richiede la versione 1.2): viene usato il bridge Mali. + %1$s non è ancora pubblicato: il bridge Mali resta attivo fino ad allora. + In coda: %1$s (in attesa di un driver runtime diverso) + DXVK è fornito dal runtime PowerVR di sistema. Gli altri pacchetti DXVK possono essere salvati ma non vengono applicati con questo driver. Supportata Sperimentale: i suoi driver sono build di test Supporto sperimentale per Adreno 850: richiede driver di visualizzazione e di gioco sperimentali compatibili; non verificato su questo dispositivo Inferiore all\'hardware testato (Adreno 725 e successive): potrebbe non funzionare Non supportata: nessun backend grafico compatibile disponibile per questa GPU + Funziona tramite il bridge Mali, sul driver Vulkan del telefono + Non supportato con il bridge Mali disattivato: Turnip richiede una GPU Adreno (Snapdragon) Raggiunto il limite di richieste di GitHub - riprova più tardi GitHub ha risposto HTTP %1$d @@ -2304,6 +2572,13 @@ Ordina Etichette della barra laterale Mostra i nomi sotto le icone della barra laterale. Disattivalo per una barra laterale più sottile. + Mascotte dell\'agente + DeeDee appare sopra il launcher e i giochi, mostrando cosa sta facendo l\'agente. + Sopra altre app + Consenti a DeeDee di apparire sopra tutte le app e di aprire lì la sua chat + Consenti + DeeDee + Apri la chat con DeeDee Visualizzazione Schede più grandi Schede più piccole @@ -2590,6 +2865,11 @@ Sviluppatore Filigrana con etichetta build Mostra sullo schermo l’etichetta della build di test o Lab. Attiva per impostazione predefinita. + Condividi i pacchetti diagnostici + Sessione e dispositivo + Grafica + Giochi e compatibilità + Tutti i pacchetti Pronto per giocare Non ancora pronto per giocare runtime %1$s @@ -2628,6 +2908,9 @@ Attiva gli obiettivi GOG nelle impostazioni Store Obiettivi non disponibili; controlla i log della sessione Obiettivo sbloccato + Mali (Venus): disattivato + Mali (Venus): attivato + Il driver su %1$s segnala Vulkan %2$s. Mali (Venus) richiede Vulkan 1.2 o superiore (gamescope non si avvia sulle versioni precedenti), quindi le sessioni saltano Venus e usano invece la coppia di driver PanVK. Incolla Stick sinistro Stick destro @@ -2996,6 +3279,7 @@ Programmi di installazione VC++ e DirectX richiesti dai giochi Esegue i giochi Linux x86 Strumento Steam + Steam scarica questo componente per i giochi che includono un anti-cheat, anche quando è disattivato. Rimuoverlo blocca la loro installazione allo 0% DroidDeck esegue i giochi senza questo runtime Proton x86, che DroidDeck non può eseguire Predefinito per tutti i giochi @@ -3115,6 +3399,8 @@ DroidDeck · %1$d fps 60 fps è più fluido ma usa più CPU durante l\'avvio di Steam. Anche un video scelto nelle impostazioni di Steam compare qui. Audio + Salta il video di avvio + Usa una clip nera di 0,1 secondi come video di avvio di Steam. Dalla sessione successiva. Il tuo video MP4, MOV, MKV o WebM. Altri formati e file oltre %1$d MB vengono convertiti in WebM 720p sul dispositivo, fino a %2$d secondi. Importa @@ -3576,6 +3862,7 @@ Mantiene Alt+Tab, il tasto Win e il tasto Home in una sessione DroidDeck attiva anziché in Android. Attiva Luminosità in Configurazione → Integrazione con Steam Ponte Mali: disattivato + %1$s non può usare il bridge Mali (richiede una GPU Mali senza un percorso tramite driver di sistema), quindi questo interruttore non ha effetto qui. Ponte Mali: attivo %1$s non è una Adreno. Il ponte Vulkan sperimentale è attivo: la sessione disegna tramite il driver del telefono. Aspettati bug; invia i log della sessione. Modalità sicura @@ -3736,6 +4023,7 @@ Impossibile importare questo layout Neve scarlatta + Superfici bianche con accenti rossi. Colonne sonore Musica @@ -3799,4 +4087,6 @@ Ripeti uno Volume Nessun file audio in questa colonna sonora + Avvio non disponibile + Non è disponibile alcun browser web per aprire questo link. diff --git a/app/src/main/res/values-ja/input_library.xml b/app/src/main/res/values-ja/input_library.xml new file mode 100644 index 0000000000..ecf218c491 --- /dev/null +++ b/app/src/main/res/values-ja/input_library.xml @@ -0,0 +1,132 @@ + + + 選択したディスプレイは利用できません。接続すると、このレイアウトを実寸で編集できます。 + 保存されていないレイアウトの変更を破棄しますか? + このレイアウトは %1$d 個のプロファイルで使用中です。保存した変更はすべてに適用されます。 + 既定のプロファイル + デスクトップモード + ゲームモード + デスクトップとゲームの既定 + ゲームモードの既定 + デスクトップモードの既定 + デバイス設定 + コントロール + ボタン、スティック、トリガー、追加キー + プロファイルをコピー + アクションをリセット + %1$s のアクションを基本プロファイルの既定値に戻しますか?レイアウトと他のプロファイルは変更されません。 + %1$s を削除しますか?使用中のモードは内蔵の既定プロファイルに戻ります。保存済みレイアウトと共有設定は引き続き利用できます。 + 表示 + すべてのプロファイルに適用されます。Auto はゲームモードでコントローラーが接続されていないときにメイン画面のコントロールを表示します。 + 画面上で編集 + 保存済みレイアウト… + レイアウトを選択するか、新規作成します + セカンド画面のセッションメニューでプロファイルコントロールを選択します。コントローラーメニューのプロファイルとセカンド画面の選択で表示するコントロールを決めます。 + ボタンのアクション + %1$s と共有中。編集はそれらのプロファイルにも適用されます。 + 設定を再利用 + 設定の使用元… + 別のプロファイルからコピーするか、設定を共有したままにします + 独立させる + 現在の設定を保持し、変更の共有を停止します + レイアウトは要素と位置を保存します。プロファイルごとに独自のアクションを割り当てられます。対象の画面で実寸で編集してください。 + 現在のレイアウト + 未使用のレイアウト %1$s と保存済みアクションを削除しますか? + 現在のレイアウトの名前を変更 + 読み取れない入力設定は復元用コピーに保存されました。復元されたプロファイルは引き続き編集できます。 + プロパティ + クリックのプロパティ + %1$s · クリック + ボタン + スティック、パッド、トリガー + ツールを隠す + コントローラー + コントローラー入力を Steam Input またはゲームに送信します。 + この要素はコントローラー、マウス、キーボードの入力を行いません。 + マウスクリック + DroidDeck アクション + アクション + スクロール速度: %1$d ステップ/秒 + + 新しいプロファイル + + 新しいレイアウト + %1$s · %2$d 個のプロファイルが使用中。変更はこの割り当てを使うすべてのプロファイルに適用されます。 + 名前を変更 + 削除 + アクションを割り当てる前に、レイアウトに要素を追加してください。 + 入力設定を保存できませんでした + 名前 + 開始元 + ボタン + スティック + タッチパッド + 十字キー + トリガー + 完了 + 元に戻す + + 追加 + ドラッグで移動。角をドラッグでサイズ変更。プロパティをタップしてアクションを割り当てます。 + サブ画面で編集中 + 別のプロファイルから %1$s を再利用します。他のコントロールソースは変更されません。 + 物理コントロールを共有したままにする + 既定では、すべてのコントロールとカスタムレイアウトは独立したコピーです。共有は物理コントロールだけをリンクします。 + この要素と位置を使用します。共有すると今後のジオメトリ変更が同期されますが、ボタンのアクションは独立したままです。別のレイアウトは未割り当てのアクションで始まります。 + これらのコントロールとアクションをコピーするか、リンクして今後の編集を両方のプロファイルに適用します。 + 共有したままにする + 独立したコピー + タッチ位置からスティックを開始 + 未使用時はスティックを隠す + ツール + 自動 (%1$s) + カスタム (%1$s) + 新しいプロファイルとして保存 + プロファイルコントロール + プロファイル + マウスタッチパッドのジェスチャー + マウスポインターに割り当てた場合: タップでクリック、長押しでドラッグ、2 本指でスクロールします。 + %1$s にはクイックメニューの上書きがあります。[自動] を選ぶと既定のプロファイルと保存済みの 3 つのパーツを使用します。 + DroidDeck 入力 + スティックをどの方向に動かしている間も保持されます: 55% を超えると押下、35% を下回ると解放。方向キーで各方向を個別に割り当てます。DroidDeck コマンドは 1 回の傾きにつき 1 回実行されます。スティックのクリックは別に設定します。 + タッチパッドに触れている間保持され、指を離すと解放されます。DroidDeck コマンドは 1 回のタッチにつき 1 回実行されます。タッチパッドのクリックは別に設定します。 + トリガーが 55% を超えると保持され、35% を下回ると解放されます。DroidDeck コマンドは 1 回の押下につき 1 回実行されます。 + スクロール方向 + 縦 + 横 + 横にスクロール + 測定値 + 記録を有効にし、実行中のセッションでコントロールを使ってから戻って結果を読み取ります。測定するのは DroidDeck の送信時間のみで、表示遅延は含みません。記録はアプリのプロセスが閉じると終了します。 + %1$d 個のコントロール + 他の保存済みレイアウト (%1$d) ▾ + 他の保存済みレイアウトを隠す (%1$d) ▴ + ホーム / Guide + 戻る · シングルタップ + 戻る · ダブルタップ + 戻る · Steam では 2 回、デスクトップでは 1 回 + Steam モード時。戻るを長押しするとクイックアクセスも開きます。 + 既定に戻す + パネルの選択は記憶されます。デスクトップは 2 つ目のワークスペースを開くだけで、セッションやその入力プロファイルを切り替えません。 + 仮想コントローラー + Steam またはゲームが認識するコントローラーの種類。 + タッチスクリーン + ゲーム画面のタッチの扱い方。プロファイルのボタンは割り当て済みのアクションを保ちます。 + タッチカーソル + ゲーム画面への直接タッチにポインターを表示します。 + タッチして長押し + ゲーム画面で指を押し続けたときのマウス動作。 + 戻るボタンのタップ + 1 つ目のアクション: シングルタップ。2 つ目のアクション: ダブルタップ。 + トグルボタン + タップで保持、もう一度タップで解放。メニューを開くかプロファイルを切り替えるとボタンは解放されます。 + 形 + 角丸 + ピル + 円 + 矩形 + ボタンのラベル + テキスト + インポートした画像 + 個別の斜めキー + 各斜め方向にキーを割り当てます。空の斜めは隣接する 2 方向を押します。 + 隣接する方向 + 以前の画面キーは下のインポート済みプロファイルとして保存されています。1 つ選んで使用または編集します。現在のプロファイル選択は保持されています。 + 以前の画面キーは自動でインポートできませんでした。元の設定は保持されています。 + diff --git a/app/src/main/res/values-ja/input_strings.xml b/app/src/main/res/values-ja/input_strings.xml new file mode 100644 index 0000000000..ac60ca8e51 --- /dev/null +++ b/app/src/main/res/values-ja/input_strings.xml @@ -0,0 +1,38 @@ + + + 入力プロファイル + プロファイル + 物理コントローラー + メイン画面 + サブ画面 + ネイティブ / Steam Input + ネイティブ: %1$s + 別のコントローラー入力を送信 + 無効 + キーまたはキーの組み合わせ + 方向キー + ポインターを移動 + ポインター速度: %1$d + スクロール + 垂直スクロール + マウス左ボタン + マウス右ボタン + マウス中ボタン + DroidDeck メニューを開く + キーボードを表示 + Steam メニューを開く + Steam クイックアクセスを開く + コントロールを削除 + コントロールを追加 + デバイス固有のボタン + 物理ボタンを割り当て + ボタンを離してから、編集・再試行・キャンセルのいずれかを選択します。B または戻るは離した後にキャンセルします。 + 再試行 + ボタンを押してください。キーボードキーとして報告される戻るボタンも含みます。音量キーと Android のシステムキーは予約されています。割り当てはこのデバイスにのみ適用されます。 + 割り当てを削除 + 入力診断 + 入力ディスパッチ時間を記録 + 測定値を読み取る + Android のディスパッチから既存の入力トランスポートへの公開までの時間を測定します。Bluetooth の到着、ゲストのポーリング、描画、表示の遅延は含みません。記録は既定でオフです。 + 通常の入力割り当てを使用 + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8bd99a0963..91e779bd6e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -185,6 +185,7 @@ PowerVRのグラフィックス環境をダウンロードできませんでした。接続を確認して、もう一度お試しください。 DirectAudioをダウンロードできなかったため、このセッションではゲーム音声に低速な経路を使用します。 このプログラム + セッションが画面に描画できませんでした: %1$s。黒い画面の代わりに、この画面で理由を表示しています。詳細はセッションログにあります。 Steamクライアントをダウンロードできませんでした。ネットワークまたはVPNがSteamのサーバーをブロックしている可能性があります。接続を確認して、もう一度お試しください。 Steamクライアントをセットアップできませんでした。接続と空き容量を確認して、もう一度お試しください。 %1$sはx86 PC向けにビルドされており、FEX経由で実行されますが、FEXはまだインストールされていません。ログインした状態で一度Steamを起動し、FEXとSteam Linux Runtimeをダウンロードしてから、もう一度起動してください。 @@ -386,6 +387,9 @@ ここではまだ未対応 コンポーネントを読み込み中… インストールできませんでした: %1$s + このダウンロードには更新が必要です。 + 更新をキューに追加しました。 + 更新を再試行 ダウンロード済み %1$sをダウンロード中 インストール中:%1$s @@ -416,6 +420,22 @@ 内部ストレージのみ フォルダ:%1$s 第2ライブラリ + 追加の Steam ライブラリ + Steam がゲームをインストールして起動できるフォルダーです。それぞれ独自の名前で管理します。削除してもゲームはディスク上に残ります。 + ライブラリを追加 + 名前を変更 + ライブラリ名 + ライブラリにするフォルダーを選択 + 追加できるライブラリは最大 %1$d 個です + そのフォルダーはすでにライブラリか、ライブラリの中にあります + %1$s · 利用できません + 次回の Steam セッションから適用されます + このデバイスで見つかりました · %1$s · %2$s + 追加 + 内部ストレージのライブラリを検索 + すべてのファイルへのアクセスを許可すると、DroidDeck が他のアプリの内部ストレージにある Steam ライブラリを検出できます + 許可 + 選択したフォルダー内の Steam ライブラリである %1$s を追加しました SDカードまたは共有ストレージからリソースを読み取るゲームはカクつく場合があります。 ストレージ診断 割り当て結果とサンプリングしたストレージの処理時間を「ログを共有」に記録します。有効中はインストールが遅くなる場合があります。次回のセッションで有効になります。 @@ -603,7 +623,10 @@ Protonのコントローラーナビゲーション補助を無効にします。これはすべてのゲームでCPUを消費します。 seccompなしでprootを実行 一部のカーネルで「システムコールが見つからない」エラーが解消される場合があります。パフォーマンスが低下する可能性があります。 + proot なしで実行 (実験的) + Linux 側を Android 上で直接起動します。次回のセッションから適用されます。起動に失敗する場合はオフにしてください。 prootファストパス + proot なしでは使用されません。 prootのseccompフィルターが必要です。 ファイル検索が速くなり、スタッターが減ります。プログラムがファイルを見つけられない場合は、これをオフにしてください。 gamescope内でカーソルを描画 @@ -812,6 +835,7 @@ デバイスはサポートされています 未テストのGPU GPUはサポートされていません + Mali ブリッジ経由の GPU %1$s · %2$s %1$s:%2$s 利用できる互換グラフィックスバックエンドがありません。%1$sでは画面が真っ暗になる可能性があります。 @@ -841,15 +865,38 @@ セッション セッションログ 各セッション終了後に保存 + 次回セッションの拡張診断 + 1 回のセッションで詳細なログを記録します。パフォーマンスが低下し、使用容量が増える場合があります。セッション開始時に自動でオフになります。共有する前にログを確認してください。 ゲームのデバッグログ 次回のゲーム起動時にProton、Wine、グラフィックスの診断情報を含めます。パフォーマンスが低下し、ストレージを多く使用する場合があります。 ゲームのデバッグログを保存するにはこのセッションを再起動してください ログ設定を更新できませんでした。スイッチを確認して、もう一度お試しください。 デバッグツール + 詳細なグラフィックスログ + Steam インターフェース: GPU 描画 + Xclipse ドライバーの組み合わせでは、Steam はソフトウェアでページを描画します (GPU 描画ではタイルが乱れました)。この端末で表示が正しければ、オンにすると Steam インターフェースが高速化します。 + %1$s にビルド + %1$s を最新ビルドに更新しました + 前回のセッションで %1$s 上の Mali ブリッジが自己診断(画像または描画)に失敗したため、代わりに PanVK ドライバーペアを使用しました。 + 前回のセッションで %1$s 上の Mali ブリッジがドライバーとメモリを共有する手段を見つけられなかったため、代わりに PanVK ドライバーペアを使用しました。この端末ではブリッジは動作しません。オフにすると PanVK ペアが維持されます。 + ゲームごとの Proton、DXVK、ドライバーのログをセッションのログに含めます。GPU が Adreno 以外の場合は常に有効です。 最新のセッションログ 保存されたセッションログ 最新の%1$d件を保持 ログを消去 + 利用可能なセッションログ + 保存されたセッションログはまだありません。 + 共有・保存した ZIP には、選択したセッションに加え、関連する Steam、ストア、ツール、Battle.net の診断情報が含まれます。 + %1$s · %2$s + 現在のセッション + 共有 + 端末に保存 + 削除 + セッションログを削除しますか? + %1$s を削除しますか?この操作は取り消せません。 + セッションログを保存しました。 + セッションログを保存できませんでした。 + セッションログを削除できませんでした。 すべての設定をリセット すべての設定をデフォルトに戻します リセット @@ -876,6 +923,8 @@ ホーム画面として使用 DroidDeckをホームアプリとして使用できます DroidDeckはホームアプリとして提供されません + ホームボタンで開くページ + DroidDeck がホームアプリのときにホームボタンを押すと表示されるページ 「ゲームを追加」で DroidDeck を「含める」に設定してください 画面の向き ランチャーの向き @@ -889,15 +938,22 @@ 全画面 Androidのステータスバーとナビゲーションバーを非表示 Androidのステータスバーとナビゲーションバーを表示 + デュアルスクリーンランチャー + 自動では、内蔵セカンドスクリーンを搭載した携帯ゲーム機で、ランチャーの各セクション(Steam、ライブラリ、ストアなど)を2画面目に表示します。オンでは任意のセカンドディスプレイを使用します。オフではランチャーを1画面に留めます。 + デュアルスクリーンセッション + 自動では、ポップオーバーの代わりにゲーム内メニューを内蔵セカンドスクリーンに固定します。オンでは任意のセカンドディスプレイを使用します。オフではメニューをゲーム画面に留めますが、メニューからセカンドスクリーンを選択することもできます。 自動 オン オフ ゲーム中の下画面コントロール + テキスト入力欄に Android キーボードを使用 セッション開始時に2画面目にトラックパッドとキーボードを開きます。 上画面に入力中 完了 デフォルトのホームアプリ ホームアプリを選択 + 待機中にランチャーを最近のアプリから非表示にする + DroidDeck がデフォルトのホームアプリで、セッションが実行されていない場合にのみ適用されます。 選択 Linuxアプリ(ベータ版) ファイル @@ -1012,6 +1068,147 @@ テストビルド 正式リリース前に特定の修正を試す 現在ありません + ラボビルド + ラボビルド + 使用中 + Android が DroidDeck を再最適化した後に一時停止しました + 読み込まれていません: %1$s + 再起動を待っています + 保持済み + 別のバージョン用 + 再ビルド + このビルドを端末から削除します + このビルドで再起動 + オフにする + 使用 + 削除 + 今すぐ削除 + 再起動を準備できませんでした: %1$s。設定でワイヤレスデバッグをペアリングして、もう一度お試しください。 + ラボビルドをインストールしました + DroidDeck を %1$s で再起動しました + Lab ビルドを一時停止しました + Android が DroidDeck を再最適化したため、%1$s は読み込まれていません。アップデートを開き、そのビルドで再起動してください。 + Lab ビルドをオフにしました + 別のバージョンの DroidDeck 用にビルドされました。アップデートに保管されています。 + そのビルドで DroidDeck が 2 回起動しませんでした + エージェント + エージェント + エージェントが作業中です + エージェントを使うには、Linux ユーザーランドに Claude Code をインストールしてください。 + ゲームやクラッシュ、DroidDeck の変更について質問してください + 送信 + 新しい会話 + 停止 + ストレージ + 削除 + 今すぐ削除 + Claude Code + Codex + DroidDeck のソース + ダウンロードキャッシュ + プッシュしていない変更は失われます + ビルド時に再度ダウンロードされます + セットアップで再度インストールできます。サインイン情報は保持されます + DroidDeck が Lab ビルドで再起動しました。続きから再開してください。 + ゲームが起動しない理由を尋ねたり、ログを説明してもらったり、DroidDeck に変更を加えてこの端末で試してもらったりしてください。 + 失敗: %1$s + %1$s が終了しました (終了コード %2$d) + 停止しました + 返信がないまま終了しました + 再試行 + エージェントを設定中です + インストール済みの DroidDeck のバージョンに合わせて Lab ビルド %1$s を再ビルドし、そのビルドで再起動してください。 + 入力 %1$s · 出力 %2$s + 考え中 + 思考 + 考え中 · %1$s + %1$s · %2$s + 入力 + 出力 + 実行中… + 結果なし:ターンが先に終了しました + 出力なし + 入力すると次のメッセージをキューに追加できます + キューに追加 + 次: %1$s + 送信しない + 添付 + 削除 + デフォルト + 推論レベル + 進める + 修正 + まだ変更はありません + 計画を進めてください。 + 今すぐ送信 + メッセージ + その他 + 閉じる + 最新 + 処理中 + コンテキスト + %2$s のうち %1$s + この会話 · %1$s + 最初の返信後に使用量が表示されます + %1$d 時間の制限 + %1$d 分の制限 + 週間制限 + %1$d%% · %2$s にリセット + + %1$d ファイル + %1$d ファイル + + まず計画を立てる + 計画 + 何も変更せずに計画を提案します + 会話履歴 + 会話履歴はまだありません + たった今 + 削除 + その会話と添付ファイルを削除します + プロセス + Linux ユーザーランドでは何も実行されていません + エージェント + 停止 + ラボビルド + ラボビルドを準備中 + %1$d%% · 残り約 %2$s + 残り約 %1$s + キャンセル + ビルドをキャンセル + 開始中 + %1$d%% + パッケージング中 + そのビルドで DroidDeck を再起動中 + 完了 + 失敗: %1$s + エージェントを設定 + 先にセットアップで Linux ランタイムをインストールしてください。 + 再試行 + チャットを始める + デバイス接続 + ワイヤレスデバッグで、エージェントが DroidDeck を認識して操作できます + %1$s をインストール + git、gh、adb を含む Linux ユーザーランドへ + %1$s にサインイン + ブラウザが開きます + GitHub + 省略可 · プルリクエストを作成する場合 + ビルドツール + 省略可 · この端末での Lab ビルド用 · 約 5 GB + エージェント準備完了 + エージェントの設定を完了してください + %1$s にサインイン済み + Lab ビルド + 高速ビルド + 高速 Lab ビルド + このバージョンを事前にコンパイルするため、Lab ビルドは数分で完了します · 初回のみ約 20 分 + コンパイル中 · %1$d%% · 残り約 %2$s + 準備 + ワイヤレスデバッグに接続できません。ペアリングで有効になります + ペアリング + インストール + サインイン PR #%1$d このDroidDeckコピー用にはビルドされていません %1$sを更新しました @@ -1247,6 +1444,14 @@ アプリ セットアップ アップデート + その他 + タブを編集 + タブ + 表示 + 「その他」に表示 + 非表示 + %1$s を上に移動 + %1$s を下に移動 %1$d%% %1$sを再開 各セッションで /root/ROMs として表示されます。内部ストレージは /root/Storage にあります。 @@ -1268,6 +1473,15 @@ キューをキャンセル Androidキーボード 隠す ✕ + 画面上のサイズ + ヘッダーを含め、キーボードが画面に占める割合。 + 不透明度 + 下げると、キーボードの背後にあるゲームが見えます。 + 非表示のキー + ほとんど使わないキーはキーボードに表示されません。 + Esc とファンクションキー列 + Ins / Del / Home / End / PgUp / PgDn + 矢印キー %1$sを起動 画面を選択してください。セカンダリ画面:%1$s。 セカンダリ画面は利用できません。 @@ -1752,7 +1966,24 @@ ターミナル Deckグリップ + トラックパッド ダッシュボード + デスクトップ + デスクトップを起動 + デスクトップ · %1$s + トラックパッド + 直接タッチ + トラックパッド。タップで直接タッチに切り替え + 直接タッチ。タップでトラックパッドに切り替え + KDE デスクトップを起動しています… + デスクトップが終了しました。 + デスクトップを起動できませんでした。ログはこのセッションの bottom-desktop フォルダーにあります。 + デスクトップは終了しています。 まだ表示するものはありません。 + 画面を入れ替え + 下部画面は今は空いていません + ゲーム画面 + ゲームを表示する画面 + 上部画面 + 下部画面 ダウンロード 実行中のダウンロードはありません。 Steam @@ -1787,6 +2018,20 @@ 燃料(t) メイン %1$s t 予備 %1$s t + フレーム時間 + 直近 %1$d 秒 + 平均フレーム + 下位 1% + 33 ms を超えるフレーム + %1$d / 分 + プレイ時間 %1$s + %1$d コア、最大 %2$s GHz + %1$d コア + ゲーム + %1$d Hz の FPS + 赤いマークは、HUD が温度を赤で表示する位置です。 + デバイス全体 + バッテリー ダッシュボード用データを送信 自動 ここに表示されているすべてのゲーム(後から見つかったゲームを含む)でオンにします。オフにしたゲームはオフのままです。 @@ -1810,6 +2055,10 @@ このゲームではマイクがオフです。話すには、DroidDeckのSteam設定(オーディオ)でマイクをオンにして、ゲームを再起動してください。 音量 %1$d%% ゲーム内統計 + 下部画面の HUD + すべてのタブにストリップを表示 + 下位 1% と 0.1% + CPU 温度 FPS CPU GPU @@ -1981,6 +2230,7 @@ セッションを開始中… %1$d:%2$02d 経過 · 処理中 Steamクライアントのアップデートをダウンロード中 · %1$d%% + Steam クライアントの更新を適用しています… Steamクライアントをダウンロード中 · %1$s 互換性ツールのインストールはすでに実行中です @@ -2057,11 +2307,29 @@ トゥーン輪郭線とシャープ化。 Adreno GPUではありません + システムの PowerVR ドライバー: 互換性はデバイスによって異なります + 実験的: RADV またはシステムの Xclipse ドライバー + システム PowerVR + この GPU には内蔵ドライバーを使用します + ランタイムとディスプレイには、システムの PowerVR ドライバーが選択されています。 + この Mali に対応するオープンソースドライバーはまだありません。Mali ブリッジが有効です。 + これは Snapdragon 以外の端末向けテストビルドです。公式ビルドは Adreno でのみ動作するため、このビルドに上書きインストールされることはありません。新しいテストビルドは github.com/The412Banner/droiddeck-nonadreno-drivers にあります。 + 前回のセッションは、クラッシュではなく Android がメモリを解放するために DroidDeck を終了したことで終わりました。他のアプリを閉じるか、ゲームのテクスチャ設定を下げてから、もう一度お試しください。 + Mali (Venus) + Mali ブリッジ + この Mali に対応するオープンソースドライバーはまだありません。端末内蔵のドライバー上で %1$s を使用します。 + %1$s はまだ公開されていません。公開されるまで %2$s を使用します。 + %1$s は利用できず、この端末のドライバーは Vulkan %2$s を報告しています(Venus には 1.2 が必要です)。Mali ブリッジを使用します。 + %1$s はまだ公開されていません。公開されるまで Mali ブリッジが有効です。 + 待機中:%1$s(別のランタイムドライバーを待っています) + DXVK はシステムの PowerVR ランタイムによって提供されます。他の DXVK パッケージは保存できますが、このドライバーでは適用されません。 サポート対象 実験的:ドライバーはテストビルドです Adreno 850の実験的サポート:互換性のある実験版のディスプレイドライバーとゲームドライバーが必要です。このデバイスでは未検証です テスト済みハードウェア(Adreno 725以降)未満:動作しない可能性があります サポート対象外:このGPUで利用できる互換グラフィックスバックエンドがありません + Mali ブリッジを経由して、端末内蔵の Vulkan ドライバー上で動作します + Mali ブリッジがオフの場合はサポートされません。Turnip には Adreno (Snapdragon) GPU が必要です GitHubのレート制限に達しました。後でもう一度お試しください GitHubがHTTP %1$dを返しました @@ -2262,6 +2530,13 @@ 並べ替え サイドバーのラベル サイドバーのアイコンの下に名前を表示します。オフにするとサイドバーが細くなります。 + エージェントのペット + DeeDee はランチャーやゲームの上に浮かんで表示され、エージェントが何をしているかを示します。 + 他のアプリの上に表示 + DeeDee をすべてのアプリの上に表示し、そこでチャットを開けるようにします + 許可 + DeeDee + DeeDee とチャット 表示 大きいカード 小さいカード @@ -2547,6 +2822,11 @@ 開発者 ビルドラベルの透かし テストビルドまたはLabビルドのラベルを画面に表示します。デフォルトで有効です。 + 診断バンドルを共有 + セッションとデバイス + グラフィックス + ゲームと互換性 + すべてのバンドル プレイの準備完了 まだプレイの準備ができていません 実行環境 %1$s @@ -2585,6 +2865,9 @@ ストア設定でGOGの実績を有効にしてください 実績を利用できません。セッションログを確認してください 実績を解除しました + Mali (Venus): オフ + Mali (Venus): オン + %1$s のドライバーは Vulkan %2$s を報告しています。Mali (Venus) には Vulkan 1.2 以降が必要で、古いバージョンでは gamescope が起動しません。そのためセッションでは Venus をスキップし、代わりに PanVK ドライバーのペアを使用します。 貼り付け 左スティック 右スティック @@ -2938,6 +3221,7 @@ ゲームが要求した VC++ と DirectX のインストーラー Linux x86 ゲームを実行 Steam ツール + Steam はアンチチートを同梱するゲーム向けに、その機能がオフでもこれをダウンロードします。削除すると、それらのゲームのインストールが 0% で止まります DroidDeck はこのランタイムなしでゲームを実行できます x86 Proton のため DroidDeck では実行できません すべてのゲームの既定 @@ -3048,6 +3332,8 @@ DroidDeck · %1$d fps 60 fps はなめらかですが、Steam の起動中に CPU をより多く使います。Steam 本体の設定で選んだムービーもここに表示されます。 サウンド + 起動ムービーをスキップ + 0.1 秒の黒いクリップを Steam の起動ムービーとして使用します。次回セッションから適用されます。 自分のムービー MP4、MOV、MKV、WebM。その他の形式や %1$d MB を超えるファイルは、端末上で 720p の WebM に変換されます(%2$d 秒まで)。 インポート @@ -3509,6 +3795,7 @@ Alt+Tab、Win キー、ホームボタンを Android ではなく操作中の DroidDeck セッションで使えるようにします。 「セットアップ」→「Steam連携」で明るさをオンにしてください Mali ブリッジ: オフ + %1$s では Mali ブリッジを使用できません(システムドライバーの経路が存在しない Mali GPU が必要です)。そのため、このスイッチはここでは効果がありません。 Mali ブリッジ: オン %1$s は Adreno ではありません。試験的な Vulkan ブリッジがオンです。セッションはスマートフォン本体のドライバーで描画します。不具合が出る可能性があります。セッションログを送ってください。 セーフモード @@ -3667,6 +3954,7 @@ このレイアウトをインポートできませんでした 緋色の雪 + 白いサーフェスに赤のアクセント。 サウンドトラック 音楽 @@ -3730,4 +4018,6 @@ 1曲リピート 音量 このサウンドトラックに音声ファイルがありません + 起動できません + このリンクを開けるウェブブラウザがありません。 diff --git a/app/src/main/res/values-ko/input_library.xml b/app/src/main/res/values-ko/input_library.xml new file mode 100644 index 0000000000..d19c198c7e --- /dev/null +++ b/app/src/main/res/values-ko/input_library.xml @@ -0,0 +1,132 @@ + + + 선택한 디스플레이를 사용할 수 없습니다. 연결하면 이 레이아웃을 실제 크기로 편집할 수 있습니다. + 저장하지 않은 레이아웃 변경을 취소할까요? + 이 레이아웃은 %1$d개 프로필에서 사용 중입니다. 저장된 변경은 모두에 적용됩니다. + 기본 프로필 + 데스크톱 모드 + 게임 모드 + 데스크톱 및 게임 기본 + 게임 모드 기본 + 데스크톱 모드 기본 + 기기 설정 + 컨트롤 + 버튼, 스틱, 트리거 및 추가 키 + 프로필 복사 + 동작 초기화 + %1$s의 동작을 기본 프로필 값으로 초기화할까요? 레이아웃과 다른 프로필은 그대로 유지됩니다. + %1$s을(를) 삭제할까요? 사용 중인 모드는 내장 기본 프로필로 돌아갑니다. 저장된 레이아웃과 공유 설정은 계속 사용할 수 있습니다. + 표시 + 모든 프로필에 적용됩니다. Auto는 게임 모드에서 컨트롤러가 연결되지 않았을 때 기본 화면 컨트롤을 표시합니다. + 화면에서 편집 + 저장된 레이아웃… + 레이아웃을 선택하거나 새로 만드세요 + 보조 화면 세션 메뉴에서 프로필 컨트롤을 선택하세요. 컨트롤러 메뉴의 프로필 및 보조 화면 선택으로 표시할 컨트롤을 정합니다. + 버튼 동작 + %1$s와(과) 공유 중입니다. 편집 내용은 해당 프로필에도 적용됩니다. + 설정 재사용 + 설정 사용 위치… + 다른 프로필에서 복사하거나 설정을 공유한 상태로 유지합니다 + 독립적으로 만들기 + 현재 설정을 유지하고 변경 공유를 중지합니다 + 레이아웃은 요소와 위치를 저장합니다. 각 프로필은 자체 동작을 지정할 수 있습니다. 대상 화면에서 실제 크기로 편집하세요. + 현재 레이아웃 + 사용하지 않는 레이아웃 %1$s과(와) 저장된 동작을 삭제할까요? + 현재 레이아웃 이름 변경 + 읽을 수 없는 입력 설정이 복구 사본에 보관되었습니다. 복원된 프로필을 계속 편집할 수 있습니다. + 속성 + 클릭 속성 + %1$s · 클릭 + 버튼 + 스틱, 패드, 트리거 + 도구 숨기기 + 컨트롤러 + 컨트롤러 입력을 Steam Input 또는 게임으로 보냅니다. + 이 요소는 컨트롤러, 마우스, 키보드 입력을 보내지 않습니다. + 마우스 클릭 + DroidDeck 동작 + 동작 + 스크롤 속도: %1$d 단계/초 + + 새 프로필 + + 새 레이아웃 + %1$s · %2$d개 프로필에서 사용 중입니다. 변경 사항은 이 할당을 사용하는 모든 프로필에 적용됩니다. + 이름 변경 + 삭제 + 동작을 할당하기 전에 레이아웃에 요소를 추가하세요. + 입력 설정을 저장할 수 없습니다 + 이름 + 시작 위치 + 버튼 + 스틱 + 터치패드 + 십자키 + 트리거 + 완료 + 실행 취소 + + 추가 + 드래그하여 이동합니다. 모서리를 드래그하여 크기를 조정합니다. 속성을 탭하여 동작을 할당합니다. + 보조 화면에서 편집 중 + 다른 프로필의 %1$s을(를) 재사용합니다. 다른 컨트롤 소스는 그대로 유지됩니다. + 물리 컨트롤을 공유 상태로 유지 + 기본적으로 모든 컨트롤과 사용자 레이아웃은 독립된 사본입니다. 공유는 물리 컨트롤만 연결합니다. + 이 요소와 위치를 사용합니다. 공유하면 이후 지오메트리 변경이 동기화되지만 버튼 동작은 독립적으로 유지됩니다. 다른 레이아웃은 할당되지 않은 동작으로 시작합니다. + 이 컨트롤과 동작을 복사하거나 연결하여 이후 편집이 두 프로필 모두에 적용되게 합니다. + 공유 유지 + 독립 사본 + 터치한 위치에서 스틱 시작 + 사용하지 않을 때 스틱 숨기기 + 도구 + 자동 (%1$s) + 사용자 지정 (%1$s) + 새 프로필로 저장 + 프로필 컨트롤 + 프로필 + 마우스 터치패드 제스처 + 마우스 포인터에 할당된 경우: 탭하여 클릭, 길게 눌러 드래그, 두 손가락으로 스크롤합니다. + %1$s에는 빠른 메뉴 재정의가 있습니다. 자동을 선택하면 기본 프로필과 저장된 세 부분을 모두 사용합니다. + DroidDeck 입력 + 스틱을 어느 방향으로든 움직이는 동안 유지됩니다: 55% 초과 시 누름, 35% 미만 시 해제. 방향 키로 각 방향을 따로 지정합니다. DroidDeck 명령은 기울기마다 한 번 실행됩니다. 스틱 클릭은 따로 설정합니다. + 터치패드를 만지는 동안 유지되고 손을 떼면 해제됩니다. DroidDeck 명령은 터치마다 한 번 실행됩니다. 터치패드 클릭은 따로 설정합니다. + 트리거가 55%를 넘으면 유지되고 35% 미만이면 해제됩니다. DroidDeck 명령은 누를 때마다 한 번 실행됩니다. + 스크롤 방향 + 세로 + 가로 + 가로로 스크롤 + 측정값 + 기록을 켜고 실행 중인 세션에서 컨트롤을 사용한 뒤 돌아와 결과를 읽으세요. DroidDeck 전달 시간만 측정하며 표시 지연은 포함하지 않습니다. 앱 프로세스가 종료되면 기록이 끝납니다. + 컨트롤 %1$d개 + 다른 저장된 레이아웃 (%1$d) ▾ + 다른 저장된 레이아웃 숨기기 (%1$d) ▴ + 홈 / Guide + 뒤로 · 한 번 탭 + 뒤로 · 두 번 탭 + 뒤로 · Steam에서는 두 번, 데스크톱에서는 한 번 + Steam 모드에서. 뒤로를 길게 누르면 빠른 액세스도 열립니다. + 기본값으로 복원 + 패널 선택이 기억됩니다. 데스크톱은 두 번째 작업 공간을 열 뿐 세션이나 입력 프로필을 전환하지 않습니다. + 가상 컨트롤러 + Steam 또는 게임이 인식하는 컨트롤러 유형입니다. + 터치스크린 + 게임 화면의 터치 처리 방식입니다. 프로필 버튼은 지정된 동작을 유지합니다. + 터치 커서 + 게임 화면의 직접 터치에 포인터를 표시합니다. + 터치 후 유지 + 게임 화면에서 손가락을 누르고 있을 때의 마우스 동작입니다. + 뒤로 버튼 탭 + 첫 번째 동작: 한 번 탭. 두 번째 동작: 두 번 탭. + 토글 버튼 + 탭하여 유지, 다시 탭하여 해제. 메뉴를 열거나 프로필을 전환하면 버튼이 해제됩니다. + 모양 + 둥근 모서리 + 알약 + 원 + 사각형 + 버튼 라벨 + 텍스트 + 가져온 이미지 + 개별 대각선 키 + 각 대각선에 키를 지정합니다. 비어 있는 대각선은 인접한 두 방향을 누릅니다. + 인접 방향 + 이전 화면 키는 아래에 가져온 프로필로 저장되어 있습니다. 하나를 선택해 사용하거나 편집하세요. 현재 프로필 선택은 유지됩니다. + 이전 화면 키를 자동으로 가져올 수 없습니다. 원래 설정이 유지되었습니다. + diff --git a/app/src/main/res/values-ko/input_strings.xml b/app/src/main/res/values-ko/input_strings.xml new file mode 100644 index 0000000000..b38fa335b5 --- /dev/null +++ b/app/src/main/res/values-ko/input_strings.xml @@ -0,0 +1,38 @@ + + + 입력 프로필 + 프로필 + 물리 컨트롤러 + 기본 화면 + 보조 화면 + 네이티브 / Steam Input + 네이티브: %1$s + 다른 컨트롤러 입력 보내기 + 사용 안 함 + 키 또는 키 조합 + 방향 키 + 포인터 이동 + 포인터 속도: %1$d + 스크롤 + 세로로 스크롤 + 마우스 왼쪽 버튼 + 마우스 오른쪽 버튼 + 마우스 가운데 버튼 + DroidDeck 메뉴 열기 + 키보드 표시 + Steam 메뉴 열기 + Steam 빠른 액세스 열기 + 컨트롤 제거 + 컨트롤 추가 + 기기별 버튼 + 물리 버튼 지정 + 버튼을 놓은 다음 편집, 다시 시도 또는 취소를 선택하세요. B 또는 뒤로는 놓은 후 취소합니다. + 다시 시도 + 버튼을 누르세요. 키보드 키로 보고되는 뒤로 버튼도 포함됩니다. 볼륨 및 Android 시스템 키는 예약되어 있습니다. 지정은 이 기기에만 적용됩니다. + 지정 제거 + 입력 진단 + 입력 전달 시간 기록 + 측정값 읽기 + Android 전달부터 기존 입력 전송으로의 게시까지 측정합니다. Bluetooth 도착, 게스트 폴링, 렌더링 및 디스플레이 지연은 포함되지 않습니다. 기록은 기본적으로 꺼져 있습니다. + 일반 입력 지정 사용 + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 8b5ceeb0ef..9a16daf7de 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -185,6 +185,7 @@ PowerVR 그래픽 환경을 다운로드하지 못했습니다. 연결을 확인하고 다시 시도하세요. DirectAudio를 다운로드할 수 없어 이번 세션에서는 게임 오디오가 더 느린 경로를 사용합니다. 이 프로그램 + 세션이 화면을 그리지 못했습니다: %1$s. 검은 화면 대신 이 화면에 이유를 표시합니다. 자세한 내용은 세션 로그에 있습니다. Steam 클라이언트를 다운로드할 수 없습니다. 네트워크나 VPN이 Steam 서버를 차단하고 있을 수 있습니다. 연결을 확인하고 다시 시도하세요. Steam 클라이언트를 설정할 수 없습니다. 연결과 남은 저장 공간을 확인한 뒤 다시 시도하세요. %1$s은(는) x86 PC용으로 빌드되어 FEX를 통해 실행되지만, FEX가 아직 설치되지 않았습니다. 로그인한 상태로 Steam을 한 번 시작하여 FEX와 Steam Linux Runtime을 다운로드한 후 다시 시작하세요. @@ -386,6 +387,9 @@ 아직 여기서 지원되지 않음 구성 요소를 불러오는 중… 설치할 수 없습니다: %1$s + 이 다운로드는 업데이트가 필요합니다. + 업데이트가 대기 중입니다. + 업데이트 다시 시도 다운로드됨 %1$s 다운로드 중 설치 중: %1$s @@ -416,6 +420,22 @@ 내부 저장 공간만 폴더: %1$s 보조 라이브러리 + 추가 Steam 라이브러리 + Steam이 게임을 설치하고 실행할 수 있는 폴더이며, 각각 고유한 이름이 지정됩니다. 삭제해도 게임은 디스크에 남습니다. + 라이브러리 추가 + 이름 변경 + 라이브러리 이름 + 라이브러리로 사용할 폴더 선택 + 추가 라이브러리는 최대 %1$d개입니다. + 해당 폴더는 이미 라이브러리이거나 라이브러리 안에 있습니다 + %1$s · 사용할 수 없음 + 다음 Steam 세션부터 적용됩니다 + 이 기기에서 찾음 · %1$s · %2$s + 추가 + 내부 저장소에서 라이브러리 찾기 + 모든 파일 접근을 허용하면 DroidDeck이 내부 저장소에 있는 다른 앱의 Steam 라이브러리를 확인할 수 있습니다. + 허용 + 선택한 폴더 안의 Steam 라이브러리 %1$s를 추가했습니다. SD 카드나 공유 저장 공간에서 리소스를 읽는 게임은 끊길 수 있습니다. 저장 공간 진단 할당 결과와 샘플링한 저장 공간 응답 시간을 \"로그 공유\"에 기록합니다. 켜져 있는 동안 설치가 느려질 수 있습니다. 다음 세션에 적용됩니다. @@ -603,7 +623,10 @@ 모든 게임에서 CPU를 사용하는 Proton의 컨트롤러 탐색 도우미를 비활성화합니다. seccomp 없이 proot 실행 일부 커널에서 시스템 호출 누락 오류를 수정할 수 있지만 성능이 저하될 수 있습니다. + proot 없이 실행 (실험적) + Linux 환경을 Android에서 직접 시작합니다. 다음 세션부터 적용됩니다. 시작에 실패하면 끄세요. proot 빠른 경로 + proot 없이는 사용되지 않습니다. proot의 seccomp 필터가 필요합니다. 파일 검색이 빨라지고 끊김이 줄어듭니다. 프로그램이 파일을 찾지 못하면 이 옵션을 끄세요. gamescope 안에서 커서 그리기 @@ -812,6 +835,7 @@ 기기 지원됨 테스트되지 않은 GPU GPU 지원되지 않음 + Mali 브리지를 통한 GPU %1$s · %2$s %1$s: %2$s 사용할 수 있는 호환 그래픽 백엔드가 없습니다. %1$s에서 화면이 검게 표시될 수 있습니다. @@ -841,15 +865,38 @@ 세션 세션 로그 각 세션 종료 후 저장 + 다음 세션용 강화 진단 + 한 세션 동안 상세 로그를 수집합니다. 성능이 저하되거나 저장 공간을 더 사용할 수 있습니다. 세션이 시작되면 자동으로 꺼지며, 공유하기 전에 로그를 확인하세요. 게임 디버그 로그 다음 게임 실행 시 Proton, Wine 및 그래픽 진단 정보를 포함합니다. 성능이 저하되고 저장 공간을 더 사용할 수 있습니다. 게임 디버그 로그를 저장하려면 이 세션을 다시 시작하세요 로깅을 업데이트할 수 없습니다. 스위치를 확인하고 다시 시도하세요. 디버깅 도구 + 상세 그래픽 로그 + Steam 인터페이스: GPU 렌더링 + Xclipse 드라이버 조합에서는 Steam 페이지를 소프트웨어로 그립니다(GPU 렌더링에서는 타일이 깨져 보였습니다). 이 기기에서 정상적으로 보인다면 더 빠른 Steam 인터페이스를 위해 켜세요. + %1$s에 빌드됨 + %1$s이(가) 최신 빌드로 업데이트되었습니다 + 지난 세션에서 %1$s의 Mali 브리지 자체 테스트(이미지 또는 드로우)가 실패해 PanVK 드라이버 쌍을 대신 사용했습니다. + 지난 세션에서 Mali 브리지가 %1$s의 드라이버와 메모리를 공유할 방법을 찾지 못해 PanVK 드라이버 쌍을 대신 사용했습니다. 이 휴대폰에서는 브리지를 사용할 수 없으며, 끄면 PanVK 쌍이 유지됩니다. + 게임별 Proton, DXVK 및 드라이버 로그가 세션 로그에 포함됩니다. GPU가 Adreno가 아닌 경우 항상 켜집니다. 최신 세션 로그 저장된 세션 로그 최신 %1$d개 유지 로그 지우기 + 사용 가능한 세션 로그 + 저장된 세션 로그가 없습니다. + 공유하거나 저장한 ZIP에는 선택한 세션과 관련 Steam, 스토어, 도구, Battle.net 진단 정보가 포함됩니다. + %1$s · %2$s + 현재 세션 + 공유 + 기기에 저장 + 삭제 + 세션 로그를 삭제하시겠습니까? + %1$s을(를) 삭제하시겠습니까? 되돌릴 수 없습니다. + 세션 로그를 저장했습니다. + 세션 로그를 저장할 수 없습니다. + 세션 로그를 삭제할 수 없습니다. 모든 설정 초기화 모든 설정을 기본값으로 되돌립니다 초기화 @@ -876,6 +923,8 @@ 홈 화면으로 사용 DroidDeck을 홈 앱으로 사용할 수 있습니다 DroidDeck은 홈 앱으로 제공되지 않습니다 + 홈 버튼으로 열 페이지 + DroidDeck이 홈 앱일 때 홈 버튼을 누르면 표시되는 페이지 게임 추가에서 DroidDeck을 포함으로 설정하세요 화면 방향 런처 방향 @@ -889,15 +938,22 @@ 전체 화면 Android 상태 표시줄 및 탐색 표시줄 숨기기 Android 상태 표시줄 및 탐색 표시줄 표시 + 듀얼 화면 런처 + 자동은 내장 두 번째 화면이 있는 휴대용 기기에서 런처 섹션(Steam, 라이브러리, 스토어 등)을 두 번째 화면에 표시합니다. 켜기는 어떤 두 번째 디스플레이든 사용합니다. 끄기는 런처를 한 화면에 유지합니다. + 듀얼 화면 세션 + 자동은 팝오버 대신 게임 내 메뉴를 내장 두 번째 화면에 고정합니다. 켜기는 어떤 두 번째 디스플레이든 사용합니다. 끄기는 메뉴를 게임 화면에 유지하지만, 메뉴에서 두 번째 화면을 선택할 수 있습니다. 자동 켜기 끄기 게임 중 하단 화면 컨트롤 + 텍스트 입력란에 Android 키보드 사용 세션이 시작되면 두 번째 화면에 트랙패드와 키보드를 엽니다. 상단 화면에 입력 중 완료 기본 홈 앱 홈 앱 선택 + 대기 중일 때 최근 앱 목록에서 런처 숨기기 + DroidDeck이 기본 홈 앱이고 실행 중인 세션이 없을 때만 적용됩니다. 선택 Linux 앱(베타) 파일 @@ -1012,6 +1068,147 @@ 테스트 빌드 정식 출시 전에 특정 수정 사항을 시험해 보기 현재 없음 + Lab 빌드 + Lab 빌드 + 사용 중 + Android가 DroidDeck을 다시 최적화한 후 일시 중지됨 + 로드되지 않음: %1$s + 재시작 대기 중 + 유지됨 + 다른 버전용 + 재빌드 + 기기에서 이 빌드를 삭제합니다 + 이 빌드로 재시작 + 끄기 + 사용 + 삭제 + 지금 삭제 + 재시작을 준비할 수 없습니다: %1$s. 설정에서 무선 디버깅을 페어링한 후 다시 시도하세요. + Lab 빌드 설치됨 + DroidDeck이 %1$s로 재시작되었습니다 + Lab 빌드 일시 중지 + Android가 DroidDeck을 다시 최적화해 %1$s이(가) 로드되지 않았습니다. 업데이트를 열어 이 빌드로 다시 시작하세요. + Lab 빌드 사용 중지 + 다른 버전의 DroidDeck용으로 빌드되었습니다. 업데이트에 보관되어 있습니다. + 이 빌드로 DroidDeck을 두 번 시작하지 못했습니다. + 에이전트 + 에이전트 + 에이전트가 작업 중입니다 + 에이전트를 사용하려면 Linux 사용자 영역에 Claude Code를 설치하세요. + 게임, 비정상 종료 또는 DroidDeck 변경에 대해 물어보세요 + 보내기 + 새 대화 + 중지 + 저장 공간 + 삭제 + 지금 삭제 + Claude Code + Codex + DroidDeck 소스 + 다운로드 캐시 + 푸시하지 않은 변경 사항은 사라집니다 + 빌드 시 다시 다운로드합니다 + 설정에서 다시 설치할 수 있으며 로그인 정보는 유지됩니다 + DroidDeck이 Lab 빌드로 다시 시작되었습니다. 하던 작업을 계속하세요. + 게임이 시작되지 않는 이유를 묻거나, 로그를 설명해 달라고 하거나, DroidDeck을 변경하고 이 기기에서 그 변경을 시험해 보라고 요청하세요. + 실패: %1$s + %1$s 종료 (코드 %2$d) + 중지됨 + 응답 없이 종료됨 + 다시 시도 + 에이전트 설정 중 + 설치된 DroidDeck 버전에 맞게 내 Lab 빌드 %1$s를 다시 빌드하고 그 빌드로 다시 시작해 주세요. + %1$s 입력 · %2$s 출력 + 생각 중 + 생각 + 생각 중 · %1$s + %1$s · %2$s + 입력 + 출력 + 실행 중… + 결과 없음: 턴이 먼저 종료되었습니다 + 출력 없음 + 입력하면 다음 메시지가 대기열에 추가됩니다 + 대기열에 추가 + 다음: %1$s + 보내지 않기 + 첨부 + 제거 + 기본 + 추론 수준 + 진행 + 수정 + 아직 변경된 내용 없음 + 계획대로 진행해 주세요. + 지금 보내기 + 메시지 + 더보기 + 닫기 + 최신 + 작업 중 + 컨텍스트 + %2$s 중 %1$s + 이 대화 · %1$s + 첫 답변 후 사용량이 표시됩니다. + %1$d시간 한도 + %1$d분 한도 + 주간 한도 + %1$d%% · %2$s에 초기화 + + %1$d개 파일 + %1$d개 파일 + + 먼저 계획 세우기 + 계획 + 아무것도 변경하지 않고 계획만 제안합니다 + 대화 + 아직 대화가 없습니다 + 방금 전 + 삭제 + 대화와 첨부 파일이 함께 삭제됩니다 + 프로세스 + 리눅스 사용자 공간에서 실행 중인 프로세스가 없습니다 + 에이전트 + 중지 + 랩 빌드 + 랩 빌드 준비 중 + %1$d%% · 약 %2$s 남음 + 약 %1$s 남음 + 취소 + 빌드 취소 + 시작 중 + %1$d%% + 패키징 중 + DroidDeck 재시작 중 + 완료 + 실패: %1$s + 에이전트 설정 + 먼저 설정에서 리눅스 런타임을 설치하세요. + 다시 시도 + 대화 시작 + 기기 연결 + 무선 디버깅으로 에이전트가 DroidDeck을 확인하고 제어할 수 있습니다 + %1$s 설치 + Linux 사용자 공간에 git, gh, adb와 함께 설치 + %1$s에 로그인 + 브라우저가 열립니다 + GitHub + 선택 사항 · 풀 리퀘스트를 만들 때 필요 + 빌드 도구 + 선택 사항 · 이 기기에서 Lab 빌드에 사용 · 약 5 GB + 에이전트 준비 완료 + 에이전트 설정을 완료하세요 + %1$s에 로그인됨 + Lab 빌드 + 빠른 빌드 + 빠른 Lab 빌드 + 이 버전을 미리 컴파일해 Lab 빌드가 몇 분 만에 완료됩니다 · 한 번 약 20분 + 컴파일 중 · %1$d%% · 약 %2$s 남음 + 준비 + 무선 디버깅에 연결할 수 없습니다. 페어링하면 켜집니다 + 페어링 + 설치 + 로그인 PR #%1$d 이 DroidDeck 복사본용으로 빌드되지 않음 %1$s 업데이트됨 @@ -1247,6 +1444,14 @@ 앱 설정 업데이트 + 더보기 + 탭 편집 + 탭 + 표시 + 더보기 안 + 숨김 + %1$s 위로 이동 + %1$s 아래로 이동 %1$d%% %1$s 재개 각 세션에서 /root/ROMs로 표시됩니다. 내부 저장 공간은 /root/Storage에 있습니다. @@ -1268,6 +1473,15 @@ 대기 취소 Android 키보드 숨기기 ✕ + 화면상 크기 + 헤더를 포함해 키보드가 화면에서 차지하는 비율입니다. + 불투명도 + 낮추면 키보드 뒤의 게임이 보입니다. + 숨긴 키 + 자주 쓰지 않는 키는 키보드에 표시되지 않습니다. + Esc 및 기능 키 행 + Ins / Del / Home / End / PgUp / PgDn + 화살표 키 %1$s 실행 화면을 선택하세요. 보조 화면: %1$s. 보조 화면을 사용할 수 없습니다. @@ -1752,7 +1966,24 @@ 터미널 Deck 그립 + 터치패드 대시보드 + 데스크톱 + 데스크톱 시작 + 데스크톱 · %1$s + 트랙패드 + 직접 터치 + 트랙패드. 탭하여 직접 터치로 전환 + 직접 터치. 탭하여 트랙패드로 전환 + KDE 데스크톱을 시작하는 중… + 데스크톱이 종료되었습니다. + 데스크톱을 시작할 수 없습니다. 로그는 이 세션의 bottom-desktop 폴더에 있습니다. + 데스크톱이 종료되어 있습니다. 아직 표시할 내용이 없습니다. + 화면 바꾸기 + 현재 하단 화면이 사용 중입니다. + 게임 화면 + 게임을 표시할 화면 + 상단 화면 + 하단 화면 다운로드 진행 중인 다운로드가 없습니다. Steam @@ -1787,6 +2018,20 @@ 연료, t 메인 %1$s t 예비 %1$s t + 프레임 시간 + 최근 %1$d초 + 평균 프레임 + 1% 로우 + 33 ms 초과 프레임 + 분당 %1$d + %1$s 동안 플레이 중 + %1$d코어, 최대 %2$s GHz + %1$d코어 + 게임 + %1$d Hz의 FPS + 빨간색 표시는 HUD가 온도를 빨간색으로 표시하는 지점입니다. + 기기 전체 + 배터리 계기판 데이터 보내기 자동 나중에 발견된 게임을 포함해 여기에 나열된 모든 게임에서 켭니다. 직접 끈 게임은 꺼진 상태로 유지됩니다. @@ -1810,6 +2055,10 @@ 이 게임에서는 마이크가 꺼져 있습니다. 대화하려면 DroidDeck의 Steam 설정(오디오)에서 마이크를 켜고 게임을 다시 시작하세요. 볼륨 %1$d%% 게임 내 통계 + 하단 화면 HUD + 모든 탭에 스트립 표시 + 1% 및 0.1% 로우 + CPU 온도 FPS CPU GPU @@ -1981,6 +2230,7 @@ 세션 시작 중… %1$d:%2$02d 경과 · 아직 진행 중 Steam 클라이언트 업데이트 다운로드 중 · %1$d%% + Steam 클라이언트 업데이트 적용 중… Steam 클라이언트 다운로드 중 · %1$s 호환성 도구를 이미 설치하고 있습니다 @@ -2057,11 +2307,29 @@ 툰 윤곽선과 샤프닝. Adreno GPU가 아님 + 시스템 PowerVR 드라이버: 기기에 따라 호환성이 다릅니다 + 실험 기능: RADV 또는 시스템 Xclipse 드라이버 + 시스템 PowerVR + 이 GPU에 내장된 드라이버를 사용합니다 + 런타임과 디스플레이에 시스템 PowerVR 드라이버가 선택되었습니다. + 아직 이 Mali를 지원하는 공개 드라이버가 없습니다: Mali 브리지가 켜져 있습니다. + 이 빌드는 스냅드래곤 외 기기용 테스트 빌드입니다: 여기의 공식 빌드는 Adreno에서만 실행되므로 이 빌드 위에는 설치되지 않습니다. 새 테스트 빌드는 github.com/The412Banner/droiddeck-nonadreno-drivers에 있습니다. + 마지막 세션은 충돌이 아니라 안드로이드가 메모리를 확보하려고 DroidDeck을 종료해 끝났습니다. 다른 앱을 닫거나 게임의 텍스처 설정을 낮춘 뒤 다시 시도하세요. + Mali (Venus) + Mali 브리지 + 아직 이 Mali를 지원하는 공개 드라이버가 없습니다: 휴대전화 자체 드라이버 위에서 %1$s가 사용됩니다. + %1$s가 아직 공개되지 않았습니다: 공개될 때까지 %2$s가 사용됩니다. + %1$s를 사용할 수 없으며, 이 휴대전화의 드라이버가 보고하는 Vulkan 버전은 %2$s입니다(Venus에는 1.2가 필요합니다): Mali 브리지가 사용됩니다. + %1$s가 아직 공개되지 않았습니다: 공개될 때까지 Mali 브리지가 켜져 있습니다. + 대기 중: %1$s(다른 런타임 드라이버를 기다리는 중) + DXVK는 시스템 PowerVR 런타임에서 제공됩니다. 다른 DXVK 패키지는 저장할 수 있지만 이 드라이버에서는 적용되지 않습니다. 지원됨 실험적: 드라이버가 테스트 빌드입니다 실험적 Adreno 850 지원: 호환되는 실험용 디스플레이 및 게임 드라이버가 필요하며, 이 기기에서 검증되지 않았습니다 테스트된 하드웨어(Adreno 725 이상)보다 낮음: 실행되지 않을 수 있습니다 지원되지 않음: 이 GPU에서 사용할 수 있는 호환 그래픽 백엔드가 없습니다 + Mali 브리지를 거쳐 휴대전화 자체 Vulkan 드라이버에서 실행됩니다. + Mali 브리지가 꺼져 있으면 지원되지 않습니다: Turnip에는 Adreno(스냅드래곤) GPU가 필요합니다. GitHub 요청 한도에 도달했습니다. 나중에 다시 시도하세요 GitHub 응답: HTTP %1$d @@ -2262,6 +2530,13 @@ 정렬 사이드바 레이블 사이드바 아이콘 아래에 이름을 표시합니다. 끄면 사이드바가 더 슬림해집니다. + 에이전트 펫 + DeeDee가 런처와 게임 위에 표시되며 에이전트가 무엇을 하고 있는지 보여 줍니다. + 다른 앱 위에 표시 + DeeDee가 모든 앱 위에 표시되도록 허용하고 해당 앱에서 채팅을 열 수 있게 합니다. + 허용 + DeeDee + DeeDee와 채팅하기 표시 카드 크게 카드 작게 @@ -2547,6 +2822,11 @@ 개발자 빌드 라벨 워터마크 테스트 또는 Lab 빌드 라벨을 화면에 표시합니다. 기본적으로 켜져 있습니다. + 진단 번들 공유 + 세션 및 기기 + 그래픽 + 게임 및 호환성 + 모든 번들 플레이 준비 완료 아직 플레이할 준비가 되지 않음 런타임 %1$s @@ -2585,6 +2865,9 @@ 스토어 설정에서 GOG 도전 과제를 활성화하세요 도전 과제를 사용할 수 없습니다. 세션 로그를 확인하세요 도전 과제 잠금 해제됨 + Mali (Venus): 꺼짐 + Mali (Venus): 켜짐 + %1$s의 드라이버가 Vulkan %2$s를 보고합니다. Mali (Venus)에는 Vulkan 1.2 이상이 필요하고(더 낮은 버전에서는 gamescope이 시작되지 않습니다), 세션은 Venus를 건너뛰고 PanVK 드라이버 조합을 대신 사용합니다. 붙여넣기 왼쪽 스틱 오른쪽 스틱 @@ -2938,6 +3221,7 @@ 게임이 요청한 VC++ 및 DirectX 설치 관리자 Linux x86 게임 실행 Steam 도구 + Steam은 게임에 안티 치트가 포함되어 있으면 꺼져 있어도 이 항목을 다운로드합니다. 삭제하면 해당 게임의 설치가 0%에서 멈춥니다. DroidDeck은 이 런타임 없이 게임을 실행할 수 있습니다 x86 Proton이라 DroidDeck에서 실행할 수 없습니다 모든 게임의 기본값 @@ -3048,6 +3332,8 @@ DroidDeck · %1$d fps 60 fps는 더 부드럽지만 Steam이 시작되는 동안 CPU를 더 사용합니다. Steam 자체 설정에서 고른 동영상도 여기에 표시됩니다. 소리 + 시작 동영상 건너뛰기 + 0.1초짜리 검은 화면 클립을 Steam 시작 동영상으로 사용합니다. 다음 세션부터 적용됩니다. 내 동영상 MP4, MOV, MKV 또는 WebM. 다른 형식과 %1$d MB를 넘는 파일은 기기에서 720p WebM으로 변환됩니다(최대 %2$d초). 가져오기 @@ -3509,6 +3795,7 @@ Alt+Tab, Win 키, 홈 버튼을 Android 대신 사용 중인 DroidDeck 세션에서 작동하게 합니다. 설정 → Steam 연동에서 밝기를 켜세요 Mali 브리지: 끔 + Mali 브리지에는 시스템 드라이버 경로가 없는 Mali GPU가 필요하므로 %1$s에서는 사용할 수 없으며, 이 스위치는 여기서 아무 효과가 없습니다. Mali 브리지: 켬 %1$s은(는) Adreno가 아닙니다. 실험적 Vulkan 브리지가 켜져 있어 세션이 휴대폰 자체 드라이버로 그립니다. 버그가 있을 수 있으니 세션 로그를 보내 주세요. 안전 모드 @@ -3667,6 +3954,7 @@ 이 레이아웃을 가져올 수 없습니다 진홍빛 눈 + 빨간색 포인트가 있는 흰색 표면. 사운드트랙 음악 @@ -3730,4 +4018,6 @@ 한 곡 반복 볼륨 이 사운드트랙에 오디오 파일이 없습니다 + 실행할 수 없음 + 이 링크를 열 수 있는 웹 브라우저가 없습니다. diff --git a/app/src/main/res/values-ms/input_library.xml b/app/src/main/res/values-ms/input_library.xml new file mode 100644 index 0000000000..bd4b455121 --- /dev/null +++ b/app/src/main/res/values-ms/input_library.xml @@ -0,0 +1,132 @@ + + + Tetapan input yang tidak dapat dibaca disimpan dalam salinan pemulihan. Anda boleh terus menyunting profil yang dipulihkan. + Sifat + Sifat klik + %1$s · Klik + Butang + Kayu, pad dan pencetus + Sembunyikan alat + Pengawal + Hantar input pengawal ke Steam Input atau permainan. + Elemen ini tidak menghantar input pengawal, tetikus atau papan kekunci. + Klik tetikus + Tindakan DroidDeck + Tindakan + Kelajuan tatal: %1$d langkah/s + + Profil baharu + + Susun atur baharu + %1$s · Digunakan oleh %2$d profil. Perubahan terpakai pada setiap profil yang menggunakan penetapan ini. + Namakan semula + Padam + Tambah elemen pada susun atur sebelum menetapkan tindakannya. + Tidak dapat menyimpan tetapan input + Nama + Mula dari + Butang + Kayu + Pad sentuh + D-pad + Pencetus + Selesai + Buat asal + + Tambah + Seret untuk mengalih. Seret penjuru untuk mengubah saiz. Ketik Sifat untuk menetapkan tindakan. + Menyunting pada skrin kedua + Skrin yang dipilih tidak tersedia. Sambungkannya untuk menyunting susun atur ini pada saiz sebenar. + Buang perubahan susun atur yang belum disimpan? + Susun atur ini digunakan oleh %1$d profil. Perubahan yang disimpan terpakai pada semua. + Profil lalai + Mod desktop + Mod permainan + Lalai untuk desktop dan permainan + Lalai untuk mod permainan + Lalai untuk mod desktop + Tetapan peranti + Kawalan + Butang, kayu, pencetus dan kekunci tambahan + Salin profil + Tetapkan semula tindakan + Tetapkan semula tindakan dalam %1$s kepada lalai profil asasnya? Susun atur dan profil lain kekal tidak berubah. + Padam %1$s? Mod yang menggunakannya akan kembali kepada profil lalai terbina dalam. Susun atur tersimpan dan tetapan dikongsi kekal tersedia. + Keterlihatan + Terpakai pada semua profil. Auto menunjukkan kawalan skrin utama apabila tiada pengawal disambungkan dalam mod permainan. + Sunting pada skrin + Susun atur tersimpan… + Pilih susun atur atau cipta sendiri + Pilih Kawalan profil dalam menu sesi skrin kedua. Pemilih Profil dan Skrin kedua dalam menu pengawal menentukan kawalan yang dipaparkan. + Tindakan butang + Dikongsi dengan %1$s. Suntingan juga terpakai pada profil tersebut. + Guna semula tetapan + Guna tetapan daripada… + Salin daripada profil lain atau kekalkan tetapan dikongsi + Jadikan bebas + Kekalkan persediaan semasa dan berhenti berkongsi perubahan + Susun atur menyimpan elemen dan kedudukannya. Setiap profil boleh menetapkan tindakannya sendiri. Sunting pada saiz penuh di skrin sasaran. + Susun atur semasa + Padam susun atur tidak digunakan %1$s dan tindakan tersimpannya? + Namakan semula susun atur semasa + Guna semula %1$s daripada profil lain. Sumber kawalan lain kekal tidak berubah. + Kekalkan kawalan fizikal dikongsi + Secara lalai, semua kawalan dan susun atur tersuai ialah salinan bebas. Perkongsian hanya memautkan kawalan fizikal. + Guna elemen dan kedudukan ini. Perkongsian memastikan perubahan geometri masa depan kekal segerak; tindakan butang anda kekal bebas. Susun atur berbeza bermula dengan tindakan yang belum ditetapkan. + Salin kawalan dan tindakan ini, atau pautkannya supaya perubahan masa depan terpakai pada kedua-dua profil. + Kekalkan dikongsi + Salinan bebas + Mulakan kayu pada kedudukan sentuhan + Sembunyikan kayu apabila tidak digunakan + Alat + Auto (%1$s) + Tersuai (%1$s) + Simpan sebagai profil baharu + Kawalan profil + Profil + Gerak isyarat pad sentuh tetikus + Apabila ditetapkan pada penuding tetikus: ketik untuk klik, tahan untuk seret, dan tatal dengan dua jari. + %1$s mempunyai penggantian menu pantas. Pilih Auto di sana untuk menggunakan profil lalainya dan ketiga-tiga bahagian tersimpan. + Input DroidDeck + Ditetapkan semasa kayu digerakkan ke mana-mana arah: tekan melebihi 55%, lepas di bawah 35%. Gunakan Kekunci arah untuk menetapkan setiap arah secara berasingan. Perintah DroidDeck berjalan sekali setiap pesongan. Klik kayu ditetapkan secara berasingan. + Ditetapkan semasa menyentuh pad sentuh; dilepaskan apabila jari diangkat. Perintah DroidDeck berjalan sekali setiap sentuhan. Klik pad sentuh ditetapkan secara berasingan. + Ditetapkan apabila pencetus melepasi 55%; dilepaskan di bawah 35%. Perintah DroidDeck berjalan sekali setiap tekanan. + Arah tatal + Menegak + Mendatar + Tatal mendatar + Ukuran + Dayakan rakaman, gunakan kawalan dalam sesi yang berjalan, kemudian kembali dan baca keputusan. Hanya mengukur masa penghantaran DroidDeck, bukan kependaman skrin. Rakaman berakhir apabila proses apl ditutup. + %1$d kawalan + Susun atur tersimpan lain (%1$d) ▾ + Sembunyikan susun atur tersimpan lain (%1$d) ▴ + Utama / Guide + Kembali · satu ketikan + Kembali · ketik dua kali + Kembali · dua kali dalam Steam, sekali di desktop + Dalam mod Steam. Menahan Kembali juga membuka akses pantas. + Pulihkan kepada lalai + Pilihan panel anda diingati. Desktop membuka ruang kerja kedua; ia tidak menukar sesi atau profil inputnya. + Pengawal maya + Jenis pengawal yang dilihat oleh Steam atau permainan. + Skrin sentuh + Bagaimana sentuhan pada skrin permainan dikendalikan. Butang profil kekal dengan tindakan yang ditetapkan. + Kursor sentuh + Tunjukkan penuding untuk sentuhan langsung pada skrin permainan. + Sentuh dan tahan + Tindakan tetikus apabila menahan jari pada skrin permainan. + Ketikan butang Kembali + Tindakan pertama: satu ketikan. Tindakan kedua: dua ketikan. + Butang togol + Ketik untuk menahan, ketik lagi untuk melepaskan. Membuka menu atau menukar profil melepaskan butang. + Bentuk + Bulat + Pil + Bulatan + Segi empat tepat + Label butang + Teks + Imej diimport + Kekunci pepenjuru berasingan + Tetapkan kekunci untuk setiap pepenjuru. Pepenjuru kosong menekan dua arah jirannya. + Arah jiran + Kekunci skrin lama anda disimpan sebagai profil diimport di bawah. Pilih satu untuk digunakan atau disunting. Pilihan profil semasa anda dikekalkan. + Kekunci skrin lama tidak dapat diimport secara automatik. Tetapan asal dikekalkan. + diff --git a/app/src/main/res/values-ms/input_strings.xml b/app/src/main/res/values-ms/input_strings.xml new file mode 100644 index 0000000000..e96a230e16 --- /dev/null +++ b/app/src/main/res/values-ms/input_strings.xml @@ -0,0 +1,38 @@ + + + Profil input + Profil + Pengawal fizikal + Skrin utama + Skrin kedua + Asli / Steam Input + Asli: %1$s + Hantar kawalan pengawal lain + Dinyahdayakan + Kekunci atau gabungan kekunci + Kekunci arah + Gerakkan penuding + Kelajuan penuding: %1$d + Tatal + Tatal menegak + Butang kiri tetikus + Butang kanan tetikus + Butang tengah tetikus + Buka menu DroidDeck + Tunjukkan papan kekunci + Buka menu Steam + Buka akses pantas Steam + Alih keluar kawalan + Tambah kawalan + Butang khusus peranti + Tetapkan butang fizikal + Lepaskan butang, kemudian pilih Edit, Cuba lagi atau Batal. B atau Kembali membatalkan selepas dilepaskan. + Cuba lagi + Tekan butang, termasuk butang Kembali yang dilaporkan sebagai kekunci. Kekunci kelantangan dan sistem Android dikhaskan. Penetapan hanya terpakai pada peranti ini. + Alih keluar penetapan + Diagnostik input + Rakam masa penghantaran input + Baca ukuran + Mengukur penghantaran dari Android hingga penerbitan ke pengangkutan input sedia ada. Tidak termasuk ketibaan Bluetooth, pengundian tetamu, pemaparan dan kependaman skrin. Rakaman dimatikan secara lalai. + Gunakan penetapan input biasa + diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 4d624af6a5..726edcd452 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -185,6 +185,7 @@ Persekitaran grafik PowerVR tidak dapat dimuat turun. Semak sambungan dan cuba lagi. DirectAudio tidak dapat dimuat turun, jadi audio permainan menggunakan laluan yang lebih perlahan untuk sesi ini. Program ini + Sesi gagal melukis pada skrin: %1$s. Skrin ini menunjukkan sebabnya, bukannya skrin hitam; butiran ada dalam log sesi. 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. @@ -386,6 +387,9 @@ Belum disokong di sini Memuatkan komponen… Tidak dapat memasang: %1$s + Muat turun ini perlu dikemas kini. + Kemas kini dalam baris gilir. + Cuba semula kemas kini Dimuat turun Memuat turun %1$s Memasang: %1$s @@ -416,6 +420,22 @@ Dalaman sahaja Folder: %1$s Pustaka kedua + Pustaka Steam tambahan + Folder tempat Steam boleh memasang permainan dan menjalankannya dari situ, setiap satu dengan namanya sendiri. Mengalih keluar satu folder tidak membuang permainannya daripada storan. + Tambah pustaka + Namakan semula + Nama pustaka + Pilih folder untuk pustaka + Maksimum %1$d pustaka tambahan + Folder itu sudah menjadi pustaka atau berada di dalam pustaka. + %1$s · tidak tersedia + Berkuat kuasa dari sesi Steam seterusnya + Ditemui pada peranti ini · %1$s · %2$s + Tambah + Cari pustaka pada storan dalaman + Benarkan akses kepada semua fail supaya DroidDeck dapat melihat pustaka Steam yang disimpan oleh apl lain pada storan dalaman + Benarkan + Ditambah %1$s, iaitu pustaka Steam di dalam folder yang anda pilih Permainan yang menstrim aset daripada SD atau storan kongsi mungkin tersekat-sekat. Diagnostik storan Rekod keputusan peruntukan dan masa storan yang disampel dalam Kongsi log. Boleh melambatkan pemasangan semasa dihidupkan. Berkuat kuasa pada sesi seterusnya. @@ -603,7 +623,10 @@ Melumpuhkan pembantu navigasi pad Proton, yang memakan CPU dalam setiap permainan. Jalankan proot tanpa seccomp Mungkin membetulkan ralat syscall yang hilang pada sesetengah kernel. Boleh mengurangkan prestasi. + Jalankan tanpa proot (eksperimen) + Memulakan bahagian Linux terus pada Android. Berkuat kuasa dari sesi seterusnya. Matikan jika ada yang gagal dimulakan. Laluan pantas proot + Tidak digunakan tanpa proot. Memerlukan penapis seccomp proot. Carian fail lebih pantas dan kurang tersekat-sekat. Matikan jika sesuatu program tidak dapat mencari failnya. Lukis kursor di dalam gamescope @@ -812,6 +835,7 @@ Peranti disokong GPU belum diuji GPU tidak disokong + GPU melalui jambatan Mali %1$s · %2$s %1$s: %2$s Tiada backend grafik yang serasi tersedia untuk %1$s. Steam mungkin memaparkan skrin hitam. @@ -841,15 +865,38 @@ Sesi Log sesi Disimpan selepas setiap sesi + Diagnostik dipertingkat untuk sesi seterusnya + Merakam log terperinci untuk satu sesi. Boleh mengurangkan prestasi dan menggunakan lebih banyak storan. Ia dimatikan sendiri apabila sesi bermula; semak log sebelum berkongsi. Log nyahpepijat permainan Sertakan diagnostik Proton, Wine dan grafik pada pelancaran permainan seterusnya. Boleh mengurangkan prestasi dan menggunakan lebih banyak storan. Mulakan semula sesi ini untuk menyimpan log nyahpepijat permainan Tidak dapat mengemas kini pengelogan. Semak suis dan cuba lagi. Alatan penyahpepijatan + Log grafik terperinci + Antara muka Steam: pelukisan GPU + Dengan pasangan pemacu Xclipse, Steam melukis halamannya melalui perisian (pelukisan GPU menghasilkan jubin yang cacat). Hidupkan untuk antara muka Steam yang lebih pantas jika hasilnya kelihatan betul pada telefon ini. + dibina pada %1$s + %1$s dikemas kini kepada binaan terbaharu + Jambatan Mali gagal ujian kendiri pada %1$s semasa sesi lepas (imej atau lukisan), jadi sesi itu menggunakan pasangan pemacu PanVK sebaliknya. + Jambatan Mali tidak menemui cara untuk berkongsi memori dengan pemacu pada %1$s semasa sesi lepas, jadi sesi itu menggunakan pasangan pemacu PanVK sebaliknya. Jambatan ini tidak boleh berfungsi pada telefon ini; mematikannya mengekalkan pasangan PanVK. + Log Proton, DXVK dan pemacu bagi setiap permainan disertakan dalam log sesi. Sentiasa aktif apabila GPU bukan Adreno. Log sesi terkini Log sesi tersimpan Menyimpan %1$d yang terbaharu Kosongkan log + Log sesi yang tersedia + Belum ada log sesi yang disimpan. + Fail ZIP yang dikongsi dan disimpan menyertakan sesi yang dipilih serta diagnostik berkaitan bagi Steam, kedai, alat dan Battle.net. + %1$s · %2$s + Sesi semasa + Kongsi + Simpan ke peranti + Padam + Padam log sesi? + Padam %1$s? Tindakan ini tidak boleh dibatalkan. + Log sesi disimpan. + Tidak dapat menyimpan log sesi. + Tidak dapat memadam log sesi. Set semula semua tetapan Kembalikan setiap tetapan kepada nilai lalai Set semula @@ -876,6 +923,8 @@ Gunakan sebagai skrin Utama DroidDeck boleh menjadi apl Utama DroidDeck tidak sekali-kali ditawarkan sebagai apl Utama + Butang Utama membuka + Halaman yang dipaparkan apabila DroidDeck ialah apl Skrin Utama dan anda menekan butang Utama Dalam Tambah Permainan, tetapkan DroidDeck kepada Sertakan Orientasi Orientasi pelancar @@ -889,15 +938,22 @@ Skrin penuh Menyembunyikan bar status dan navigasi Android Memaparkan bar status dan navigasi Android + Pelancar dwi skrin + Automatik meletakkan bahagian pelancar (Steam, Pustaka, Kedai dan selebihnya) pada skrin kedua terbina dalam peranti genggam. Hidup menggunakan sebarang paparan kedua. Mati mengekalkan pelancar pada satu skrin. + Sesi dwi skrin + Automatik meletakkan menu dalam permainan pada skrin kedua terbina dalam, bukannya sebagai tetingkap timbul. Hidup menggunakan sebarang paparan kedua. Mati mengekalkan menu pada skrin permainan; anda masih boleh memilih skrin kedua daripada menu itu. Automatik Hidup Mati Kawalan skrin bawah dalam permainan + Papan kekunci Android untuk medan teks Membuka pad jejak dan papan kekunci pada skrin kedua apabila sesi bermula. Menaip untuk skrin atas Selesai Apl Utama lalai Pilih apl Utama + Sembunyikan pelancar daripada senarai apl terkini semasa melahu + Hanya berkuat kuasa apabila DroidDeck ialah apl Skrin Utama lalai dan tiada sesi sedang berjalan. Pilih Apl Linux (beta) Fail @@ -1012,6 +1068,147 @@ Binaan ujian Cuba pembetulan sebelum dikeluarkan Tiada pada masa ini + Binaan Lab + Binaan Lab + Sedang digunakan + Dijeda selepas Android mengoptimumkan semula DroidDeck + Tidak dimuatkan: %1$s + Menunggu permulaan semula + Dikekalkan + Untuk versi lain + Bina semula + Memadam binaan ini daripada peranti + Mulakan semula dengannya + Matikan + Gunakan + Padam + Padam sekarang + Tidak dapat menyediakan permulaan semula: %1$s. Pasangkan penyahpepijatan wayarles dalam Persediaan dan cuba lagi. + Binaan Lab dipasang + DroidDeck dimulakan semula pada %1$s + Binaan Lab dijeda + Android mengoptimumkan semula DroidDeck, jadi %1$s tidak dimuatkan. Buka Kemas Kini untuk memulakan semula padanya. + Binaan Lab dimatikan + Ia dibina untuk versi DroidDeck yang lain. Ia disimpan dalam Kemas Kini. + DroidDeck tidak dimulakan padanya dua kali + Ejen + Ejen + Ejen sedang bekerja + Pasang Claude Code dalam ruang pengguna Linux untuk menggunakan ejen. + Tanya tentang permainan, ranapan, atau perubahan pada DroidDeck + Hantar + Perbualan baharu + Hentikan + Storan + Alih keluar + Alih keluar sekarang + Claude Code + Codex + Sumber DroidDeck + Cache muat turun + Perubahan yang belum dimuat naik akan hilang + Binaan akan memuat turunnya semula + Persediaan boleh memasangnya semula; log masuk dikekalkan + DroidDeck dimulakan semula pada binaan Lab anda. Sambung semula dari tempat anda berhenti. + Tanya mengapa sesuatu permainan tidak dapat dimulakan, minta ia menerangkan log, atau mengubah DroidDeck dan mencuba perubahan itu pada peranti ini. + Gagal: %1$s + %1$s tamat (kod keluar %2$d) + Dihentikan + Tamat tanpa balasan + Cuba semula + Menyediakan ejen + Bina semula binaan Lab saya %1$s untuk versi DroidDeck yang dipasang dan mulakan semula padanya. + %1$s masuk · %2$s keluar + Berfikir + Fikiran + Berfikir · %1$s + %1$s · %2$s + MASUKAN + KELUARAN + Sedang berjalan… + Tiada hasil: giliran tamat terlebih dahulu + Tiada output + Taip untuk membariskan mesej seterusnya + Baris gilir + Seterusnya: %1$s + Jangan hantar + Lampirkan + Alih keluar + Lalai + Usaha penaakulan + Teruskan + Ubah suai + Belum ada perubahan + Teruskan dengan pelan ini. + Hantar sekarang + Mesej + Lagi + Tutup + Terkini + Sedang bekerja + Konteks + %1$s daripada %2$s + Perbualan ini · %1$s + Penggunaan dipaparkan selepas balasan pertama + Had %1$d jam + Had %1$d minit + Had mingguan + %1$d%% · ditetapkan semula %2$s + + %1$d fail + %1$d fail + + Rancang dahulu + Rancang + Mencadangkan pelan tanpa mengubah apa-apa + Perbualan + Belum ada perbualan + Baru sahaja + Padam + Memadamnya dan lampirannya + Proses + Tiada apa-apa berjalan dalam ruang pengguna Linux + AGEN + Hentikan + Binaan Lab + Menyediakan binaan Lab + %1$d%% · kira-kira %2$s lagi + kira-kira %1$s lagi + Batal + Batalkan binaan + Memulakan + %1$d%% + Membungkus + Memulakan semula DroidDeck padanya + Selesai + Gagal: %1$s + Sediakan agen + Pasang runtime Linux dalam Setup terlebih dahulu. + Cuba semula + Mula berbual + Sambungan peranti + Penyahpepijatan wayarles, supaya agen boleh melihat dan mengawal DroidDeck + Pasang %1$s + Ke dalam userland Linux, dengan git, gh dan adb + Log masuk ke %1$s + Membuka penyemak imbas anda + GitHub + Pilihan, untuk membuka pull request + Alat binaan + Pilihan, untuk binaan Lab pada peranti ini · kira-kira 5 GB + Ejen sedia + Lengkapkan persediaan ejen + Sudah log masuk ke %1$s + Binaan Lab + binaan pantas + Binaan Lab pantas + Mengkompil versi ini lebih awal, supaya binaan Lab mengambil masa beberapa minit · kira-kira 20 minit sekali sahaja + Mengkompil · %1$d%% · kira-kira %2$s lagi + Sediakan + Penyahpepijatan wayarles tidak dapat dicapai; Pasangkan menghidupkannya + Pasangkan + Pasang + Log masuk PR #%1$d Tidak dibina untuk salinan DroidDeck ini Dikemas kini %1$s @@ -1247,6 +1444,14 @@ Apl Persediaan Kemas kini + Lagi + Sunting tab + Tab + Dipaparkan + Dalam Lagi + Disembunyikan + Alih %1$s ke atas + Alih %1$s ke bawah %1$d%% Sambung %1$s Muncul sebagai /root/ROMs dalam setiap sesi. Storan dalaman berada di /root/Storage. @@ -1268,6 +1473,15 @@ Batalkan yang tertangguh Papan kekunci Android Sembunyi ✕ + Saiz pada skrin + Bahagian skrin yang digunakan papan kekunci, termasuk pengepala. + Kelegapan + Turunkan untuk melihat permainan di belakang papan kekunci. + Kekunci tersembunyi + Kekunci yang jarang digunakan tidak dipaparkan pada papan kekunci. + Esc dan baris kekunci fungsi + Ins / Del / Home / End / PgUp / PgDn + Kekunci anak panah Lancarkan %1$s Pilih skrin. Kedua: %1$s. Paparan kedua tidak lagi tersedia. @@ -1752,7 +1966,24 @@ Terminal Pemegang Deck + trackpad Papan pemuka + Desktop + Mulakan desktop + Desktop · %1$s + Pad jejak + Sentuhan terus + Pad jejak. Ketik untuk sentuhan terus + Sentuhan terus. Ketik untuk pad jejak + Memulakan desktop KDE… + Desktop telah ditutup. + Desktop tidak dapat dimulakan. Lognya ada dalam folder bottom-desktop sesi ini. + Desktop ditutup. Belum ada apa-apa untuk dipaparkan di sini. + Tukar skrin + Skrin bawah tidak tersedia buat masa ini + Skrin permainan + Tunjukkan permainan pada + Skrin atas + Skrin bawah Muat turun Tiada muat turun yang sedang berjalan. Steam @@ -1787,6 +2018,20 @@ Bahan api, t Utama %1$s t Simpanan %1$s t + Masa bingkai + %1$d s terakhir + purata bingkai + 1% terendah + bingkai melebihi 33 ms + %1$d / min + Bermain selama %1$s + %1$d teras, sehingga %2$s GHz + %1$d teras + permainan + FPS pada %1$d Hz + Tanda merah ialah tempat HUD memaparkan suhu dalam warna merah. + seluruh peranti + bateri Hantar data papan pemuka Automatik Menghidupkannya untuk setiap permainan yang disenaraikan di sini, termasuk permainan yang ditemui kemudian. Permainan yang anda matikan kekal mati. @@ -1810,6 +2055,10 @@ Mikrofon dimatikan untuk permainan ini. Untuk bercakap, hidupkan Mikrofon dalam tetapan Steam DroidDeck (Audio) dan mulakan permainan semula. Kelantangan %1$d%% Statistik dalam permainan + HUD skrin bawah + Jalur pada setiap tab + 1% dan 0.1% terendah + Suhu CPU FPS CPU GPU @@ -1981,6 +2230,7 @@ Memulakan sesi… %1$d:%2$02d berlalu · masih berjalan Memuat turun kemas kini klien Steam · %1$d%% + Memasang kemas kini klien Steam… Memuat turun klien Steam · %1$s Pemasangan alat keserasian sudah berjalan @@ -2057,11 +2307,29 @@ Garis luar kartun tambah ketajaman. Bukan GPU Adreno + Pemandu sistem PowerVR: keserasian berbeza mengikut peranti + Eksperimen: RADV atau pemandu sistem Xclipse + PowerVR sistem + Menggunakan pemandu terbina dalam untuk GPU ini + Pemandu PowerVR sistem dipilih untuk masa jalan dan paparan. + Tiada pemandu sumber terbuka yang menyokong Mali ini setakat ini: jambatan Mali dihidupkan. + Ini ialah binaan ujian bukan Snapdragon: binaan rasmi di sini hanya berjalan pada Adreno, jadi binaan-binaan itu tidak dipasang menggantikannya. Binaan ujian baharu terdapat di github.com/The412Banner/droiddeck-nonadreno-drivers. + Sesi terakhir tamat kerana Android menutup DroidDeck untuk membebaskan memori, bukan kerana ranap. Tutup aplikasi lain atau kurangkan tetapan tekstur permainan, kemudian cuba lagi. + Mali (Venus) + jambatan Mali + Tiada pemandu sumber terbuka yang menyokong Mali ini setakat ini: %1$s digunakan, dengan pemandu asal telefon. + %1$s belum diterbitkan: %2$s digunakan sehingga ia diterbitkan. + %1$s tidak tersedia, dan pemandu telefon ini melaporkan Vulkan %2$s (Venus memerlukan Vulkan 1.2): jambatan Mali digunakan. + %1$s belum diterbitkan: jambatan Mali dihidupkan sehingga ia diterbitkan. + Dalam baris gilir: %1$s (menunggu pemandu masa jalan yang lain) + DXVK disediakan oleh persekitaran masa jalan PowerVR sistem. Pakej DXVK lain boleh disimpan tetapi tidak digunakan dengan pemandu ini. Disokong Eksperimen: pemacunya ialah binaan ujian Sokongan eksperimen Adreno 850: memerlukan pemacu paparan dan permainan eksperimen yang serasi; belum disahkan pada peranti ini Di bawah perkakasan yang diuji (Adreno 725 dan lebih baharu): mungkin tidak dapat berjalan Tidak disokong: tiada backend grafik yang serasi tersedia untuk GPU ini + Berjalan melalui jambatan Mali, menggunakan pemandu Vulkan asal telefon + Tidak disokong apabila jambatan Mali dimatikan: Turnip memerlukan GPU Adreno (Snapdragon) Had kadar GitHub dicapai - cuba lagi kemudian GitHub menjawab HTTP %1$d @@ -2262,6 +2530,13 @@ Isih Label bar sisi Paparkan nama di bawah ikon bar sisi. Matikan untuk bar sisi yang lebih ramping. + Haiwan peliharaan ejen + DeeDee terapung di atas pelancar dan permainan serta menunjukkan apa yang sedang dilakukan oleh ejen. + Di atas apl lain + Benarkan DeeDee terapung di atas setiap apl dan buka sembangnya di situ + Benarkan + DeeDee + Sembang dengan DeeDee Paparan Kad lebih besar Kad lebih kecil @@ -2547,6 +2822,11 @@ Pembangun Tera air label binaan Paparkan label binaan ujian atau Lab pada skrin. Dihidupkan secara lalai. + Kongsi himpunan diagnostik + Sesi dan peranti + Grafik + Permainan dan keserasian + Semua himpunan Sedia untuk bermain Belum sedia untuk bermain masa jalan %1$s @@ -2585,6 +2865,9 @@ Hidupkan pencapaian GOG dalam tetapan Stores Pencapaian tidak tersedia; semak log sesi Pencapaian dibuka kunci + Mali (Venus): dimatikan + Mali (Venus): dihidupkan + Pemandu pada %1$s melaporkan Vulkan %2$s. Mali (Venus) memerlukan Vulkan 1.2 atau lebih baharu (gamescope tidak bermula pada versi lebih lama), jadi sesi melangkau Venus dan menggunakan pasangan pemandu PanVK sebaliknya. Tampal Kayu bedik kiri Kayu bedik kanan @@ -2938,6 +3221,7 @@ Pemasangan VC++ dan DirectX yang diperlukan permainan Menjalankan permainan Linux x86 Alat Steam + Steam memuat turun ini untuk permainan yang menyertakan anti-cheat, walaupun anti-cheat itu dimatikan. Membuangnya menyebabkan pemasangan permainan itu terhenti pada 0% DroidDeck menjalankan permainan tanpa runtime ini Proton x86, yang tidak dapat dijalankan oleh DroidDeck Lalai untuk semua permainan @@ -3048,6 +3332,8 @@ DroidDeck · %1$d fps 60 fps kelihatan lebih lancar tetapi menggunakan lebih banyak CPU semasa Steam bermula. Video yang dipilih dalam tetapan Steam sendiri turut dipaparkan di sini. Bunyi + Langkau filem permulaan + Gunakan klip hitam 0.1 saat sebagai filem permulaan Steam. Berkuat kuasa pada sesi seterusnya. Video anda sendiri MP4, MOV, MKV atau WebM. Format lain dan fail melebihi %1$d MB ditukar kepada WebM 720p pada peranti, sehingga %2$d saat. Import @@ -3509,6 +3795,7 @@ Mengekalkan Alt+Tab, kekunci Win dan butang Utama dalam sesi DroidDeck yang aktif, bukan Android. Hidupkan Kecerahan dalam Persediaan → Integrasi Steam Jambatan Mali: mati + %1$s tidak boleh menggunakan jambatan Mali (jambatan itu memerlukan GPU Mali tanpa laluan pemandu sistem), jadi suis ini tidak memberi kesan di sini. Jambatan Mali: hidup %1$s bukan Adreno. Jambatan Vulkan eksperimen dihidupkan: sesi melukis melalui pemacu telefon itu sendiri. Jangkakan pepijat; hantar log sesi. Mod selamat @@ -3667,6 +3954,7 @@ Susun atur ini tidak dapat diimport Salji Merah Skarlet + Permukaan putih dengan aksen merah. Runut bunyi Muzik @@ -3730,4 +4018,6 @@ Ulang satu Kelantangan Tiada fail audio dalam runut bunyi ini + Pelancaran tidak tersedia + Tiada penyemak imbas web tersedia untuk membuka pautan ini. diff --git a/app/src/main/res/values-nb/input_library.xml b/app/src/main/res/values-nb/input_library.xml new file mode 100644 index 0000000000..e810fed5a4 --- /dev/null +++ b/app/src/main/res/values-nb/input_library.xml @@ -0,0 +1,132 @@ + + + Ulesbare inndata-innstillinger ble bevart i en gjenopprettingskopi. Du kan fortsette å redigere de gjenopprettede profilene. + Egenskaper + Egenskaper for klikk + %1$s · Klikk + Knapper + Stikker, puter og avtrekkere + Skjul verktøy + Kontroller + Send kontrollerinndata til Steam Input eller spillet. + Dette elementet sender ingen inndata fra kontroller, mus eller tastatur. + Museklikk + DroidDeck-handling + Handling + Rullehastighet: %1$d trinn/s + + Ny profil + + Nytt oppsett + %1$s · Brukes av %2$d profiler. Endringer gjelder for alle profiler som bruker disse tildelingene. + Gi nytt navn + Slett + Legg til elementer i oppsettet før du tildeler handlingene deres. + Kunne ikke lagre inndata-innstillingene + Navn + Start fra + Knapp + Stikke + Styreflate + Retningskryss + Avtrekker + Ferdig + Angre + + Legg til + Dra for å flytte. Dra i et hjørne for å endre størrelse. Trykk på Egenskaper for å tildele en handling. + Redigeres på sekundærskjermen + Den valgte skjermen er ikke tilgjengelig. Koble den til for å redigere dette oppsettet i full størrelse. + Forkaste ulagrede oppsettendringer? + Dette oppsettet brukes av %1$d profiler. Lagrede endringer gjelder for alle. + Standardprofiler + Skrivebordsmodus + Spillmodus + Standard for skrivebord og spill + Standard for spillmodus + Standard for skrivebordsmodus + Enhetsinnstillinger + Kontroller + Knapper, stikker, avtrekkere og ekstra taster + Kopier profil + Tilbakestill handlinger + Tilbakestille handlingene i %1$s til basisprofilens standardverdier? Oppsett og andre profiler forblir uendret. + Slette %1$s? Moduser som bruker den går tilbake til sin innebygde standardprofil. Lagrede oppsett og delte innstillinger forblir tilgjengelige. + Synlighet + Gjelder alle profiler. Auto viser hovedskjermens kontroller når ingen kontroller er tilkoblet i spillmodus. + Rediger på skjermen + Lagrede oppsett… + Velg et oppsett eller lag ditt eget + Velg Profilkontroller i øktmenyen på sekundærskjermen. Profil- og Sekundærskjerm-valgene i kontrollermenyen bestemmer hvilke kontroller som vises. + Knapphandlinger + Delt med %1$s. Endringer gjelder også disse profilene. + Bruk innstillinger på nytt + Bruk innstillinger fra… + Kopier fra en annen profil eller behold innstillingene delt + Gjør uavhengig + Behold dagens oppsett og slutt å dele endringer + Oppsett lagrer elementer og posisjonene deres. Hver profil kan tildele egne handlinger. Rediger i full størrelse på målskjermen. + Gjeldende oppsett + Slette det ubrukte oppsettet %1$s og de lagrede handlingene? + Gi gjeldende oppsett nytt navn + Bruk %1$s på nytt fra en annen profil. De andre kontrollkildene forblir uendret. + Behold fysiske kontroller delt + Som standard er alle kontroller og egendefinerte oppsett uavhengige kopier. Deling kobler bare de fysiske kontrollene. + Bruk disse elementene og posisjonene. Deling holder fremtidige geometriendringer synkronisert; knapphandlingene dine forblir uavhengige. Et annet oppsett starter med utildelte handlinger. + Kopier disse kontrollene og handlingene, eller koble dem slik at fremtidige endringer gjelder begge profilene. + Behold delt + Uavhengig kopi + Start stikka ved berøringspunktet + Skjul stikka når den ikke brukes + Verktøy + Auto (%1$s) + Egendefinert (%1$s) + Lagre som ny profil + Profilkontroller + Profil + Musestyreflatebevegelser + Når tilordnet musepekeren: trykk for å klikke, hold for å dra, og rull med to fingre. + %1$s har en overstyring av hurtigmenyen. Velg Auto der for å bruke standardprofilen og alle tre lagrede delene. + DroidDeck-inndata + Holdes mens stikka flyttes i en hvilken som helst retning: trykk over 55 %, slipp under 35 %. Bruk Retningstaster for å tildele hver retning separat. DroidDeck-kommandoer kjøres én gang per utslag. Stikkklikket konfigureres separat. + Holdes mens du berører styreflaten; slippes når du løfter fingeren. DroidDeck-kommandoer kjøres én gang per berøring. Styreflateklikket konfigureres separat. + Holdes når avtrekkeren passerer 55 %; slippes under 35 %. DroidDeck-kommandoer kjøres én gang per trykk. + Rulleretning + Loddrett + Vannrett + Rull vannrett + Målinger + Slå på opptak, bruk kontrollene i en kjørende økt, og kom tilbake og les resultatene. Måler bare DroidDeck-utsendingstiden, ikke skjermforsinkelse. Opptaket avsluttes når appprosessen lukkes. + %1$d kontroller + Andre lagrede oppsett (%1$d) ▾ + Skjul andre lagrede oppsett (%1$d) ▴ + Hjem / Guide + Tilbake · enkelt trykk + Tilbake · dobbeltrykk + Tilbake · to ganger i Steam, én gang på skrivebordet + I Steam-modus. Å holde Tilbake åpner også hurtigtilgang. + Tilbakestill til standard + Panelvalget ditt huskes. Skrivebord åpner et andre arbeidsområde; det bytter ikke økten eller inndataprofilen. + Virtuell kontroller + Kontrollertypen som Steam eller spillet ser. + Berøringsskjerm + Hvordan berøringer på spillskjermen håndteres. Profilknappene beholder sine tilordnede handlinger. + Berøringsmarkør + Vis en peker for direkte berøringer på spillskjermen. + Berør og hold + Musehandling når du holder en finger på spillskjermen. + Trykk på Tilbake-knappen + Første handling: enkelt trykk. Andre handling: dobbeltrykk. + Veksleknapp + Trykk for å holde, trykk igjen for å slippe. Å åpne en meny eller bytte profil slipper knappen. + Form + Avrundet + Pille + Sirkel + Rektangel + Knappetekst + Tekst + Importert bilde + Separate diagonalknapper + Tilordne en tast til hver diagonal. En tom diagonal trykker de to naboretningene. + Naboretninger + De gamle skjermtastene dine er lagret som importerte profiler nedenfor. Velg en for å bruke eller redigere den. Dine nåværende profilvalg er beholdt. + De gamle skjermtastene kunne ikke importeres automatisk. De opprinnelige innstillingene er beholdt. + diff --git a/app/src/main/res/values-nb/input_strings.xml b/app/src/main/res/values-nb/input_strings.xml new file mode 100644 index 0000000000..92e1af4eff --- /dev/null +++ b/app/src/main/res/values-nb/input_strings.xml @@ -0,0 +1,38 @@ + + + Inndataprofiler + Profiler + Fysisk kontroller + Hovedskjerm + Sekundærskjerm + Innebygd / Steam Input + Innebygd: %1$s + Send en annen kontrollerkontroll + Deaktivert + Tast eller tastekombinasjon + Retningstaster + Flytt pekeren + Pekerhastighet: %1$d + Rull + Rull loddrett + Venstre museknapp + Høyre museknapp + Midtre museknapp + Åpne DroidDeck-menyen + Vis tastatur + Åpne Steam-menyen + Åpne Steams hurtigtilgang + Fjern kontroll + Legg til kontroll + Enhetsspesifikke knapper + Tildel en fysisk knapp + Slipp knappen, og velg Rediger, Prøv igjen eller Avbryt. B eller Tilbake avbryter etter slipp. + Prøv igjen + Trykk på en knapp, også en Tilbake-knapp som rapporteres som tast. Volum- og Android-systemtaster er reservert. Tildelingen gjelder bare denne enheten. + Fjern tildeling + Inndatadiagnostikk + Ta opp inndataforsinkelse + Les målinger + Måler forsendelsen fra Android til publisering i den eksisterende inndatatransporten. Bluetoothtilkobling, gjestepolling, gjengivelse og skjermforsinkelse er ikke med. Opptak er av som standard. + Bruk vanlig inndatatildeling + diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index cb7a8f8294..03cceb6dff 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -185,6 +185,7 @@ PowerVR-grafikkmiljøet kunne ikke lastes ned. Sjekk tilkoblingen og prøv igjen. Kunne ikke laste ned DirectAudio, så spillyd bruker den tregere veien i denne sesjonen. Dette programmet + Økten kunne ikke tegne på skjermen: %1$s. Denne skjermen viser hvorfor i stedet for en svart skjerm; detaljene finnes i loggene for økten. 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. @@ -387,6 +388,9 @@ Ikke støttet her ennå Laster komponentene… Kunne ikke installere: %1$s + Denne nedlastingen trenger en oppdatering. + Oppdateringen er lagt i kø. + Prøv oppdateringen på nytt Lastet ned Laster ned %1$s Installerer: %1$s @@ -417,6 +421,22 @@ Bare intern Mappe: %1$s Andre bibliotek + Flere Steam-biblioteker + Mapper som Steam kan installere til og spille fra, hver under sitt eget navn. Fjerner du ett, blir spillene liggende på disken. + Legg til bibliotek + Endre navn + Biblioteknavn + Velg en mappe for biblioteket + Høyst %1$d biblioteker kan legges til + Den mappen er allerede et bibliotek eller ligger inne i ett + %1$s · ikke tilgjengelig + Gjelder fra neste Steam-økt + Funnet på denne enheten · %1$s · %2$s + Legg til + Finn biblioteker på intern lagring + Tillat tilgang til alle filer, slik at DroidDeck kan se Steam-biblioteker som andre apper lagrer på intern lagring + Tillat + La til %1$s, Steam-biblioteket inne i mappen du valgte Spill som strømmer ressurser fra SD-kort eller delt lagring kan hakke. Lagringsdiagnostikk Lagrer tildelingsresultater og tidsmålinger for lagring i Del logger. Kan gjøre installasjoner tregere mens dette er på. Gjelder fra neste sesjon. @@ -605,7 +625,10 @@ Slår av Protons hjelper for kontrollernavigasjon, som koster CPU i hvert spill. Kjør proot uten seccomp Kan fikse feil om manglende systemkall på noen kjerner. Kan redusere ytelsen. + Kjør uten proot (eksperimentelt) + Starter Linux-delen direkte på Android. Gjelder fra neste økt. Slå av hvis noe ikke starter. proot-hurtigvei + Brukes ikke uten proot. Krever prootens seccomp-filter. Raskere filoppslag og mindre hakking. Slå av hvis et program ikke finner filene sine. Tegn markøren i gamescope @@ -815,6 +838,7 @@ Enheten er støttet Utestet GPU GPU ikke støttet + GPU via Mali-bro %1$s · %2$s %1$s: %2$s Ingen kompatibel grafikkbackend er tilgjengelig for %1$s. Steam kan vise en svart skjerm. @@ -844,15 +868,38 @@ Sesjon Sesjonslogger Lagret etter hver sesjon + Utvidet diagnostikk for neste økt + Samler inn detaljerte logger for én økt. Kan redusere ytelsen og bruke mer lagringsplass. Slår seg av når økten starter; se gjennom loggene før du deler. Feilsøkingslogger for spill Ta med diagnostikk for Proton, Wine og grafikk ved neste spillstart. Kan redusere ytelsen og bruke mer lagringsplass. Start denne sesjonen på nytt for å lagre feilsøkingslogger for spill Kunne ikke oppdatere loggingen. Sjekk bryteren og prøv igjen. Feilsøkingsverktøy + Detaljerte grafikklogger + Steam-grensesnitt: GPU-tegning + Med Xclipse-driverparet tegner Steam sidene sine i programvare (GPU-tegning viste ødelagte fliser). Slå på for et raskere Steam-grensesnitt hvis det ser riktig ut på denne telefonen. + bygget %1$s + %1$s oppdatert til det nyeste bygget + Mali-broen bestod ikke selvtesten på %1$s under forrige økt (bilder eller tegnekall), så økten brukte PanVK-driverparet i stedet. + Mali-broen fant ingen måte å dele minne med driveren på %1$s under forrige økt, så økten brukte PanVK-driverparet i stedet. Broen kan ikke fungere på denne telefonen; hvis du slår den av, beholder du PanVK-paret. + Proton-, DXVK- og driverloggene for hvert spill tas med i øktens logger. Alltid på når GPU-en ikke er en Adreno. Nyeste sesjonslogger Lagrede sesjonslogger Beholder de %1$d nyeste Tøm logger + Tilgjengelige øktlogger + Ingen lagrede øktlogger ennå. + Delte og lagrede ZIP-filer inneholder den valgte økten samt tilhørende diagnostikk for Steam, butikker, verktøy og Battle.net. + %1$s · %2$s + Gjeldende økt + Del + Lagre på enheten + Slett + Slette øktlogger? + Slette %1$s? Dette kan ikke angres. + Øktlogger lagret. + Kunne ikke lagre øktlogger. + Kunne ikke slette øktlogger. Tilbakestill alle innstillinger Sett hver innstilling tilbake til standardverdien Tilbakestill @@ -879,6 +926,8 @@ Bruk som Hjem-skjerm DroidDeck kan være Hjem-appen DroidDeck tilbys aldri som en Hjem-app + Hjem-knappen åpner + Siden som vises når DroidDeck er startappen og du trykker på Hjem I Legg til spill setter du DroidDeck til Inkluder Retning Retning for launcheren @@ -892,15 +941,22 @@ Fullskjerm Skjuler Androids status- og navigasjonslinjer Viser Androids status- og navigasjonslinjer + Startprogram på to skjermer + Automatisk plasserer startprogrammets deler (Steam, Bibliotek, Butikker og resten) på den andre skjermen på håndholdte enheter med innebygd sekundærskjerm. På bruker en hvilken som helst annen skjerm. Av holder startprogrammet på én skjerm. + Økter på to skjermer + Automatisk fester spillmenyen til den innebygde sekundærskjermen i stedet for å vise den som et overlappende vindu. På bruker en hvilken som helst annen skjerm. Av holder menyen på spillskjermen; du kan fortsatt velge en annen skjerm i menyen. Automatisk På Av Kontroller på nederste skjerm i spill + Android-tastatur for tekstfelt Åpner styreflaten og tastaturet på den andre skjermen når en økt starter. Skriver for den øverste skjermen Ferdig Standard Hjem-app Velg en Hjem-app + Skjul startappen fra Siste apper mens den er inaktiv + Gjelder bare når DroidDeck er standard startapp og ingen økt kjører. Velg Linux-apper (beta) Filer @@ -1015,6 +1071,147 @@ Testbuilder Prøv en fiks før den blir utgitt Ingen akkurat nå + Lab-bygg + Lab-bygg + I bruk + Satt på pause etter at Android optimaliserte DroidDeck på nytt + Ikke lastet inn: %1$s + Venter på omstart + Beholdt + For en annen versjon + Bygg på nytt + Sletter dette bygget fra enheten + Start på nytt med bygget + Slå av + Bruk + Slett + Slett nå + Kunne ikke klargjøre omstarten: %1$s. Par trådløs feilsøking i Oppsett og prøv igjen. + Lab-bygg installert + DroidDeck startet på nytt med %1$s + Lab-bygget er satt på pause + Android har optimalisert DroidDeck på nytt, så %1$s er ikke lastet inn. Åpne Oppdateringer for å starte på nytt med det. + Lab-bygget er slått av + Det ble bygget for en annen versjon av DroidDeck. Det ligger fortsatt i Oppdateringer. + DroidDeck klarte ikke å starte med det to ganger + Agent + Agent + Agenten jobber + Installer Claude Code i Linux-brukermiljøet for å bruke agenten. + Spør om et spill, en krasj eller en endring i DroidDeck + Send + Ny samtale + Stopp + Lagring + Fjern + Fjern nå + Claude Code + Codex + DroidDeck-kildekode + Nedlastingshurtiglagre + Endringer som ikke pushes, går tapt + Bygg laster dem ned på nytt + Oppsettet kan installere det på nytt; innloggingene beholdes + DroidDeck startet på nytt med Lab-bygget ditt. Fortsett der du slapp. + Spør den hvorfor et spill ikke starter, be den forklare en logg, eller få den til å endre DroidDeck og prøve endringen på denne enheten. + Mislyktes: %1$s + %1$s avsluttet (avslutningskode %2$d) + Stoppet + Avsluttet uten svar + Prøv igjen + Setter opp agenten + Bygg Lab-bygget mitt %1$s på nytt for den installerte versjonen av DroidDeck, og start på nytt med det. + %1$s inn · %2$s ut + Tenker + Tanke + Tenker · %1$s + %1$s · %2$s + INNDATA + UTDATA + Kjører… + Ingen resultat: runden ble avsluttet først + Ingen utdata + Skriv for å legge neste melding i kø + Legg i kø + Neste: %1$s + Ikke send + Legg ved + Fjern + Standard + Resonneringsinnsats + Gå videre + Revider + Ingen endringer ennå + Gå videre med planen. + Send nå + Melding + Mer + Lukk + Nyeste + Arbeider + Kontekst + %1$s av %2$s + Denne samtalen · %1$s + Forbruket vises etter det første svaret + %1$d-timersgrense + %1$d-minuttersgrense + Ukentlig grense + %1$d%% · nullstilles %2$s + + %1$d fil + %1$d filer + + Planlegg først + Plan + Foreslår en plan uten å endre noe + Samtaler + Ingen samtaler ennå + Akkurat nå + Slett + Sletter den og vedleggene + Prosesser + Ingenting kjører i Linux-brukerlandet + AGENT + Stopp + Lab-bygg + Forbereder Lab-bygg + %1$d%% · ca. %2$s igjen + ca. %1$s igjen + Avbryt + Avbryt byggingen + Starter + %1$d%% + Pakker + Starter DroidDeck på nytt på den + Ferdig + Feilet: %1$s + Sett opp agenten + Installer Linux-runtime i Oppsett først. + Prøv igjen + Begynn å chatte + Enhetstilkobling + Trådløs feilsøking, så agenten kan se og styre DroidDeck + Installer %1$s + I Linux-brukerlandet, med git, gh og adb + Logg inn på %1$s + Åpner nettleseren din + GitHub + Valgfritt, for å opprette pull-forespørsler + Byggeverktøy + Valgfritt, for Lab-bygg på denne enheten · ca. 5 GB + Agenten er klar + Fullfør oppsettet av agenten + Logget inn på %1$s + Lab-bygg + raske bygg + Raske Lab-bygg + Kompilerer denne versjonen på forhånd, slik at Lab-bygg tar minutter · ca. 20 minutter én gang + Kompilerer · %1$d%% · ca. %2$s igjen + Forbered + Trådløs feilsøking er ikke tilgjengelig; Par slår den på + Par + Installer + Logg inn PR #%1$d Ikke bygget for denne kopien av DroidDeck Oppdatert %1$s @@ -1254,6 +1451,14 @@ Apper Oppsett Oppdateringer + Mer + Rediger faner + Faner + Synlig + I Mer + Skjult + Flytt %1$s opp + Flytt %1$s ned %1$d%% Gjenoppta %1$s Vises som /root/ROMs i hver sesjon. Intern lagring er på /root/Storage. @@ -1275,6 +1480,15 @@ Avbryt i kø Android-tastatur Skjul ✕ + Størrelse på skjermen + Andelen av skjermen tastaturet tar, inkludert toppfeltet. + Ugjennomsiktighet + Senk den for å se spillet bak tastaturet. + Skjulte taster + Taster du sjelden bruker vises ikke på tastaturet. + Esc og funksjonsrad + Ins / Del / Home / End / PgUp / PgDn + Piltaster Start %1$s Velg en skjerm. Sekundær: %1$s. Den sekundære skjermen er ikke tilgjengelig lenger. @@ -1776,7 +1990,24 @@ Terminal Deck-grep + styreflater Dashbord + Skrivebord + Start skrivebordet + Skrivebord · %1$s + Styreflate + Direkte berøring + Styreflate. Trykk for direkte berøring + Direkte berøring. Trykk for styreflate + Starter KDE-skrivebordet… + Skrivebordet ble lukket. + Skrivebordet kunne ikke starte. Loggene ligger i bottom-desktop-mappen for denne økten. + Skrivebordet er lukket. Ingenting å vise her ennå. + Bytt skjermer + Bunnskjermen er ikke ledig akkurat nå + Spillskjerm + Vis spillet på + Toppskjermen + Bunnskjermen Nedlastinger Ingen nedlastinger pågår. Steam @@ -1811,6 +2042,20 @@ Drivstoff, t Hoved %1$s t Reserve %1$s t + Bildetid + siste %1$d s + Gjennomsnittlig bildetid + Laveste 1 % + Bilder over 33 ms + %1$d / min + Spilt i %1$s + %1$d kjerner, opptil %2$s GHz + %1$d kjerner + spill + FPS på %1$d Hz + Den røde markeringen er der HUD-en viser temperaturen i rødt. + hele enheten + batteri Send dashborddata Automatisk Slår det på for alle spill som er oppført her, også spill som blir funnet senere. Spill du slår av, forblir av. @@ -1834,6 +2079,10 @@ Mikrofonen er av for dette spillet. For å snakke, slå på Mikrofon i DroidDecks Steam-innstillinger (Lyd) og start spillet på nytt. Volum %1$d%% Statistikk i spillet + HUD på bunnskjermen + Stripe på hver fane + Laveste 1 % og 0,1 % + CPU-temperatur FPS CPU GPU @@ -2006,6 +2255,7 @@ Starter sesjonen… %1$d:%2$02d gått · fortsatt i gang Laster ned Steam-klientoppdateringen · %1$d%% + Installerer Steam-klientoppdateringen… Laster ned Steam-klienten · %1$s En installasjon av et kompatibilitetsverktøy kjører allerede @@ -2082,11 +2332,29 @@ Tegnefilm-konturer pluss skarphet. Ikke en Adreno-GPU + PowerVR-driver fra systemet: kompatibiliteten varierer med enheten + Eksperimentelt: RADV eller Xclipse-driver fra systemet + PowerVR fra systemet + Bruker de innebygde driverne for denne GPU-en + Systemets PowerVR-driver er valgt for kjøretidsmiljøet og skjermen. + Ingen åpen driver støtter denne Mali-GPU-en ennå: Mali-broen er slått på. + Dette er testbygget for ikke-Snapdragon: de offisielle byggene her kjører bare på Adreno, så de blir ikke installert oppå det. Nye testbygg finnes på github.com/The412Banner/droiddeck-nonadreno-drivers. + Forrige økt ble avsluttet fordi Android lukket DroidDeck for å frigjøre minne, ikke på grunn av et krasj. Lukk andre apper eller senk spillets teksturinnstillinger, og prøv igjen. + Mali (Venus) + Mali-broen + Ingen åpen driver støtter denne Mali-GPU-en ennå: %1$s brukes, på telefonens egen driver. + %1$s er ikke publisert ennå: %2$s brukes til den er det. + %1$s er ikke tilgjengelig, og driveren på denne telefonen rapporterer Vulkan %2$s (Venus krever 1.2): Mali-broen brukes. + %1$s er ikke publisert ennå: Mali-broen er slått på til den er det. + I kø: %1$s (venter på en annen driver for kjøretidsmiljøet) + DXVK leveres av systemets PowerVR-kjøretidsmiljø. Andre DXVK-pakker kan lagres, men blir ikke tatt i bruk med denne driveren. Støttet Eksperimentell: driverne er testbuilder Eksperimentell støtte for Adreno 850: krever kompatible eksperimentelle skjerm- og spilldrivere; ikke bekreftet på denne enheten Under testet maskinvare (Adreno 725 og nyere): den kan ikke kjøre Støttes ikke: ingen kompatibel grafikkbackend er tilgjengelig for denne GPU-en + Kjører via Mali-broen, på telefonens egen Vulkan-driver + Støttes ikke når Mali-broen er av: Turnip krever en Adreno-GPU (Snapdragon) GitHubs hastighetsgrense ble nådd – prøv igjen senere GitHub svarte HTTP %1$d @@ -2287,6 +2555,13 @@ Sorter Etiketter i sidepanelet Vis navn under ikonene i sidepanelet. Slå av for et smalere sidepanel. + Agentkjæledyr + DeeDee flyter over startskjermen og spill og viser hva agenten gjør. + Over andre apper + La DeeDee flyte over alle apper og åpne chatten sin der + Tillat + DeeDee + Chat med DeeDee Visning Større kort Mindre kort @@ -2574,6 +2849,11 @@ Utvikler Vannmerke for byggetikett Vis etiketten for test- eller Lab-bygget på skjermen. På som standard. + Del diagnostikkpakker + Økt og enhet + Grafikk + Spill og kompatibilitet + Alle pakker Klar til å spille Ikke klar til å spille ennå kjøretid %1$s @@ -2612,6 +2892,9 @@ Slå på GOG-prestasjoner i Store-innstillinger Prestasjoner ikke tilgjengelig; sjekk sesjonsloggene Prestasjon låst opp + Mali (Venus): av + Mali (Venus): på + Driveren på %1$s rapporterer Vulkan %2$s. Mali (Venus) krever Vulkan 1.2 eller nyere (gamescope starter ikke på eldre versjoner), så øktene hopper over Venus og bruker PanVK-driverparet i stedet. Lim inn Venstre stikke Høyre stikke @@ -2967,6 +3250,7 @@ VC++- og DirectX-installasjoner spill krever Kjører Linux x86-spill Steam-verktøy + Steam laster ned dette for spill som leveres med anti-juks, selv når anti-juks er slått av. Fjerner du dette, blir installasjonen deres stående på 0%. DroidDeck kjører spill uten dette kjøretidsmiljøet Proton x86, som DroidDeck ikke kan kjøre Standard for alle spill @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps 60 fps ser jevnere ut, men bruker mer CPU mens Steam starter. En video valgt i Steams egne innstillinger vises også her. Lyd + Hopp over oppstartsfilmen + Bruk et svart klipp på 0,1 sekunder som oppstartsfilmen til Steam. Trer i kraft neste økt. Din egen video MP4, MOV, MKV eller WebM. Andre formater og filer over %1$d MB konverteres til 720p-WebM på enheten, opptil %2$d sekunder. Importer @@ -3538,6 +3824,7 @@ Holder Alt+Tab, Win-tasten og Hjem-knappen i en aktiv DroidDeck-økt i stedet for Android. Slå på Lysstyrke i Oppsett → Steam-integrering Mali-bro: av + %1$s kan ikke bruke Mali-broen (den krever en Mali-GPU uten en rute via systemdriveren), så denne bryteren har ingen effekt her. Mali-bro: på %1$s er ikke en Adreno. Den eksperimentelle Vulkan-broen er på: økten tegner gjennom telefonens egen driver. Forvent feil; send øktloggene. Sikker modus @@ -3697,6 +3984,7 @@ Kunne ikke importere dette oppsettet Skarlagenssnø + Hvite flater med røde aksenter. Lydspor Musikk @@ -3760,4 +4048,6 @@ Gjenta ett Volum Ingen lydfiler i dette lydsporet + Start utilgjengelig + Ingen nettleser er tilgjengelig for å åpne denne lenken. diff --git a/app/src/main/res/values-nl/input_library.xml b/app/src/main/res/values-nl/input_library.xml new file mode 100644 index 0000000000..80f96a853b --- /dev/null +++ b/app/src/main/res/values-nl/input_library.xml @@ -0,0 +1,132 @@ + + + Onleesbare invoerinstellingen zijn bewaard in een herstelkopie. Je kunt de herstelde profielen blijven bewerken. + Eigenschappen + Klikeigenschappen + %1$s · Klik + Knoppen + Sticks, pads en triggers + Gereedschap verbergen + Controller + Stuur controllerinvoer naar Steam Input of het spel. + Dit element stuurt geen controller-, muis- of toetsenbordinvoer. + Muisklik + DroidDeck-actie + Actie + Scrollsnelheid: %1$d stappen/s + + Nieuw profiel + + Nieuwe indeling + %1$s · Gebruikt door %2$d profielen. Wijzigingen gelden voor elk profiel met deze toewijzingen. + Naam wijzigen + Verwijderen + Voeg elementen toe aan de indeling voordat je hun acties toewijst. + Invoerinstellingen konden niet worden opgeslagen + Naam + Beginnen met + Knop + Stick + Touchpad + Kruis + Trigger + Gereed + Ongedaan maken + + Toevoegen + Sleep om te verplaatsen. Sleep een hoek om te vergroten of verkleinen. Tik op Eigenschappen om een actie toe te wijzen. + Bewerken op het secundaire scherm + Het geselecteerde scherm is niet beschikbaar. Sluit het aan om deze indeling op ware grootte te bewerken. + Niet-opgeslagen indelingswijzigingen negeren? + Deze indeling wordt door %1$d profielen gebruikt. Opgeslagen wijzigingen gelden voor alle. + Standaardprofielen + Bureaubladmodus + Spelmodus + Standaard voor bureaublad en spel + Standaard voor spelmodus + Standaard voor bureaubladmodus + Apparaatinstellingen + Bediening + Knoppen, sticks, triggers en extra toetsen + Profiel kopiëren + Acties resetten + Acties in %1$s terugzetten naar de standaardwaarden van het basisprofiel? Indelingen en andere profielen blijven ongewijzigd. + %1$s verwijderen? Modi die het gebruiken keren terug naar hun ingebouwde standaardprofiel. Opgeslagen indelingen en gedeelde instellingen blijven beschikbaar. + Zichtbaarheid + Geldt voor alle profielen. Auto toont de bediening van het hoofdscherm als er geen controller is aangesloten in spelmodus. + Op scherm bewerken + Opgeslagen indelingen… + Kies een indeling of maak je eigen + Kies Profielbediening in het sessiemenu van het secundaire scherm. De keuzes Profiel en Secundair scherm in het controllermenu bepalen welke bediening wordt getoond. + Knopacties + Gedeeld met %1$s. Bewerkingen gelden ook voor die profielen. + Instellingen hergebruiken + Instellingen gebruiken van… + Kopiëren van een ander profiel of instellingen gedeeld houden + Onafhankelijk maken + Huidige opzet behouden en wijzigingen niet meer delen + Indelingen bewaren elementen en hun posities. Elk profiel kan eigen acties toewijzen. Bewerk op ware grootte op het doelscherm. + Huidige indeling + De ongebruikte indeling %1$s en de opgeslagen acties verwijderen? + Huidige indeling een andere naam geven + %1$s hergebruiken van een ander profiel. De andere bedieningsbronnen blijven ongewijzigd. + Fysieke bediening gedeeld houden + Standaard zijn alle bedieningen en aangepaste indelingen onafhankelijke kopieën. Delen koppelt alleen de fysieke bediening. + Deze elementen en posities gebruiken. Delen houdt toekomstige geometriewijzigingen gesynchroniseerd; je knopacties blijven onafhankelijk. Een andere indeling begint met niet-toegewezen acties. + Deze bediening en acties kopiëren of koppelen zodat toekomstige wijzigingen voor beide profielen gelden. + Gedeeld houden + Onafhankelijke kopie + Stick starten op aanraakpunt + Stick verbergen als die niet wordt gebruikt + Gereedschap + Auto (%1$s) + Aangepast (%1$s) + Opslaan als nieuw profiel + Profielbediening + Profiel + Muis-touchpadgebaren + Bij toewijzing aan de muisaanwijzer: tik om te klikken, houd vast om te slepen en scroll met twee vingers. + %1$s heeft een snelmenu-overschrijving. Kies daar Auto om het standaardprofiel en alle drie opgeslagen delen te gebruiken. + DroidDeck-invoer + Vastgehouden terwijl de stick in een willekeurige richting wordt bewogen: ingedrukt boven 55%, losgelaten onder 35%. Gebruik Richtingtoetsen om elke richting apart toe te wijzen. DroidDeck-opdrachten worden één keer per uitslag uitgevoerd. De stickklik wordt apart ingesteld. + Vastgehouden tijdens aanraking van de touchpad; losgelaten bij het optillen van je vinger. DroidDeck-opdrachten worden één keer per aanraking uitgevoerd. De touchpadklik wordt apart ingesteld. + Vastgehouden wanneer de trigger 55% passeert; losgelaten onder 35%. DroidDeck-opdrachten worden één keer per druk uitgevoerd. + Scrollrichting + Verticaal + Horizontaal + Horizontaal scrollen + Metingen + Schakel opnemen in, gebruik de bediening in een lopende sessie en kom terug om de resultaten te lezen. Meet alleen de DroidDeck-verzendtijd, niet de schermvertraging. De opname stopt wanneer het app-proces sluit. + %1$d bedieningen + Andere opgeslagen indelingen (%1$d) ▾ + Andere opgeslagen indelingen verbergen (%1$d) ▴ + Home / Guide + Terug · één tik + Terug · dubbeltik + Terug · twee keer in Steam, één keer op bureaublad + In spelmodus Steam. Terug ingedrukt houden opent ook snelle toegang. + Terugzetten naar standaard + Je paneelkeuze wordt onthouden. Bureaublad opent een tweede werkruimte; het wisselt de sessie of het invoerprofiel niet. + Virtuele controller + Het controllertype dat Steam of het spel ziet. + Touchscreen + Hoe aanrakingen op het spelscherm worden afgehandeld. Profielknoppen behouden hun toegewezen acties. + Aanraakcursor + Toon een aanwijzer voor directe aanrakingen op het spelscherm. + Aanraken en vasthouden + Muisactie wanneer je een vinger op het spelscherm houdt. + Tikken op de terugknop + Eerste actie: één tik. Tweede actie: dubbeltik. + Schakelknop + Tik om vast te houden, tik opnieuw om los te laten. Een menu openen of van profiel wisselen laat de knop los. + Vorm + Afgerond + Pil + Cirkel + Rechthoek + Knoplabel + Tekst + Geïmporteerde afbeelding + Aparte diagonale toetsen + Wijs een toets toe aan elke diagonaal. Een lege diagonaal drukt de twee aangrenzende richtingen. + Aangrenzende richtingen + Je oude schermtoetsen zijn hieronder opgeslagen als geïmporteerde profielen. Selecteer er een om te gebruiken of te bewerken. Je huidige profielkeuzes zijn behouden. + De oude schermtoetsen konden niet automatisch worden geïmporteerd. De oorspronkelijke instellingen zijn behouden. + diff --git a/app/src/main/res/values-nl/input_strings.xml b/app/src/main/res/values-nl/input_strings.xml new file mode 100644 index 0000000000..df68d569fe --- /dev/null +++ b/app/src/main/res/values-nl/input_strings.xml @@ -0,0 +1,38 @@ + + + Invoerprofielen + Profielen + Fysieke controller + Hoofdscherm + Secundair scherm + Native / Steam Input + Native: %1$s + Een andere controllerbesturing sturen + Uitgeschakeld + Toets of toetscombinatie + Richtingtoetsen + Aanwijzer verplaatsen + Aanwijzersnelheid: %1$d + Scrollen + Verticaal scrollen + Linkermuisknop + Rechtermuisknop + Middelste muisknop + DroidDeck-menu openen + Toetsenbord tonen + Steam-menu openen + Steam-sneltoegang openen + Besturing verwijderen + Besturing toevoegen + Apparaatspecifieke knoppen + Een fysieke knop toewijzen + Laat de knop los en kies Bewerken, Opnieuw of Annuleren. B of Terug annuleert na loslaten. + Opnieuw + Druk op een knop, ook een Terug-knop die als toets wordt gemeld. Volumetoetsen en Android-systeemtoetsen zijn gereserveerd. De toewijzing geldt alleen voor dit apparaat. + Toewijzing verwijderen + Invoerdiagnose + Invoerverzendtijd opnemen + Metingen lezen + Meet de verzending van Android tot publicatie in het bestaande invoertransport. Bluetooth-aankomst, gastpolling, weergave en schermvertraging vallen er niet onder. Opnemen staat standaard uit. + Normale invoertoewijzing gebruiken + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f9a5cbb753..2d02446e51 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -185,6 +185,7 @@ De PowerVR-grafische omgeving kon niet worden gedownload. Controleer de verbinding en probeer het opnieuw. DirectAudio kon niet worden gedownload, dus gamegeluid gebruikt deze sessie de tragere route. Dit programma + De sessie kon niet op het scherm tekenen: %1$s. Dit scherm laat zien waarom, in plaats van een zwart scherm; de details staan in de sessielogboeken. 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. @@ -387,6 +388,9 @@ Hier nog niet ondersteund Componenten laden… Kan niet installeren: %1$s + Voor deze download is een update nodig. + Update staat in de wachtrij. + Update opnieuw proberen Gedownload %1$s downloaden Installeren: %1$s @@ -417,6 +421,22 @@ Alleen intern Map: %1$s Tweede bibliotheek + Meer Steam-bibliotheken + Mappen waarnaar Steam kan installeren en van waaruit het games kan spelen, elk onder een eigen naam. Als je er een verwijdert, blijven de games op schijf staan. + Bibliotheek toevoegen + Hernoemen + Bibliotheeknaam + Kies een map voor de bibliotheek + Maximaal %1$d toegevoegde bibliotheken + Die map is al een bibliotheek of bevindt zich in een bibliotheek + %1$s · niet beschikbaar + Geldt vanaf de volgende Steam-sessie + Gevonden op dit apparaat · %1$s · %2$s + Toevoegen + Bibliotheken op interne opslag zoeken + Geef toegang tot alle bestanden zodat DroidDeck Steam-bibliotheken kan zien die andere apps op interne opslag bewaren + Toestaan + %1$s toegevoegd, de Steam-bibliotheek in de map die je hebt gekozen Games die assets streamen vanaf SD of gedeelde opslag kunnen haperen. Opslagdiagnose Legt toewijzingsresultaten en steekproeven van opslagtijden vast in Logs delen. Kan installaties vertragen zolang dit aan staat. Geldt vanaf de volgende sessie. @@ -605,7 +625,10 @@ Schakelt de gamepadnavigatiehulp van Proton uit, die in elke game CPU kost. Draai proot zonder seccomp Kan foutmeldingen over ontbrekende systeemaanroepen op sommige kernels verhelpen. Kan de prestaties verlagen. + Uitvoeren zonder proot (experimenteel) + Start de Linux-kant rechtstreeks op Android. Geldt voor de volgende sessie. Schakel dit uit als iets niet kan starten. proot-snelpad + Niet gebruikt zonder proot. Vereist het seccomp-filter van proot. Snellere bestandstoegang en minder stotteren. Zet dit uit als een programma zijn bestanden niet kan vinden. Cursor in gamescope tekenen @@ -815,6 +838,7 @@ Apparaat ondersteund Ongeteste GPU GPU niet ondersteund + GPU via Mali-brug %1$s · %2$s %1$s: %2$s Er is geen compatibele grafische backend beschikbaar voor %1$s. Steam kan een zwart scherm tonen. @@ -844,15 +868,38 @@ Sessie Sessielogs Opgeslagen na elke sessie + Uitgebreide diagnostiek voor de volgende sessie + Legt gedetailleerde logboeken vast voor één sessie. Kan de prestaties verminderen en meer opslagruimte gebruiken. Schakelt zichzelf uit zodra de sessie start; bekijk de logboeken voordat je ze deelt. Debuglogs van games Neem bij de volgende gamestart diagnostiek van Proton, Wine en graphics op. Kan de prestaties verlagen en meer opslag gebruiken. Start deze sessie opnieuw om debuglogs van games op te slaan Kan logging niet bijwerken. Controleer de schakelaar en probeer het opnieuw. Hulpmiddelen voor debuggen + Gedetailleerde grafische logboeken + Steam-interface: GPU-tekenen + Met het Xclipse-driverpaar tekent Steam zijn pagina\'s in software (GPU-tekenen liet gebroken tegels zien). Schakel dit in voor een snellere Steam-interface als het op deze telefoon goed uitziet. + gebouwd op %1$s + %1$s bijgewerkt naar de nieuwste build + Tijdens de vorige sessie slaagde de Mali-brug op %1$s niet voor de zelftest (afbeeldingen of draws), dus gebruikte de sessie in plaats daarvan het PanVK-driverpaar. + De Mali-brug vond tijdens de vorige sessie geen manier om op %1$s geheugen met de driver te delen, dus gebruikte de sessie in plaats daarvan het PanVK-driverpaar. De brug kan op deze telefoon niet werken; als je de brug uitzet, blijft het PanVK-paar in gebruik. + De Proton-, DXVK- en driverlogboeken van elk spel komen terecht in de logboeken van de sessie. Altijd aan als de GPU geen Adreno is. Nieuwste sessielogs Opgeslagen sessielogs Bewaart de nieuwste %1$d Logs wissen + Beschikbare sessielogboeken + Nog geen opgeslagen sessielogboeken. + Gedeelde en opgeslagen ZIP\'s bevatten de geselecteerde sessie en bijbehorende diagnostische gegevens van Steam, winkels, tools en Battle.net. + %1$s · %2$s + Huidige sessie + Delen + Opslaan op apparaat + Verwijderen + Sessielogboeken verwijderen? + %1$s verwijderen? Dit kan niet ongedaan worden gemaakt. + Sessielogboeken opgeslagen. + Sessielogboeken konden niet worden opgeslagen. + Sessielogboeken konden niet worden verwijderd. Alle instellingen resetten Zet elke instelling terug op de standaardwaarde Resetten @@ -879,6 +926,8 @@ Als startscherm gebruiken DroidDeck kan de startschermapp zijn DroidDeck wordt nooit aangeboden als startschermapp + Home-knop opent + De pagina die wordt weergegeven als DroidDeck de Home-app is en je op Home drukt Zet DroidDeck bij Games toevoegen op Opnemen Oriëntatie Oriëntatie van launcher @@ -892,15 +941,22 @@ Volledig scherm Verbergt de statusbalk en navigatiebalk van Android Toont de statusbalk en navigatiebalk van Android + Launcher op twee schermen + Automatisch zet de launchersecties (Steam, Bibliotheek, Winkels en de rest) op het tweede scherm van handhelds met een ingebouwd exemplaar. Aan gebruikt elk tweede scherm. Uit houdt de launcher op één scherm. + Sessies op twee schermen + Automatisch zet het menu in de game vast op het ingebouwde tweede scherm, in plaats van in een pop-over. Aan gebruikt elk tweede scherm. Uit houdt het menu op het gamescherm; je kunt vanuit dat menu alsnog een tweede scherm kiezen. Automatisch Aan Uit Bediening op het onderste scherm in games + Android-toetsenbord voor tekstvelden Opent het trackpad en toetsenbord op het tweede scherm wanneer een sessie start. Typen voor het bovenste scherm Klaar Standaard startschermapp Kies een startschermapp + Launcher verbergen in Recente apps tijdens inactiviteit + Geldt alleen als DroidDeck de standaard Home-app is en er geen sessie actief is. Kiezen Linux-apps (bèta) Bestanden @@ -1015,6 +1071,147 @@ Testbuilds Probeer een fix voordat die wordt uitgebracht Momenteel geen + Lab-build + Lab-builds + In gebruik + Gepauzeerd nadat Android DroidDeck opnieuw heeft geoptimaliseerd + Niet geladen: %1$s + Wachten op een herstart + Behouden + Voor een andere versie + Opnieuw bouwen + Verwijdert deze build van het apparaat + Opnieuw starten met deze build + Uitzetten + Gebruiken + Verwijderen + Nu verwijderen + De herstart kon niet worden voorbereid: %1$s. Koppel draadloze foutopsporing in Instellingen en probeer het opnieuw. + Lab-build geïnstalleerd + DroidDeck is opnieuw gestart met %1$s + Lab-build gepauzeerd + Android heeft DroidDeck opnieuw geoptimaliseerd, dus %1$s is niet geladen. Open Updates om DroidDeck ermee opnieuw te starten. + Lab-build uitgeschakeld + Deze build is gebouwd voor een andere versie van DroidDeck. Hij wordt bewaard in Updates. + DroidDeck is er twee keer niet mee opgestart. + Agent + Agent + De agent is aan het werk + Installeer Claude Code in de Linux-gebruikersomgeving om de agent te gebruiken. + Stel een vraag over een game, een crash of een aanpassing aan DroidDeck + Verzenden + Nieuw gesprek + Stoppen + Opslag + Verwijderen + Nu verwijderen + Claude Code + Codex + DroidDeck-broncode + Downloadcaches + Niet-gepushte wijzigingen gaan verloren + Builds downloaden ze opnieuw + Setup kan het opnieuw installeren; aanmeldgegevens blijven bewaard + DroidDeck is opnieuw gestart op je Lab-build. Ga verder waar je gebleven was. + Vraag het waarom een game niet start, laat het een log uitleggen of laat het DroidDeck aanpassen en de wijziging op dit apparaat uitproberen. + Mislukt: %1$s + %1$s is beëindigd (exitcode %2$d) + Gestopt + Beëindigd zonder antwoord + Opnieuw proberen + De agent wordt ingesteld + Bouw mijn Lab-build %1$s opnieuw voor de geïnstalleerde versie van DroidDeck en start er opnieuw op. + %1$s in · %2$s uit + Nadenken + Gedachte + Nadenken · %1$s + %1$s · %2$s + INVOER + UITVOER + Wordt uitgevoerd… + Geen resultaat: de beurt is al afgelopen + Geen uitvoer + Typ om het volgende bericht in de wachtrij te zetten + In wachtrij + Volgende: %1$s + Niet verzenden + Bijvoegen + Verwijderen + Standaard + Redeneerinspanning + Ga + Herzien + Nog niets gewijzigd + Ga door met het plan. + Nu verzenden + Bericht + Meer + Sluiten + Nieuwste + Bezig + Context + %1$s van %2$s + Dit gesprek · %1$s + Verbruik verschijnt na het eerste antwoord + %1$d-uurslimiet + %1$d-minutenlimiet + Wekelijkse limiet + %1$d%% · reset %2$s + + %1$d bestand + %1$d bestanden + + Eerst plannen + Plan + Stelt een plan voor zonder iets te wijzigen + Gesprekken + Nog geen gesprekken + Zojuist + Verwijderen + Verwijdert het gesprek en de bijlagen + Processen + Er draait niets in het Linux-userland + AGENT + Stoppen + Lab-build + Lab-builds voorbereiden + %1$d%% · nog ongeveer %2$s + nog ongeveer %1$s + Annuleren + Build annuleren + Starten + %1$d%% + Pakket maken + DroidDeck erop opnieuw starten + Klaar + Mislukt: %1$s + Agent instellen + Installeer eerst de Linux-runtime in Setup. + Opnieuw proberen + Begin met chatten + Apparaatverbinding + Draadloos debuggen, zodat de agent DroidDeck kan zien en aansturen + %1$s installeren + In het Linux-userland, met git, gh en adb + Inloggen bij %1$s + Opent je browser + GitHub + Optioneel, om pull requests te openen + Buildtools + Optioneel, voor Lab-builds op dit apparaat · ongeveer 5 GB + Agent gereed + Voltooi de configuratie van de agent + Ingelogd bij %1$s + Lab-builds + snelle builds + Snelle Lab-builds + Compileert deze versie vooraf, zodat Lab-builds minuten duren · eenmalig ongeveer 20 minuten + Compileren · %1$d%% · nog ongeveer %2$s te gaan + Voorbereiden + Draadloze foutopsporing is niet bereikbaar; Koppelen schakelt dit in + Koppelen + Installeren + Inloggen PR #%1$d Niet gebouwd voor deze kopie van DroidDeck Geüpdatet %1$s @@ -1254,6 +1451,14 @@ Apps Installatie Updates + Meer + Tabbladen bewerken + Tabbladen + Weergegeven + In Meer + Verborgen + %1$s naar boven verplaatsen + %1$s naar beneden verplaatsen %1$d%% %1$s hervatten Verschijnt in elke sessie als /root/ROMs. Interne opslag staat op /root/Storage. @@ -1275,6 +1480,15 @@ Wachtrij annuleren Android-toetsenbord Verbergen ✕ + Grootte op scherm + Het deel van het scherm dat het toetsenbord inneemt, inclusief de header. + Dekking + Verlaag deze om het spel achter het toetsenbord te zien. + Verborgen toetsen + Toetsen die je zelden gebruikt staan niet op het toetsenbord. + Esc en functierij + Ins / Del / Home / End / PgUp / PgDn + Pijltjestoetsen %1$s starten Kies een scherm. Tweede scherm: %1$s. Het tweede scherm is niet meer beschikbaar. @@ -1776,7 +1990,24 @@ Terminal Deck-grepen + trackpads Dashboard + Desktop + Desktop starten + Desktop · %1$s + Trackpad + Directe aanraking + Trackpad. Tik voor directe aanraking + Directe aanraking. Tik voor trackpad + KDE-desktop starten… + De desktop is afgesloten. + De desktop kon niet starten. De logboeken staan in de map bottom-desktop van deze sessie. + De desktop is gesloten. Hier is nog niets te zien. + Schermen omwisselen + Het onderste scherm is nu niet vrij. + Gamescherm + Game tonen op + Bovenste scherm + Onderste scherm Downloads Er lopen geen downloads. Steam @@ -1811,6 +2042,20 @@ Brandstof, t Hoofdtank %1$s t Reserve %1$s t + Frametijd + laatste %1$d s + gem. frame + 1% low + frames boven 33 ms + %1$d / min + Speeltijd %1$s + %1$d cores, tot %2$s GHz + %1$d cores + game + FPS van %1$d Hz + De rode markering is het punt waarop de HUD de temperatuur in het rood weergeeft. + hele apparaat + accu Dashboardgegevens verzenden Automatisch Zet het aan voor elke game in deze lijst, ook voor games die later worden gevonden. Games die je uitzet, blijven uit. @@ -1834,6 +2079,10 @@ De microfoon staat uit voor deze game. Zet Microfoon aan in de Steam-instellingen van DroidDeck (Audio) en start de game opnieuw om te praten. Volume %1$d%% In-game statistieken + HUD op het onderste scherm + Strip op elk tabblad + 1% en 0,1% lows + CPU-temperatuur FPS CPU GPU @@ -2006,6 +2255,7 @@ Sessie wordt gestart… %1$d:%2$02d verstreken · nog bezig Update van de Steam-client downloaden · %1$d%% + Update van de Steam-client toepassen… Steam-client downloaden · %1$s Er wordt al een compatibiliteitstool geïnstalleerd @@ -2082,11 +2332,29 @@ Contourlijnen plus verscherping. Geen Adreno-GPU + PowerVR-systeemdriver: de compatibiliteit verschilt per apparaat + Experimenteel: RADV of de Xclipse-systeemdriver + Systeem-PowerVR + Gebruikt de ingebouwde drivers voor deze GPU + De PowerVR-systeemdriver is geselecteerd voor de runtime en het scherm. + Nog geen open driver ondersteunt deze Mali: de Mali-brug staat aan. + Dit is de niet-Snapdragon-testbuild: de officiële builds hier draaien alleen op Adreno en worden daarom niet over deze build heen geïnstalleerd. Nieuwe testbuilds staan op github.com/The412Banner/droiddeck-nonadreno-drivers. + De laatste sessie is beëindigd omdat Android DroidDeck sloot om geheugen vrij te maken, niet door een crash. Sluit andere apps of verlaag de textuurinstellingen van het spel en probeer het opnieuw. + Mali (Venus) + de Mali-brug + Nog geen open driver ondersteunt deze Mali: %1$s wordt gebruikt, op de eigen driver van het toestel. + %1$s is nog niet gepubliceerd: tot die tijd wordt %2$s gebruikt. + %1$s is niet beschikbaar en de driver van dit toestel meldt Vulkan %2$s (Venus heeft 1.2 nodig): de Mali-brug wordt gebruikt. + %1$s is nog niet gepubliceerd: tot die tijd staat de Mali-brug aan. + In de wachtrij: %1$s (wacht op een andere runtimedriver) + DXVK wordt geleverd door de PowerVR-systeemruntime. Andere DXVK-pakketten kunnen worden opgeslagen, maar worden met deze driver niet toegepast. Ondersteund Experimenteel: de drivers zijn testbuilds Experimentele ondersteuning voor Adreno 850: vereist compatibele experimentele scherm- en gamedrivers; niet geverifieerd op dit apparaat Onder de geteste hardware (Adreno 725 en nieuwer): werkt mogelijk niet Niet ondersteund: er is geen compatibele grafische backend beschikbaar voor deze GPU + Loopt via de Mali-brug, op de eigen Vulkan-driver van het toestel + Niet ondersteund met de Mali-brug uitgeschakeld: Turnip heeft een Adreno (Snapdragon)-GPU nodig De ratelimiet van GitHub is bereikt - probeer het later opnieuw GitHub antwoordde met HTTP %1$d @@ -2287,6 +2555,13 @@ Sorteren Labels in zijbalk Toon namen onder de pictogrammen in de zijbalk. Zet uit voor een smallere zijbalk. + Agenthuisdier + DeeDee zweeft boven de launcher en games en laat zien wat de agent doet. + Boven andere apps + Laat DeeDee boven elke app zweven en open daar de chat + Toestaan + DeeDee + Chatten met DeeDee Weergave Grotere kaarten Kleinere kaarten @@ -2574,6 +2849,11 @@ Ontwikkelaar Buildlabel als watermerk Toon het label van de testbuild of Lab-build op het scherm. Standaard ingeschakeld. + Diagnostische bundels delen + Sessie en apparaat + Grafische gegevens + Games en compatibiliteit + Alle bundels Klaar om te spelen Nog niet klaar om te spelen runtime %1$s @@ -2612,6 +2892,9 @@ Zet GOG-prestaties aan in de Stores-instellingen Prestaties niet beschikbaar; controleer sessielogs Prestatie ontgrendeld + Mali (Venus): uit + Mali (Venus): aan + De driver op %1$s meldt Vulkan %2$s. Mali (Venus) heeft Vulkan 1.2 of nieuwer nodig (gamescope start niet op oudere versies), dus sessies slaan Venus over en gebruiken in plaats daarvan het PanVK-driverpaar. Plakken Linkerstick Rechterstick @@ -2967,6 +3250,7 @@ VC++- en DirectX-installaties die games nodig hebben Draait Linux x86-games Steam-hulpprogramma + Steam downloadt dit voor games die anti-cheat meeleveren, ook als anti-cheat is uitgeschakeld. Als je het verwijdert, blijft de installatie op 0% hangen DroidDeck draait games zonder deze runtime Proton x86, dat DroidDeck niet kan draaien Standaard voor alle games @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps 60 fps oogt vloeiender maar gebruikt meer CPU terwijl Steam opstart. Een video die in Steam zelf is gekozen verschijnt hier ook. Geluid + Opstartvideo overslaan + Gebruik een zwart fragment van 0,1 seconde als opstartvideo van Steam. Wordt toegepast in de volgende sessie. Eigen video MP4, MOV, MKV of WebM. Andere formaten en bestanden boven %1$d MB worden op het apparaat omgezet naar 720p-WebM, tot %2$d seconden. Importeren @@ -3538,6 +3824,7 @@ Houdt Alt+Tab, de Win-toets en de Home-knop in een actieve DroidDeck-sessie in plaats van Android. Zet Helderheid aan in Installatie → Steam-integratie Mali-brug: uit + %1$s kan de Mali-brug niet gebruiken (die heeft een Mali-GPU nodig zonder route via de systeemdriver), dus deze schakelaar heeft hier geen effect. Mali-brug: aan %1$s is geen Adreno. De experimentele Vulkan-brug staat aan: de sessie tekent via het eigen stuurprogramma van de telefoon. Verwacht fouten; stuur de sessielogboeken. Veilige modus @@ -3697,6 +3984,7 @@ Deze indeling kan niet worden geïmporteerd Scharlakenrode sneeuw + Witte oppervlakken met rode accenten. Soundtracks Muziek @@ -3760,4 +4048,6 @@ Eén herhalen Volume Geen audiobestanden in deze soundtrack + Starten niet beschikbaar + Er is geen webbrowser beschikbaar om deze link te openen. diff --git a/app/src/main/res/values-pl/input_library.xml b/app/src/main/res/values-pl/input_library.xml new file mode 100644 index 0000000000..1193c2a125 --- /dev/null +++ b/app/src/main/res/values-pl/input_library.xml @@ -0,0 +1,132 @@ + + + Nieczytelne ustawienia wejścia zachowano w kopii zapasowej. Możesz dalej edytować przywrócone profile. + Właściwości + Właściwości kliknięcia + %1$s · Kliknięcie + Przyciski + Drążki, pady i spusty + Ukryj narzędzia + Kontroler + Wysyłaj wejście kontrolera do Steam Input lub gry. + Ten element nie wysyła wejścia kontrolera, myszy ani klawiatury. + Kliknięcie myszy + Akcja DroidDeck + Akcja + Szybkość przewijania: %1$d kroków/s + + Nowy profil + + Nowy układ + %1$s · Używane przez %2$d profile. Zmiany dotyczą każdego profilu z tymi przypisaniami. + Zmień nazwę + Usuń + Dodaj elementy do układu, zanim przypiszesz ich akcje. + Nie udało się zapisać ustawień wejścia + Nazwa + Zacznij od + Przycisk + Drążek + Touchpad + Krzyżak + Spust + Gotowe + Cofnij + + Dodaj + Przeciągnij, aby przenieść. Przeciągnij róg, aby zmienić rozmiar. Dotknij Właściwości, aby przypisać akcję. + Edycja na dodatkowym ekranie + Wybrany ekran jest niedostępny. Podłącz go, aby edytować ten układ w rzeczywistym rozmiarze. + Odrzucić niezapisane zmiany układu? + Ten układ jest używany przez %1$d profili. Zapisane zmiany dotyczą wszystkich. + Profile domyślne + Tryb pulpitu + Tryb gry + Domyślny dla pulpitu i gry + Domyślny dla trybu gry + Domyślny dla trybu pulpitu + Ustawienia urządzenia + Sterowanie + Przyciski, drążki, spusty i dodatkowe klawisze + Kopiuj profil + Resetuj akcje + Zresetować akcje w %1$s do wartości domyślnych profilu bazowego? Układy i inne profile pozostaną bez zmian. + Usunąć %1$s? Tryby, które go używają, wrócą do wbudowanego profilu domyślnego. Zapisane układy i udostępnione ustawienia pozostaną dostępne. + Widoczność + Dotyczy wszystkich profili. Auto pokazuje sterowanie ekranu głównego, gdy w trybie gry nie podłączono kontrolera. + Edytuj na ekranie + Zapisane układy… + Wybierz układ lub utwórz własny + Wybierz Sterowanie profilu w menu sesji dodatkowego ekranu. Wybory Profil i Dodatkowy ekran w menu kontrolera decydują, które sterowanie jest pokazywane. + Akcje przycisków + Udostępnione z %1$s. Zmiany dotyczą także tych profili. + Użyj ponownie ustawień + Użyj ustawień z… + Skopiuj z innego profilu lub pozostaw ustawienia udostępnione + Uczyń niezależnym + Zachowaj bieżącą konfigurację i przestań udostępniać zmiany + Układy przechowują elementy i ich pozycje. Każdy profil może przypisać własne akcje. Edytuj w pełnym rozmiarze na docelowym ekranie. + Bieżący układ + Usunąć nieużywany układ %1$s i jego zapisane akcje? + Zmień nazwę bieżącego układu + Użyj ponownie %1$s z innego profilu. Inne źródła sterowania pozostaną bez zmian. + Zachowaj współdzielenie sterowania fizycznego + Domyślnie wszystkie elementy sterowania i układy niestandardowe to niezależne kopie. Udostępnianie łączy tylko sterowanie fizyczne. + Użyj tych elementów i pozycji. Udostępnianie synchronizuje przyszłe zmiany geometrii; akcje przycisków pozostają niezależne. Inny układ zaczyna się od nieprzypisanych akcji. + Skopiuj te elementy sterowania i akcje albo połącz je, aby przyszłe zmiany dotyczyły obu profili. + Zachowaj udostępnione + Niezależna kopia + Zacznij drążek w miejscu dotknięcia + Ukryj drążek, gdy nie jest używany + Narzędzia + Auto (%1$s) + Niestandardowy (%1$s) + Zapisz jako nowy profil + Sterowanie profilu + Profil + Gesty touchpada myszy + Po przypisaniu do wskaźnika myszy: dotknij, aby kliknąć, przytrzymaj, aby przeciągnąć, i przewijaj dwoma palcami. + %1$s ma zastąpienie szybkiego menu. Wybierz tam Auto, aby użyć profilu domyślnego i wszystkich trzech zapisanych części. + Wejście DroidDeck + Przytrzymywane, gdy drążek jest wychylony w dowolnym kierunku: naciśnięcie powyżej 55%, zwolnienie poniżej 35%. Użyj Klawiszy kierunkowych, aby przypisać każdy kierunek osobno. Polecenia DroidDeck działają raz na wychylenie. Kliknięcie drążka ustawia się osobno. + Przytrzymywane podczas dotykania touchpada; zwalniane po podniesieniu palca. Polecenia DroidDeck działają raz na dotknięcie. Kliknięcie touchpada ustawia się osobno. + Przytrzymywane, gdy spust przekroczy 55%; zwalniane poniżej 35%. Polecenia DroidDeck działają raz na naciśnięcie. + Kierunek przewijania + Pionowo + Poziomo + Przewijaj poziomo + Pomiary + Włącz nagrywanie, użyj sterowania w działającej sesji, a następnie wróć i odczytaj wyniki. Mierzy tylko czas wysyłania DroidDeck, nie opóźnienie ekranu. Nagrywanie kończy się przy zamknięciu procesu aplikacji. + Elementów sterowania: %1$d + Inne zapisane układy (%1$d) ▾ + Ukryj inne zapisane układy (%1$d) ▴ + Home / Guide + Wstecz · jedno dotknięcie + Wstecz · dwukrotne dotknięcie + Wstecz · dwa razy w Steam, raz na pulpicie + W trybie Steam. Przytrzymanie Wstecz otwiera też szybki dostęp. + Przywróć domyślne + Wybór panelu jest zapamiętywany. Pulpit otwiera drugą przestrzeń roboczą; nie przełącza sesji ani jej profilu wejścia. + Wirtualny kontroler + Typ kontrolera widziany przez Steam lub grę. + Ekran dotykowy + Jak obsługiwane są dotknięcia na ekranie gry. Przyciski profilu zachowują przypisane akcje. + Kursor dotyku + Pokazuj wskaźnik dla bezpośrednich dotknięć na ekranie gry. + Dotknij i przytrzymaj + Akcja myszy przy przytrzymaniu palca na ekranie gry. + Dotknięcia przycisku Wstecz + Pierwsza akcja: jedno dotknięcie. Druga akcja: dwukrotne dotknięcie. + Przycisk przełączania + Dotknij, aby przytrzymać, dotknij ponownie, aby zwolnić. Otwarcie menu lub zmiana profilu zwalnia przycisk. + Kształt + Zaokrąglony + Kapsułka + Koło + Prostokąt + Etykieta przycisku + Tekst + Zaimportowany obraz + Osobne klawisze ukośne + Przypisz klawisz do każdej przekątnej. Pusta przekątna naciska dwa sąsiednie kierunki. + Sąsiednie kierunki + Twoje stare klawisze ekranowe są zapisane poniżej jako zaimportowane profile. Wybierz jeden, aby go użyć lub edytować. Bieżące wybory profili zostały zachowane. + Nie udało się automatycznie zaimportować starych klawiszy ekranowych. Oryginalne ustawienia zostały zachowane. + diff --git a/app/src/main/res/values-pl/input_strings.xml b/app/src/main/res/values-pl/input_strings.xml new file mode 100644 index 0000000000..fcd5fdf9dd --- /dev/null +++ b/app/src/main/res/values-pl/input_strings.xml @@ -0,0 +1,38 @@ + + + Profile wejścia + Profile + Fizyczny kontroler + Główny ekran + Dodatkowy ekran + Natywny / Steam Input + Natywny: %1$s + Wyślij inne sterowanie kontrolera + Wyłączone + Klawisz lub kombinacja klawiszy + Klawisze kierunkowe + Przesuń wskaźnik + Szybkość wskaźnika: %1$d + Przewiń + Przewiń w pionie + Lewy przycisk myszy + Prawy przycisk myszy + Środkowy przycisk myszy + Otwórz menu DroidDeck + Pokaż klawiaturę + Otwórz menu Steam + Otwórz szybki dostęp Steam + Usuń element sterujący + Dodaj element sterujący + Przyciski specyficzne dla urządzenia + Przypisz przycisk fizyczny + Zwolnij przycisk, a następnie wybierz Edytuj, Ponów lub Anuluj. B lub Wstecz anuluje po zwolnieniu. + Ponów + Naciśnij przycisk, w tym przycisk Wstecz zgłaszany jako klawisz. Klawisze głośności i systemowe Android są zarezerwowane. Przypisanie dotyczy tylko tego urządzenia. + Usuń przypisanie + Diagnostyka wejścia + Zapisuj czas wysyłania wejścia + Odczytaj pomiary + Mierzy wysyłanie z Androida do publikacji w istniejącym transporcie wejścia. Nie obejmuje przybycia przez Bluetooth, odpytywania gościa, renderowania ani opóźnienia ekranu. Nagrywanie jest domyślnie wyłączone. + Użyj normalnego przypisania wejścia + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 793558e9b4..d1813d6ebe 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -185,6 +185,7 @@ Nie udało się pobrać środowiska graficznego PowerVR. Sprawdź połączenie i spróbuj ponownie. Nie udało się pobrać DirectAudio, więc w tej sesji dźwięk gier używa wolniejszej ścieżki. Ten program + Sesja nie mogła wyświetlić obrazu na ekranie: %1$s. Ten ekran pokazuje przyczynę zamiast czarnego obrazu; szczegóły znajdują się w logach sesji. 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. @@ -389,6 +390,9 @@ Tutaj jeszcze nieobsługiwane Wczytywanie komponentów… Nie udało się zainstalować: %1$s + Pobrane pliki wymagają aktualizacji. + Aktualizacja w kolejce. + Ponów aktualizację Pobrano Pobieranie %1$s Instalowanie: %1$s @@ -419,6 +423,22 @@ Tylko pamięć wewnętrzna Folder: %1$s Druga biblioteka + Więcej bibliotek Steam + Foldery, do których Steam może instalować gry i z których może je uruchamiać, każdy pod własną nazwą. Usunięcie folderu zostawia jego gry na dysku. + Dodaj bibliotekę + Zmień nazwę + Nazwa biblioteki + Wybierz folder dla biblioteki + Maksymalnie %1$d dodanych bibliotek + Ten folder jest już biblioteką lub znajduje się wewnątrz innej + %1$s · niedostępna + Zacznie obowiązywać od następnej sesji Steam + Znaleziono na tym urządzeniu · %1$s · %2$s + Dodaj + Znajdź biblioteki w pamięci wewnętrznej + Zezwól na dostęp do wszystkich plików, aby DroidDeck mógł widzieć biblioteki Steam, które inne aplikacje przechowują w pamięci wewnętrznej + Zezwól + Dodano %1$s, bibliotekę Steam znajdującą się w wybranym folderze Gry, które strumieniują zasoby z karty SD lub pamięci współdzielonej, mogą się zacinać. Diagnostyka pamięci Zapisuje wyniki alokacji i próbkowane czasy dostępu do pamięci w „Udostępnij logi”. Po włączeniu może spowalniać instalacje. Działa od następnej sesji. @@ -609,7 +629,10 @@ Wyłącza pomocnika Proton do nawigacji kontrolerem, który zużywa CPU w każdej grze. Uruchamiaj proot bez seccomp Może naprawić błędy brakujących wywołań systemowych na niektórych jądrach. Może obniżyć wydajność. + Uruchom bez proot (eksperymentalne) + Uruchamia środowisko Linux bezpośrednio na Androidzie. Zacznie obowiązywać od następnej sesji. Wyłącz, jeśli coś nie chce się uruchomić. Szybka ścieżka proot + Nie jest używane bez proot. Wymaga filtra seccomp proot. Szybsze wyszukiwanie plików i mniej przycięć. Wyłącz, jeśli program nie może znaleźć swoich plików. Rysuj kursor w gamescope @@ -821,6 +844,7 @@ Urządzenie obsługiwane Nieprzetestowany GPU GPU nieobsługiwany + GPU przez mostek Mali %1$s · %2$s %1$s: %2$s Brak zgodnego zaplecza graficznego dla %1$s. Steam może wyświetlać czarny ekran. @@ -850,15 +874,38 @@ Sesja Logi sesji Zapisywane po każdej sesji + Rozszerzona diagnostyka dla następnej sesji + Zapisuje szczegółowe logi przez jedną sesję. Może obniżyć wydajność i zająć więcej miejsca. Wyłącza się sama w momencie uruchomienia sesji; przed udostępnieniem przejrzyj logi. Logi debugowania gier Dołącz diagnostykę Proton, Wine i grafiki przy następnym uruchomieniu gry. Może obniżyć wydajność i zająć więcej miejsca. Uruchom ponownie tę sesję, aby zapisywać logi debugowania gier Nie udało się zmienić logowania. Sprawdź przełącznik i spróbuj ponownie. Narzędzia debugowania + Szczegółowe logi graficzne + Interfejs Steam: rysowanie przez GPU + Z parą sterowników Xclipse Steam rysuje swoje strony programowo (rysowanie przez GPU dawało uszkodzone kafelki). Włącz, aby przyspieszyć interfejs Steam, jeśli na tym telefonie wygląda poprawnie. + zbudowano %1$s + %1$s zaktualizowano do najnowszej kompilacji + Most Mali nie przeszedł autotestu na %1$s w poprzedniej sesji (obrazy lub rysowanie), więc zamiast niego użyto pary sterowników PanVK. + Most Mali nie znalazł sposobu na współdzielenie pamięci ze sterownikiem na %1$s w poprzedniej sesji, więc zamiast niego użyto pary sterowników PanVK. Most nie może działać na tym telefonie; wyłączenie go pozostawia parę PanVK. + Dzienniki Proton, DXVK i sterowników każdej gry znajdują się w dziennikach sesji. Zawsze włączone, gdy GPU nie jest Adreno. Najnowsze logi sesji Zapisane logi sesji Zachowuje najnowsze: %1$d Wyczyść logi + Dostępne dzienniki sesji + Brak zapisanych dzienników sesji. + Udostępniane i zapisywane archiwa ZIP zawierają wybraną sesję oraz powiązane dane diagnostyczne Steam, sklepu, narzędzi i Battle.net. + %1$s · %2$s + Bieżąca sesja + Udostępnij + Zapisz na urządzeniu + Usuń + Usunąć dzienniki sesji? + Usunąć %1$s? Tej operacji nie można cofnąć. + Zapisano dzienniki sesji. + Nie udało się zapisać dzienników sesji. + Nie udało się usunąć dzienników sesji. Zresetuj wszystkie ustawienia Przywróć każde ustawienie do wartości domyślnej Resetuj @@ -885,6 +932,8 @@ Użyj jako ekranu głównego DroidDeck może być aplikacją ekranu głównego DroidDeck nigdy nie jest proponowany jako aplikacja ekranu głównego + Przycisk ekranu głównego otwiera + Strona wyświetlana, gdy DroidDeck jest aplikacją ekranu głównego i naciśniesz przycisk ekranu głównego W sekcji Dodaj gry ustaw DroidDeck na Uwzględnij Orientacja Orientacja launchera @@ -898,15 +947,22 @@ Pełny ekran Ukrywa systemowe paski stanu i nawigacji Pokazuje systemowe paski stanu i nawigacji + Launcher na dwóch ekranach + Automatycznie umieszcza sekcje launchera (Steam, Biblioteka, Sklepy i pozostałe) na wbudowanym drugim ekranie konsol przenośnych. Włączone używa dowolnego drugiego wyświetlacza. Wyłączone pozostawia launcher na jednym ekranie. + Sesje na dwóch ekranach + Automatycznie przypina menu w grze do wbudowanego drugiego ekranu zamiast okna podręcznego. Włączone używa dowolnego drugiego wyświetlacza. Wyłączone pozostawia menu na ekranie gry; nadal można z poziomu menu wybrać drugi ekran. Automatycznie Włączone Wyłączone Sterowanie na dolnym ekranie w grach + Klawiatura systemu Android do pól tekstowych Otwiera gładzik i klawiaturę na drugim ekranie po rozpoczęciu sesji. Pisanie dla górnego ekranu Gotowe Domyślna aplikacja ekranu głównego Wybierz aplikację ekranu głównego + Ukryj launchera w ostatnich aplikacjach podczas bezczynności + Dotyczy tylko sytuacji, gdy DroidDeck jest domyślną aplikacją ekranu głównego i nie trwa żadna sesja. Wybierz Aplikacje Linux (beta) Pliki @@ -1021,6 +1077,149 @@ Kompilacje testowe Wypróbuj poprawkę przed jej wydaniem Obecnie żadnych + Kompilacja testowa + Kompilacje testowe + W użyciu + Wstrzymana po ponownej optymalizacji DroidDeck przez system Android + Nie wczytano: %1$s + Oczekiwanie na restart + Zachowano + Dla innej wersji + Przebuduj + Usuwa tę kompilację z urządzenia + Uruchom ponownie na niej + Wyłącz + Użyj + Usuń + Usuń teraz + Nie udało się przygotować restartu: %1$s. Sparuj debugowanie bezprzewodowe w Ustawieniach i spróbuj ponownie. + Zainstalowano kompilację testową + DroidDeck uruchomiono ponownie na %1$s + Kompilacja Lab wstrzymana + Android ponownie zoptymalizował DroidDeck, więc %1$s nie jest wczytana. Otwórz Aktualizacje, aby ponownie uruchomić na niej DroidDeck. + Kompilacja Lab wyłączona + Została zbudowana dla innej wersji DroidDeck. Znajduje się w Aktualizacjach. + DroidDeck dwukrotnie nie uruchomił się na niej. + Agent + Agent + Agent pracuje + Zainstaluj Claude Code w przestrzeni użytkownika Linux, aby korzystać z agenta. + Zapytaj o grę, awarię lub zmianę w DroidDeck + Wyślij + Nowa rozmowa + Zatrzymaj + Pamięć + Usuń + Usuń teraz + Claude Code + Codex + Kod źródłowy DroidDeck + Pamięć podręczna pobrań + Zmiany, które nie zostały wypchnięte, zostaną utracone. + Kompilacje pobiorą je ponownie. + Konfiguracja może zainstalować to ponownie; dane logowania zostają zachowane. + DroidDeck uruchomił się ponownie na twojej kompilacji Lab. Kontynuuj tam, gdzie przerwałeś. + Zapytaj, dlaczego gra nie chce się uruchomić, poproś o wyjaśnienie logu albo o zmianę w DroidDeck i wypróbowanie jej na tym urządzeniu. + Nie udało się: %1$s + %1$s zakończył działanie (kod wyjścia %2$d) + Zatrzymano + Zakończyło się bez odpowiedzi + Ponów + Konfigurowanie agenta + Zbuduj ponownie moją kompilację Lab %1$s dla zainstalowanej wersji DroidDeck i uruchom na niej ponownie DroidDeck. + %1$s wej. · %2$s wyj. + Myślenie + Myśl + Myślenie · %1$s + %1$s · %2$s + WEJŚCIE + WYJŚCIE + Trwa… + Brak wyniku: tura zakończyła się wcześniej + Brak danych wyjściowych + Wpisz, aby zakolejkować następną wiadomość + Zakolejkuj + Następna: %1$s + Nie wysyłaj + Załącz + Usuń + Domyślny + Poziom rozumowania + Wykonaj + Zmodyfikuj + Nic jeszcze nie zmieniono + Wykonaj plan. + Wyślij teraz + Wiadomość + Więcej + Zamknij + Najnowsze + Pracuje + Kontekst + %1$s z %2$s + Ta rozmowa · %1$s + Zużycie pojawi się po pierwszej odpowiedzi + %1$d-godzinny limit + %1$d-minutowy limit + Tygodniowy limit + %1$d%% · resetuje się %2$s + + %1$d pliki + %1$d plików + %1$d plik + %1$d pliku + + Najpierw plan + Plan + Proponuje plan bez wprowadzania zmian + Rozmowy + Nie ma jeszcze rozmów + Przed chwilą + Usuń + Usuwa rozmowę i jej załączniki + Procesy + Nic nie działa w przestrzeni użytkownika Linux + AGENT + Zatrzymaj + Kompilacja Lab + Przygotowywanie kompilacji Lab + %1$d%% · pozostało około %2$s + pozostało około %1$s + Anuluj + Anulować kompilację + Rozpoczynanie + %1$d%% + Pakowanie + Ponowne uruchamianie DroidDeck na nim + Gotowe + Nie udało się: %1$s + Skonfiguruj agenta + Najpierw zainstaluj środowisko uruchomieniowe Linux w ustawieniach. + Ponów + Rozpocznij rozmowę + Połączenie z urządzeniem + Debugowanie bezprzewodowe, aby agent mógł widzieć DroidDeck i sterować nim + Zainstaluj %1$s + Do przestrzeni użytkownika Linuksa, z git, gh i adb + Zaloguj się do %1$s + Otwiera przeglądarkę + GitHub + Opcjonalnie, do tworzenia pull requestów + Narzędzia do kompilacji + Opcjonalnie, do kompilacji Lab na tym urządzeniu · około 5 GB + Agent gotowy + Dokończ konfigurację agenta + Zalogowano do %1$s + Kompilacje Lab + szybkie kompilacje + Szybkie kompilacje Lab + Kompiluje tę wersję z wyprzedzeniem, więc kompilacje Lab trwają minuty · jednorazowo około 20 minut + Kompilowanie · %1$d%% · pozostało około %2$s + Przygotuj + Debugowanie bezprzewodowe jest niedostępne; Paruj, aby je włączyć + Paruj + Zainstaluj + Zaloguj się PR #%1$d Nie zbudowano dla tej kopii DroidDeck Zaktualizowano %1$s @@ -1268,6 +1467,14 @@ Aplikacje Konfiguracja Aktualizacje + Więcej + Edytuj karty + Karty + Widoczne + W menu Więcej + Ukryte + Przesuń %1$s w górę + Przesuń %1$s w dół %1$d%% Wznów %1$s W każdej sesji widoczny jako /root/ROMs. Pamięć wewnętrzna jest w /root/Storage. @@ -1289,6 +1496,15 @@ Anuluj oczekujące Klawiatura Android Ukryj ✕ + Rozmiar na ekranie + Część ekranu zajmowana przez klawiaturę, wliczając nagłówek. + Krycie + Zmniejsz je, aby zobaczyć grę za klawiaturą. + Ukryte klawisze + Klawisze, których rzadko używasz, nie pojawiają się na klawiaturze. + Esc i rząd klawiszy funkcyjnych + Ins / Del / Home / End / PgUp / PgDn + Klawisze strzałek Uruchom %1$s Wybierz ekran. Dodatkowy: %1$s. Dodatkowy wyświetlacz nie jest już dostępny. @@ -1824,7 +2040,24 @@ Terminal Uchwyty Deck + trackpady Panel + Pulpit + Uruchom pulpit + Pulpit · %1$s + Gładzik + Dotyk bezpośredni + Gładzik. Dotknij, aby przełączyć na dotyk bezpośredni + Dotyk bezpośredni. Dotknij, aby przełączyć na gładzik + Uruchamianie pulpitu KDE… + Pulpit został zamknięty. + Nie udało się uruchomić pulpitu. Jego logi znajdują się w folderze bottom-desktop tej sesji. + Pulpit jest zamknięty. Na razie nie ma tu nic do pokazania. + Zamień ekrany + Dolny ekran jest teraz zajęty + Ekran gry + Wyświetl grę na + Górny ekran + Dolny ekran Pobieranie Nic nie jest pobierane. Steam @@ -1859,6 +2092,20 @@ Paliwo, t Główne %1$s t Rezerwa %1$s t + Czas klatki + ostatnie %1$d s + średni czas klatki + najniższe 1% + klatki powyżej 33 ms + %1$d / min + Czas gry: %1$s + %1$d rdzeni, do %2$s GHz + %1$d rdzeni + gra + FPS przy %1$d Hz + Czerwony znacznik wskazuje temperaturę, od której HUD wyświetla ją na czerwono. + całe urządzenie + bateria Wysyłaj dane do panelu Automatycznie Włącza wysyłanie dla każdej gry z tej listy, także dla gier znalezionych później. Gry, które wyłączysz, pozostaną wyłączone. @@ -1882,6 +2129,10 @@ Mikrofon jest wyłączony dla tej gry. Aby rozmawiać, włącz Mikrofon w ustawieniach Steam w DroidDeck (Dźwięk) i uruchom grę ponownie. Głośność %1$d%% Statystyki w grze + HUD dolnego ekranu + Pasek na każdej karcie + najniższe 1% i 0,1% + Temperatura CPU FPS CPU GPU @@ -2056,6 +2307,7 @@ Uruchamianie sesji… Minęło %1$d:%2$02d · nadal trwa Pobieranie aktualizacji klienta Steam · %1$d%% + Instalowanie aktualizacji klienta Steam… Pobieranie klienta Steam · %1$s Instalacja narzędzia zgodności już trwa @@ -2132,11 +2384,29 @@ Kreskówkowe kontury i wyostrzenie. To nie jest GPU Adreno + Systemowy sterownik PowerVR: kompatybilność zależy od urządzenia + Eksperymentalne: RADV lub systemowy sterownik Xclipse + Systemowy PowerVR + Używa wbudowanych sterowników tego GPU + Wybrano systemowy sterownik PowerVR dla środowiska uruchomieniowego i wyświetlania. + Żaden otwarty sterownik nie obsługuje jeszcze tego Mali: mostek Mali jest włączony. + To testowa kompilacja dla urządzeń bez Snapdragona: oficjalne kompilacje tutaj działają tylko na Adreno, więc nie nadpisują jej. Nowe kompilacje testowe są na github.com/The412Banner/droiddeck-nonadreno-drivers. + Ostatnia sesja zakończyła się, bo Android zamknął DroidDeck, żeby zwolnić pamięć. To nie była awaria. Zamknij inne aplikacje lub obniż ustawienia tekstur gry i spróbuj ponownie. + Mali (Venus) + mostek Mali + Żaden otwarty sterownik nie obsługuje jeszcze tego Mali: używany jest %1$s na własnym sterowniku telefonu. + %1$s nie został jeszcze opublikowany: do tego czasu używany jest %2$s. + %1$s jest niedostępny, a sterownik tego telefonu zgłasza Vulkan %2$s (Venus wymaga 1.2): używany jest mostek Mali. + %1$s nie został jeszcze opublikowany: do tego czasu mostek Mali jest włączony. + W kolejce: %1$s (oczekiwanie na inny sterownik środowiska uruchomieniowego) + DXVK jest dostarczany przez systemowe środowisko uruchomieniowe PowerVR. Inne pakiety DXVK można przechowywać, ale nie są stosowane z tym sterownikiem. Obsługiwany Eksperymentalny: jego sterowniki to wersje testowe Eksperymentalna obsługa Adreno 850: wymaga zgodnych eksperymentalnych sterowników ekranu i gier; nie zweryfikowano na tym urządzeniu Poniżej testowanego sprzętu (Adreno 725 i nowsze): może nie działać Nieobsługiwany: brak zgodnego zaplecza graficznego dla tego GPU + Działa przez mostek Mali, na własnym sterowniku Vulkan telefonu + Nieobsługiwane przy wyłączonym moście Mali: Turnip wymaga GPU Adreno (Snapdragon) Osiągnięto limit zapytań GitHub – spróbuj ponownie później GitHub odpowiedział HTTP %1$d @@ -2337,6 +2607,13 @@ Sortuj Etykiety paska bocznego Pokazuj nazwy pod ikonami paska bocznego. Wyłącz, aby pasek był węższy. + Maskotka agenta + DeeDee wyświetla się nad launcherem i grami oraz pokazuje, co robi agent. + Nad innymi aplikacjami + Pozwól DeeDee wyświetlać się nad każdą aplikacją i otwierać tam jej czat + Zezwól + DeeDee + Czat z DeeDee Wyświetlanie Większe karty Mniejsze karty @@ -2628,6 +2905,11 @@ Programista Znak wodny z etykietą kompilacji Pokazuj na ekranie etykietę kompilacji testowej lub Lab. Domyślnie włączone. + Udostępnij pakiety diagnostyczne + Sesja i urządzenie + Grafika + Gry i zgodność + Wszystkie pakiety Gotowe do gry Jeszcze nie gotowe do gry środowisko %1$s @@ -2666,6 +2948,9 @@ Włącz osiągnięcia GOG w ustawieniach Store Osiągnięcia niedostępne; sprawdź dzienniki sesji Osiągnięcie odblokowane + Mali (Venus): wyłączone + Mali (Venus): włączone + Sterownik na %1$s zgłasza Vulkan %2$s. Mali (Venus) wymaga Vulkan 1.2 lub nowszego (na starszych wersjach gamescope się nie uruchamia), więc sesje pomijają Venus i zamiast tego używają pary sterowników PanVK. Wklej Lewy drążek Prawy drążek @@ -3025,6 +3310,7 @@ Instalacje VC++ i DirectX wymagane przez gry Uruchamia gry Linux x86 Narzędzie Steam + Steam pobiera ten składnik dla gier z systemem antycheatowym nawet wtedy, gdy jest wyłączony. Jego usunięcie zatrzymuje ich instalację na 0%. DroidDeck uruchamia gry bez tego środowiska Proton x86, którego DroidDeck nie potrafi uruchomić Domyślne dla wszystkich gier @@ -3153,6 +3439,8 @@ DroidDeck · %1$d kl./s 60 kl./s wygląda płynniej, ale bardziej obciąża procesor podczas uruchamiania Steam. Film wybrany w ustawieniach Steam też jest tu widoczny. Dźwięk + Pomiń film startowy + Użyj 0,1-sekundowego czarnego klipu jako filmu startowego Steam. Zacznie obowiązywać w następnej sesji. Własny film MP4, MOV, MKV lub WebM. Inne formaty i pliki powyżej %1$d MB są konwertowane na urządzeniu do WebM 720p, do %2$d sekund. Importuj @@ -3614,6 +3902,7 @@ Zatrzymuje Alt+Tab, klawisz Win i przycisk Home w aktywnej sesji DroidDeck zamiast w Androidzie. Włącz Jasność w Konfiguracja → Integracja ze Steam Most Mali: wył. + %1$s nie może używać mostku Mali (wymaga GPU Mali bez ścieżki sterownika systemowego), więc ten przełącznik nic tu nie zmienia. Most Mali: wł. %1$s to nie Adreno. Eksperymentalny most Vulkan jest włączony: sesja rysuje przez własny sterownik telefonu. Spodziewaj się błędów; wyślij logi sesji. Tryb bezpieczny @@ -3775,6 +4064,7 @@ Nie można zaimportować tego układu Szkarłatny śnieg + Białe powierzchnie z czerwonymi akcentami. Ścieżki dźwiękowe Muzyka @@ -3838,4 +4128,6 @@ Powtarzaj jeden Głośność Brak plików audio w tej ścieżce dźwiękowej + Uruchomienie niedostępne + Brak przeglądarki internetowej do otwarcia tego linku. diff --git a/app/src/main/res/values-pt-rPT/input_library.xml b/app/src/main/res/values-pt-rPT/input_library.xml new file mode 100644 index 0000000000..498a7442e0 --- /dev/null +++ b/app/src/main/res/values-pt-rPT/input_library.xml @@ -0,0 +1,132 @@ + + + O ecrã selecionado não está disponível. Ligue-o para editar esta disposição no tamanho real. + Descartar as alterações de disposição não guardadas? + Esta disposição é usada por %1$d perfis. As alterações guardadas aplicam-se a todos. + Perfis predefinidos + Modo de ambiente de trabalho + Modo de jogo + Predefinido para ambiente de trabalho e jogo + Predefinido para o modo de jogo + Predefinido para o modo de ambiente de trabalho + Definições do dispositivo + Controlos + Botões, analógicos, gatilhos e teclas extra + Copiar perfil + Repor ações + Repor as ações de %1$s nos valores predefinidos do perfil base? As disposições e os outros perfis mantêm-se iguais. + Eliminar %1$s? Os modos que o usam voltam ao perfil predefinido integrado. As disposições guardadas e as definições partilhadas continuam disponíveis. + Visibilidade + Aplica-se a todos os perfis. Auto mostra os controlos do ecrã principal quando não há comando ligado no modo de jogo. + Editar no ecrã + Disposições guardadas… + Escolha uma disposição ou crie a sua + Escolha Controlos do perfil no menu de sessão do ecrã secundário. Os seletores Perfil e Ecrã secundário no menu do comando escolhem os controlos a mostrar. + Ações dos botões + Partilhado com %1$s. As edições também se aplicam a esses perfis. + Reutilizar definições + Usar definições de… + Copiar de outro perfil ou manter as definições partilhadas + Tornar independente + Manter a configuração atual e deixar de partilhar alterações + As disposições guardam elementos e posições. Cada perfil pode atribuir as suas próprias ações. Edite em tamanho real no ecrã de destino. + Disposição atual + Eliminar a disposição não utilizada %1$s e as suas ações guardadas? + Mudar o nome da disposição atual + As definições de entrada ilegíveis foram guardadas numa cópia de recuperação. Pode continuar a editar os perfis restaurados. + Propriedades + Propriedades do clique + %1$s · Clique + Botões + Analógicos, pads e gatilhos + Ocultar ferramentas + Comando + Envia a entrada do comando para o Steam Input ou para o jogo. + Este elemento não envia entrada de comando, rato ou teclado. + Clique do rato + Ação do DroidDeck + Ação + Velocidade de deslocamento: %1$d passos/s + + Novo perfil + + Nova disposição + %1$s · Usado por %2$d perfis. As alterações aplicam-se a todos os perfis que usam estas atribuições. + Mudar o nome + Eliminar + Adicione elementos à disposição antes de atribuir as suas ações. + Não foi possível guardar as definições de entrada + Nome + Começar de + Botão + Analógico + Touchpad + Direcional + Gatilho + Concluído + Anular + + Adicionar + Arraste para mover. Arraste um canto para redimensionar. Toque em Propriedades para atribuir uma ação. + A editar no ecrã secundário + Reutilizar %1$s de outro perfil. As outras fontes de controlo mantêm-se iguais. + Manter os controlos físicos partilhados + Por predefinição, todos os controlos e disposições personalizadas são cópias independentes. Partilhar apenas liga os controlos físicos. + Usar estes elementos e posições. Partilhar mantém as futuras alterações de geometria sincronizadas; as ações dos botões continuam independentes. Uma disposição diferente começa com ações não atribuídas. + Copiar estes controlos e ações, ou ligá-los para que alterações futuras se apliquem aos dois perfis. + Manter partilhado + Cópia independente + Iniciar o analógico no ponto de toque + Ocultar o analógico quando não está a ser usado + Ferramentas + Auto (%1$s) + Personalizado (%1$s) + Guardar como novo perfil + Controlos do perfil + Perfil + Gestos do touchpad do rato + Quando atribuído ao ponteiro do rato: toque para clicar, mantenha para arrastar e desloque com dois dedos. + %1$s tem uma substituição do menu rápido. Selecione Auto para usar o perfil predefinido e as três partes guardadas. + Entrada DroidDeck + Mantido enquanto o analógico é movido em qualquer direção: pressiona acima de 55%, liberta abaixo de 35%. Use Teclas de direção para atribuir cada direção em separado. Os comandos DroidDeck correm uma vez por desvio. O clique do analógico configura-se à parte. + Mantido enquanto toca no touchpad; libertado ao levantar o dedo. Os comandos DroidDeck correm uma vez por toque. O clique do touchpad configura-se à parte. + Mantido quando o gatilho passa os 55%; libertado abaixo dos 35%. Os comandos DroidDeck correm uma vez por pressão. + Direção de deslocamento + Vertical + Horizontal + Deslocar horizontalmente + Medições + Ative a gravação, use os controlos numa sessão em curso e depois volte e leia os resultados. Mede apenas o tempo de envio do DroidDeck, não a latência do ecrã. A gravação termina quando o processo da app fecha. + %1$d controlos + Outras disposições guardadas (%1$d) ▾ + Ocultar outras disposições guardadas (%1$d) ▴ + Início / Guia + Voltar · toque único + Voltar · duplo toque + Voltar · duas vezes no Steam, uma no ambiente de trabalho + No modo Steam. Manter Voltar também abre o acesso rápido. + Repor predefinições + A sua escolha de painel é memorizada. O ambiente de trabalho abre um segundo espaço de trabalho; não muda a sessão nem o seu perfil de entrada. + Comando virtual + O tipo de comando visto pelo Steam ou pelo jogo. + Ecrã tátil + Como os toques no ecrã do jogo são tratados. Os botões do perfil mantêm as ações atribuídas. + Cursor tátil + Mostra um ponteiro para toques diretos no ecrã do jogo. + Tocar e manter + Ação do rato ao manter um dedo no ecrã do jogo. + Toques do botão Voltar + Primeira ação: toque único. Segunda ação: duplo toque. + Botão de alternância + Toque para manter, toque novamente para libertar. Abrir um menu ou mudar de perfil liberta o botão. + Forma + Arredondada + Cápsula + Círculo + Retângulo + Etiqueta do botão + Texto + Imagem importada + Teclas diagonais separadas + Atribua uma tecla a cada diagonal. Uma diagonal vazia pressiona as duas direções vizinhas. + Direções vizinhas + As suas antigas teclas no ecrã foram guardadas como perfis importados abaixo. Selecione um para usar ou editar. As suas seleções de perfil atuais foram mantidas. + As antigas teclas no ecrã não puderam ser importadas automaticamente. As definições originais foram mantidas. + diff --git a/app/src/main/res/values-pt-rPT/input_strings.xml b/app/src/main/res/values-pt-rPT/input_strings.xml new file mode 100644 index 0000000000..0d81834854 --- /dev/null +++ b/app/src/main/res/values-pt-rPT/input_strings.xml @@ -0,0 +1,38 @@ + + + Perfis de entrada + Perfis + Comando físico + Ecrã principal + Ecrã secundário + Nativo / Steam Input + Nativo: %1$s + Enviar outro controlo do comando + Desativado + Tecla ou combinação de teclas + Teclas direcionais + Mover o ponteiro + Velocidade do ponteiro: %1$d + Deslocar + Deslocar verticalmente + Botão esquerdo do rato + Botão direito do rato + Botão do meio do rato + Abrir o menu do DroidDeck + Mostrar teclado + Abrir o menu do Steam + Abrir o acesso rápido do Steam + Remover controlo + Adicionar controlo + Botões específicos do dispositivo + Atribuir um botão físico + Largue o botão e escolha Editar, Repetir ou Cancelar. B ou Voltar cancela após largar. + Repetir + Prima um botão, incluindo um botão Voltar reportado como tecla. As teclas de volume e do sistema Android estão reservadas. A atribuição aplica-se apenas a este dispositivo. + Remover atribuição + Diagnóstico de entrada + Registar o tempo de envio da entrada + Ler medições + Mede o envio do Android até à publicação no transporte de entrada existente. Exclui a chegada por Bluetooth, a sondagem do convidado, a renderização e a latência do ecrã. A gravação está desativada por predefinição. + Usar a atribuição de entrada normal + diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 7d8467909f..df607acd02 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -185,6 +185,7 @@ Não foi possível transferir o ambiente gráfico PowerVR. Verifique a ligação e tente novamente. Não foi possível transferir o DirectAudio, por isso o áudio dos jogos utiliza o caminho mais lento nesta sessão. Este programa + A sessão não conseguiu desenhar no ecrã: %1$s. Este ecrã mostra o motivo em vez de um ecrã preto; os registos da sessão têm os detalhes. 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. @@ -388,6 +389,9 @@ Ainda não suportado aqui A carregar os componentes… Não foi possível instalar: %1$s + Esta transferência precisa de uma atualização. + Atualização na fila. + Repetir atualização Transferido A transferir %1$s A instalar: %1$s @@ -418,6 +422,22 @@ Apenas interno Pasta: %1$s Segunda biblioteca + Mais bibliotecas Steam + Pastas onde o Steam pode instalar jogos e a partir das quais os pode executar, cada uma com o seu próprio nome. Remover uma pasta mantém os jogos no disco. + Adicionar biblioteca + Mudar o nome + Nome da biblioteca + Escolher uma pasta para a biblioteca + No máximo %1$d bibliotecas adicionadas + Essa pasta já é uma biblioteca ou está dentro de uma + %1$s · indisponível + Aplica-se a partir da próxima sessão do Steam + Encontrado neste dispositivo · %1$s · %2$s + Adicionar + Encontrar bibliotecas no armazenamento interno + Permitir o acesso a todos os ficheiros para que o DroidDeck possa ver as bibliotecas Steam que outras aplicações mantêm no armazenamento interno + Permitir + Foi adicionada %1$s, a biblioteca Steam dentro da pasta que escolheu Os jogos que carregam recursos em streaming a partir do SD ou do armazenamento partilhado podem apresentar soluços. Diagnóstico de armazenamento Regista os resultados de alocação e amostras de tempos de armazenamento em Partilhar registos. Pode tornar as instalações mais lentas enquanto estiver ativado. Aplica-se na próxima sessão. @@ -607,7 +627,10 @@ Desativa o assistente de navegação por comando do Proton, que gasta CPU em todos os jogos. Executar o proot sem seccomp Pode corrigir erros de chamadas de sistema em falta em alguns kernels. Pode reduzir o desempenho. + Executar sem proot (experimental) + Inicia a parte Linux diretamente no Android. Aplica-se à próxima sessão. Desative se algo não conseguir arrancar. Caminho rápido do proot + Não utilizado sem proot. Requer o filtro seccomp do proot. Pesquisas de ficheiros mais rápidas e menos soluços. Desative se um programa não encontrar os seus ficheiros. Desenhar o cursor dentro do gamescope @@ -818,6 +841,7 @@ Dispositivo suportado GPU não testada GPU não suportada + GPU via ponte Mali %1$s · %2$s %1$s: %2$s Não está disponível um backend gráfico compatível para %1$s. O Steam pode apresentar um ecrã preto. @@ -847,15 +871,38 @@ Sessão Registos da sessão Guardados após cada sessão + Diagnóstico avançado para a próxima sessão + Captura registos detalhados durante uma sessão. Pode reduzir o desempenho e ocupar mais espaço de armazenamento. Desativa-se automaticamente quando a sessão começa; reveja os registos antes de os partilhar. Registos de depuração dos jogos Inclui diagnósticos do Proton, do Wine e de gráficos no próximo arranque de um jogo. Pode reduzir o desempenho e ocupar mais armazenamento. Reinicie esta sessão para guardar os registos de depuração dos jogos Não foi possível atualizar os registos. Verifique o interruptor e tente novamente. Ferramentas de depuração + Registos gráficos detalhados + Interface do Steam: desenho pela GPU + Com o par de controladores Xclipse, o Steam desenha as suas páginas por software (o desenho pela GPU mostrou mosaicos com falhas). Ative para uma interface do Steam mais rápida se esta parecer correta neste telemóvel. + compilado em %1$s + %1$s atualizado para a compilação mais recente + Na última sessão, a ponte Mali falhou o autoteste em %1$s (imagens ou desenhos), pelo que a sessão utilizou o par de controladores PanVK. + Na última sessão, a ponte Mali não encontrou forma de partilhar memória com o controlador em %1$s, pelo que a sessão utilizou o par de controladores PanVK. A ponte não pode funcionar neste telemóvel; desativá-la mantém o par PanVK. + Os registos de Proton, DXVK e dos controladores de cada jogo ficam nos registos da sessão. Sempre ativado quando a GPU não é Adreno. Registos da última sessão Registos de sessões guardados Mantém os %1$d mais recentes Limpar registos + Registos de sessão disponíveis + Ainda não há registos de sessão guardados. + Os ficheiros ZIP partilhados e guardados incluem a sessão selecionada, além dos diagnósticos relacionados do Steam, da loja, das ferramentas e da Battle.net. + %1$s · %2$s + Sessão atual + Partilhar + Guardar no dispositivo + Eliminar + Eliminar os registos de sessão? + Eliminar %1$s? Esta ação não pode ser anulada. + Registos de sessão guardados. + Não foi possível guardar os registos de sessão. + Não foi possível eliminar os registos de sessão. Modo offline Inicie sessão no Steam primeiro Iniciador @@ -874,6 +921,8 @@ Utilizar como página inicial O DroidDeck pode ser a app de página inicial O DroidDeck nunca é proposto como app de página inicial + O botão Home abre + A página apresentada quando o DroidDeck é a aplicação Home e se premir Home Em Adicionar jogos, define o DroidDeck como Incluir Orientação Orientação do iniciador @@ -887,15 +936,22 @@ Ecrã inteiro Oculta as barras de estado e de navegação do Android Mostra as barras de estado e de navegação do Android + Iniciador de ecrã duplo + Automático coloca as secções do iniciador (Steam, Biblioteca, Lojas e as restantes) no segundo ecrã das consolas portáteis com um segundo ecrã integrado. Ativado utiliza qualquer segundo ecrã. Desativado mantém o iniciador num único ecrã. + Sessões de ecrã duplo + Automático fixa o menu do jogo no segundo ecrã integrado em vez de o apresentar como painel sobreposto. Ativado utiliza qualquer segundo ecrã. Desativado mantém o menu no ecrã do jogo; ainda pode escolher um segundo ecrã no próprio menu. Automático Ativado Desativado Controlos no ecrã inferior nos jogos + Teclado Android para campos de texto Abre o trackpad e o teclado no segundo ecrã quando uma sessão começa. A escrever para o ecrã superior Concluído App de página inicial predefinida Escolher uma app de página inicial + Ocultar o iniciador dos Recentes enquanto inativo + Só se aplica quando o DroidDeck é a aplicação Home predefinida e não há nenhuma sessão em curso. Escolher Apps Linux (beta) Ficheiros @@ -1010,6 +1066,147 @@ Versões de teste Experimente uma correção antes de ser lançada Nenhuma de momento + Compilação de laboratório + Compilações de laboratório + Em utilização + Em pausa após o Android ter reotimizado o DroidDeck + Não carregado: %1$s + À espera de um reinício + Mantido + Para outra versão + Recompilar + Elimina esta compilação do dispositivo + Reiniciar com esta compilação + Desativar + Utilizar + Eliminar + Eliminar agora + Não foi possível preparar o reinício: %1$s. Emparelhe a depuração sem fios nas Definições e tente de novo. + Compilação de laboratório instalada + O DroidDeck reiniciou com %1$s + Compilação Lab em pausa + O Android voltou a otimizar o DroidDeck, pelo que %1$s não está carregada. Abra Atualizações para reiniciar com ela. + Compilação Lab desativada + Foi compilada para outra versão do DroidDeck. Está guardada em Atualizações. + O DroidDeck não arrancou com ela duas vezes + Agente + Agente + O agente está a trabalhar + Instale o Claude Code no espaço de utilizador do Linux para usar o agente. + Pergunte sobre um jogo, uma falha ou uma alteração no DroidDeck + Enviar + Nova conversa + Parar + Armazenamento + Remover + Remover agora + Claude Code + Codex + Código-fonte do DroidDeck + Caches de transferências + As alterações não enviadas são perdidas + As compilações voltam a descarregá-las + A configuração inicial pode voltar a instalá-lo; as sessões iniciadas mantêm-se + O DroidDeck reiniciou com a sua compilação Lab. Continue onde ficou. + Pergunte-lhe porque é que um jogo não arranca, peça-lhe para explicar um registo ou para alterar o DroidDeck e testar a alteração neste dispositivo. + Falhou: %1$s + %1$s terminou (código de saída %2$d) + Parado + Terminou sem resposta + Tentar novamente + A configurar o agente + Recompile a minha compilação Lab %1$s para a versão instalada do DroidDeck e reinicie com ela. + %1$s de entrada · %2$s de saída + A pensar + Pensamento + A pensar · %1$s + %1$s · %2$s + ENTRADA + SAÍDA + A executar… + Sem resultado: o turno terminou antes + Sem saída + Escreva para pôr a mensagem seguinte na fila + Pôr na fila + Seguinte: %1$s + Não enviar + Anexar + Remover + Predefinido + Esforço de raciocínio + Avançar + Rever + Ainda nada mudou + Avançar com o plano. + Enviar agora + Mensagem + Mais + Fechar + Mais recente + A trabalhar + Contexto + %1$s de %2$s + Esta conversa · %1$s + A utilização só aparece após a primeira resposta + Limite de %1$d horas + Limite de %1$d minutos + Limite semanal + %1$d%% · reinício: %2$s + + %1$d ficheiro + %1$d ficheiros + + Planear primeiro + Planear + Propõe um plano sem alterar nada + Conversas + Ainda não há conversas + Agora mesmo + Eliminar + Elimina-a e os respetivos anexos + Processos + Não há nada a correr no espaço de utilizador do Linux + AGENTE + Parar + Compilação do Lab + A preparar compilações do Lab + %1$d%% · falta cerca de %2$s + falta cerca de %1$s + Cancelar + Cancelar compilação + A iniciar + %1$d%% + A empacotar + A reiniciar o DroidDeck no dispositivo + Concluído + Falhou: %1$s + Configurar o agente + Instale primeiro o ambiente de execução Linux na Configuração inicial. + Tentar novamente + Começar a conversar + Ligação ao dispositivo + Depuração sem fios, para o agente ver e controlar o DroidDeck + Instalar %1$s + No espaço de utilizador Linux, com git, gh e adb + Iniciar sessão em %1$s + Abre o navegador + GitHub + Opcional, para abrir pull requests + Ferramentas de compilação + Opcional, para compilações do Lab neste dispositivo · cerca de 5 GB + Agente pronto + Conclua a configuração do agente + Sessão iniciada em %1$s + Compilações do Lab + compilações rápidas + Compilações rápidas do Lab + Compila esta versão antecipadamente, para que as compilações do Lab demorem minutos · cerca de 20 minutos, uma única vez + A compilar · %1$d%% · restam cerca de %2$s + Preparar + A depuração sem fios não está acessível; Emparelhar ativa-a + Emparelhar + Instalar + Iniciar sessão PR #%1$d Não compilada para esta cópia do DroidDeck Atualizado %1$s @@ -1253,6 +1450,14 @@ Aplicações Configuração Atualizações + Mais + Editar separadores + Separadores + Visível + Em Mais + Oculto + Mover %1$s para cima + Mover %1$s para baixo %1$d%% Retomar %1$s Aparece como /root/ROMs em cada sessão. O armazenamento interno está em /root/Storage. @@ -1274,6 +1479,15 @@ Cancelar pedido pendente Teclado Android Ocultar ✕ + Tamanho no ecrã + Percentagem do ecrã ocupada pelo teclado, incluindo o cabeçalho. + Opacidade + Reduza-a para ver o jogo por trás do teclado. + Teclas ocultas + As teclas que raramente usa não aparecem no teclado. + Esc e linha das teclas de função + Ins / Del / Home / End / PgUp / PgDn + Teclas de direção Iniciar %1$s Escolha um ecrã. Secundário: %1$s. O ecrã secundário já não está disponível. @@ -1792,7 +2006,24 @@ Terminal Pegas + trackpads do Deck Painel + Ambiente de trabalho + Iniciar o ambiente de trabalho + Ambiente de trabalho · %1$s + Painel tátil + Toque direto + Painel tátil. Toca para passar ao toque direto + Toque direto. Toca para passar ao painel tátil + A iniciar o ambiente de trabalho… + O ambiente de trabalho foi encerrado. + Não foi possível iniciar o ambiente de trabalho. Os registos estão na pasta bottom-desktop desta sessão. + O ambiente de trabalho está encerrado. Ainda não há nada para mostrar aqui. + Trocar ecrãs + O ecrã inferior não está livre neste momento + Ecrã do jogo + Mostrar o jogo em + Ecrã superior + Ecrã inferior Transferências Nenhuma transferência em curso. Steam @@ -1827,6 +2058,20 @@ Combustível, t Principal %1$s t Reserva %1$s t + Tempo de fotograma + últimos %1$d s + fotograma médio + 1% mais baixo + fotogramas acima de 33 ms + %1$d / min + A jogar há %1$s + %1$d núcleos, até %2$s GHz + %1$d núcleos + jogo + FPS de %1$d Hz + A marca vermelha é o ponto em que o HUD mostra a temperatura a vermelho. + todo o dispositivo + bateria Enviar dados para o painel Automático Ativa para todos os jogos aqui listados, incluindo os encontrados mais tarde. Os jogos que desativar permanecem desativados. @@ -1850,6 +2095,10 @@ O microfone está desligado neste jogo. Para falar, ative Microfone nas definições do Steam do DroidDeck (Áudio) e volte a iniciar o jogo. Volume %1$d%% Estatísticas no jogo + HUD do ecrã inferior + Faixa em todos os separadores + 1% e 0,1% mais baixos + Temperatura da CPU FPS CPU GPU @@ -2023,6 +2272,7 @@ A iniciar a sessão… %1$d:%2$02d decorridos · ainda a trabalhar A transferir a atualização do cliente Steam · %1$d%% + A aplicar a atualização do cliente Steam… A transferir o cliente Steam · %1$s Já está em curso a instalação de uma ferramenta de compatibilidade @@ -2099,11 +2349,29 @@ Contornos de desenho animado mais nitidez. Não é uma GPU Adreno + Controlador PowerVR do sistema: a compatibilidade varia consoante o dispositivo + Experimental: RADV ou o controlador Xclipse do sistema + PowerVR do sistema + Utiliza os controladores integrados desta GPU + O controlador PowerVR do sistema está selecionado para o runtime e o ecrã. + Ainda não há nenhum controlador de código aberto que suporte esta Mali: a ponte Mali está ativada. + Esta é a versão de teste para dispositivos sem Snapdragon: as versões oficiais daqui só funcionam em Adreno, por isso não são instaladas sobre ela. As novas versões de teste estão em github.com/The412Banner/droiddeck-nonadreno-drivers. + A última sessão terminou porque o Android fechou o DroidDeck para libertar memória; não foi uma falha. Feche outras aplicações ou reduza as definições de textura do jogo e tente de novo. + Mali (Venus) + a ponte Mali + Ainda não há nenhum controlador de código aberto que suporte esta Mali: %1$s é usado com o controlador do próprio telemóvel. + %1$s ainda não foi publicado: %2$s é usado até lá. + %1$s não está disponível e o controlador deste telemóvel indica Vulkan %2$s (Venus requer 1.2): é usada a ponte Mali. + %1$s ainda não foi publicado: a ponte Mali está ativada até lá. + Em fila: %1$s (à espera de um controlador de runtime diferente) + O DXVK é fornecido pelo runtime PowerVR do sistema. Outros pacotes DXVK podem ser armazenados, mas não são aplicados com este controlador. Suportada Experimental: os controladores são versões de teste Suporte experimental para Adreno 850: requer controladores de ecrã e de jogos experimentais compatíveis; não verificado neste dispositivo Abaixo do hardware testado (Adreno 725 e mais recentes): pode não funcionar Não suportada: não está disponível um backend gráfico compatível para esta GPU + Corre através da ponte Mali, com o controlador Vulkan do próprio telemóvel + Não suportado com a ponte Mali desativada: o Turnip precisa de uma GPU Adreno (Snapdragon) Foi atingido o limite de pedidos do GitHub - tente novamente mais tarde O GitHub respondeu HTTP %1$d @@ -2304,6 +2572,13 @@ Ordenar Etiquetas da barra lateral Mostra os nomes por baixo dos ícones da barra lateral. Desative para uma barra lateral mais estreita. + Mascote do agente + A DeeDee flutua sobre o iniciador e os jogos e mostra o que o agente está a fazer. + Sobre outras aplicações + Permitir que a DeeDee flutue sobre todas as aplicações e abra aí a conversa + Permitir + DeeDee + Conversar com a DeeDee Apresentação Cartões maiores Cartões mais pequenos @@ -2590,6 +2865,11 @@ Programador Marca de água da compilação Mostrar no ecrã a etiqueta da compilação de teste ou Lab. Ativada por predefinição. + Partilhar pacotes de diagnóstico + Sessão e dispositivo + Gráficos + Jogos e compatibilidade + Todos os pacotes Pronto para jogar Ainda não está pronto para jogar ambiente de execução %1$s @@ -2628,6 +2908,9 @@ Ativa as conquistas da GOG nas definições de Lojas Conquistas indisponíveis; verifica os registos da sessão Conquista desbloqueada + Mali (Venus): desativado + Mali (Venus): ativado + O controlador de %1$s indica Vulkan %2$s. Mali (Venus) requer Vulkan 1.2 ou superior (o gamescope não arranca em versões anteriores), por isso as sessões não usam o Venus e recorrem ao par de controladores PanVK. Colar Stick esquerdo Stick direito @@ -2996,6 +3279,7 @@ Instaladores VC++ e DirectX exigidos pelos jogos Executa jogos Linux x86 Ferramenta do Steam + O Steam descarrega isto para jogos que incluem anti-cheat, mesmo quando este está desativado. Removê-lo deixa a instalação desses jogos parada nos 0% O DroidDeck executa jogos sem este ambiente de execução Proton x86, que o DroidDeck não consegue executar Predefinido para todos os jogos @@ -3115,6 +3399,8 @@ DroidDeck · %1$d fps 60 fps é mais fluido, mas usa mais CPU enquanto o Steam arranca. Um vídeo escolhido nas definições do Steam também aparece aqui. Som + Ignorar o vídeo de arranque + Utilizar um clipe preto de 0,1 segundos como vídeo de arranque do Steam. Aplica-se na próxima sessão. O seu próprio vídeo MP4, MOV, MKV ou WebM. Outros formatos e ficheiros acima de %1$d MB são convertidos para WebM 720p no dispositivo, até %2$d segundos. Importar @@ -3576,6 +3862,7 @@ Mantém Alt+Tab, a tecla Win e o botão Início numa sessão ativa do DroidDeck em vez do Android. Ative Brilho em Configuração → Integração com o Steam Ponte Mali: desligada + %1$s não pode usar a ponte Mali (é necessária uma GPU Mali sem rota de controlador do sistema), por isso este interruptor não tem efeito aqui. Ponte Mali: ligada %1$s não é uma Adreno. A ponte Vulkan experimental está ligada: a sessão desenha através do próprio controlador do telemóvel. Conte com erros; envie os registos da sessão. Modo seguro @@ -3736,6 +4023,7 @@ Não foi possível importar este esquema Neve Escarlate + Superfícies brancas com detalhes vermelhos. Bandas sonoras Música @@ -3799,4 +4087,6 @@ Repetir uma Volume Nenhum ficheiro de áudio nesta banda sonora + Início indisponível + Não há nenhum navegador disponível para abrir esta ligação. diff --git a/app/src/main/res/values-pt/input_library.xml b/app/src/main/res/values-pt/input_library.xml new file mode 100644 index 0000000000..ae84ba99ce --- /dev/null +++ b/app/src/main/res/values-pt/input_library.xml @@ -0,0 +1,132 @@ + + + A tela selecionada não está disponível. Conecte-a para editar este layout no tamanho real. + Descartar as alterações de layout não salvas? + Este layout é usado por %1$d perfis. As alterações salvas valem para todos. + Perfis padrão + Modo desktop + Modo jogo + Padrão para desktop e jogo + Padrão para o modo jogo + Padrão para o modo desktop + Configurações do dispositivo + Controles + Botões, analógicos, gatilhos e teclas extras + Copiar perfil + Redefinir ações + Redefinir as ações de %1$s para os padrões do perfil base? Os layouts e outros perfis permanecem iguais. + Excluir %1$s? Os modos que o usam voltarão ao perfil padrão integrado. Os layouts salvos e as configurações compartilhadas continuarão disponíveis. + Visibilidade + Vale para todos os perfis. Auto mostra os controles da tela principal quando nenhum controle está conectado no modo jogo. + Editar na tela + Layouts salvos… + Escolha um layout ou crie o seu + Escolha Controles do perfil no menu de sessão da tela secundária. Os seletores Perfil e Tela secundária no menu do controle escolhem os controles exibidos. + Ações dos botões + Compartilhado com %1$s. As edições também valem para esses perfis. + Reutilizar configurações + Usar configurações de… + Copiar de outro perfil ou manter as configurações compartilhadas + Tornar independente + Manter a configuração atual e parar de compartilhar alterações + Os layouts guardam elementos e posições. Cada perfil pode atribuir suas próprias ações. Edite em tamanho real na tela de destino. + Layout atual + Excluir o layout não usado %1$s e suas ações salvas? + Renomear o layout atual + As configurações de entrada ilegíveis foram preservadas em uma cópia de recuperação. Você pode continuar editando os perfis restaurados. + Propriedades + Propriedades do clique + %1$s · Clique + Botões + Analógicos, pads e gatilhos + Ocultar ferramentas + Controle + Envia a entrada do controle para o Steam Input ou para o jogo. + Este elemento não envia entrada de controle, mouse ou teclado. + Clique do mouse + Ação do DroidDeck + Ação + Velocidade de rolagem: %1$d passos/s + + Novo perfil + + Novo layout + %1$s · Usado por %2$d perfis. As alterações valem para todos os perfis que usam estas atribuições. + Renomear + Excluir + Adicione elementos ao layout antes de atribuir suas ações. + Não foi possível salvar as configurações de entrada + Nome + Começar de + Botão + Analógico + Touchpad + Direcional + Gatilho + Concluído + Desfazer + + Adicionar + Arraste para mover. Arraste um canto para redimensionar. Toque em Propriedades para atribuir uma ação. + Editando na tela secundária + Reutilizar %1$s de outro perfil. As outras fontes de controle permanecem iguais. + Manter os controles físicos compartilhados + Por padrão, todos os controles e layouts personalizados são cópias independentes. Compartilhar só vincula os controles físicos. + Usar estes elementos e posições. Compartilhar mantém as futuras mudanças de geometria em sincronia; suas ações de botão continuam independentes. Um layout diferente começa com ações não atribuídas. + Copiar estes controles e ações, ou vinculá-los para que mudanças futuras valham para os dois perfis. + Manter compartilhado + Cópia independente + Iniciar o analógico no ponto de toque + Ocultar o analógico quando não estiver em uso + Ferramentas + Auto (%1$s) + Personalizado (%1$s) + Salvar como novo perfil + Controles do perfil + Perfil + Gestos do touchpad do mouse + Quando atribuído ao ponteiro do mouse: toque para clicar, segure para arrastar e role com dois dedos. + %1$s tem uma substituição do menu rápido. Selecione Auto lá para usar o perfil padrão e as três partes salvas. + Entrada do DroidDeck + Mantido enquanto o analógico é movido em qualquer direção: pressiona acima de 55%, solta abaixo de 35%. Use Teclas de direção para atribuir cada direção separadamente. Os comandos do DroidDeck rodam uma vez por deflexão. O clique do analógico é configurado à parte. + Mantido enquanto o touchpad é tocado; liberado ao levantar o dedo. Os comandos do DroidDeck rodam uma vez por toque. O clique do touchpad é configurado à parte. + Mantido quando o gatilho passa de 55%; liberado abaixo de 35%. Os comandos do DroidDeck rodam uma vez por pressionamento. + Direção de rolagem + Vertical + Horizontal + Rolar horizontalmente + Medições + Ative a gravação, use os controles em uma sessão em execução e depois volte e leia os resultados. Mede apenas o tempo de envio do DroidDeck, não a latência da tela. A gravação termina quando o processo do app fecha. + %1$d controles + Outros layouts salvos (%1$d) ▾ + Ocultar outros layouts salvos (%1$d) ▴ + Início / Guia + Voltar · toque único + Voltar · toque duplo + Voltar · duas vezes no Steam, uma no desktop + No modo Steam. Manter Voltar também abre o acesso rápido. + Restaurar o padrão + Sua escolha de painel é lembrada. O desktop abre um segundo espaço de trabalho; não troca a sessão nem o perfil de entrada. + Controle virtual + O tipo de controle visto pelo Steam ou pelo jogo. + Tela sensível ao toque + Como os toques na tela do jogo são tratados. Os botões do perfil mantêm as ações atribuídas. + Cursor de toque + Mostra um ponteiro para toques diretos na tela do jogo. + Tocar e segurar + Ação do mouse ao segurar um dedo na tela do jogo. + Toques do botão Voltar + Primeira ação: toque único. Segunda ação: toque duplo. + Botão de alternância + Toque para manter, toque de novo para soltar. Abrir um menu ou trocar de perfil solta o botão. + Forma + Arredondada + Pílula + Círculo + Retângulo + Rótulo do botão + Texto + Imagem importada + Teclas diagonais separadas + Atribua uma tecla a cada diagonal. Uma diagonal vazia pressiona suas duas direções vizinhas. + Direções vizinhas + Suas antigas teclas na tela foram salvas como perfis importados abaixo. Selecione um para usar ou editar. Suas seleções de perfil atuais foram mantidas. + As antigas teclas na tela não puderam ser importadas automaticamente. As configurações originais foram mantidas. + diff --git a/app/src/main/res/values-pt/input_strings.xml b/app/src/main/res/values-pt/input_strings.xml new file mode 100644 index 0000000000..5847aa3ac4 --- /dev/null +++ b/app/src/main/res/values-pt/input_strings.xml @@ -0,0 +1,38 @@ + + + Perfis de entrada + Perfis + Controle físico + Tela principal + Tela secundária + Nativo / Steam Input + Nativo: %1$s + Enviar outro comando do controle + Desativado + Tecla ou combinação de teclas + Teclas direcionais + Mover o ponteiro + Velocidade do ponteiro: %1$d + Rolar + Rolar verticalmente + Botão esquerdo do mouse + Botão direito do mouse + Botão do meio do mouse + Abrir o menu do DroidDeck + Mostrar teclado + Abrir o menu do Steam + Abrir o acesso rápido do Steam + Remover controle + Adicionar controle + Botões específicos do dispositivo + Atribuir um botão físico + Solte o botão e escolha Editar, Repetir ou Cancelar. B ou Voltar cancela após soltar. + Repetir + Pressione um botão, incluindo um botão Voltar informado como tecla. As teclas de volume e do sistema Android são reservadas. A atribuição vale apenas para este dispositivo. + Remover atribuição + Diagnóstico de entrada + Registrar o tempo de envio da entrada + Ler medições + Mede o envio do Android até a publicação no transporte de entrada existente. Não inclui a chegada por Bluetooth, a sondagem do convidado, a renderização nem a latência da tela. A gravação fica desativada por padrão. + Usar a atribuição de entrada normal + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e49887a37a..29e6152dfa 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -185,6 +185,7 @@ Não foi possível baixar o ambiente gráfico PowerVR. Verifique a conexão e tente novamente. Não foi possível baixar o DirectAudio, então o áudio dos jogos usa o caminho mais lento nesta sessão. Este programa + A sessão não conseguiu desenhar na tela: %1$s. Esta tela mostra o motivo no lugar de uma tela preta; os logs da sessão trazem os detalhes. 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. @@ -388,6 +389,9 @@ Ainda sem suporte aqui Carregando os componentes… Não foi possível instalar: %1$s + Este download precisa de uma atualização. + Atualização na fila. + Tentar atualizar novamente Baixado Baixando %1$s Instalando: %1$s @@ -418,6 +422,22 @@ Somente interno Pasta: %1$s Segunda biblioteca + Mais bibliotecas do Steam + Pastas onde o Steam pode instalar e executar jogos, cada uma com seu próprio nome. Remover uma mantém os jogos no disco. + Adicionar biblioteca + Renomear + Nome da biblioteca + Escolher uma pasta para a biblioteca + No máximo %1$d bibliotecas adicionadas + Essa pasta já é uma biblioteca ou está dentro de uma + %1$s · indisponível + Vale a partir da próxima sessão do Steam + Encontrado neste dispositivo · %1$s · %2$s + Adicionar + Encontrar bibliotecas no armazenamento interno + Permita acesso a todos os arquivos para que o DroidDeck veja bibliotecas do Steam que outros apps mantêm no armazenamento interno + Permitir + Adicionada %1$s, a biblioteca do Steam dentro da pasta escolhida Jogos que carregam recursos do SD ou do armazenamento compartilhado durante o jogo podem ter engasgos. Diagnóstico de armazenamento Registra os resultados de alocação e amostras de tempos de armazenamento em Compartilhar logs. Pode deixar as instalações mais lentas enquanto estiver ativado. Vale a partir da próxima sessão. @@ -607,7 +627,10 @@ Desativa o assistente de navegação por controle do Proton, que consome CPU em todos os jogos. Rodar o proot sem seccomp Pode corrigir erros de syscall ausente em alguns kernels. Pode reduzir o desempenho. + Executar sem proot (experimental) + Inicia o ambiente Linux diretamente no Android. Vale a partir da próxima sessão. Desative se algo não iniciar. Caminho rápido do proot + Não usado sem proot. Requer o filtro seccomp do proot. Buscas de arquivos mais rápidas e menos engasgos. Desative se um programa não encontrar os arquivos dele. Desenhar o cursor dentro do gamescope @@ -818,6 +841,7 @@ Dispositivo compatível GPU não testada GPU sem suporte + GPU via ponte Mali %1$s · %2$s %1$s: %2$s Nenhum backend gráfico compatível está disponível para %1$s. O Steam pode exibir uma tela preta. @@ -847,15 +871,38 @@ Sessão Logs da sessão Salvos após cada sessão + Diagnósticos avançados para a próxima sessão + Captura logs detalhados durante uma sessão. Pode reduzir o desempenho e usar mais armazenamento. Desliga-se sozinho quando a sessão começa; revise os logs antes de compartilhar. Logs de depuração dos jogos Inclui diagnósticos do Proton, do Wine e de gráficos na próxima inicialização do jogo. Pode reduzir o desempenho e usar mais armazenamento. Reinicie esta sessão para salvar os logs de depuração dos jogos Não foi possível atualizar os logs. Verifique a chave e tente novamente. Ferramentas de depuração + Logs detalhados de gráficos + Interface do Steam: renderização pela GPU + Com o par de drivers Xclipse, o Steam renderiza suas páginas por software (a renderização pela GPU apresentou blocos quebrados). Ative para ter uma interface do Steam mais rápida se ela aparecer corretamente neste telefone. + compilado em %1$s + %1$s atualizado para a compilação mais recente + A ponte Mali falhou no autoteste em %1$s na última sessão (imagens ou chamadas de desenho), então a sessão usou o par de drivers PanVK em vez disso. + A ponte Mali não encontrou nenhuma forma de compartilhar memória com o driver em %1$s na última sessão, então a sessão usou o par de drivers PanVK em vez disso. A ponte não funciona neste aparelho; desativá-la mantém o par PanVK. + Os registros de Proton, DXVK e do driver de cada jogo são incluídos nos registros da sessão. Sempre ativado quando a GPU não é Adreno. Logs da última sessão Logs de sessão salvos Mantém os %1$d mais recentes Limpar logs + Registros de sessão disponíveis + Ainda não há registros de sessão salvos. + Os arquivos ZIP compartilhados e salvos incluem a sessão selecionada, além de diagnósticos relacionados da Steam, da loja, das ferramentas e da Battle.net. + %1$s · %2$s + Sessão atual + Compartilhar + Salvar no dispositivo + Excluir + Excluir registros de sessão? + Excluir %1$s? Isso não pode ser desfeito. + Registros de sessão salvos. + Não foi possível salvar os registros de sessão. + Não foi possível excluir os registros de sessão. Modo offline Inicie sessão na Steam primeiro Inicializador @@ -874,6 +921,8 @@ Usar como tela inicial O DroidDeck pode ser o app de início O DroidDeck nunca é oferecido como app de início + Botão Home abre + A página exibida quando DroidDeck é o app Home e você pressiona Home Em Adicionar jogos, defina o DroidDeck como Incluir Orientação Orientação do launcher @@ -887,15 +936,22 @@ Tela cheia Oculta as barras de status e de navegação do Android Mostra as barras de status e de navegação do Android + Iniciador em duas telas + O modo automático coloca as seções do iniciador (Steam, Biblioteca, Lojas e as demais) na segunda tela de consoles portáteis com uma tela secundária integrada. Ativado usa qualquer tela secundária. Desativado mantém o iniciador em uma única tela. + Sessões em duas telas + O modo automático fixa o menu do jogo na segunda tela integrada em vez de exibi-lo como painel flutuante. Ativado usa qualquer tela secundária. Desativado mantém o menu na tela do jogo; ainda é possível escolher uma segunda tela a partir dele. Automático Ativado Desativado Controles na tela inferior nos jogos + Teclado do Android para campos de texto Abre o trackpad e o teclado na segunda tela quando uma sessão começa. Digitando para a tela superior Concluído App de início padrão Escolher um app de início + Ocultar o launcher dos Recentes enquanto estiver ocioso + Aplica-se apenas quando DroidDeck é o app Home padrão e nenhuma sessão estiver em execução. Escolher Apps Linux (beta) Arquivos @@ -1010,6 +1066,148 @@ Versões de teste Experimente uma correção antes do lançamento Nenhuma no momento + Compilação de laboratório + Compilações de laboratório + Em uso + Pausada após o Android otimizar o DroidDeck novamente + Não carregada: %1$s + Aguardando um reinício + Mantida + Para outra versão + Recompilar + Exclui esta compilação do dispositivo + Reiniciar com esta + Desativar + Usar + Excluir + Excluir agora + Não foi possível preparar o reinício: %1$s. Emparelhe a depuração sem fio em Configurações e tente novamente. + Compilação de laboratório instalada + DroidDeck foi reiniciado com %1$s + Build do Lab pausado + O Android reotimizou o DroidDeck, então %1$s não foi carregado. Abra Atualizações para reiniciar com ele. + Build do Lab desativado + Ele foi compilado para outra versão do DroidDeck. Está guardado em Atualizações. + O DroidDeck não iniciou com ele duas vezes + Agente + Agente + O agente está trabalhando + Instale o Claude Code no espaço de usuário do Linux para usar o agente. + Pergunte sobre um jogo, um travamento ou uma alteração no DroidDeck + Enviar + Nova conversa + Parar + Armazenamento + Remover + Remover agora + Claude Code + Codex + Código-fonte do DroidDeck + Caches de download + Alterações não enviadas são perdidas + Os builds baixam esses arquivos novamente + A configuração pode instalá-lo novamente; os logins são mantidos + O DroidDeck reiniciou com seu build do Lab. Continue de onde parou. + Pergunte por que um jogo não inicia, peça para explicar um log ou para alterar o DroidDeck e testar a alteração neste dispositivo. + Falha: %1$s + %1$s terminou (código de saída %2$d) + Interrompido + Terminou sem resposta + Tentar novamente + Configurando o agente + Recompile meu build do Lab %1$s para a versão instalada do DroidDeck e reinicie com ele. + %1$s de entrada · %2$s de saída + Pensando + Pensamento + Pensando · %1$s + %1$s · %2$s + ENTRADA + SAÍDA + Executando… + Nenhum resultado: o turno terminou antes + Nenhuma saída + Digite para enfileirar a próxima mensagem + Enfileirar + Próxima: %1$s + Não enviar + Anexar + Remover + Padrão + Esforço de raciocínio + Prosseguir + Revisar + Nada mudou ainda + Siga em frente com o plano. + Enviar agora + Mensagem + Mais + Fechar + Mais recente + Trabalhando + Contexto + %1$s de %2$s + Esta conversa · %1$s + O uso aparece após a primeira resposta + Limite de %1$d horas + Limite de %1$d minutos + Limite semanal + %1$d%% · reinicia em %2$s + + %1$d arquivos + %1$d arquivo + %1$d arquivos + + Planejar primeiro + Planejar + Propõe um plano sem alterar nada + Conversas + Ainda não há conversas + Agora mesmo + Excluir + Exclui a conversa e seus anexos + Processos + Nada está em execução no espaço de usuário do Linux + AGENTE + Parar + Compilação do laboratório + Preparando compilações do laboratório + %1$d%% · faltam cerca de %2$s + faltam cerca de %1$s + Cancelar + Cancelar compilação + Iniciando + %1$d%% + Empacotando + Reiniciando o DroidDeck nele + Concluído + Falhou: %1$s + Configurar o agente + Instale o ambiente de execução do Linux em Configurações primeiro. + Tentar novamente + Começar a conversar + Conexão do dispositivo + Depuração por Wi-Fi, para que o agente possa ver e controlar o DroidDeck + Instalar %1$s + No espaço de usuário do Linux, com git, gh e adb + Entrar em %1$s + Abre o navegador + GitHub + Opcional, para abrir solicitações de pull + Ferramentas de compilação + Opcional, para compilações do Lab neste dispositivo · cerca de 5 GB + Agente pronto + Conclua a configuração do agente + Conectado a %1$s + Compilações do Lab + compilações rápidas + Compilações rápidas do Lab + Pré-compila esta versão, para que as compilações do Lab levem minutos · cerca de 20 minutos, uma única vez + Compilando · %1$d%% · cerca de %2$s para concluir + Preparar + A depuração sem fio não está acessível; Parear a ativa + Parear + Instalar + Entrar PR #%1$d Não compilada para esta cópia do DroidDeck Atualizado %1$s @@ -1253,6 +1451,14 @@ Apps Configuração Atualizações + Mais + Editar abas + Abas + Visível + Em Mais + Oculto + Mover %1$s para cima + Mover %1$s para baixo %1$d%% Retomar %1$s Aparece como /root/ROMs em cada sessão. O armazenamento interno fica em /root/Storage. @@ -1274,6 +1480,15 @@ Cancelar pendente Teclado do Android Ocultar ✕ + Tamanho na tela + Parte da tela ocupada pelo teclado, incluindo o cabeçalho. + Opacidade + Reduza para ver o jogo atrás do teclado. + Teclas ocultas + Teclas que você usa raramente não aparecem no teclado. + Esc e fileira de teclas de função + Ins / Del / Home / End / PgUp / PgDn + Teclas de seta Iniciar %1$s Escolha uma tela. Secundária: %1$s. A tela secundária não está mais disponível. @@ -1792,7 +2007,24 @@ Terminal Botões traseiros + trackpads do Deck Painel + Área de trabalho + Iniciar a área de trabalho + Área de trabalho · %1$s + Touchpad + Toque direto + Touchpad. Toque para usar o toque direto + Toque direto. Toque para usar o touchpad + Iniciando a área de trabalho KDE… + A área de trabalho foi encerrada. + Não foi possível iniciar a área de trabalho. Os registros ficam na pasta bottom-desktop desta sessão. + A área de trabalho está fechada. Nada para mostrar aqui ainda. + Alternar telas + A tela inferior está ocupada no momento + Tela do jogo + Exibir o jogo em + Tela superior + Tela inferior Downloads Nenhum download em andamento. Steam @@ -1827,6 +2059,20 @@ Combustível, t Principal %1$s t Reserva %1$s t + Tempo de quadro + últimos %1$d s + quadro médio + 1% mais baixo + quadros acima de 33 ms + %1$d / min + Jogando há %1$s + %1$d núcleos, até %2$s GHz + %1$d núcleos + jogo + FPS de %1$d Hz + A marca vermelha indica onde o HUD mostra a temperatura em vermelho. + dispositivo inteiro + bateria Enviar dados para o painel Automático Ativa para todos os jogos listados aqui, incluindo os encontrados depois. Os jogos que você desativar continuam desativados. @@ -1850,6 +2096,10 @@ O microfone está desligado neste jogo. Para falar, ative Microfone nas configurações da Steam do DroidDeck (Áudio) e inicie o jogo de novo. Volume %1$d%% Estatísticas no jogo + HUD da tela inferior + Faixa em todas as abas + 1% e 0,1% mais baixos + Temperatura da CPU FPS CPU GPU @@ -2023,6 +2273,7 @@ Iniciando a sessão… %1$d:%2$02d decorridos · ainda em andamento Baixando a atualização do cliente Steam · %1$d%% + Aplicando a atualização do cliente Steam… Baixando o cliente Steam · %1$s Já há uma instalação de ferramenta de compatibilidade em andamento @@ -2099,11 +2350,29 @@ Contornos de desenho animado e nitidez. Não é uma GPU Adreno + Driver PowerVR do sistema: a compatibilidade varia por dispositivo + Experimental: RADV ou o driver Xclipse do sistema + PowerVR do sistema + Usa os drivers integrados desta GPU + O driver PowerVR do sistema está selecionado para o runtime e a tela. + Nenhum driver de código aberto oferece suporte a esta Mali ainda: a ponte Mali está ativada. + Esta é a versão de teste para aparelhos sem Snapdragon: as versões oficiais daqui só rodam em Adreno, então não são instaladas sobre ela. As novas versões de teste estão em github.com/The412Banner/droiddeck-nonadreno-drivers. + A última sessão terminou porque o Android fechou o DroidDeck para liberar memória, e não por uma falha. Feche outros apps ou reduza as configurações de textura do jogo e tente novamente. + Mali (Venus) + a ponte Mali + Nenhum driver de código aberto oferece suporte a esta Mali ainda: %1$s é usado no driver nativo do aparelho. + %1$s ainda não foi publicado: %2$s é usado até lá. + %1$s não está disponível, e o driver deste aparelho informa Vulkan %2$s (Venus requer 1.2): a ponte Mali é usada. + %1$s ainda não foi publicado: a ponte Mali está ativada até lá. + Na fila: %1$s (aguardando outro driver de runtime) + O DXVK é fornecido pelo runtime PowerVR do sistema. Outros pacotes DXVK podem ser armazenados, mas não são aplicados com este driver. Compatível Experimental: os drivers são versões de teste Suporte experimental à Adreno 850: requer drivers de tela e de jogos experimentais compatíveis; não verificado neste dispositivo Abaixo do hardware testado (Adreno 725 ou mais recente): pode não funcionar Não suportada: nenhum backend gráfico compatível está disponível para esta GPU + Funciona pela ponte Mali, no driver Vulkan nativo do aparelho + Sem suporte com a ponte Mali desativada: o Turnip precisa de uma GPU Adreno (Snapdragon) O limite de requisições do GitHub foi atingido - tente mais tarde O GitHub respondeu HTTP %1$d @@ -2304,6 +2573,13 @@ Ordenar Rótulos da barra lateral Mostra os nomes sob os ícones da barra lateral. Desative para uma barra lateral mais estreita. + Mascote do agente + DeeDee flutua sobre o launcher e os jogos e mostra o que o agente está fazendo. + Sobre outros apps + Permita que DeeDee flutue sobre todos os apps e abra o chat dela ali + Permitir + DeeDee + Conversar com DeeDee Exibição Cards maiores Cards menores @@ -2590,6 +2866,11 @@ Desenvolvedor Marca de água da compilação Mostrar na tela a etiqueta da compilação de teste ou Lab. Ativada por padrão. + Compartilhar pacotes de diagnóstico + Sessão e dispositivo + Gráficos + Jogos e compatibilidade + Todos os pacotes Pronto para jogar Ainda não está pronto para jogar runtime %1$s @@ -2628,6 +2909,9 @@ Ative as conquistas da GOG nas configurações de Lojas Conquistas indisponíveis; veja os registros da sessão Conquista desbloqueada + Mali (Venus): desativado + Mali (Venus): ativado + O driver em %1$s informa Vulkan %2$s. Mali (Venus) requer Vulkan 1.2 ou mais recente (o gamescope não inicia em versões anteriores), por isso as sessões ignoram o Venus e usam o par de drivers PanVK. Colar Analógico esquerdo Analógico direito @@ -2996,6 +3280,7 @@ Instaladores de VC++ e DirectX exigidos pelos jogos Roda jogos Linux x86 Ferramenta da Steam + O Steam baixa isso para jogos que incluem anti-cheat, mesmo quando ele está desativado. Removê-lo trava a instalação desses jogos em 0% O DroidDeck roda jogos sem este runtime Proton x86, que o DroidDeck não consegue rodar Padrão para todos os jogos @@ -3115,6 +3400,8 @@ DroidDeck · %1$d fps 60 fps fica mais fluido, mas usa mais CPU enquanto o Steam inicia. Um vídeo escolhido nas configurações do Steam também aparece aqui. Som + Pular vídeo de inicialização + Use um clipe preto de 0,1 segundo como vídeo de inicialização do Steam. Aplica-se na próxima sessão. Seu próprio vídeo MP4, MOV, MKV ou WebM. Outros formatos e arquivos acima de %1$d MB são convertidos para WebM 720p no aparelho, até %2$d segundos. Importar @@ -3576,6 +3863,7 @@ Mantém Alt+Tab, a tecla Win e o botão Início em uma sessão ativa do DroidDeck em vez do Android. Ative Brilho em Configuração → Integração com a Steam Ponte Mali: desligada + %1$s não pode usar a ponte Mali (ela precisa de uma GPU Mali sem uma rota de driver do sistema), por isso esta chave não tem efeito aqui. Ponte Mali: ligada %1$s não é uma Adreno. A ponte Vulkan experimental está ligada: a sessão desenha pelo próprio driver do celular. Espere bugs; envie os logs da sessão. Modo seguro @@ -3736,6 +4024,7 @@ Não foi possível importar este layout Neve Escarlate + Superfícies brancas com detalhes em vermelho. Trilhas sonoras Música @@ -3799,4 +4088,6 @@ Repetir uma Volume Nenhum arquivo de áudio nesta trilha sonora + Inicialização indisponível + Nenhum navegador está disponível para abrir este link. diff --git a/app/src/main/res/values-ro/input_library.xml b/app/src/main/res/values-ro/input_library.xml new file mode 100644 index 0000000000..e277e65abf --- /dev/null +++ b/app/src/main/res/values-ro/input_library.xml @@ -0,0 +1,132 @@ + + + Setările de intrare necitibile au fost păstrate într-o copie de recuperare. Poți continua să editezi profilurile restaurate. + Proprietăți + Proprietăți clic + %1$s · Clic + Butoane + Manete, pad-uri și trăgaci + Ascunde instrumentele + Controller + Trimite intrarea controllerului către Steam Input sau joc. + Acest element nu trimite intrare de controller, mouse sau tastatură. + Clic de mouse + Acțiune DroidDeck + Acțiune + Viteza de derulare: %1$d pași/s + + Profil nou + + Aspect nou + %1$s · Folosit de %2$d profiluri. Modificările se aplică fiecărui profil care folosește aceste atribuiri. + Redenumește + Șterge + Adaugă elemente în aspect înainte de a le atribui acțiuni. + Setările de intrare nu au putut fi salvate + Nume + Începe de la + Buton + Manetă + Touchpad + Cruce + Trăgaci + Gata + Anulează + + Adaugă + Trage pentru a muta. Trage de un colț pentru a redimensiona. Atinge Proprietăți pentru a atribui o acțiune. + Editare pe ecranul secundar + Ecranul selectat nu este disponibil. Conectează-l pentru a edita acest aspect la dimensiunea reală. + Renunți la modificările de aspect nesalvate? + Acest aspect este folosit de %1$d profiluri. Modificările salvate se aplică tuturor. + Profiluri implicite + Mod desktop + Mod joc + Implicit pentru desktop și joc + Implicit pentru modul joc + Implicit pentru modul desktop + Setări dispozitiv + Comenzi + Butoane, manete, trăgaci și taste suplimentare + Copiază profilul + Resetează acțiunile + Resetezi acțiunile din %1$s la valorile implicite ale profilului de bază? Aspectele și celelalte profiluri rămân neschimbate. + Ștergi %1$s? Modurile care îl folosesc revin la profilul implicit integrat. Aspectele salvate și setările partajate rămân disponibile. + Vizibilitate + Se aplică tuturor profilurilor. Auto afișează comenzile ecranului principal când nu este conectat un controller în modul joc. + Editează pe ecran + Aspecte salvate… + Alege un aspect sau creează-l pe al tău + Alege Comenzile profilului în meniul de sesiune al ecranului secundar. Selectoarele Profil și Ecran secundar din meniul controllerului decid ce comenzi sunt afișate. + Acțiunile butoanelor + Partajat cu %1$s. Modificările se aplică și acelor profiluri. + Reutilizează setările + Folosește setările din… + Copiază din alt profil sau păstrează setările partajate + Fă independent + Păstrează configurația actuală și nu mai partaja modificările + Aspectele stochează elemente și pozițiile lor. Fiecare profil poate atribui propriile acțiuni. Editează la dimensiune completă pe ecranul țintă. + Aspectul actual + Ștergi aspectul nefolosit %1$s și acțiunile lui salvate? + Redenumește aspectul actual + Reutilizează %1$s din alt profil. Celelalte surse de control rămân neschimbate. + Păstrează comenzile fizice partajate + Implicit, toate comenzile și aspectele personalizate sunt copii independente. Partajarea leagă doar comenzile fizice. + Folosește aceste elemente și poziții. Partajarea sincronizează modificările viitoare de geometrie; acțiunile butoanelor rămân independente. Un aspect diferit începe cu acțiuni neatribuite. + Copiază aceste comenzi și acțiuni sau leagă-le astfel încât modificările viitoare să se aplice ambelor profiluri. + Păstrează partajat + Copie independentă + Pornește maneta la punctul de atingere + Ascunde maneta când nu este folosită + Instrumente + Auto (%1$s) + Personalizat (%1$s) + Salvează ca profil nou + Comenzile profilului + Profil + Gesturi touchpad mouse + Când este atribuit indicatorului mouse-ului: atinge pentru clic, ține pentru tragere și derulează cu două degete. + %1$s are o suprascriere a meniului rapid. Selectează Auto acolo pentru a folosi profilul implicit și toate cele trei părți salvate. + Intrare DroidDeck + Ținut cât timp maneta este mișcată în orice direcție: apăsat peste 55%, eliberat sub 35%. Folosește Tastele direcționale pentru a atribui fiecare direcție separat. Comenzile DroidDeck rulează o dată per deviere. Clicul manetei se configurează separat. + Ținut cât timp atingi touchpad-ul; eliberat când ridici degetul. Comenzile DroidDeck rulează o dată per atingere. Clicul touchpad-ului se configurează separat. + Ținut când trăgaciul trece de 55%; eliberat sub 35%. Comenzile DroidDeck rulează o dată per apăsare. + Direcția de derulare + Vertical + Orizontal + Derulează orizontal + Măsurători + Activează înregistrarea, folosește comenzile într-o sesiune activă, apoi revino și citește rezultatele. Măsoară doar timpul de trimitere DroidDeck, nu latența ecranului. Înregistrarea se termină când procesul aplicației se închide. + %1$d comenzi + Alte aspecte salvate (%1$d) ▾ + Ascunde alte aspecte salvate (%1$d) ▴ + Acasă / Guide + Înapoi · o atingere + Înapoi · atingere dublă + Înapoi · de două ori în Steam, o dată pe desktop + În modul Steam. Ținerea butonului Înapoi deschide și accesul rapid. + Restabilește implicit + Alegerea panoului este reținută. Desktopul deschide un al doilea spațiu de lucru; nu schimbă sesiunea sau profilul ei de intrare. + Controller virtual + Tipul de controller văzut de Steam sau de joc. + Ecran tactil + Cum sunt tratate atingerile pe ecranul jocului. Butoanele profilului își păstrează acțiunile atribuite. + Cursor tactil + Afișează un indicator pentru atingeri directe pe ecranul jocului. + Atinge și ține + Acțiunea mouse-ului când ții un deget pe ecranul jocului. + Atingeri ale butonului Înapoi + Prima acțiune: o atingere. A doua acțiune: atingere dublă. + Buton de comutare + Atinge pentru a ține, atinge din nou pentru a elibera. Deschiderea unui meniu sau schimbarea profilului eliberează butonul. + Formă + Rotunjit + Capsulă + Cerc + Dreptunghi + Eticheta butonului + Text + Imagine importată + Taste diagonale separate + Atribuie o tastă fiecărei diagonale. O diagonală goală apasă cele două direcții vecine. + Direcții vecine + Vechile tale taste de pe ecran sunt salvate mai jos ca profiluri importate. Selectează unul pentru a-l folosi sau edita. Selecțiile actuale de profil au fost păstrate. + Vechile taste de pe ecran nu au putut fi importate automat. Setările originale au fost păstrate. + diff --git a/app/src/main/res/values-ro/input_strings.xml b/app/src/main/res/values-ro/input_strings.xml new file mode 100644 index 0000000000..1603f7b260 --- /dev/null +++ b/app/src/main/res/values-ro/input_strings.xml @@ -0,0 +1,38 @@ + + + Profiluri de intrare + Profiluri + Controller fizic + Ecran principal + Ecran secundar + Nativ / Steam Input + Nativ: %1$s + Trimite altă comandă a controllerului + Dezactivat + Tastă sau combinație de taste + Taste direcționale + Mută indicatorul + Viteza indicatorului: %1$d + Derulează + Derulează vertical + Butonul stâng al mouse-ului + Butonul drept al mouse-ului + Butonul din mijloc al mouse-ului + Deschide meniul DroidDeck + Afișează tastatura + Deschide meniul Steam + Deschide accesul rapid Steam + Elimină controlul + Adaugă control + Butoane specifice dispozitivului + Atribuie un buton fizic + Eliberează butonul, apoi alege Editează, Reîncearcă sau Anulează. B sau Înapoi anulează după eliberare. + Reîncearcă + Apasă un buton, inclusiv un buton Înapoi raportat ca tastă. Tastele de volum și tastele de sistem Android sunt rezervate. Atribuirea se aplică doar acestui dispozitiv. + Elimină atribuirea + Diagnoză intrare + Înregistrează timpul de trimitere a intrării + Citește măsurătorile + Măsoară trimiterea de la Android până la publicarea în transportul de intrare existent. Nu include sosirea prin Bluetooth, interogarea invitatului, randarea și latența ecranului. Înregistrarea este oprită implicit. + Folosește atribuirea normală de intrare + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 34df44fe1e..ac3b76c54c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -185,6 +185,7 @@ Mediul grafic PowerVR nu a putut fi descărcat. Verifică conexiunea și încearcă din nou. DirectAudio nu a putut fi descărcat, așa că sunetul jocurilor folosește calea mai lentă în această sesiune. Acest program + Sesiunea nu a putut reda pe ecran: %1$s. Acest ecran arată motivul în locul unui ecran negru; detaliile sunt în jurnalele sesiunii. 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. @@ -388,6 +389,9 @@ Neacceptat încă aici Se încarcă componentele… Nu s-a putut instala: %1$s + Această descărcare trebuie actualizată. + Actualizare în așteptare. + Reîncearcă actualizarea Descărcat Se descarcă %1$s Se instalează: %1$s @@ -418,6 +422,22 @@ Doar internă Folder: %1$s A doua bibliotecă + Mai multe biblioteci Steam + Dosare în care Steam poate instala și din care poate rula jocuri, fiecare cu propriul nume. Eliminarea unuia lasă jocurile pe disc. + Adaugă bibliotecă + Redenumește + Nume bibliotecă + Alege un dosar pentru bibliotecă + Cel mult %1$d biblioteci adăugate + Acel dosar este deja o bibliotecă sau se află într-una + %1$s · indisponibil + Se aplică din următoarea sesiune Steam + Găsit pe acest dispozitiv · %1$s · %2$s + Adaugă + Găsește biblioteci în stocarea internă + Permite accesul la toate fișierele ca DroidDeck să poată vedea bibliotecile Steam păstrate de alte aplicații în stocarea internă + Permite + S-a adăugat %1$s, biblioteca Steam din dosarul ales Jocurile care transmit fișiere de pe SD sau din stocarea partajată pot avea sacadări. Diagnosticare stocare Înregistrează rezultatele alocărilor și timpii de stocare eșantionați în Partajare jurnale. Poate încetini instalările cât este activă. Se aplică la sesiunea următoare. @@ -607,7 +627,10 @@ Dezactivează asistentul de navigare cu gamepad al Proton, care costă CPU în fiecare joc. Rulează proot fără seccomp Poate remedia erori de apel de sistem lipsă pe unele kernel-uri. Poate reduce performanța. + Rulează fără proot (experimental) + Pornește partea Linux direct pe Android. Se aplică din următoarea sesiune. Dezactivează dacă ceva nu pornește. Cale rapidă proot + Nu se folosește fără proot. Necesită filtrul seccomp al proot. Căutări de fișiere mai rapide și mai puține sacadări. Dezactivează dacă un program nu își găsește fișierele. Desenează cursorul în gamescope @@ -818,6 +841,7 @@ Dispozitiv acceptat GPU netestat GPU neacceptat + GPU prin puntea Mali %1$s · %2$s %1$s: %2$s Nu este disponibil un backend grafic compatibil pentru %1$s. Steam poate afișa un ecran negru. @@ -847,15 +871,38 @@ Sesiune Jurnalele sesiunii Salvate după fiecare sesiune + Diagnosticare extinsă pentru următoarea sesiune + Captează jurnale detaliate pentru o singură sesiune. Poate reduce performanța și folosi mai mult spațiu de stocare. Se dezactivează automat când pornește sesiunea; verifică jurnalele înainte de a le partaja. Jurnale de depanare a jocurilor Include diagnosticare Proton, Wine și grafică la următoarea lansare a unui joc. Poate reduce performanța și folosește mai mult spațiu. Repornește această sesiune pentru a salva jurnalele de depanare Jurnalizarea nu a putut fi actualizată. Verifică comutatorul și încearcă din nou. Instrumente de depanare + Jurnale detaliate de grafică + Interfața Steam: desenare GPU + Cu perechea de drivere Xclipse, Steam își desenează paginile în software (desenarea GPU a afișat dale stricate). Activează pentru o interfață Steam mai rapidă dacă arată corect pe acest telefon. + compilat la %1$s + %1$s actualizat la cea mai nouă versiune + Puntea Mali nu a trecut autotestul pe %1$s în sesiunea anterioară (imagini sau desenări), așa că sesiunea a folosit în schimb perechea de drivere PanVK. + Puntea Mali nu a găsit nicio modalitate de a partaja memoria cu driverul pe %1$s în sesiunea anterioară, așa că sesiunea a folosit în schimb perechea de drivere PanVK. Puntea nu poate funcționa pe acest telefon; dezactivarea ei păstrează perechea PanVK. + Jurnalele Proton, DXVK și de drivere ale fiecărui joc sunt incluse în jurnalele sesiunii. Activat mereu când GPU-ul nu este Adreno. Cele mai recente jurnale de sesiune Jurnale de sesiune salvate Păstrează cele mai recente %1$d Șterge jurnalele + Jurnale de sesiune disponibile + Nu există încă jurnale de sesiune salvate. + Arhivele ZIP partajate și salvate includ sesiunea selectată, plus datele de diagnosticare aferente pentru Steam, magazine, instrumente și Battle.net. + %1$s · %2$s + Sesiunea curentă + Partajează + Salvează pe dispozitiv + Șterge + Șterge jurnalele de sesiune? + Șterge %1$s? Operațiunea nu poate fi anulată. + Jurnalele de sesiune au fost salvate. + Jurnalele de sesiune nu au putut fi salvate. + Jurnalele de sesiune nu au putut fi șterse. Resetează toate setările Readuce fiecare setare la valoarea implicită Resetează @@ -882,6 +929,8 @@ Folosește ca ecran Acasă DroidDeck poate fi aplicația Acasă DroidDeck nu este niciodată oferit ca aplicație Acasă + Butonul Acasă deschide + Pagina afișată când DroidDeck este aplicația de pornire și apeși butonul Acasă În Adaugă jocuri, setează DroidDeck pe Include Orientare Orientarea launcherului @@ -895,15 +944,22 @@ Ecran complet Ascunde barele de stare și de navigare Android Arată barele de stare și de navigare Android + Lansator pe două ecrane + Automat plasează secțiunile lansatorului (Steam, Bibliotecă, Magazine și celelalte) pe ecranul secundar al consolelor portabile cu unul integrat. Activat folosește orice ecran secundar. Dezactivat păstrează lansatorul pe un singur ecran. + Sesiuni pe două ecrane + Automat andochează meniul din joc pe ecranul secundar integrat, în loc de o fereastră suprapusă. Activat folosește orice ecran secundar. Dezactivat păstrează meniul pe ecranul jocului; poți alege în continuare un ecran secundar din meniu. Automat Pornit Oprit Comenzi pe ecranul de jos în jocuri + Tastatura Android pentru câmpurile de text Deschide trackpadul și tastatura pe al doilea ecran când pornește o sesiune. Scriere pentru ecranul de sus Gata Aplicația Acasă implicită Alege o aplicație Acasă + Ascunde aplicația de pornire din lista aplicațiilor recente cât timp este inactivă + Se aplică doar când DroidDeck este aplicația implicită de pornire și nu rulează nicio sesiune. Alege Aplicații Linux (beta) Fișiere @@ -1018,6 +1074,148 @@ Versiuni de test Încearcă o remediere înainte de lansare Niciuna acum + Versiune experimentală + Versiuni experimentale + În utilizare + În pauză după ce Android a reoptimizat DroidDeck + Nu s-a încărcat: %1$s + În așteptarea unei reporniri + Păstrată + Pentru altă versiune + Reconstruiește + Șterge această versiune de pe dispozitiv + Repornește cu această versiune + Dezactivează + Folosește + Șterge + Șterge acum + Repornirea nu a putut fi pregătită: %1$s. Asociază depanarea wireless în Configurare și încearcă din nou. + Versiune experimentală instalată + DroidDeck a repornit pe %1$s + Compilarea Lab suspendată + Android a reoptimizat DroidDeck, așa că %1$s nu s-a încărcat. Deschide Actualizări pentru a reporni pe ea. + Compilarea Lab dezactivată + A fost construită pentru o altă versiune de DroidDeck. Este păstrată în Actualizări. + DroidDeck nu a pornit pe ea de două ori + Agent + Agent + Agentul lucrează + Instalează Claude Code în spațiul utilizatorului Linux pentru a folosi agentul. + Întreabă despre un joc, o blocare sau o modificare a DroidDeck + Trimite + Conversație nouă + Oprește + Stocare + Elimină + Elimină acum + Claude Code + Codex + Codul sursă DroidDeck + Cache-uri de descărcare + Modificările netrimise se pierd + Compilările le vor descărca din nou + Configurarea îl poate instala din nou; datele de autentificare se păstrează + DroidDeck a repornit pe compilarea ta Lab. Continuă de unde ai rămas. + Întreabă-l de ce un joc nu pornește, cere-i să explice un jurnal sau să modifice DroidDeck și să încerce modificarea pe acest dispozitiv. + A eșuat: %1$s + %1$s s-a încheiat (ieșire %2$d) + Oprit + S-a încheiat fără răspuns + Reîncearcă + Se configurează agentul + Reconstruiește compilarea mea Lab %1$s pentru versiunea instalată de DroidDeck și repornește pe ea. + %1$s intrare · %2$s ieșire + Se gândește + Gând + Se gândește · %1$s + %1$s · %2$s + INTRARE + IEȘIRE + Se execută… + Niciun rezultat: runda s-a încheiat înainte + Nicio ieșire + Scrie pentru a pune următorul mesaj în coadă + Pune în coadă + Următorul: %1$s + Nu trimite + Atașează + Elimină + Implicit + Efort de raționament + Continuă + Revizuiește + Nimic nu s-a schimbat încă + Continuă cu planul. + Trimite acum + Mesaj + Mai multe + Închide + Cele mai recente + Lucrează + Context + %1$s din %2$s + Această conversație · %1$s + Utilizarea apare după primul răspuns + Limită de %1$d ore + Limită de %1$d minute + Limită săptămânală + %1$d%% · se resetează %2$s + + %1$d fișiere + %1$d fișier + %1$d de fișiere + + Planifică mai întâi + Plan + Propune un plan fără a modifica nimic + Conversații + Nu există încă conversații + Chiar acum + Șterge + Șterge conversația și atașamentele ei + Procese + Nu rulează nimic în spațiul utilizatorului Linux + AGENT + Oprește + Compilare Lab + Se pregătesc compilările Lab + %1$d%% · mai rămân aproximativ %2$s + mai rămân aproximativ %1$s + Anulează + Anulează compilarea + Se pornește + %1$d%% + Se împachetează + Se repornește DroidDeck pe acesta + Gata + Eșec: %1$s + Configurează agentul + Instalează mai întâi mediul de execuție Linux în Configurare. + Reîncearcă + Începe conversația + Conexiunea dispozitivului + Depanare wireless, pentru ca agentul să vadă și să controleze DroidDeck + Instalează %1$s + În mediul Linux, cu git, gh și adb + Conectare la %1$s + Deschide browserul + GitHub + Opțional, pentru a deschide pull requests + Instrumente de compilare + Opțional, pentru compilări Lab pe acest dispozitiv · aproximativ 5 GB + Agent pregătit + Finalizați configurarea agentului + Conectat la %1$s + Compilări Lab + compilări rapide + Compilări Lab rapide + Compilează această versiune în avans, ca apoi compilările Lab să dureze minute · aproximativ 20 de minute, o singură dată + Se compilează · %1$d%% · timp rămas: aproximativ %2$s + Pregătește + Depanarea fără fir nu este accesibilă; „Asociază” o activează + Asociază + Instalează + Conectați-vă PR #%1$d Nu este compilată pentru această copie de DroidDeck Actualizat %1$s @@ -1261,6 +1459,14 @@ Aplicații Configurare Actualizări + Mai multe + Editează taburile + Taburi + Afișat + În meniul Mai multe + Ascuns + Mută %1$s în sus + Mută %1$s în jos %1$d%% Reluare %1$s Apare ca /root/ROMs în fiecare sesiune. Stocarea internă este la /root/Storage. @@ -1282,6 +1488,15 @@ Anulează cererea în așteptare Tastatura Android Ascunde ✕ + Dimensiune pe ecran + Partea din ecran ocupată de tastatură, inclusiv antetul. + Opacitate + Reduceți-o pentru a vedea jocul din spatele tastaturii. + Taste ascunse + Tastele pe care le folosiți rar nu apar pe tastatură. + Esc și rândul tastelor funcționale + Ins / Del / Home / End / PgUp / PgDn + Tastele cu săgeți Lansează %1$s Alege un ecran. Secundar: %1$s. Ecranul secundar nu mai este disponibil. @@ -1800,7 +2015,24 @@ Terminal Mânere + trackpaduri Deck Tablou de bord + Desktop + Pornește desktopul + Desktop · %1$s + Trackpad + Atingere directă + Trackpad. Atinge pentru atingere directă + Atingere directă. Atinge pentru trackpad + Se pornește desktopul KDE… + Desktopul s-a închis. + Desktopul nu a putut porni. Jurnalele se află în dosarul bottom-desktop al acestei sesiuni. + Desktopul este închis. Nimic de afișat aici încă. + Inversează ecranele + Ecranul de jos nu este liber momentan + Ecranul jocului + Afișează jocul pe + Ecranul de sus + Ecranul de jos Descărcări Nicio descărcare în curs. Steam @@ -1835,6 +2067,20 @@ Combustibil, t Principal %1$s t Rezervă %1$s t + Timp per cadru + ultimele %1$d s + medie per cadru + 1% minime + cadre peste 33 ms + %1$d / min + În joc de %1$s + %1$d nuclee, până la %2$s GHz + %1$d nuclee + joc + FPS din %1$d Hz + Marcajul roșu indică locul în care HUD-ul afișează temperatura în roșu. + tot dispozitivul + baterie Trimite date pentru tabloul de bord Automat Activează trimiterea pentru fiecare joc din listă, inclusiv pentru jocurile găsite mai târziu. Jocurile pe care le dezactivezi rămân dezactivate. @@ -1858,6 +2104,10 @@ Microfonul este oprit pentru acest joc. Pentru a vorbi, activează Microfon în setările Steam din DroidDeck (Sunet) și pornește din nou jocul. Volum %1$d%% Statistici în joc + HUD pe ecranul de jos + Bandă pe fiecare filă + Minimele de 1% și 0,1% + Temperatura CPU FPS CPU GPU @@ -2031,6 +2281,7 @@ Se pornește sesiunea… %1$d:%2$02d scurse · încă se lucrează Se descarcă actualizarea clientului Steam · %1$d%% + Se aplică actualizarea clientului Steam… Se descarcă clientul Steam · %1$s O instalare a unui instrument de compatibilitate este deja în curs @@ -2107,11 +2358,29 @@ Contururi toon plus claritate. Nu este un GPU Adreno + Driverul de sistem PowerVR: compatibilitatea variază în funcție de dispozitiv + Experimental: RADV sau driverul de sistem Xclipse + PowerVR de sistem + Folosește driverele integrate ale acestui GPU + Driverul PowerVR de sistem este selectat pentru runtime și afișaj. + Niciun driver open-source nu suportă încă acest Mali: puntea Mali este activată. + Aceasta este versiunea de test non-Snapdragon: versiunile oficiale de aici rulează doar pe Adreno, așa că nu sunt instalate peste ea. Versiunile de test noi se află pe github.com/The412Banner/droiddeck-nonadreno-drivers. + Ultima sesiune s-a încheiat deoarece Android a închis DroidDeck pentru a elibera memorie, nu din cauza unei opriri neașteptate. Închide alte aplicații sau reduce setările de textură ale jocului, apoi încearcă din nou. + Mali (Venus) + puntea Mali + Niciun driver open-source nu suportă încă acest Mali: se folosește %1$s, pe driverul propriu al telefonului. + %1$s nu este încă publicat: se folosește %2$s până atunci. + %1$s nu este disponibil, iar driverul acestui telefon raportează Vulkan %2$s (Venus necesită 1.2): se folosește puntea Mali. + %1$s nu este încă publicat: puntea Mali rămâne activată până atunci. + În coadă: %1$s (se așteaptă un alt driver de runtime) + DXVK este furnizat de runtime-ul PowerVR de sistem. Alte pachete DXVK pot fi stocate, dar nu sunt aplicate cu acest driver. Acceptat Experimental: driverele sale sunt versiuni de test Suport experimental pentru Adreno 850: necesită drivere experimentale compatibile de afișaj și de jocuri; neverificat pe acest dispozitiv Sub hardware-ul testat (Adreno 725 și mai nou): poate să nu ruleze Neacceptat: nu este disponibil un backend grafic compatibil pentru acest GPU + Rulează prin puntea Mali, pe driverul Vulkan propriu al telefonului + Nu este suportat cu puntea Mali dezactivată: Turnip necesită un GPU Adreno (Snapdragon) S-a atins limita de solicitări a GitHub - încearcă din nou mai târziu GitHub a răspuns cu HTTP %1$d @@ -2312,6 +2581,13 @@ Sortează Etichete în bara laterală Afișează numele sub pictogramele din bara laterală. Dezactivează pentru o bară laterală mai îngustă. + Mascota agentului + DeeDee plutește peste aplicația de pornire și peste jocuri, arătând ce face agentul. + Peste alte aplicații + Permite ca DeeDee să plutească peste orice aplicație și să deschidă chatul acolo + Permite + DeeDee + Discută cu DeeDee Afișare Carduri mai mari Carduri mai mici @@ -2601,6 +2877,11 @@ Dezvoltator Filigrană cu eticheta versiunii Afișează pe ecran eticheta versiunii de testare sau Lab. Activată implicit. + Partajează pachetele de diagnosticare + Sesiune și dispozitiv + Grafică + Jocuri și compatibilitate + Toate pachetele Pregătit de joc Încă nepregătit de joc mediu de execuție %1$s @@ -2639,6 +2920,9 @@ Activează realizările GOG din setările Stores Realizări indisponibile; verifică jurnalele sesiunii Realizare deblocată + Mali (Venus): dezactivat + Mali (Venus): activat + Driverul de pe %1$s raportează Vulkan %2$s. Mali (Venus) necesită Vulkan 1.2 sau mai nou (gamescope nu pornește pe versiuni mai vechi), așa că sesiunile omit Venus și folosesc în schimb perechea de drivere PanVK. Inserează Stick stânga Stick dreapta @@ -2996,6 +3280,7 @@ Instalări VC++ și DirectX cerute de jocuri Rulează jocuri Linux x86 Unealtă Steam + Steam descarcă această componentă pentru jocurile care includ anti-cheat, chiar și când este dezactivat. Eliminarea ei blochează instalarea acestora la 0% DroidDeck rulează jocuri fără acest mediu de execuție Proton x86, pe care DroidDeck nu îl poate rula Implicit pentru toate jocurile @@ -3115,6 +3400,8 @@ DroidDeck · %1$d fps 60 fps arată mai fluid, dar folosește mai mult procesorul cât pornește Steam. Un videoclip ales în setările Steam apare și aici. Sunet + Omite filmul de pornire + Folosește un clip negru de 0,1 secunde ca film de pornire pentru Steam. Se aplică la următoarea sesiune. Videoclipul tău MP4, MOV, MKV sau WebM. Alte formate și fișierele de peste %1$d MB sunt convertite pe dispozitiv în WebM 720p, până la %2$d secunde. Importă @@ -3576,6 +3863,7 @@ Păstrează Alt+Tab, tasta Win și butonul Acasă într-o sesiune DroidDeck activă în loc de Android. Activează Luminozitate în Configurare → Integrare Steam Punte Mali: oprită + %1$s nu poate folosi puntea Mali (are nevoie de un GPU Mali fără o rută prin driverul de sistem), deci acest comutator nu are niciun efect aici. Punte Mali: pornită %1$s nu este Adreno. Puntea Vulkan experimentală este pornită: sesiunea desenează prin driverul propriu al telefonului. Așteaptă-te la erori; trimite jurnalele sesiunii. Mod sigur @@ -3736,6 +4024,7 @@ Acest aranjament nu a putut fi importat Zăpadă stacojie + Suprafețe albe cu accente roșii. Coloane sonore Muzică @@ -3799,4 +4088,6 @@ Repetă una Volum Niciun fișier audio în această coloană sonoră + Lansare indisponibilă + Nu este disponibil niciun browser web pentru a deschide acest link. diff --git a/app/src/main/res/values-ru/input_library.xml b/app/src/main/res/values-ru/input_library.xml new file mode 100644 index 0000000000..d02df2ffe6 --- /dev/null +++ b/app/src/main/res/values-ru/input_library.xml @@ -0,0 +1,132 @@ + + + Выбранный экран недоступен. Подключите его, чтобы редактировать эту раскладку в реальном размере. + Отменить несохранённые изменения раскладки? + Эта раскладка используется профилями: %1$d. Сохранённые изменения применятся ко всем. + Профили по умолчанию + Режим рабочего стола + Игровой режим + По умолчанию для рабочего стола и игры + По умолчанию для игрового режима + По умолчанию для режима рабочего стола + Настройки устройства + Управление + Кнопки, стики, триггеры и доп. клавиши + Копировать профиль + Сбросить действия + Сбросить действия в %1$s до значений базового профиля? Раскладки и другие профили останутся без изменений. + Удалить %1$s? Режимы, использующие его, вернутся к встроенному профилю по умолчанию. Сохранённые раскладки и общие настройки останутся доступны. + Видимость + Применяется ко всем профилям. Auto показывает управление основного экрана, если в игровом режиме не подключён контроллер. + Редактировать на экране + Сохранённые раскладки… + Выберите раскладку или создайте свою + Выберите «Управление профиля» в меню сеанса второго экрана. Селекторы «Профиль» и «Второй экран» в меню контроллера определяют, какое управление показывать. + Действия кнопок + Общий доступ с %1$s. Изменения также применятся к этим профилям. + Повторно использовать настройки + Использовать настройки из… + Скопировать из другого профиля или оставить настройки общими + Сделать независимым + Оставить текущую настройку и перестать делиться изменениями + Раскладки хранят элементы и их позиции. Каждый профиль может назначать свои действия. Редактируйте в полном размере на целевом экране. + Текущая раскладка + Удалить неиспользуемую раскладку %1$s и её сохранённые действия? + Переименовать текущую раскладку + Нечитаемые настройки ввода сохранены в резервной копии. Вы можете продолжить редактировать восстановленные профили. + Свойства + Свойства нажатия + %1$s · Нажатие + Кнопки + Стики, тачпады и триггеры + Скрыть инструменты + Контроллер + Отправлять ввод контроллера в Steam Input или игру. + Этот элемент не отправляет ввод контроллера, мыши или клавиатуры. + Нажатие мыши + Действие DroidDeck + Действие + Скорость прокрутки: %1$d шагов/с + + Новый профиль + + Новая раскладка + %1$s · Используется профилями: %2$d. Изменения применяются ко всем профилям с этими привязками. + Переименовать + Удалить + Добавьте элементы в раскладку, прежде чем назначать им действия. + Не удалось сохранить настройки ввода + Название + Начать с + Кнопка + Стик + Тачпад + Крестовина + Триггер + Готово + Отменить + + Добавить + Перетащите, чтобы переместить. Потяните за угол, чтобы изменить размер. Нажмите «Свойства», чтобы назначить действие. + Редактирование на втором экране + Использовать %1$s из другого профиля. Остальные источники управления останутся без изменений. + Оставить физическое управление общим + По умолчанию все элементы управления и пользовательские раскладки — независимые копии. Общий доступ связывает только физическое управление. + Использовать эти элементы и позиции. Общий доступ синхронизирует будущие изменения геометрии; действия кнопок останутся независимыми. Другая раскладка начинается с неназначенными действиями. + Скопировать эти элементы управления и действия или связать их, чтобы будущие изменения применялись к обоим профилям. + Оставить общим + Независимая копия + Запускать стик от точки касания + Скрывать стик, когда он не используется + Инструменты + Авто (%1$s) + Пользовательский (%1$s) + Сохранить как новый профиль + Управление профиля + Профиль + Жесты тачпада мыши + Если назначено указателю мыши: касание — клик, удержание — перетаскивание, прокрутка двумя пальцами. + Для %1$s задано переопределение быстрого меню. Выберите «Авто», чтобы использовать профиль по умолчанию и все три сохранённые части. + Ввод DroidDeck + Удерживается, пока стик отклонён в любом направлении: нажатие выше 55%, отпускание ниже 35%. Используйте «Клавиши направлений», чтобы назначить каждое направление отдельно. Команды DroidDeck срабатывают один раз за отклонение. Нажатие стика настраивается отдельно. + Удерживается, пока вы касаетесь тачпада; отпускается при поднятии пальца. Команды DroidDeck срабатывают один раз за касание. Нажатие тачпада настраивается отдельно. + Удерживается, когда триггер проходит 55%; отпускается ниже 35%. Команды DroidDeck срабатывают один раз за нажатие. + Направление прокрутки + Вертикально + Горизонтально + Прокручивать по горизонтали + Измерения + Включите запись, используйте управление в запущенном сеансе, затем вернитесь и прочитайте результаты. Измеряется только время отправки DroidDeck, без задержки экрана. Запись завершается при закрытии процесса приложения. + Элементов управления: %1$d + Другие сохранённые раскладки (%1$d) ▾ + Скрыть другие сохранённые раскладки (%1$d) ▴ + Домой / Guide + Назад · одно нажатие + Назад · двойное нажатие + Назад · дважды в Steam, один раз в рабочем столе + В режиме Steam. Удержание «Назад» также открывает быстрый доступ. + Вернуть по умолчанию + Выбор панели запоминается. Рабочий стол открывает второе рабочее пространство; он не переключает сеанс или его профиль ввода. + Виртуальный контроллер + Тип контроллера, который видят Steam или игра. + Сенсорный экран + Как обрабатываются касания на экране игры. Кнопки профиля сохраняют назначенные действия. + Касание-курсор + Показывать указатель для прямых касаний на экране игры. + Коснуться и удерживать + Действие мыши при удержании пальца на экране игры. + Нажатия кнопки «Назад» + Первое действие: одно нажатие. Второе действие: двойное нажатие. + Кнопка-переключатель + Коснитесь, чтобы удерживать, коснитесь снова, чтобы отпустить. Открытие меню или смена профиля отпускает кнопку. + Форма + Скруглённая + Капсула + Круг + Прямоугольник + Подпись кнопки + Текст + Импортированное изображение + Отдельные клавиши диагоналей + Назначьте клавишу каждой диагонали. Пустая диагональ нажимает два соседних направления. + Соседние направления + Ваши старые экранные клавиши сохранены ниже как импортированные профили. Выберите один, чтобы использовать или изменить. Текущие выбранные профили сохранены. + Старые экранные клавиши не удалось импортировать автоматически. Исходные настройки сохранены. + diff --git a/app/src/main/res/values-ru/input_strings.xml b/app/src/main/res/values-ru/input_strings.xml new file mode 100644 index 0000000000..9f041bfb21 --- /dev/null +++ b/app/src/main/res/values-ru/input_strings.xml @@ -0,0 +1,38 @@ + + + Профили ввода + Профили + Физический контроллер + Основной экран + Второй экран + Собственный / Steam Input + Собственный: %1$s + Отправить другую команду контроллера + Отключено + Клавиша или сочетание клавиш + Клавиши направлений + Двигать указатель + Скорость указателя: %1$d + Прокрутка + Прокрутка по вертикали + Левая кнопка мыши + Правая кнопка мыши + Средняя кнопка мыши + Открыть меню DroidDeck + Показать клавиатуру + Открыть меню Steam + Открыть быстрый доступ Steam + Удалить элемент + Добавить элемент + Кнопки конкретного устройства + Назначить физическую кнопку + Отпустите кнопку и выберите «Изменить», «Повторить» или «Отмена». B или «Назад» отменяет после отпускания. + Повторить + Нажмите кнопку, в том числе «Назад», если она передаётся как клавиша. Клавиши громкости и системные клавиши Android зарезервированы. Назначение действует только на этом устройстве. + Удалить назначение + Диагностика ввода + Записывать время отправки ввода + Прочитать измерения + Измеряет путь от диспетчеризации Android до публикации в существующем транспорте ввода. Не учитывает приход по Bluetooth, опрос гостя, отрисовку и задержку экрана. Запись по умолчанию выключена. + Использовать обычное назначение ввода + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f78eb676d0..81f4f3370c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -185,6 +185,7 @@ Не удалось скачать графическую среду PowerVR. Проверьте подключение и повторите попытку. Не удалось скачать DirectAudio, поэтому в этой сессии звук игр идёт по более медленному пути. Эта программа + Сеансу не удалось вывести изображение на экран: %1$s. Вместо чёрного экрана здесь показана причина; подробности в журналах сеанса. Не удалось скачать клиент Steam. Возможно, ваша сеть или VPN блокирует серверы Steam; проверьте подключение и повторите попытку. Не удалось настроить клиент Steam. Проверьте подключение и свободное место, затем повторите попытку. %1$s — сборка для x86-ПК, которая работает через FEX, а он еще не установлен. Запустите Steam один раз, войдя в аккаунт, и дайте ему скачать FEX и Steam Linux Runtime, затем запустите программу снова. @@ -628,7 +629,10 @@ Отключает помощник навигации геймпада Proton, который потребляет CPU в каждой игре. Запускать proot без seccomp Может исправить ошибки отсутствующих системных вызовов на некоторых ядрах, но может снизить производительность. + Запуск без proot (экспериментально) + Запускает окружение Linux напрямую в Android. Применяется к следующему сеансу. Отключите, если что-то не запускается. Быстрый путь proot + Без proot не используется. Требуется фильтр seccomp для proot. Быстрый поиск файлов, меньше подтормаживаний. Отключите, если программа не находит файлы. Рисовать курсор внутри gamescope @@ -870,11 +874,21 @@ Сессия Журналы сессии Сохраняется после каждой сессии + Расширенная диагностика для следующего сеанса + Записывает подробные журналы за один сеанс. Может снизить производительность и занять больше места. Отключается сама при запуске сеанса; перед отправкой просмотрите журналы. Журналы отладки игр Добавлять диагностику Proton, Wine и графики при следующем запуске игры. Может снизить производительность и занять больше места. Перезапустите сессию, чтобы сохранять журналы отладки игр Не удалось обновить журналирование. Проверьте переключатель и повторите попытку. Инструменты отладки + Подробные журналы графики + Интерфейс Steam: отрисовка на GPU + С парой драйверов Xclipse Steam отрисовывает страницы программно (при отрисовке на GPU появлялись битые тайлы). Включите, чтобы ускорить интерфейс Steam, если на этом телефоне он выглядит корректно. + сборка %1$s + %1$s обновлён до последней сборки + В прошлом сеансе мост Mali не прошёл самопроверку на %1$s (изображения или отрисовка), поэтому в сеансе использовалась пара драйверов PanVK. + В прошлом сеансе мост Mali не нашёл способа разделять память с драйвером на %1$s, поэтому в сеансе использовалась пара драйверов PanVK. На этом телефоне мост работать не может; при его отключении останется пара PanVK. + Журналы Proton, DXVK и драйверов для каждой игры находятся в журналах сеанса. Всегда включено, если GPU не Adreno. Последние журналы сессии Сохраненные журналы сессии Хранятся последние %1$d @@ -918,6 +932,8 @@ Использовать как главный экран DroidDeck может использоваться как приложение главного экрана DroidDeck не будет доступен как приложение главного экрана + Кнопка «Домой» открывает + Страница, которая открывается, когда DroidDeck — приложение главного экрана по умолчанию и нажата кнопка «Домой». В разделе «Добавить игры» переключите DroidDeck на «Включить» Ориентация Ориентация лаунчера @@ -939,11 +955,14 @@ Вкл. Выкл. Управление на нижнем экране в играх + Клавиатура Android для текстовых полей Открывает тачпад и клавиатуру на втором экране при запуске сеанса. Ввод для верхнего экрана Готово Главный экран по умолчанию Выбрать главный экран + Скрывать лаунчер из «Недавних приложений» в режиме ожидания + Применяется только если DroidDeck — приложение главного экрана по умолчанию и нет активного сеанса. Выбрать Приложения Linux (бета) Файлы @@ -1058,6 +1077,149 @@ Тестовые сборки Попробовать исправление до официального выпуска Сейчас нет + Лабораторная сборка + Лабораторные сборки + Используется + Приостановлено после повторной оптимизации DroidDeck в Android + Не загружено: %1$s + Ожидает перезапуска + Сохранено + Для другой версии + Пересобрать + Удаляет эту сборку с устройства + Перезапустить с ней + Отключить + Использовать + Удалить + Удалить сейчас + Не удалось подготовить перезапуск: %1$s. Выполните сопряжение для беспроводной отладки в «Настройке» и повторите попытку. + Лабораторная сборка установлена + DroidDeck перезапущен на %1$s + Лабораторная сборка приостановлена + Android повторно оптимизировал DroidDeck, поэтому %1$s не загружена. Откройте «Обновления», чтобы перезапустить на ней. + Лабораторная сборка отключена + Сборка создана для другой версии DroidDeck. Она сохранена в «Обновления». + DroidDeck дважды не запустился на ней + Агент + Агент + Агент работает + Установите Claude Code в пользовательской среде Linux, чтобы использовать агента. + Спросите об игре, сбое или изменении DroidDeck + Отправить + Новый диалог + Остановить + Хранилище + Удалить + Удалить сейчас + Claude Code + Codex + Исходный код DroidDeck + Кэш загрузок + Неотправленные изменения будут потеряны + Сборки скачают их заново + «Настройка» может установить его снова; авторизация сохранится + DroidDeck перезапущен на вашей лабораторной сборке. Продолжите с того места, где остановились. + Спросите, почему игра не запускается, попросите объяснить лог, изменить DroidDeck и проверить изменение на этом устройстве. + Ошибка: %1$s + %1$s завершён (код выхода %2$d) + Остановлено + Завершено без ответа + Повторить + Настройка агента + Пересоберите мою лабораторную сборку %1$s под установленную версию DroidDeck и перезапустите на ней. + %1$s на входе · %2$s на выходе + Думает + Мысль + Думает · %1$s + %1$s · %2$s + ВВОД + ВЫВОД + Выполняется… + Нет результата: ход завершился раньше + Нет вывода + Введите текст, чтобы поставить следующее сообщение в очередь + В очередь + Далее: %1$s + Не отправлять + Прикрепить + Удалить + По умолчанию + Уровень рассуждений + Вперёд + Изменить + Изменений пока нет + Действуйте по плану. + Отправить сейчас + Сообщение + Ещё + Закрыть + Последняя версия + Работает + Контекст + %1$s из %2$s + Этот диалог · %1$s + Данные об использовании появятся после первого ответа + Лимит %1$d ч + Лимит %1$d мин + Недельный лимит + %1$d%% · сброс %2$s + + %1$d файла + %1$d файлов + %1$d файл + %1$d файлов + + Сначала план + План + Предлагает план, ничего не меняя + Диалоги + Диалогов пока нет + Только что + Удалить + Удалит диалог и вложения + Процессы + В пользовательском пространстве Linux ничего не запущено + АГЕНТ + Остановить + Сборка Lab + Подготовка сборок Lab + %1$d%% · осталось около %2$s + осталось около %1$s + Отмена + Отменить сборку + Запуск + %1$d%% + Упаковка + Перезапуск DroidDeck на ней + Готово + Ошибка: %1$s + Настройка агента + Сначала установите среду выполнения Linux в разделе «Настройка». + Повторить + Начать диалог + Подключение устройства + Беспроводная отладка, чтобы агент видел DroidDeck и управлял им + Установить %1$s + В пользовательскую среду Linux, с git, gh и adb + Войти в %1$s + Откроет браузер + GitHub + Необязательно, для открытия пулл-реквестов + Инструменты сборки + Необязательно, для сборок Lab на этом устройстве · около 5 ГБ + Агент готов + Завершите настройку агента + Вы вошли в %1$s + Сборки Lab + быстрые сборки + Быстрые сборки Lab + Заранее компилирует эту версию, чтобы сборки Lab занимали минуты · около 20 минут один раз + Компиляция · %1$d%% · осталось около %2$s + Подготовить + Беспроводная отладка недоступна; «Сопряжение» включит её + Сопряжение + Установить + Войти PR #%1$d Не собрано для этой копии DroidDeck Обновлено %1$s @@ -1305,6 +1467,14 @@ Приложения Настройка Обновления + Ещё + Настроить вкладки + Вкладки + Отображается + В «Ещё» + Скрыто + Переместить %1$s вверх + Переместить %1$s вниз %1$d%% Продолжить %1$s Отображается как /root/ROMs в каждой сессии. Внутреннее хранилище находится в /root/Storage. @@ -2137,6 +2307,7 @@ Запуск сессии… Прошло %1$d:%2$02d · работа продолжается Загрузка обновления клиента Steam · %1$d%% + Применение обновления клиента Steam… Загрузка клиента Steam · %1$s Инструмент совместимости уже устанавливается @@ -2213,6 +2384,22 @@ Мультяшные контуры плюс резкость. GPU не Adreno + Системный драйвер PowerVR: совместимость зависит от устройства + Экспериментально: RADV или системный драйвер Xclipse + Системный PowerVR + Использует встроенные драйверы для этого GPU + Для среды выполнения и отображения выбран системный драйвер PowerVR. + Ни один открытый драйвер пока не поддерживает этот Mali: включён мост Mali. + Это тестовая сборка для устройств без Snapdragon: официальные сборки здесь работают только на Adreno, поэтому они не устанавливаются поверх неё. Новые тестовые сборки доступны на github.com/The412Banner/droiddeck-nonadreno-drivers. + Последний сеанс завершился потому, что Android закрыл DroidDeck, чтобы освободить память; это не сбой. Закройте другие приложения или снизьте настройки качества текстур в игре, затем попробуйте снова. + Mali (Venus) + мост Mali + Ни один открытый драйвер пока не поддерживает этот Mali: используется %1$s поверх собственного драйвера телефона. + %1$s ещё не опубликован: до публикации используется %2$s. + %1$s недоступен, а драйвер этого телефона сообщает версию Vulkan %2$s (для Venus нужен Vulkan 1.2): используется мост Mali. + %1$s ещё не опубликован: мост Mali включён до его публикации. + В очереди: %1$s (ожидает другой драйвер среды выполнения) + DXVK предоставляется системной средой выполнения PowerVR. Другие пакеты DXVK можно хранить, но при использовании этого драйвера они не применяются. Поддерживается Экспериментально: его драйверы — тестовые сборки Экспериментальная поддержка Adreno 850: требуются совместимые экспериментальные драйверы дисплея и игр; не проверено на этом устройстве @@ -2420,6 +2607,13 @@ Сортировка Подписи боковой панели Показывать названия под значками боковой панели. Отключите, чтобы сделать панель уже. + Питомец агента + DeeDee отображается поверх лаунчера и игр и показывает, что делает агент. + Поверх других приложений + Разрешить DeeDee отображаться поверх всех приложений и открывать там чат с DeeDee + Разрешить + DeeDee + Чат с DeeDee Вид Крупные карточки Мелкие карточки @@ -2708,6 +2902,11 @@ Разработчик Водяной знак с меткой сборки Показывать на экране метку тестовой сборки или сборки Lab. Включено по умолчанию. + Поделиться наборами диагностики + Сеанс и устройство + Графика + Игры и совместимость + Все наборы Готово к игре Пока не готово к игре среда выполнения %1$s @@ -2746,6 +2945,9 @@ Включите достижения GOG в настройках магазинов Достижения недоступны; проверьте журналы сессии Достижение открыто + Mali (Venus): отключено + Mali (Venus): включено + Драйвер на %1$s сообщает версию Vulkan %2$s. Для Mali (Venus) нужен Vulkan 1.2 или новее (на более старых версиях gamescope не запускается), поэтому Venus в сеансах не используется: вместо этого применяется пара драйверов PanVK. Вставить Левый стик Правый стик @@ -3108,6 +3310,7 @@ Установщики VC++ и DirectX, которые требуют игры Запускает игры Linux x86 Инструмент Steam + Steam загружает этот компонент для игр с античитом, даже если он отключён. Если его удалить, установка этих игр зависнет на 0% DroidDeck запускает игры без этой среды выполнения Proton x86, который DroidDeck не может запустить По умолчанию для всех игр @@ -3236,6 +3439,8 @@ DroidDeck · %1$d кадр/с 60 кадр/с выглядит плавнее, но сильнее нагружает процессор при запуске Steam. Видео, выбранное в настройках самого Steam, тоже появляется здесь. Звук + Пропускать стартовое видео + Использовать 0,1-секундный чёрный клип в качестве стартового видео Steam. Применится в следующем сеансе. Своё видео MP4, MOV, MKV или WebM. Другие форматы и файлы больше %1$d МБ преобразуются на устройстве в WebM 720p, до %2$d секунд. Импорт @@ -3697,6 +3902,7 @@ Оставляет Alt+Tab, клавишу Win и кнопку «Домой» в активном сеансе DroidDeck, а не в Android. Включите «Яркость» в «Настройка → Интеграция со Steam» Мост Mali: выкл. + %1$s не может использовать мост Mali (для него нужен GPU Mali без маршрута через системный драйвер), поэтому этот переключатель здесь ни на что не влияет. Мост Mali: вкл. %1$s — не Adreno. Включён экспериментальный мост Vulkan: сеанс рисует через собственный драйвер телефона. Возможны ошибки; отправьте журналы сеанса. Безопасный режим @@ -3858,6 +4064,7 @@ Не удалось импортировать эту раскладку Алый снег + Белые поверхности с красными акцентами. Саундтреки Музыка @@ -3921,4 +4128,6 @@ Повторять один Громкость В этом саундтреке нет аудиофайлов + Запуск недоступен + Нет доступного веб-браузера для открытия этой ссылки. diff --git a/app/src/main/res/values-sv/input_library.xml b/app/src/main/res/values-sv/input_library.xml new file mode 100644 index 0000000000..dfe4102366 --- /dev/null +++ b/app/src/main/res/values-sv/input_library.xml @@ -0,0 +1,132 @@ + + + Oläsbara inmatningsinställningar bevarades i en återställningskopia. Du kan fortsätta redigera de återställda profilerna. + Egenskaper + Klickegenskaper + %1$s · Klick + Knappar + Spakar, plattor och avtryckare + Dölj verktyg + Handkontroll + Skicka handkontrollens inmatning till Steam Input eller spelet. + Det här elementet skickar ingen inmatning från handkontroll, mus eller tangentbord. + Musklick + DroidDeck-åtgärd + Åtgärd + Rullningshastighet: %1$d steg/s + + Ny profil + + Ny layout + %1$s · Används av %2$d profiler. Ändringar gäller alla profiler som använder dessa tilldelningar. + Byt namn + Ta bort + Lägg till element i layouten innan du tilldelar deras åtgärder. + Kunde inte spara inmatningsinställningarna + Namn + Börja från + Knapp + Spak + Styrplatta + Styrkors + Avtryckare + Klar + Ångra + + Lägg till + Dra för att flytta. Dra i ett hörn för att ändra storlek. Tryck på Egenskaper för att tilldela en åtgärd. + Redigeras på sekundärskärmen + Den valda skärmen är inte tillgänglig. Anslut den för att redigera layouten i full storlek. + Kassera osparade layoutändringar? + Den här layouten används av %1$d profiler. Sparade ändringar gäller alla. + Standardprofiler + Skrivbordsläge + Spelläge + Standard för skrivbord och spel + Standard för spelläge + Standard för skrivbordsläge + Enhetsinställningar + Styrning + Knappar, spakar, avtryckare och extra tangenter + Kopiera profil + Återställ åtgärder + Återställ åtgärderna i %1$s till basprofilens standardvärden? Layouter och andra profiler förblir oförändrade. + Ta bort %1$s? Lägen som använder den återgår till sin inbyggda standardprofil. Sparade layouter och delade inställningar finns kvar. + Synlighet + Gäller alla profiler. Auto visar huvudskärmens styrning när ingen handkontroll är ansluten i spelläge. + Redigera på skärmen + Sparade layouter… + Välj en layout eller skapa din egen + Välj Profilstyrning i sekundärskärmens sessionsmeny. Valen Profil och Sekundär skärm i handkontrollsmenyn avgör vilken styrning som visas. + Knappåtgärder + Delad med %1$s. Ändringar gäller även dessa profiler. + Återanvänd inställningar + Använd inställningar från… + Kopiera från en annan profil eller behåll inställningarna delade + Gör oberoende + Behåll nuvarande uppsättning och sluta dela ändringar + Layouter sparar element och deras positioner. Varje profil kan tilldela egna åtgärder. Redigera i full storlek på målskärmen. + Aktuell layout + Ta bort den oanvända layouten %1$s och dess sparade åtgärder? + Byt namn på aktuell layout + Återanvänd %1$s från en annan profil. De andra styrkällorna förblir oförändrade. + Behåll fysisk styrning delad + Som standard är alla styrningar och anpassade layouter oberoende kopior. Delning länkar bara den fysiska styrningen. + Använd dessa element och positioner. Delning håller framtida geometriändringar synkroniserade; dina knappåtgärder förblir oberoende. En annan layout börjar med otilldelade åtgärder. + Kopiera dessa styrningar och åtgärder, eller länka dem så att framtida ändringar gäller båda profilerna. + Behåll delad + Oberoende kopia + Starta spaken vid beröringspunkten + Dölj spaken när den inte används + Verktyg + Auto (%1$s) + Anpassad (%1$s) + Spara som ny profil + Profilstyrning + Profil + Musstyrplattesgester + När tilldelad muspekaren: tryck för att klicka, håll för att dra och rulla med två fingrar. + %1$s har en åsidosättning av snabbmenyn. Välj Auto där för att använda standardprofilen och alla tre sparade delarna. + DroidDeck-inmatning + Hålls medan spaken rörs i valfri riktning: tryck över 55 %, släpp under 35 %. Använd Riktningstangenter för att tilldela varje riktning separat. DroidDeck-kommandon körs en gång per utslag. Spakens klick konfigureras separat. + Hålls medan du rör styrplattan; släpps när du lyfter fingret. DroidDeck-kommandon körs en gång per beröring. Styrplattans klick konfigureras separat. + Hålls när avtryckaren passerar 55 %; släpps under 35 %. DroidDeck-kommandon körs en gång per tryck. + Rullningsriktning + Lodrätt + Vågrätt + Rulla vågrätt + Mätningar + Slå på inspelning, använd styrningen i en pågående session och kom tillbaka och läs resultaten. Mäter bara DroidDecks sändningstid, inte skärmfördröjning. Inspelningen avslutas när appens process stängs. + %1$d styrningar + Andra sparade layouter (%1$d) ▾ + Dölj andra sparade layouter (%1$d) ▴ + Hem / Guide + Tillbaka · enkel tryckning + Tillbaka · dubbeltryck + Tillbaka · två gånger i Steam, en gång på skrivbordet + I Steam-läge. Att hålla Tillbaka öppnar även snabbåtkomst. + Återställ till standard + Ditt panelval kommer ihåg. Skrivbord öppnar en andra arbetsyta; det byter inte sessionen eller dess inmatningsprofil. + Virtuell handkontroll + Den handkontrolltyp som Steam eller spelet ser. + Pekskärm + Hur beröringar på spelskärmen hanteras. Profilknapparna behåller sina tilldelade åtgärder. + Pekmarkör + Visa en pekare för direkta beröringar på spelskärmen. + Tryck och håll + Musåtgärd när du håller ett finger på spelskärmen. + Tryck på Tillbaka-knappen + Första åtgärden: ett tryck. Andra åtgärden: dubbeltryck. + Växlingsknapp + Tryck för att hålla, tryck igen för att släppa. Att öppna en meny eller byta profil släpper knappen. + Form + Rundad + Kapsel + Cirkel + Rektangel + Knappetikett + Text + Importerad bild + Separata diagonalknappar + Tilldela en tangent till varje diagonal. En tom diagonal trycker de två angränsande riktningarna. + Angränsande riktningar + Dina gamla skärmtangenter är sparade som importerade profiler nedan. Välj en för att använda eller redigera den. Dina nuvarande profilval har behållits. + De gamla skärmtangenterna kunde inte importeras automatiskt. De ursprungliga inställningarna har behållits. + diff --git a/app/src/main/res/values-sv/input_strings.xml b/app/src/main/res/values-sv/input_strings.xml new file mode 100644 index 0000000000..ae79aa8645 --- /dev/null +++ b/app/src/main/res/values-sv/input_strings.xml @@ -0,0 +1,38 @@ + + + Inmatningsprofiler + Profiler + Fysisk handkontroll + Huvudskärm + Sekundär skärm + Inbyggd / Steam Input + Inbyggd: %1$s + Skicka en annan handkontrollsstyrning + Inaktiverad + Tangent eller tangentkombination + Riktningstangenter + Flytta pekaren + Pekarhastighet: %1$d + Rulla + Rulla lodrätt + Vänster musknapp + Höger musknapp + Mitten musknapp + Öppna DroidDeck-menyn + Visa tangentbord + Öppna Steam-menyn + Öppna Steams snabbåtkomst + Ta bort kontroll + Lägg till kontroll + Enhetsspecifika knappar + Tilldela en fysisk knapp + Släpp knappen och välj Redigera, Försök igen eller Avbryt. B eller Tillbaka avbryter efter släpp. + Försök igen + Tryck på en knapp, även en Tillbaka-knapp som rapporteras som tangent. Volym- och Android-systemtangenter är reserverade. Tilldelningen gäller bara den här enheten. + Ta bort tilldelning + Indatadiagnostik + Spela in indatasändningstid + Läs mätningar + Mäter sändningen från Android till publicering i den befintliga indatatransporten. Bluetoothankomst, gästpollning, rendering och skärmfördröjning ingår inte. Inspelning är av som standard. + Använd normal indatatilldelning + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e6435a97f2..f560640f76 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -185,6 +185,7 @@ PowerVR-grafikmiljön kunde inte laddas ned. Kontrollera anslutningen och försök igen. Det gick inte att ladda ned DirectAudio, så spelljudet använder den långsammare vägen den här sessionen. Det här programmet + Sessionen kunde inte rita på skärmen: %1$s. Den här skärmen visar orsaken i stället för att vara svart; detaljerna finns i sessionsloggarna. 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. @@ -387,6 +388,9 @@ Stöds inte här än Läser in komponenterna… Kunde inte installera: %1$s + Den här nedladdningen behöver en uppdatering. + Uppdatering i kö. + Försök uppdatera igen Nedladdad Laddar ned %1$s Installerar: %1$s @@ -417,6 +421,22 @@ Endast internt Mapp: %1$s Andra biblioteket + Fler Steam-bibliotek + Mappar som Steam kan installera till och spela från, var och en under sitt eget namn. Tar du bort en mapp finns spelen kvar på lagringen. + Lägg till bibliotek + Byt namn + Biblioteksnamn + Välj en mapp för biblioteket + Högst %1$d tillagda bibliotek + Mappen är redan ett bibliotek eller ligger i ett + %1$s · inte tillgänglig + Gäller från nästa Steam-session + Hittades på den här enheten · %1$s · %2$s + Lägg till + Hitta bibliotek i den interna lagringen + Tillåt åtkomst till alla filer så att DroidDeck kan se Steam-bibliotek som andra appar sparar i den interna lagringen + Tillåt + Lade till %1$s, Steam-biblioteket i mappen du valde Spel som strömmar tillgångar från SD-kortet eller delad lagring kan hacka. Lagringsdiagnostik Registrerar allokeringsresultat och uppmätta lagringstider i Dela loggar. Kan göra installationer långsammare medan funktionen är aktiverad. Gäller från nästa session. @@ -605,7 +625,10 @@ Inaktiverar Protons hjälp för handkontrollsnavigering, vilket kostar CPU i alla spel. Kör proot utan seccomp Kan åtgärda fel med saknade systemanrop på vissa Linux-kärnor. Kan minska prestandan. + Kör utan proot (experimentellt) + Startar Linux-delen direkt på Android. Gäller nästa session. Stäng av om något inte startar. proot snabbväg + Används inte utan proot. Kräver proots seccomp-filter. Snabbare filuppslagningar och mindre hack. Stäng av om ett program inte hittar sina filer. Rita markören i gamescope @@ -815,6 +838,7 @@ Enheten stöds Otestad GPU GPU stöds inte + GPU via Mali-bryggan %1$s · %2$s %1$s: %2$s Ingen kompatibel grafikbackend är tillgänglig för %1$s. Steam kan visa en svart skärm. @@ -844,15 +868,38 @@ Session Sessionsloggar Sparas efter varje session + Utökad diagnostik för nästa session + Samlar in detaljerade loggar under en session. Kan sänka prestandan och använda mer lagring. Stängs av automatiskt när sessionen startar; granska loggarna innan du delar dem. Felsökningsloggar för spel Ta med diagnostik för Proton, Wine och grafik vid nästa spelstart. Kan sänka prestandan och använda mer lagringsutrymme. Starta om sessionen för att spara felsökningsloggar för spel Det gick inte att uppdatera loggningen. Kontrollera reglaget och försök igen. Felsökningsverktyg + Detaljerade grafikloggar + Steam-gränssnitt: GPU-ritning + Med Xclipse-drivrutinsparet ritar Steam sina sidor i mjukvara (GPU-ritning gav trasiga rutor). Slå på för ett snabbare Steam-gränssnitt om det ser rätt ut på den här telefonen. + byggd %1$s + %1$s har uppdaterats till det senaste bygget + Mali-bryggan klarade inte sitt självtest på %1$s under förra sessionen (bilder eller ritningsanrop), så sessionen använde PanVK-drivrutinsparet i stället. + Mali-bryggan hittade inget sätt att dela minne med drivrutinen på %1$s under förra sessionen, så sessionen använde PanVK-drivrutinsparet i stället. Bryggan kan inte fungera på den här telefonen; med den avstängd behålls PanVK-paret. + Varje spels Proton-, DXVK- och drivrutinsloggar ingår i sessionens loggar. Alltid på när GPU:n inte är en Adreno. Senaste sessionsloggar Sparade sessionsloggar Behåller de %1$d senaste Rensa loggar + Tillgängliga sessionsloggar + Inga sparade sessionsloggar ännu. + Delade och sparade ZIP-filer innehåller den valda sessionen samt relaterad Steam-, butiks-, verktygs- och Battle.net-diagnostik. + %1$s · %2$s + Aktuell session + Dela + Spara på enheten + Ta bort + Ta bort sessionsloggarna? + Ta bort %1$s? Det går inte att ångra. + Sessionsloggarna sparades. + Kunde inte spara sessionsloggarna. + Kunde inte ta bort sessionsloggarna. Återställ alla inställningar Sätt tillbaka varje inställning till standardvärdet Återställ @@ -879,6 +926,8 @@ Använd som startskärm DroidDeck kan vara startskärmsappen DroidDeck erbjuds aldrig som startskärmsapp + Hemknappen öppnar + Sidan som visas när DroidDeck är hemskärmsappen och du trycker på Hemknappen Under Lägg till spel ställer du DroidDeck på Inkludera Orientering Launcherns orientering @@ -892,15 +941,22 @@ Helskärm Döljer Androids statusfält och navigeringsfält Visar Androids statusfält och navigeringsfält + Startprogram för två skärmar + Automatiskt: placerar startprogrammets avsnitt (Steam, Bibliotek, Butiker med flera) på den inbyggda andra skärmen på handhållna enheter som har en. På: använder vilken andra bildskärm som helst. Av: behåller startprogrammet på en skärm. + Sessioner med två skärmar + Automatiskt: fäster spelmenyn på den inbyggda andra skärmen i stället för att visa den som en popupmeny. På: använder vilken andra bildskärm som helst. Av: behåller menyn på spelskärmen; du kan fortfarande välja en andra skärm från menyn. Automatiskt På Av Kontroller på nedre skärmen i spel + Android-tangentbord för textfält Öppnar styrplattan och tangentbordet på den andra skärmen när en session startar. Skriver för den övre skärmen Klar Standardapp för startskärmen Välj en app för startskärmen + Dölj startprogrammet i Senaste när det är inaktivt + Gäller bara när DroidDeck är standardappen för hemskärmen och ingen session körs. Välj Linux-appar (beta) Filer @@ -1015,6 +1071,147 @@ Testbyggen Prova en fix innan den släpps Inga just nu + Labbversion + Labbversioner + Används + Pausad efter att Android optimerade om DroidDeck + Inte laddad: %1$s + Väntar på omstart + Behållen + För en annan version + Bygg om + Tar bort den här versionen från enheten + Starta om med den + Stäng av + Använd + Ta bort + Ta bort nu + Kunde inte förbereda omstarten: %1$s. Para ihop via trådlös felsökning i Inställningar och försök igen. + Labbversion installerad + DroidDeck startades om med %1$s + Lab-bygget pausat + Android har optimerat om DroidDeck, så %1$s är inte inläst. Öppna Uppdateringar för att starta om på det. + Lab-bygget avstängt + Det byggdes för en annan version av DroidDeck. Det behålls i Uppdateringar. + DroidDeck startade inte på det två gånger + Agent + Agent + Agenten arbetar + Installera Claude Code i Linux-användarmiljön för att använda agenten. + Fråga om ett spel, en krasch eller en ändring av DroidDeck + Skicka + Ny konversation + Stoppa + Lagring + Ta bort + Ta bort nu + Claude Code + Codex + DroidDeck-källkod + Nedladdningscache + Ändringar som inte pushas går förlorade + Byggen laddar ner dem igen + Installationen kan installera det igen; inloggningarna behålls + DroidDeck startades om på ditt Lab-bygge. Fortsätt där du slutade. + Fråga den varför ett spel inte startar, be den förklara en logg eller ändra DroidDeck och testa ändringen på den här enheten. + Misslyckades: %1$s + %1$s avslutades (avslutskod %2$d) + Stoppad + Avslutades utan svar + Försök igen + Konfigurerar agenten + Bygg om mitt Lab-bygge %1$s för den installerade versionen av DroidDeck och starta om på det. + %1$s in · %2$s ut + Tänker + Tanke + Tänker · %1$s + %1$s · %2$s + INDATA + UTDATA + Kör… + Inget resultat: omgången avslutades först + Ingen utdata + Skriv för att köa nästa meddelande + Köa + Nästa: %1$s + Skicka inte + Bifoga + Ta bort + Standard + Resonemangsnivå + Kör + Revidera + Inget har ändrats ännu + Kör planen. + Skicka nu + Meddelande + Mer + Stäng + Senaste + Arbetar + Kontext + %1$s av %2$s + Den här konversationen · %1$s + Användningen visas efter första svaret + %1$d-timmarsgräns + %1$d-minutersgräns + Veckogräns + %1$d%% · återställs %2$s + + %1$d fil + %1$d filer + + Planera först + Planera + Föreslår en plan utan att ändra något + Konversationer + Inga konversationer ännu + Nyss + Ta bort + Tar bort den och dess bilagor + Processer + Inget körs i Linux-användarutrymmet + AGENT + Stoppa + Lab-bygge + Förbereder Lab-byggen + %1$d%% · cirka %2$s kvar + cirka %1$s kvar + Avbryt + Avbryt bygget + Startar + %1$d%% + Paketerar + Startar om DroidDeck på det + Klart + Misslyckades: %1$s + Ställ in agenten + Installera Linux-körmiljön i Inställningar först. + Försök igen + Börja chatta + Enhetsanslutning + Trådlös felsökning, så att agenten kan se och styra DroidDeck + Installera %1$s + In i Linux-miljön, med git, gh och adb + Logga in på %1$s + Öppnar din webbläsare + GitHub + Valfritt, för att öppna pull requests + Byggverktyg + Valfritt, för Lab-byggen på den här enheten · cirka 5 GB + Agenten är redo + Slutför konfigurationen av agenten + Inloggad på %1$s + Lab-byggen + snabba byggen + Snabba Lab-byggen + Kompilerar den här versionen i förväg, så att Lab-byggen tar minuter · cirka 20 minuter en gång + Kompilerar · %1$d%% · cirka %2$s kvar + Förbered + Trådlös felsökning kan inte nås; Para slår på den + Para + Installera + Logga in PR #%1$d Inte byggd för den här kopian av DroidDeck Uppdaterad %1$s @@ -1254,6 +1451,14 @@ Appar Konfiguration Uppdateringar + Mer + Redigera flikar + Flikar + Visas + I Mer + Dold + Flytta upp %1$s + Flytta ner %1$s %1$d %% Återuppta %1$s Visas som /root/ROMs i varje session. Det interna lagringsutrymmet finns på /root/Storage. @@ -1275,6 +1480,15 @@ Avbryt kön Android-tangentbord Dölj ✕ + Storlek på skärmen + Andel av skärmen som tangentbordet tar upp, inklusive toppfältet. + Opacitet + Sänk den för att se spelet bakom tangentbordet. + Dolda tangenter + Tangenter du sällan använder hålls borta från tangentbordet. + Raden med Esc och funktionstangenter + Ins / Del / Home / End / PgUp / PgDn + Piltangenter Starta %1$s Välj en skärm. Sekundär: %1$s. Den sekundära skärmen är inte längre tillgänglig. @@ -1776,7 +1990,24 @@ Terminal Deck-grepp + styrplattor Översikt + Skrivbord + Starta skrivbordet + Skrivbord · %1$s + Styrplatta + Direkt pekning + Styrplatta. Tryck för direkt pekning + Direkt pekning. Tryck för styrplatta + Startar KDE-skrivbordet… + Skrivbordet stängdes. + Skrivbordet kunde inte starta. Loggarna finns i mappen bottom-desktop för den här sessionen. + Skrivbordet är stängt. Inget att visa här än. + Växla skärmar + Den nedre skärmen är upptagen just nu + Spelskärm + Visa spelet på + Övre skärmen + Nedre skärmen Nedladdningar Inga nedladdningar pågår. Steam @@ -1811,6 +2042,20 @@ Bränsle, t Huvudtank %1$s t Reserv %1$s t + Bildrutetid + senaste %1$d s + snitt per bildruta + lägsta 1 % + bildrutor över 33 ms + %1$d / min + Spelat i %1$s + %1$d kärnor, upp till %2$s GHz + %1$d kärnor + spel + FPS vid %1$d Hz + Det röda märket är där HUD:en visar temperaturen i rött. + hela enheten + batteri Skicka data till instrumentpanelen Automatiskt Slår på det för alla spel i listan, även spel som hittas senare. Spel som du stänger av förblir avstängda. @@ -1834,6 +2079,10 @@ Mikrofonen är avstängd för det här spelet. Slå på Mikrofon i DroidDecks Steam-inställningar (Ljud) och starta spelet igen för att prata. Volym %1$d%% Statistik i spelet + HUD på nedre skärmen + Remsa på varje flik + lägsta 1 % och 0,1 % + CPU-temperatur FPS CPU GPU @@ -2006,6 +2255,7 @@ Startar sessionen… %1$d:%2$02d förflutit · arbetar fortfarande Laddar ned uppdateringen av Steam-klienten · %1$d %% + Tillämpar uppdateringen av Steam-klienten… Laddar ned Steam-klienten · %1$s En installation av ett kompatibilitetsverktyg pågår redan @@ -2082,11 +2332,29 @@ Tecknade konturer plus skärpa. Inte en Adreno-GPU + System-PowerVR-drivrutin: kompatibiliteten varierar beroende på enhet + Experimentellt: RADV eller systemets Xclipse-drivrutin + System-PowerVR + Använder de inbyggda drivrutinerna för den här GPU:n + Systemets PowerVR-drivrutin är vald för körmiljön och skärmen. + Ingen öppen drivrutin stöder den här Mali ännu: Mali-bryggan är på. + Detta är testbygget för icke-Snapdragon: de officiella byggena här fungerar bara på Adreno, så de installeras inte ovanpå det. Nya testbyggen finns på github.com/The412Banner/droiddeck-nonadreno-drivers. + Den senaste sessionen avslutades eftersom Android stängde DroidDeck för att frigöra minne, inte på grund av en krasch. Stäng andra appar eller sänk spelets texturinställningar och försök igen. + Mali (Venus) + Mali-bryggan + Ingen öppen drivrutin stöder den här Mali ännu: %1$s används på telefonens egen drivrutin. + %1$s har ännu inte publicerats: %2$s används tills dess. + %1$s är inte tillgänglig, och telefonens drivrutin rapporterar Vulkan %2$s (Venus kräver 1.2): Mali-bryggan används. + %1$s har ännu inte publicerats: Mali-bryggan är på tills dess. + I kö: %1$s (väntar på en annan drivrutin för körmiljön) + DXVK tillhandahålls av systemets PowerVR-körmiljö. Andra DXVK-paket kan lagras men tillämpas inte med den här drivrutinen. Stöds Experimentell: dess drivrutiner är testversioner Experimentellt stöd för Adreno 850: kräver kompatibla experimentella skärm- och speldrivrutiner; inte verifierat på den här enheten Under testad maskinvara (Adreno 725 och nyare): det kan hända att det inte fungerar Stöds inte: ingen kompatibel grafikbackend är tillgänglig för denna GPU + Körs via Mali-bryggan, på telefonens egen Vulkan-drivrutin + Stöds inte när Mali-bryggan är av: Turnip kräver en Adreno-GPU (Snapdragon) GitHubs hastighetsgräns nåddes - försök igen senare GitHub svarade HTTP %1$d @@ -2287,6 +2555,13 @@ Sortera Sidofältets etiketter Visa namn under ikonerna i sidofältet. Stäng av för ett smalare sidofält. + Agentens husdjur + DeeDee svävar över startprogrammet och spel och visar vad agenten gör. + Över andra appar + Låt DeeDee sväva över alla appar och öppna chatten där + Tillåt + DeeDee + Chatta med DeeDee Visning Större kort Mindre kort @@ -2574,6 +2849,11 @@ Utvecklare Vattenstämpel med byggetikett Visa testbyggets eller Lab-byggets etikett på skärmen. Aktiverad som standard. + Dela diagnostikpaket + Session och enhet + Grafik + Spel och kompatibilitet + Alla paket Redo att spela Inte redo att spela än runtime %1$s @@ -2612,6 +2892,9 @@ Aktivera GOG-prestationer i butiksinställningarna Prestationer inte tillgängliga; kontrollera sessionsloggarna Prestation upplåst + Mali (Venus): av + Mali (Venus): på + Drivrutinen på %1$s rapporterar Vulkan %2$s. Mali (Venus) kräver Vulkan 1.2 eller senare (gamescope startar inte på äldre), så sessionerna hoppar över Venus och använder PanVK-drivrutinsparet i stället. Klistra in Vänster styrspak Höger styrspak @@ -2967,6 +3250,7 @@ VC++- och DirectX-installationer som spel behöver Kör Linux x86-spel Steam-verktyg + Steam laddar ner detta för spel som levereras med anti-cheat, även när det är avstängt. Tar du bort det fastnar deras installation på 0 % DroidDeck kör spel utan den här körmiljön Proton x86, som DroidDeck inte kan köra Standard för alla spel @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps 60 fps ser jämnare ut men använder mer CPU medan Steam startar. En video vald i Steams egna inställningar visas också här. Ljud + Hoppa över uppstartsfilmen + Använd ett svart klipp på 0,1 sekunder som uppstartsfilm för Steam. Tillämpas nästa session. Egen video MP4, MOV, MKV eller WebM. Andra format och filer över %1$d MB konverteras till 720p-WebM på enheten, upp till %2$d sekunder. Importera @@ -3538,6 +3824,7 @@ Håller Alt+Tab, Win-tangenten och Hem-knappen i en aktiv DroidDeck-session i stället för Android. Slå på Ljusstyrka under Konfiguration → Steam-integration Mali-brygga: av + %1$s kan inte använda Mali-bryggan (den kräver en Mali-GPU utan en väg via systemdrivrutinen), så det här reglaget har ingen effekt här. Mali-brygga: på %1$s är inte en Adreno. Den experimentella Vulkan-bryggan är på: sessionen ritar via telefonens egen drivrutin. Räkna med buggar; skicka sessionsloggarna. Säkert läge @@ -3697,6 +3984,7 @@ Det gick inte att importera layouten Scharlakansröd snö + Vita ytor med röda accenter. Soundtracks Musik @@ -3760,4 +4048,6 @@ Upprepa ett Volym Inga ljudfiler i detta soundtrack + Kan inte starta + Ingen webbläsare är tillgänglig för att öppna den här länken. diff --git a/app/src/main/res/values-th/input_library.xml b/app/src/main/res/values-th/input_library.xml new file mode 100644 index 0000000000..944a4aaa79 --- /dev/null +++ b/app/src/main/res/values-th/input_library.xml @@ -0,0 +1,132 @@ + + + การตั้งค่าอินพุตที่อ่านไม่ได้ถูกเก็บไว้ในสำเนากู้คืน คุณยังแก้ไขโปรไฟล์ที่กู้คืนได้ + คุณสมบัติ + คุณสมบัติการคลิก + %1$s · คลิก + ปุ่ม + ก้าน แพด และไก + ซ่อนเครื่องมือ + คอนโทรลเลอร์ + ส่งอินพุตคอนโทรลเลอร์ไปยัง Steam Input หรือเกม + องค์ประกอบนี้ไม่ส่งอินพุตคอนโทรลเลอร์ เมาส์ หรือคีย์บอร์ด + คลิกเมาส์ + การทำงานของ DroidDeck + การทำงาน + ความเร็วการเลื่อน: %1$d ขั้น/วินาที + + โปรไฟล์ใหม่ + + เลย์เอาต์ใหม่ + %1$s · ใช้โดย %2$d โปรไฟล์ การเปลี่ยนแปลงมีผลกับทุกโปรไฟล์ที่ใช้การกำหนดนี้ + เปลี่ยนชื่อ + ลบ + เพิ่มองค์ประกอบในเลย์เอาต์ก่อนกำหนดการทำงาน + บันทึกการตั้งค่าอินพุตไม่ได้ + ชื่อ + เริ่มจาก + ปุ่ม + ก้าน + ทัชแพด + D-pad + ไก + เสร็จ + เลิกทำ + + เพิ่ม + ลากเพื่อย้าย ลากมุมเพื่อปรับขนาด แตะคุณสมบัติเพื่อกำหนดการทำงาน + กำลังแก้ไขบนหน้าจอรอง + ไม่มีหน้าจอที่เลือก เชื่อมต่อเพื่อแก้ไขเลย์เอาต์นี้ที่ขนาดจริง + ทิ้งการเปลี่ยนแปลงเลย์เอาต์ที่ยังไม่บันทึกหรือไม่ + เลย์เอาต์นี้ใช้โดย %1$d โปรไฟล์ การเปลี่ยนแปลงที่บันทึกมีผลกับทั้งหมด + โปรไฟล์เริ่มต้น + โหมดเดสก์ท็อป + โหมดเกม + ค่าเริ่มต้นสำหรับเดสก์ท็อปและเกม + ค่าเริ่มต้นสำหรับโหมดเกม + ค่าเริ่มต้นสำหรับโหมดเดสก์ท็อป + การตั้งค่าอุปกรณ์ + การควบคุม + ปุ่ม ก้าน ไก และปุ่มเพิ่มเติม + คัดลอกโปรไฟล์ + รีเซ็ตการทำงาน + รีเซ็ตการทำงานใน %1$s เป็นค่าเริ่มต้นของโปรไฟล์ฐานหรือไม่ เลย์เอาต์และโปรไฟล์อื่นจะไม่เปลี่ยน + ลบ %1$s หรือไม่ โหมดที่ใช้จะกลับไปใช้โปรไฟล์เริ่มต้นที่มีมาให้ เลย์เอาต์ที่บันทึกและการตั้งค่าที่แชร์ยังใช้ได้ + การมองเห็น + มีผลกับทุกโปรไฟล์ Auto จะแสดงการควบคุมหน้าจอหลักเมื่อไม่ได้เชื่อมต่อคอนโทรลเลอร์ในโหมดเกม + แก้ไขบนหน้าจอ + เลย์เอาต์ที่บันทึก… + เลือกเลย์เอาต์หรือสร้างของคุณเอง + เลือกการควบคุมโปรไฟล์ในเมนูเซสชันของหน้าจอรอง ตัวเลือกโปรไฟล์และหน้าจอรองในเมนูคอนโทรลเลอร์กำหนดว่าจะแสดงการควบคุมใด + การทำงานของปุ่ม + แชร์กับ %1$s การแก้ไขมีผลกับโปรไฟล์เหล่านั้นด้วย + ใช้การตั้งค่าซ้ำ + ใช้การตั้งค่าจาก… + คัดลอกจากโปรไฟล์อื่นหรือเก็บการตั้งค่าไว้แชร์ + ทำให้เป็นอิสระ + เก็บการตั้งค่าปัจจุบันและหยุดแชร์การเปลี่ยนแปลง + เลย์เอาต์เก็บองค์ประกอบและตำแหน่ง แต่ละโปรไฟล์กำหนดการทำงานของตนเองได้ แก้ไขที่ขนาดเต็มบนหน้าจอเป้าหมาย + เลย์เอาต์ปัจจุบัน + ลบเลย์เอาต์ที่ไม่ได้ใช้ %1$s และการทำงานที่บันทึกไว้หรือไม่ + เปลี่ยนชื่อเลย์เอาต์ปัจจุบัน + ใช้ %1$s ซ้ำจากโปรไฟล์อื่น แหล่งควบคุมอื่นจะไม่เปลี่ยน + เก็บการควบคุมจริงไว้แชร์ + โดยค่าเริ่มต้น การควบคุมและเลย์เอาต์ที่กำหนดเองทั้งหมดเป็นสำเนาอิสระ การแชร์จะเชื่อมเฉพาะการควบคุมจริง + ใช้องค์ประกอบและตำแหน่งเหล่านี้ การแชร์จะทำให้การแก้ไขเรขาคณิตในอนาคตซิงก์กัน การทำงานของปุ่มยังคงเป็นอิสระ เลย์เอาต์อื่นเริ่มต้นด้วยการทำงานที่ยังไม่กำหนด + คัดลอกการควบคุมและการทำงานเหล่านี้ หรือเชื่อมโยงเพื่อให้การแก้ไขในอนาคตมีผลกับทั้งสองโปรไฟล์ + เก็บไว้แชร์ + สำเนาอิสระ + เริ่มก้านที่ตำแหน่งแตะ + ซ่อนก้านเมื่อไม่ใช้งาน + เครื่องมือ + อัตโนมัติ (%1$s) + กำหนดเอง (%1$s) + บันทึกเป็นโปรไฟล์ใหม่ + การควบคุมโปรไฟล์ + โปรไฟล์ + ท่าทางทัชแพดเมาส์ + เมื่อกำหนดให้ตัวชี้เมาส์: แตะเพื่อคลิก กดค้างเพื่อลาก และเลื่อนด้วยสองนิ้ว + %1$s มีการแทนที่เมนูด่วน เลือกอัตโนมัติที่นั่นเพื่อใช้โปรไฟล์เริ่มต้นและทั้งสามส่วนที่บันทึกไว้ + อินพุต DroidDeck + ถูกกดค้างขณะก้านถูกเลื่อนไปทุกทิศทาง: กดเมื่อเกิน 55% ปล่อยเมื่อต่ำกว่า 35% ใช้ปุ่มทิศทางเพื่อกำหนดแต่ละทิศแยกกัน คำสั่ง DroidDeck ทำงานครั้งเดียวต่อการเอียง คลิกก้านตั้งค่าแยก + ถูกกดค้างขณะแตะทัชแพด และปล่อยเมื่อยกนิ้ว คำสั่ง DroidDeck ทำงานครั้งเดียวต่อการแตะ คลิกทัชแพดตั้งค่าแยก + ถูกกดค้างเมื่อไกเกิน 55% และปล่อยเมื่อต่ำกว่า 35% คำสั่ง DroidDeck ทำงานครั้งเดียวต่อการกด + ทิศทางการเลื่อน + แนวตั้ง + แนวนอน + เลื่อนแนวนอน + การวัด + เปิดการบันทึก ใช้การควบคุมในเซสชันที่กำลังทำงาน แล้วกลับมาอ่านผล วัดเฉพาะเวลาการส่งของ DroidDeck ไม่รวมความหน่วงของหน้าจอ การบันทึกจะสิ้นสุดเมื่อโปรเซสแอปปิด + %1$d การควบคุม + เลย์เอาต์ที่บันทึกไว้อื่น (%1$d) ▾ + ซ่อนเลย์เอาต์ที่บันทึกไว้อื่น (%1$d) ▴ + หน้าแรก / Guide + ย้อนกลับ · แตะครั้งเดียว + ย้อนกลับ · แตะสองครั้ง + ย้อนกลับ · สองครั้งใน Steam หนึ่งครั้งบนเดสก์ท็อป + ในโหมด Steam การกดย้อนกลับค้างจะเปิดการเข้าถึงด่วนด้วย + คืนค่าเริ่มต้น + ตัวเลือกแผงของคุณจะถูกจำไว้ เดสก์ท็อปจะเปิดพื้นที่ทำงานที่สอง ไม่ได้สลับเซสชันหรือโปรไฟล์อินพุต + คอนโทรลเลอร์เสมือน + ชนิดคอนโทรลเลอร์ที่ Steam หรือเกมมองเห็น + หน้าจอสัมผัส + วิธีจัดการการสัมผัสบนหน้าจอเกม ปุ่มโปรไฟล์ยังคงการทำงานที่กำหนดไว้ + เคอร์เซอร์สัมผัส + แสดงตัวชี้สำหรับการสัมผัสโดยตรงบนหน้าจอเกม + แตะแล้วกดค้าง + การทำงานของเมาส์เมื่อกดนิ้วค้างบนหน้าจอเกม + การแตะปุ่มย้อนกลับ + การทำงานแรก: แตะครั้งเดียว การทำงานที่สอง: แตะสองครั้ง + ปุ่มสลับ + แตะเพื่อกดค้าง แตะอีกครั้งเพื่อปล่อย การเปิดเมนูหรือสลับโปรไฟล์จะปล่อยปุ่ม + รูปร่าง + มุมมน + แคปซูล + วงกลม + สี่เหลี่ยมผืนผ้า + ป้ายปุ่ม + ข้อความ + รูปภาพที่นำเข้า + ปุ่มทแยงแยก + กำหนดปุ่มให้แต่ละทแยง ทแยงว่างจะกดสองทิศที่อยู่ข้างเคียง + ทิศข้างเคียง + ปุ่มหน้าจอเดิมของคุณถูกบันทึกเป็นโปรไฟล์ที่นำเข้าไว้ด้านล่าง เลือกหนึ่งรายการเพื่อใช้หรือแก้ไข ตัวเลือกโปรไฟล์ปัจจุบันยังคงอยู่ + ไม่สามารถนำเข้าปุ่มหน้าจอเดิมโดยอัตโนมัติได้ การตั้งค่าเดิมยังคงอยู่ + diff --git a/app/src/main/res/values-th/input_strings.xml b/app/src/main/res/values-th/input_strings.xml new file mode 100644 index 0000000000..de9275d0a6 --- /dev/null +++ b/app/src/main/res/values-th/input_strings.xml @@ -0,0 +1,38 @@ + + + โปรไฟล์อินพุต + โปรไฟล์ + คอนโทรลเลอร์จริง + หน้าจอหลัก + หน้าจอรอง + ดั้งเดิม / Steam Input + ดั้งเดิม: %1$s + ส่งการควบคุมคอนโทรลเลอร์อื่น + ปิดใช้งาน + ปุ่มหรือชุดปุ่ม + ปุ่มทิศทาง + เลื่อนตัวชี้ + ความเร็วตัวชี้: %1$d + เลื่อน + เลื่อนแนวตั้ง + ปุ่มซ้ายของเมาส์ + ปุ่มขวาของเมาส์ + ปุ่มกลางของเมาส์ + เปิดเมนู DroidDeck + แสดงแป้นพิมพ์ + เปิดเมนู Steam + เปิดการเข้าถึงด่วนของ Steam + ลบการควบคุม + เพิ่มการควบคุม + ปุ่มเฉพาะอุปกรณ์ + กำหนดปุ่มจริง + ปล่อยปุ่ม แล้วเลือก แก้ไข ลองอีกครั้ง หรือยกเลิก B หรือย้อนกลับจะยกเลิกหลังปล่อย + ลองอีกครั้ง + กดปุ่ม รวมถึงปุ่มย้อนกลับที่รายงานเป็นปุ่มคีย์บอร์ด ปุ่มระดับเสียงและปุ่มระบบ Android ถูกสงวนไว้ การกำหนดใช้กับอุปกรณ์นี้เท่านั้น + ลบการกำหนด + การวินิจฉัยอินพุต + บันทึกเวลาการส่งอินพุต + อ่านค่าที่วัด + วัดการส่งจาก Android จนถึงการเผยแพร่ไปยังช่องทางอินพุตที่มีอยู่ ไม่รวมการมาถึงของ Bluetooth การโพลของเกสต์ การเรนเดอร์ และความหน่วงของหน้าจอ การบันทึกปิดอยู่โดยค่าเริ่มต้น + ใช้การกำหนดอินพุตปกติ + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index fc85d51320..06a2ed2cd5 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -185,6 +185,7 @@ ดาวน์โหลดสภาพแวดล้อมกราฟิก PowerVR ไม่สำเร็จ ตรวจสอบการเชื่อมต่อแล้วลองอีกครั้ง ดาวน์โหลด DirectAudio ไม่ได้ เสียงเกมในเซสชันนี้จึงใช้เส้นทางที่ช้ากว่า โปรแกรมนี้ + เซสชันไม่สามารถแสดงผลบนหน้าจอได้: %1$s หน้าจอนี้แสดงสาเหตุแทนที่จะเป็นหน้าจอสีดำ รายละเอียดอยู่ในบันทึกของเซสชัน ดาวน์โหลดไคลเอนต์ Steam ไม่ได้ เครือข่ายหรือ VPN ของคุณอาจบล็อกเซิร์ฟเวอร์ของ Steam ตรวจสอบการเชื่อมต่อแล้วลองอีกครั้ง ตั้งค่าไคลเอนต์ Steam ไม่ได้ ตรวจสอบการเชื่อมต่อและพื้นที่ว่าง แล้วลองอีกครั้ง %1$s สร้างมาสำหรับพีซี x86 และรันผ่าน FEX ซึ่งยังไม่ได้ติดตั้ง เริ่ม Steam สักครั้งขณะลงชื่อเข้าใช้และให้ดาวน์โหลด FEX และ Steam Linux Runtime จากนั้นเริ่มโปรแกรมนี้อีกครั้ง @@ -386,6 +387,9 @@ ยังไม่รองรับในที่นี้ กำลังโหลดคอมโพเนนต์… ติดตั้งไม่ได้: %1$s + ไฟล์ที่ดาวน์โหลดนี้ต้องอัปเดต + อัปเดตอยู่ในคิวแล้ว + ลองอัปเดตอีกครั้ง ดาวน์โหลดแล้ว กำลังดาวน์โหลด %1$s กำลังติดตั้ง: %1$s @@ -416,6 +420,22 @@ พื้นที่ภายในเท่านั้น โฟลเดอร์: %1$s ไลบรารีที่สอง + ไลบรารี Steam เพิ่มเติม + โฟลเดอร์ที่ Steam ใช้ติดตั้งและเล่นเกมได้ โดยแต่ละโฟลเดอร์มีชื่อของตัวเอง การนำโฟลเดอร์ออกไม่ได้ลบเกมออกจากเครื่อง + เพิ่มไลบรารี + เปลี่ยนชื่อ + ชื่อไลบรารี + เลือกโฟลเดอร์สำหรับไลบรารี + เพิ่มไลบรารีได้สูงสุด %1$d รายการ + โฟลเดอร์นี้เป็นไลบรารีอยู่แล้วหรืออยู่ภายในไลบรารีอื่น + %1$s · ไม่พร้อมใช้งาน + มีผลตั้งแต่เซสชัน Steam ถัดไป + พบในเครื่องนี้ · %1$s · %2$s + เพิ่ม + ค้นหาไลบรารีในที่เก็บข้อมูลภายใน + อนุญาตการเข้าถึงไฟล์ทั้งหมด เพื่อให้ DroidDeck เห็นไลบรารี Steam ที่แอปอื่นเก็บไว้ในที่เก็บข้อมูลภายใน + อนุญาต + เพิ่ม %1$s แล้ว ซึ่งเป็นไลบรารี Steam ที่อยู่ภายในโฟลเดอร์ที่คุณเลือก เกมที่สตรีมข้อมูลจาก SD หรือพื้นที่จัดเก็บที่ใช้ร่วมกันอาจกระตุก การวินิจฉัยพื้นที่จัดเก็บ บันทึกผลการจัดสรรและเวลาพื้นที่จัดเก็บที่สุ่มตรวจไว้ในล็อกที่แชร์ อาจทำให้การติดตั้งช้าลงขณะเปิดใช้งาน จะมีผลในเซสชันถัดไป @@ -603,7 +623,10 @@ ปิดตัวช่วยควบคุมด้วยคอนโทรลเลอร์ของ Proton ซึ่งกินพลัง CPU ในทุกเกม รัน proot โดยไม่ใช้ seccomp อาจแก้ข้อผิดพลาด syscall ที่ขาดหายบนบางเคอร์เนล อาจลดประสิทธิภาพ + เรียกใช้โดยไม่ใช้ proot (ทดลอง) + เริ่มฝั่ง Linux บน Android โดยตรง มีผลกับเซสชันถัดไป หากมีอะไรเริ่มไม่สำเร็จให้ปิดตัวเลือกนี้ เส้นทางลัดของ proot + ไม่ได้ใช้งานเมื่อไม่มี proot ต้องใช้ตัวกรอง seccomp ของ proot ค้นหาไฟล์เร็วขึ้นและสะดุดน้อยลง ปิดหากโปรแกรมหาไฟล์ของตัวเองไม่พบ วาดเคอร์เซอร์ภายใน gamescope @@ -812,6 +835,7 @@ รองรับอุปกรณ์นี้ GPU ที่ยังไม่ผ่านการทดสอบ ไม่รองรับ GPU นี้ + GPU ผ่านบริดจ์ Mali %1$s · %2$s %1$s: %2$s ไม่มีแบ็กเอนด์กราฟิกที่เข้ากันได้สำหรับ %1$s Steam อาจแสดงหน้าจอสีดำ @@ -841,15 +865,38 @@ เซสชัน ล็อกเซสชัน บันทึกไว้หลังจบแต่ละเซสชัน + การวินิจฉัยขั้นสูงสำหรับเซสชันถัดไป + เก็บบันทึกโดยละเอียดเป็นเวลาหนึ่งเซสชัน อาจทำให้ประสิทธิภาพลดลงและใช้พื้นที่เก็บข้อมูลมากขึ้น จะปิดเองเมื่อเซสชันเริ่มขึ้น ตรวจสอบบันทึกก่อนแชร์ บันทึกดีบักของเกม รวมข้อมูลวินิจฉัยของ Proton, Wine และกราฟิกในการเปิดเกมครั้งถัดไป อาจลดประสิทธิภาพและใช้พื้นที่จัดเก็บมากขึ้น รีสตาร์ทเซสชันนี้เพื่อบันทึกบันทึกดีบักของเกม อัปเดตการบันทึกไม่ได้ ตรวจสอบสวิตช์แล้วลองใหม่ เครื่องมือดีบัก + บันทึกกราฟิกโดยละเอียด + อินเทอร์เฟซ Steam: วาดด้วย GPU + ด้วยไดรเวอร์คู่ Xclipse Steam จะวาดหน้าเพจด้วยซอฟต์แวร์ (การวาดด้วย GPU ทำให้ภาพแตกเป็นชิ้น) เปิดตัวเลือกนี้เพื่อให้อินเทอร์เฟซ Steam เร็วขึ้นหากดูปกติบนเครื่องนี้ + สร้างเมื่อ %1$s + %1$s อัปเดตเป็นบิลด์ล่าสุดแล้ว + บริดจ์ Mali ตรวจสอบตัวเองไม่ผ่านบน %1$s ในเซสชันก่อนหน้า (รูปภาพหรือการวาด) เซสชันจึงใช้คู่ไดรเวอร์ PanVK แทน + บริดจ์ Mali หาช่องทางแชร์หน่วยความจำกับไดรเวอร์บน %1$s ไม่พบในเซสชันก่อนหน้า เซสชันจึงใช้คู่ไดรเวอร์ PanVK แทน บริดจ์ใช้งานไม่ได้บนโทรศัพท์เครื่องนี้ การปิดบริดจ์จะให้ใช้คู่ PanVK ต่อไป + บันทึก Proton, DXVK และไดรเวอร์ของแต่ละเกมจะอยู่ในบันทึกของเซสชัน เปิดใช้งานเสมอเมื่อ GPU ไม่ใช่ Adreno ล็อกเซสชันล่าสุด ล็อกเซสชันที่บันทึกไว้ เก็บ %1$d รายการล่าสุด ล้างล็อก + บันทึกเซสชันที่มีอยู่ + ยังไม่มีบันทึกเซสชันที่เก็บไว้ + ไฟล์ ZIP ที่แชร์และที่บันทึกจะรวมเซสชันที่เลือก พร้อมข้อมูลวินิจฉัยที่เกี่ยวข้องของ Steam, ร้านค้า, เครื่องมือ และ Battle.net + %1$s · %2$s + เซสชันปัจจุบัน + แชร์ + บันทึกลงในอุปกรณ์ + ลบ + ลบบันทึกเซสชัน? + ลบ %1$s? ไม่สามารถกู้คืนได้ + บันทึกเซสชันเรียบร้อยแล้ว + ไม่สามารถบันทึกเซสชันได้ + ไม่สามารถลบบันทึกเซสชันได้ รีเซ็ตการตั้งค่าทั้งหมด คืนค่าทุกการตั้งค่าเป็นค่าเริ่มต้น รีเซ็ต @@ -876,6 +923,8 @@ ใช้เป็นหน้าจอหลัก DroidDeck สามารถเป็นแอปหน้าจอหลักได้ DroidDeck จะไม่ถูกเสนอให้เป็นแอปหน้าจอหลัก + ปุ่มโฮมเปิดไปยัง + หน้าที่แสดงเมื่อ DroidDeck เป็นแอปหน้าจอหลักและคุณกดปุ่มโฮม ในเพิ่มเกม ให้ตั้ง DroidDeck เป็นรวม การวางแนว การวางแนวของตัวเปิดใช้ @@ -889,15 +938,22 @@ เต็มจอ ซ่อนแถบสถานะและแถบนำทางของ Android แสดงแถบสถานะและแถบนำทางของ Android + ลอนเชอร์แบบสองจอ + โหมดอัตโนมัติจะแสดงส่วนต่างๆ ของลอนเชอร์ (Steam, คลังเกม, ร้านค้า และส่วนอื่นๆ) บนจอที่สองของเครื่องเล่นพกพาที่มีจอที่สองในตัว โหมดเปิดใช้จอที่สองใดก็ได้ โหมดปิดจะแสดงลอนเชอร์บนจอเดียว + เซสชันแบบสองจอ + โหมดอัตโนมัติจะตรึงเมนูในเกมไว้บนจอที่สองในตัวแทนหน้าต่างป๊อปอัป โหมดเปิดใช้จอที่สองใดก็ได้ โหมดปิดจะเก็บเมนูไว้บนจอเกม แต่ยังเลือกจอที่สองจากเมนูได้ อัตโนมัติ เปิด ปิด ปุ่มควบคุมหน้าจอล่างในเกม + คีย์บอร์ด Android สำหรับช่องข้อความ เปิดแทร็กแพดและแป้นพิมพ์บนหน้าจอที่สองเมื่อเริ่มเซสชัน กำลังพิมพ์ให้หน้าจอบน เสร็จสิ้น แอปหน้าจอหลักเริ่มต้น เลือกแอปหน้าจอหลัก + ซ่อนแอปหน้าจอหลักจากหน้าจอแอปล่าสุดเมื่อไม่ได้ใช้งาน + ใช้เฉพาะเมื่อ DroidDeck เป็นแอปหน้าจอหลักเริ่มต้นและไม่มีเซสชันกำลังทำงานอยู่ เลือก แอป Linux (ทดลอง) ไฟล์ @@ -1012,6 +1068,147 @@ บิลด์ทดสอบ ลองการแก้ไขก่อนเผยแพร่จริง ไม่มีในขณะนี้ + บิลด์ทดลอง + บิลด์ทดลอง + กำลังใช้งาน + หยุดชั่วคราวหลัง Android ทำการปรับแต่ง DroidDeck ใหม่ + ไม่ได้โหลด: %1$s + รอการรีสตาร์ท + เก็บไว้ + สำหรับเวอร์ชันอื่น + สร้างใหม่ + ลบบิลด์นี้ออกจากอุปกรณ์ + รีสตาร์ทด้วยบิลด์นี้ + ปิด + ใช้ + ลบ + ลบตอนนี้ + เตรียมการรีสตาร์ทไม่สำเร็จ: %1$s จับคู่การดีบักแบบไร้สายในหน้าตั้งค่า แล้วลองอีกครั้ง + ติดตั้งบิลด์ทดลองแล้ว + DroidDeck รีสตาร์ทด้วย %1$s แล้ว + หยุดบิลด์ Lab ชั่วคราว + Android ปรับแต่ง DroidDeck ใหม่ จึงไม่ได้โหลด %1$s เปิด Updates เพื่อเริ่มใหม่ด้วยบิลด์นั้น + ปิดบิลด์ Lab แล้ว + บิลด์นี้สร้างสำหรับ DroidDeck เวอร์ชันอื่น และถูกเก็บไว้ใน Updates + DroidDeck เริ่มด้วยบิลด์นี้ไม่สำเร็จ 2 ครั้ง + ผู้ช่วย + ผู้ช่วย + ผู้ช่วยกำลังทำงาน + ติดตั้ง Claude Code ในพื้นที่ผู้ใช้ Linux เพื่อใช้ผู้ช่วย + ถามเกี่ยวกับเกม อาการแครช หรือการเปลี่ยนแปลงใน DroidDeck + ส่ง + บทสนทนาใหม่ + หยุด + ที่เก็บข้อมูล + ลบ + ลบตอนนี้ + Claude Code + Codex + ซอร์สโค้ด DroidDeck + แคชที่ดาวน์โหลด + การเปลี่ยนแปลงที่ยังไม่ได้พุชจะหายไป + ตอนสร้างบิลด์จะดาวน์โหลดใหม่อีกครั้ง + ติดตั้งใหม่ได้จากการตั้งค่า และยังคงการเข้าสู่ระบบไว้ + DroidDeck เริ่มใหม่ด้วยบิลด์ Lab ของคุณ ทำต่อได้จากที่ค้างไว้ + ถามว่าทำไมเกมถึงไม่เริ่ม ให้อธิบายล็อก หรือให้เปลี่ยน DroidDeck แล้วลองบนเครื่องนี้ + ล้มเหลว: %1$s + %1$s จบการทำงาน (รหัสออก %2$d) + หยุดแล้ว + จบโดยไม่มีคำตอบ + ลองใหม่ + กำลังตั้งค่าผู้ช่วย + สร้างบิลด์ Lab %1$s ของฉันใหม่สำหรับ DroidDeck เวอร์ชันที่ติดตั้งอยู่ แล้วเริ่มใหม่ด้วยบิลด์นั้น + %1$s เข้า · %2$s ออก + กำลังคิด + ความคิด + กำลังคิด · %1$s + %1$s · %2$s + ข้อมูลเข้า + ข้อมูลออก + กำลังทำงาน… + ไม่มีผลลัพธ์: รอบสนทนาจบลงก่อน + ไม่มีข้อมูลแสดงผล + พิมพ์เพื่อเข้าคิวข้อความถัดไป + เข้าคิว + ถัดไป: %1$s + ไม่ต้องส่ง + แนบ + นำออก + ค่าเริ่มต้น + ระดับการใช้เหตุผล + ดำเนินการ + แก้ไข + ยังไม่มีการเปลี่ยนแปลง + ดำเนินการตามแผนได้เลย + ส่งตอนนี้ + ข้อความ + เพิ่มเติม + ปิด + ล่าสุด + กำลังทำงาน + บริบท + %1$s จาก %2$s + การสนทนานี้ · %1$s + การใช้งานจะแสดงหลังจากตอบกลับครั้งแรก + ขีดจำกัด %1$d ชั่วโมง + ขีดจำกัด %1$d นาที + ขีดจำกัดรายสัปดาห์ + %1$d%% · รีเซ็ต %2$s + + %1$d ไฟล์ + %1$d ไฟล์ + + วางแผนก่อน + วางแผน + เสนอแผนโดยไม่เปลี่ยนแปลงสิ่งใด + บทสนทนา + ยังไม่มีบทสนทนา + เมื่อสักครู่ + ลบ + ลบทั้งบทสนทนาและไฟล์แนบ + โปรเซส + ไม่มีโปรเซสใดทำงานในพื้นที่ผู้ใช้ของ Linux + เอเจนต์ + หยุด + บิลด์ Lab + กำลังเตรียมบิลด์ Lab + %1$d%% · เหลืออีกประมาณ %2$s + เหลืออีกประมาณ %1$s + ยกเลิก + ยกเลิกบิลด์ + กำลังเริ่ม + %1$d%% + กำลังจัดทำแพ็กเกจ + กำลังเริ่ม DroidDeck ใหม่บนนั้น + เสร็จแล้ว + ล้มเหลว: %1$s + ตั้งค่าเอเจนต์ + ติดตั้งรันไทม์ Linux ในหน้าตั้งค่าก่อน + ลองอีกครั้ง + เริ่มสนทนา + การเชื่อมต่ออุปกรณ์ + ดีบักแบบไร้สาย เพื่อให้เอเจนต์มองเห็นและควบคุม DroidDeck ได้ + ติดตั้ง %1$s + ลงในสภาพแวดล้อมผู้ใช้ Linux พร้อม git, gh และ adb + ลงชื่อเข้าใช้ %1$s + เปิดเบราว์เซอร์ของคุณ + GitHub + ไม่บังคับ สำหรับเปิดพูลรีเควสต์ + เครื่องมือบิลด์ + ไม่บังคับ สำหรับบิลด์ Lab บนเครื่องนี้ · ประมาณ 5 GB + เอเจนต์พร้อมแล้ว + ตั้งค่าเอเจนต์ให้เรียบร้อย + ลงชื่อเข้าใช้ %1$s แล้ว + บิลด์ Lab + บิลด์เร็ว + บิลด์ Lab แบบเร็ว + คอมไพล์เวอร์ชันนี้ล่วงหน้า เพื่อให้บิลด์ Lab ใช้เวลาเพียงไม่กี่นาที · ทำครั้งเดียว ประมาณ 20 นาที + กำลังคอมไพล์ · %1$d%% · เหลืออีกประมาณ %2$s + เตรียม + เชื่อมต่อการดีบักแบบไร้สายไม่ได้; จับคู่จะเปิดใช้งาน + จับคู่ + ติดตั้ง + ลงชื่อเข้าใช้ PR #%1$d ไม่ได้สร้างไว้สำหรับสำเนานี้ของ DroidDeck อัปเดตแล้ว %1$s @@ -1247,6 +1444,14 @@ แอป การตั้งค่า การอัปเดต + เพิ่มเติม + แก้ไขแท็บ + แท็บ + แสดง + ในเพิ่มเติม + ซ่อน + ย้าย %1$s ขึ้น + ย้าย %1$s ลง %1$d%% ดำเนินการต่อ %1$s แสดงเป็น /root/ROMs ในแต่ละเซสชัน พื้นที่จัดเก็บภายในอยู่ที่ /root/Storage @@ -1268,6 +1473,15 @@ ยกเลิกรายการที่รออยู่ แป้นพิมพ์ Android ซ่อน ✕ + ขนาดบนหน้าจอ + สัดส่วนหน้าจอที่คีย์บอร์ดใช้ รวมแถบหัวด้วย + ความทึบแสง + ลดค่านี้เพื่อให้เห็นเกมด้านหลังคีย์บอร์ด + ปุ่มที่ซ่อนไว้ + ปุ่มที่ใช้ไม่บ่อยจะไม่แสดงบนคีย์บอร์ด + Esc และแถวปุ่มฟังก์ชัน + Ins / Del / Home / End / PgUp / PgDn + ปุ่มลูกศร เปิด %1$s เลือกหน้าจอ หน้าจอที่สอง: %1$s หน้าจอที่สองไม่พร้อมใช้งานแล้ว @@ -1752,7 +1966,24 @@ เทอร์มินัล ปุ่มด้านหลังและแทร็กแพดของ Deck แดชบอร์ด + เดสก์ท็อป + เริ่มเดสก์ท็อป + เดสก์ท็อป · %1$s + ทัชแพด + สัมผัสโดยตรง + ทัชแพด แตะเพื่อใช้สัมผัสโดยตรง + สัมผัสโดยตรง แตะเพื่อใช้ทัชแพด + กำลังเริ่มเดสก์ท็อป KDE… + เดสก์ท็อปปิดแล้ว + เริ่มเดสก์ท็อปไม่ได้ บันทึกอยู่ในโฟลเดอร์ bottom-desktop ของเซสชันนี้ + เดสก์ท็อปปิดอยู่ ยังไม่มีอะไรให้แสดงที่นี่ + สลับหน้าจอ + หน้าจอล่างไม่ว่างตอนนี้ + หน้าจอเกม + แสดงเกมที่ + หน้าจอบน + หน้าจอล่าง ดาวน์โหลด ไม่มีการดาวน์โหลดที่กำลังทำงาน Steam @@ -1787,6 +2018,20 @@ เชื้อเพลิง, t หลัก %1$s t สำรอง %1$s t + เวลาต่อเฟรม + ย้อนหลัง %1$d วินาที + เฟรมเฉลี่ย + ค่า 1% ต่ำสุด + เฟรมที่เกิน 33 ms + %1$d / นาที + เล่นมาแล้ว %1$s + %1$d คอร์ สูงสุด %2$s GHz + %1$d คอร์ + เกม + FPS ที่ %1$d Hz + ขีดสีแดงคือจุดที่ HUD แสดงอุณหภูมิเป็นสีแดง + ทั้งเครื่อง + แบตเตอรี่ ส่งข้อมูลแดชบอร์ด อัตโนมัติ เปิดใช้สำหรับทุกเกมที่แสดงที่นี่ รวมถึงเกมที่พบในภายหลัง เกมที่คุณปิดไว้จะยังคงปิดอยู่ @@ -1810,6 +2055,10 @@ ไมค์ปิดอยู่สำหรับเกมนี้ หากต้องการพูด ให้เปิดไมโครโฟนในการตั้งค่า Steam ของ DroidDeck (เสียง) แล้วเริ่มเกมอีกครั้ง ระดับเสียง %1$d%% สถิติในเกม + HUD หน้าจอล่าง + แถบในทุกแท็บ + ค่า 1% และ 0.1% ต่ำสุด + อุณหภูมิ CPU FPS CPU GPU @@ -1981,6 +2230,7 @@ กำลังเริ่มเซสชัน… ผ่านไป %1$d:%2$02d · ยังทำงานอยู่ กำลังดาวน์โหลดอัปเดตไคลเอนต์ Steam · %1$d%% + กำลังติดตั้งอัปเดตไคลเอนต์ Steam… กำลังดาวน์โหลดไคลเอนต์ Steam · %1$s มีการติดตั้งเครื่องมือความเข้ากันได้อื่นกำลังทำงานอยู่แล้ว @@ -2057,11 +2307,29 @@ เส้นขอบแบบการ์ตูนพร้อมเพิ่มความคมชัด ไม่ใช่ GPU Adreno + ไดรเวอร์ PowerVR ของระบบ: ความเข้ากันได้แตกต่างกันตามอุปกรณ์ + ทดลอง: RADV หรือไดรเวอร์ Xclipse ของระบบ + PowerVR ของระบบ + ใช้ไดรเวอร์ในตัวสำหรับ GPU นี้ + ไดรเวอร์ PowerVR ของระบบถูกเลือกให้ใช้กับรันไทม์และการแสดงผลแล้ว + ยังไม่มีไดรเวอร์โอเพนซอร์สที่รองรับ Mali รุ่นนี้: จึงเปิดใช้บริดจ์ Mali + นี่คือบิลด์ทดสอบสำหรับเครื่องที่ไม่ใช่ Snapdragon: บิลด์ทางการที่นี่ทำงานได้เฉพาะบน Adreno จึงไม่ติดตั้งทับบิลด์นี้ บิลด์ทดสอบใหม่มีอยู่ที่ github.com/The412Banner/droiddeck-nonadreno-drivers + เซสชันล่าสุดจบลงเพราะ Android ปิด DroidDeck เพื่อคืนหน่วยความจำ ไม่ใช่เพราะแอปขัดข้อง ปิดแอปอื่นหรือลดคุณภาพพื้นผิวของเกม แล้วลองอีกครั้ง + Mali (Venus) + บริดจ์ Mali + ยังไม่มีไดรเวอร์โอเพนซอร์สที่รองรับ Mali รุ่นนี้: จึงใช้ %1$s บนไดรเวอร์ของเครื่องเอง + %1$s ยังไม่ได้เผยแพร่: จึงใช้ %2$s ไปจนกว่าจะเผยแพร่ + %1$s ยังใช้งานไม่ได้ และไดรเวอร์ของเครื่องนี้ระบุ Vulkan %2$s (Venus ต้องการ 1.2): จึงใช้บริดจ์ Mali + %1$s ยังไม่ได้เผยแพร่: ระบบเปิดใช้บริดจ์ Mali ไปจนกว่าจะเผยแพร่ + อยู่ในคิว: %1$s (กำลังรอไดรเวอร์รันไทม์ตัวอื่น) + DXVK มาจากรันไทม์ PowerVR ของระบบ แพ็กเกจ DXVK อื่นจัดเก็บได้แต่จะไม่ถูกนำไปใช้กับไดรเวอร์นี้ รองรับ ทดลอง: ไดรเวอร์เป็นบิลด์ทดสอบ รองรับ Adreno 850 แบบทดลอง: ต้องใช้ไดรเวอร์จอแสดงผลและไดรเวอร์เกมแบบทดลองที่เข้ากันได้ ยังไม่ได้ตรวจสอบบนอุปกรณ์นี้ ต่ำกว่าฮาร์ดแวร์ที่ทดสอบแล้ว (Adreno 725 และรุ่นใหม่กว่า): อาจรันไม่ได้ ไม่รองรับ: ไม่มีแบ็กเอนด์กราฟิกที่เข้ากันได้สำหรับ GPU นี้ + ทำงานผ่านบริดจ์ Mali บนไดรเวอร์ Vulkan ของเครื่องเอง + ไม่รองรับเมื่อปิดบริดจ์ Mali: Turnip ต้องการ GPU Adreno (Snapdragon) ติดขีดจำกัดอัตราของ GitHub - ลองใหม่ในหลัง GitHub ตอบกลับด้วย HTTP %1$d @@ -2262,6 +2530,13 @@ จัดเรียง ป้ายแถบด้านข้าง แสดงชื่อใต้ไอคอนในแถบด้านข้าง ปิดเพื่อให้แถบด้านข้างแคบลง + สัตว์เลี้ยงเอเจนต์ + DeeDee ลอยเหนือแอปหน้าจอหลักและเกม พร้อมแสดงสิ่งที่เอเจนต์กำลังทำอยู่ + เหนือแอปอื่น + ให้ DeeDee ลอยเหนือทุกแอปและเปิดแชทได้จากตรงนั้น + อนุญาต + DeeDee + แชทกับ DeeDee การแสดงผล การ์ดใหญ่ขึ้น การ์ดเล็กลง @@ -2547,6 +2822,11 @@ นักพัฒนา ลายน้ำป้ายชื่อบิลด์ แสดงป้ายชื่อบิลด์ทดสอบหรือบิลด์ Lab บนหน้าจอ เปิดไว้โดยค่าเริ่มต้น + แชร์ชุดข้อมูลการวินิจฉัย + เซสชันและอุปกรณ์ + กราฟิก + เกมและความเข้ากันได้ + ทุกชุดข้อมูล พร้อมเล่นแล้ว ยังไม่พร้อมเล่น รันไทม์ %1$s @@ -2585,6 +2865,9 @@ เปิดใช้ความสำเร็จของ GOG ในการตั้งค่า Stores ไม่พบความสำเร็จ ตรวจสอบบันทึกเซสชัน ปลดล็อกความสำเร็จแล้ว + Mali (Venus): ปิด + Mali (Venus): เปิด + ไดรเวอร์บน %1$s ระบุ Vulkan %2$s แต่ Mali (Venus) ต้องการ Vulkan 1.2 ขึ้นไป (gamescope ไม่เริ่มทำงานบนเวอร์ชันที่เก่ากว่า) เซสชันจึงข้าม Venus แล้วใช้คู่ไดรเวอร์ PanVK แทน วาง อนาล็อกซ้าย อนาล็อกขวา @@ -2938,6 +3221,7 @@ ตัวติดตั้ง VC++ และ DirectX ที่เกมต้องใช้ รันเกม Linux x86 เครื่องมือ Steam + Steam ดาวน์โหลดรายการนี้ให้เกมที่มีระบบป้องกันการโกง แม้ระบบนั้นจะถูกปิดอยู่ก็ตาม การลบออกจะทำให้การติดตั้งเกมเหล่านั้นค้างอยู่ที่ 0% DroidDeck รันเกมได้โดยไม่ต้องใช้รันไทม์นี้ Proton x86 ซึ่ง DroidDeck รันไม่ได้ ค่าเริ่มต้นสำหรับทุกเกม @@ -3048,6 +3332,8 @@ DroidDeck · %1$d fps 60 fps ลื่นกว่าแต่ใช้ CPU มากขึ้นระหว่างที่ Steam กำลังเริ่ม วิดีโอที่เลือกในการตั้งค่าของ Steam เองจะแสดงที่นี่ด้วย เสียง + ข้ามวิดีโอเริ่มต้น + ใช้คลิปสีดำความยาว 0.1 วินาทีเป็นวิดีโอเริ่มต้นของ Steam มีผลในเซสชันถัดไป วิดีโอของคุณเอง MP4, MOV, MKV หรือ WebM รูปแบบอื่นและไฟล์ที่ใหญ่กว่า %1$d MB จะถูกแปลงเป็น WebM 720p บนอุปกรณ์ ความยาวไม่เกิน %2$d วินาที นำเข้า @@ -3509,6 +3795,7 @@ ให้ Alt+Tab ปุ่ม Win และปุ่มโฮมทำงานในเซสชัน DroidDeck ที่ใช้งานอยู่แทน Android เปิดความสว่างในการตั้งค่า → การผสานรวม Steam บริดจ์ Mali: ปิด + %1$s ใช้บริดจ์ Mali ไม่ได้ (ต้องการ GPU Mali ที่ยังไม่มีเส้นทางไดรเวอร์ระบบ) สวิตช์นี้จึงไม่มีผลบนเครื่องนี้ บริดจ์ Mali: เปิด %1$s ไม่ใช่ Adreno บริดจ์ Vulkan รุ่นทดลองเปิดอยู่: เซสชันวาดผ่านไดรเวอร์ของโทรศัพท์เอง อาจพบบั๊ก โปรดส่งบันทึกของเซสชัน โหมดปลอดภัย @@ -3667,6 +3954,7 @@ ไม่สามารถนำเข้าการจัดวางนี้ได้ หิมะสีแดงชาด + พื้นผิวสีขาวมีสีแดงเป็นสีเน้น ซาวด์แทร็ก เพลง @@ -3730,4 +4018,6 @@ เล่นซ้ำหนึ่งเพลง ระดับเสียง ไม่พบไฟล์เสียงในซาวด์แทร็กนี้ + ไม่สามารถเปิดได้ + ไม่มีเว็บเบราว์เซอร์ที่เปิดลิงก์นี้ได้ diff --git a/app/src/main/res/values-tr/input_library.xml b/app/src/main/res/values-tr/input_library.xml new file mode 100644 index 0000000000..12d264ee81 --- /dev/null +++ b/app/src/main/res/values-tr/input_library.xml @@ -0,0 +1,132 @@ + + + Okunamayan giriş ayarları bir kurtarma kopyasında saklandı. Geri yüklenen profilleri düzenlemeye devam edebilirsiniz. + Özellikler + Tıklama özellikleri + %1$s · Tıklama + Düğmeler + Çubuklar, pedler ve tetikler + Araçları gizle + Denetleyici + Denetleyici girişini Steam Input\'a veya oyuna gönder. + Bu öğe denetleyici, fare veya klavye girişi göndermez. + Fare tıklaması + DroidDeck eylemi + Eylem + Kaydırma hızı: %1$d adım/sn + + Yeni profil + + Yeni düzen + %1$s · %2$d profil tarafından kullanılıyor. Değişiklikler bu atamaları kullanan her profile uygulanır. + Yeniden adlandır + Sil + Eylemlerini atamadan önce düzene öğe ekleyin. + Giriş ayarları kaydedilemedi + Ad + Şuradan başla + Düğme + Çubuk + Dokunmatik yüzey + Yön tuşları + Tetik + Bitti + Geri al + + Ekle + Taşımak için sürükleyin. Boyutlandırmak için bir köşeyi sürükleyin. Eylem atamak için Özellikler\'e dokunun. + İkincil ekranda düzenleniyor + Seçilen ekran kullanılamıyor. Bu düzeni gerçek boyutunda düzenlemek için ekranı bağlayın. + Kaydedilmemiş düzen değişiklikleri atılsın mı? + Bu düzen %1$d profil tarafından kullanılıyor. Kaydedilen değişiklikler hepsine uygulanır. + Varsayılan profiller + Masaüstü modu + Oyun modu + Masaüstü ve oyun için varsayılan + Oyun modu için varsayılan + Masaüstü modu için varsayılan + Cihaz ayarları + Kontroller + Düğmeler, çubuklar, tetikler ve ek tuşlar + Profili kopyala + Eylemleri sıfırla + %1$s içindeki eylemler temel profil varsayılanlarına sıfırlansın mı? Düzenler ve diğer profiller değişmez. + %1$s silinsin mi? Onu kullanan modlar yerleşik varsayılan profillerine döner. Kaydedilen düzenler ve paylaşılan ayarlar kullanılabilir kalır. + Görünürlük + Tüm profillere uygulanır. Auto, oyun modunda denetleyici bağlı değilken ana ekran kontrollerini gösterir. + Ekranda düzenle + Kaydedilen düzenler… + Bir düzen seçin veya kendinizinkini oluşturun + İkincil ekran oturum menüsünde Profil kontrollerini seçin. Denetleyici menüsündeki Profil ve İkincil ekran seçicileri hangi kontrollerin gösterileceğini belirler. + Düğme eylemleri + %1$s ile paylaşılıyor. Düzenlemeler o profillere de uygulanır. + Ayarları yeniden kullan + Şuradan ayarları kullan… + Başka bir profilden kopyala veya ayarları paylaşımlı tut + Bağımsız yap + Mevcut kurulumu koru ve değişiklikleri paylaşmayı bırak + Düzenler öğeleri ve konumlarını saklar. Her profil kendi eylemlerini atayabilir. Hedef ekranda tam boyutta düzenleyin. + Geçerli düzen + Kullanılmayan %1$s düzeni ve kaydedilmiş eylemleri silinsin mi? + Geçerli düzeni yeniden adlandır + %1$s öğesini başka bir profilden yeniden kullan. Diğer kontrol kaynakları değişmez. + Fiziksel kontrolleri paylaşımlı tut + Varsayılan olarak tüm kontroller ve özel düzenler bağımsız kopyalardır. Paylaşım yalnızca fiziksel kontrolleri bağlar. + Bu öğeleri ve konumları kullan. Paylaşım gelecekteki geometri değişikliklerini eşitler; düğme eylemleriniz bağımsız kalır. Farklı bir düzen atanmamış eylemlerle başlar. + Bu kontrolleri ve eylemleri kopyala veya gelecekteki değişiklikler iki profile de uygulanacak şekilde bağla. + Paylaşımlı tut + Bağımsız kopya + Çubuğu dokunma noktasında başlat + Kullanılmadığında çubuğu gizle + Araçlar + Otomatik (%1$s) + Özel (%1$s) + Yeni profil olarak kaydet + Profil kontrolleri + Profil + Fare dokunmatik yüzey hareketleri + Fare işaretçisine atandığında: tıklamak için dokunun, sürüklemek için basılı tutun ve iki parmakla kaydırın. + %1$s için hızlı menü geçersiz kılması var. Varsayılan profilini ve üç kayıtlı bölümünü kullanmak için orada Otomatik seçin. + DroidDeck girişi + Çubuk herhangi bir yöne hareket ettirildiğinde basılı tutulur: %55 üzerinde basılır, %35 altında bırakılır. Her yönü ayrı atamak için Yön tuşlarını kullanın. DroidDeck komutları her sapma için bir kez çalışır. Çubuk tıklaması ayrıca yapılandırılır. + Dokunmatik yüzeye dokunulduğunda basılı tutulur; parmağınızı kaldırdığınızda bırakılır. DroidDeck komutları her dokunuş için bir kez çalışır. Dokunmatik yüzey tıklaması ayrıca yapılandırılır. + Tetik %55 i geçtiğinde basılı tutulur; %35 altında bırakılır. DroidDeck komutları her basış için bir kez çalışır. + Kaydırma yönü + Dikey + Yatay + Yatay kaydır + Ölçümler + Kaydı açın, çalışan bir oturumda kontrolleri kullanın, sonra dönüp sonuçları okuyun. Yalnızca DroidDeck gönderme süresini ölçer, ekran gecikmesini değil. Kayıt, uygulama süreci kapanınca sona erer. + %1$d kontrol + Diğer kayıtlı düzenler (%1$d) ▾ + Diğer kayıtlı düzenleri gizle (%1$d) ▴ + Ana sayfa / Guide + Geri · tek dokunuş + Geri · çift dokunuş + Geri · Steam\'de iki kez, masaüstünde bir kez + Steam modunda. Geri tuşunu basılı tutmak hızlı erişimi de açar. + Varsayılana sıfırla + Panel seçiminiz hatırlanır. Masaüstü ikinci bir çalışma alanı açar; oturumu veya giriş profilini değiştirmez. + Sanal denetleyici + Steam veya oyunun gördüğü denetleyici türü. + Dokunmatik ekran + Oyun ekranındaki dokunuşların nasıl işlendiği. Profil düğmeleri atanmış eylemlerini korur. + Dokunma imleci + Oyun ekranındaki doğrudan dokunuşlar için işaretçi göster. + Dokun ve tut + Oyun ekranında parmağınızı tutarken fare eylemi. + Geri düğmesi dokunuşları + İlk eylem: tek dokunuş. İkinci eylem: çift dokunuş. + Aç/kapa düğmesi + Basılı tutmak için dokunun, bırakmak için tekrar dokunun. Menü açmak veya profil değiştirmek düğmeyi bırakır. + Şekil + Yuvarlatılmış + Kapsül + Daire + Dikdörtgen + Düğme etiketi + Metin + İçe aktarılan görsel + Ayrı çapraz tuşlar + Her çapraza bir tuş atayın. Boş çapraz, iki komşu yönüne basar. + Komşu yönler + Eski ekran tuşlarınız aşağıda içe aktarılmış profiller olarak kaydedildi. Kullanmak veya düzenlemek için birini seçin. Geçerli profil seçimleriniz korundu. + Eski ekran tuşları otomatik olarak içe aktarılamadı. Özgün ayarlar korundu. + diff --git a/app/src/main/res/values-tr/input_strings.xml b/app/src/main/res/values-tr/input_strings.xml new file mode 100644 index 0000000000..1a3fa61cad --- /dev/null +++ b/app/src/main/res/values-tr/input_strings.xml @@ -0,0 +1,38 @@ + + + Giriş profilleri + Profiller + Fiziksel denetleyici + Ana ekran + İkincil ekran + Yerel / Steam Input + Yerel: %1$s + Başka bir denetleyici denetimi gönder + Devre dışı + Tuş veya tuş bileşimi + Yön tuşları + İşaretçiyi taşı + İşaretçi hızı: %1$d + Kaydır + Dikey kaydır + Fare sol düğmesi + Fare sağ düğmesi + Fare orta düğmesi + DroidDeck menüsünü aç + Klavyeyi göster + Steam menüsünü aç + Steam hızlı erişimini aç + Denetimi kaldır + Denetim ekle + Cihaza özel düğmeler + Fiziksel düğme ata + Düğmeyi bırakın, ardından Düzenle, Yeniden dene veya İptal seçin. B veya Geri, bıraktıktan sonra iptal eder. + Yeniden dene + Bir düğmeye basın; klavye tuşu olarak bildirilen Geri düğmesi de dahil. Ses ve Android sistem tuşları ayrılmıştır. Atama yalnızca bu cihaz için geçerlidir. + Atamayı kaldır + Giriş tanılama + Giriş gönderme süresini kaydet + Ölçümleri oku + Android\'den mevcut giriş aktarımına yayına kadar ölçer. Bluetooth varışı, konuk yoklaması, oluşturma ve ekran gecikmesi hariçtir. Kayıt varsayılan olarak kapalıdır. + Normal giriş atamasını kullan + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 6540c78ea2..33e9152668 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -185,6 +185,7 @@ PowerVR grafik ortamı indirilemedi. Bağlantıyı kontrol edip tekrar deneyin. DirectAudio indirilemedi, bu yüzden oyun sesi bu oturumda daha yavaş yolu kullanıyor. Bu program + Oturum ekrana görüntü çizemedi: %1$s. Bu ekran, siyah bir ekran yerine nedenini gösteriyor; ayrıntılar oturum günlüklerinde. 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. @@ -387,6 +388,9 @@ Burada henüz desteklenmiyor Bileşenler yükleniyor… Yüklenemedi: %1$s + Bu indirme güncellenmeli. + Güncelleme sıraya alındı. + Güncellemeyi yeniden dene İndirildi %1$s indiriliyor Yükleniyor: %1$s @@ -417,6 +421,22 @@ Yalnızca dahili Klasör: %1$s İkinci kütüphane + Ek Steam kitaplıkları + Steam üzerinden oyun yüklenip oynatılabilen klasörler; her biri kendi adıyla listelenir. Birini kaldırmak oyunlarını diskte bırakır. + Kitaplık ekle + Yeniden adlandır + Kitaplık adı + Kitaplık için bir klasör seçin + En fazla %1$d kitaplık eklenebilir + Bu klasör zaten bir kitaplık ya da bir kitaplığın içinde yer alıyor + %1$s · kullanılamıyor + Sonraki Steam oturumundan itibaren geçerli + Bu cihazda bulundu · %1$s · %2$s + Ekle + Dahili depolamadaki kitaplıkları bul + DroidDeck, diğer uygulamaların dahili depolamada sakladığı Steam kitaplıklarını görebilsin diye tüm dosyalara erişim izni verin. + İzin ver + %1$s eklendi: seçtiğiniz klasörün içindeki Steam kitaplığı Varlıkları SD karttan veya paylaşılan depolamadan akışla yükleyen oyunlarda takılmalar olabilir. Depolama tanılaması Ayırma sonuçlarını ve örneklenmiş depolama sürelerini “Günlükleri paylaş” çıktısına ekler. Açıkken yüklemeleri yavaşlatabilir. Sonraki oturumda uygulanır. @@ -605,7 +625,10 @@ Proton\'un her oyunda CPU harcayan kumandayla gezinme yardımcısını kapatır. proot\'u seccomp olmadan çalıştır Bazı çekirdeklerde eksik sistem çağrısı hatalarını düzeltebilir. Performansı düşürebilir. + proot olmadan çalıştır (deneysel) + Linux tarafını doğrudan Android üzerinde başlatır. Sonraki oturumda geçerli olur. Bir şey başlatılamazsa kapatın. proot hızlı yolu + proot olmadan kullanılmaz. proot\'un seccomp filtresi gerekir. Daha hızlı dosya aramaları ve daha az takılma. Bir program dosyalarını bulamıyorsa kapatın. İmleci gamescope içinde çiz @@ -815,6 +838,7 @@ Cihaz destekleniyor Test edilmemiş GPU GPU desteklenmiyor + Mali köprüsü üzerinden GPU %1$s · %2$s %1$s: %2$s %1$s için uyumlu bir grafik arka ucu yok. Steam siyah ekran gösterebilir. @@ -844,15 +868,38 @@ Oturum Oturum günlükleri Her oturumdan sonra kaydedilir + Sonraki oturum için gelişmiş tanılama + Bir oturum için ayrıntılı günlükler kaydeder. Performansı düşürebilir ve daha fazla depolama alanı kullanabilir. Oturum başladığında kendiliğinden kapanır; paylaşmadan önce günlükleri inceleyin. Oyun hata ayıklama günlükleri Sonraki oyun başlatmada Proton, Wine ve grafik tanılamalarını ekler. Performansı düşürebilir ve daha fazla depolama kullanabilir. Oyun hata ayıklama günlüklerini kaydetmek için bu oturumu yeniden başlatın Günlük kaydı güncellenemedi. Anahtarı kontrol edip tekrar deneyin. Hata ayıklama araçları + Ayrıntılı grafik günlükleri + Steam arayüzü: GPU ile çizim + Xclipse sürücü ikilisi kullanıldığında Steam, sayfalarını yazılımla çizer (GPU ile çizimde bozuk döşemeler görüldü). Bu telefonda düzgün görünüyorsa daha hızlı bir Steam arayüzü için açın. + %1$s tarihinde derlendi + %1$s en yeni derlemeye güncellendi + Mali köprüsü son oturumda %1$s üzerinde kendi kendini testini geçemedi (görüntüler veya çizimler), bu nedenle oturum yerine PanVK sürücü çiftini kullandı. + Mali köprüsü son oturumda %1$s üzerinde sürücüyle bellek paylaşmanın bir yolunu bulamadı, bu nedenle oturum yerine PanVK sürücü çiftini kullandı. Köprü bu telefonda çalışamaz; kapatmak PanVK çiftini korur. + Her oyunun Proton, DXVK ve sürücü günlükleri oturumun günlüklerinde yer alır. GPU bir Adreno değilse her zaman açıktır. Son oturum günlükleri Kayıtlı oturum günlükleri En yeni %1$d tanesini saklar Günlükleri temizle + Kullanılabilir oturum günlükleri + Henüz kaydedilmiş oturum günlüğü yok. + Paylaşılan ve kaydedilen ZIP dosyaları, seçili oturumun yanı sıra ilgili Steam, mağaza, araç ve Battle.net tanılama verilerini içerir. + %1$s · %2$s + Geçerli oturum + Paylaş + Cihaza kaydet + Sil + Oturum günlükleri silinsin mi? + %1$s silinsin mi? Bu işlem geri alınamaz. + Oturum günlükleri kaydedildi. + Oturum günlükleri kaydedilemedi. + Oturum günlükleri silinemedi. Çevrimdışı mod Önce Steam\'de oturum açın Başlatıcı @@ -871,6 +918,8 @@ Ana ekran olarak kullan DroidDeck ana ekran uygulaması olabilir DroidDeck hiçbir zaman ana ekran uygulaması olarak sunulmaz + Ana ekran tuşunun açtığı sayfa + DroidDeck Ana ekran uygulamasıyken Ana ekran tuşuna bastığınızda gösterilen sayfa Oyun Ekle bölümünde DroidDeck\'i Dahil Et olarak ayarlayın Yön Başlatıcı yönü @@ -884,15 +933,22 @@ Tam ekran Android durum ve gezinme çubuklarını gizler Android durum ve gezinme çubuklarını gösterir + Çift ekranlı başlatıcı + Otomatik, yerleşik ikinci ekranı olan el konsollarında başlatıcı bölümlerini (Steam, Kitaplık, Mağazalar ve diğerleri) ikinci ekrana yerleştirir. Açık, herhangi bir ikinci ekranı kullanır. Kapalı, başlatıcıyı tek ekranda tutar. + Çift ekranlı oturumlar + Otomatik, oyun içi menüyü açılır pencere yerine yerleşik ikinci ekrana sabitler. Açık, herhangi bir ikinci ekranı kullanır. Kapalı, menüyü oyun ekranında tutar; yine de menüden ikinci bir ekran seçebilirsiniz. Otomatik Açık Kapalı Oyunlarda alt ekran kontrolleri + Metin alanları için Android klavyesi Bir oturum başladığında ikinci ekranda dokunmatik yüzeyi ve klavyeyi açar. Üst ekran için yazılıyor Bitti Varsayılan ana ekran uygulaması Ana ekran uygulaması seçin + Boştayken başlatıcıyı Son kullanılanlardan gizle + Yalnızca DroidDeck varsayılan Ana ekran uygulamasıyken ve hiçbir oturum çalışmıyorken geçerlidir. Seç Linux uygulamaları (beta) Dosyalar @@ -1007,6 +1063,147 @@ Test derlemeleri Yayınlanmadan önce bir düzeltmeyi deneyin Şu anda yok + Deneysel derleme + Deneysel derlemeler + Kullanımda + Android, DroidDeck uygulamasını yeniden optimize ettikten sonra duraklatıldı + Yüklenmedi: %1$s + Yeniden başlatma bekleniyor + Korundu + Başka bir sürüm için + Yeniden derle + Bu derlemeyi cihazdan siler + Bu derlemeyle yeniden başlat + Kapat + Kullan + Sil + Şimdi sil + Yeniden başlatma hazırlanamadı: %1$s. Ayarlar bölümünde kablosuz hata ayıklamayı eşleştirip yeniden deneyin. + Deneysel derleme yüklendi + DroidDeck, %1$s ile yeniden başlatıldı + Lab derlemesi duraklatıldı + Android, DroidDeck\'i yeniden optimize ettiği için %1$s yüklenmedi. Bu derlemeyle yeniden başlatmak için Güncellemeler\'i açın. + Lab derlemesi kapatıldı + DroidDeck\'in başka bir sürümü için derlendi. Güncellemeler\'de saklanıyor. + DroidDeck bu derlemeyle iki kez başlatılamadı + Ajan + Ajan + Ajan çalışıyor + Ajanı kullanmak için Claude Code\'u Linux kullanıcı alanına yükleyin. + Bir oyun, bir çökme ya da DroidDeck\'te bir değişiklik hakkında sorun + Gönder + Yeni sohbet + Durdur + Depolama + Kaldır + Şimdi kaldır + Claude Code + Codex + DroidDeck kaynak kodu + İndirme önbellekleri + Gönderilmeyen değişiklikler kaybolur + Derlemeler bunları yeniden indirir + Kurulum bunu yeniden yükleyebilir; oturum bilgileri korunur + DroidDeck, Lab derlemenizle yeniden başlatıldı. Kaldığınız yerden devam edin. + Bir oyunun neden açılmadığını sorun, bir günlüğü açıklamasını isteyin ya da DroidDeck\'i değiştirip değişikliği bu cihazda denemesini isteyin. + Başarısız: %1$s + %1$s sonlandı (çıkış %2$d) + Durduruldu + Yanıt vermeden sonlandı + Yeniden dene + Ajan kuruluyor + %1$s Lab derlememi yüklü DroidDeck sürümü için yeniden derle ve bu derlemeyle yeniden başlat. + %1$s giriş · %2$s çıkış + Düşünüyor + Düşünce + Düşünüyor · %1$s + %1$s · %2$s + GİRDİ + ÇIKTI + Çalışıyor… + Sonuç yok: tur önce sona erdi + Çıktı yok + Sonraki mesajı sıraya almak için yazın + Sıraya ekle + Sıradaki: %1$s + Gönderme + Ekle + Kaldır + Varsayılan + Akıl yürütme çabası + Devam et + Revize et + Henüz bir şey değişmedi + Planla devam et. + Şimdi gönder + Mesaj + Diğer + Kapat + En son + Çalışıyor + Bağlam + %1$s / %2$s + Bu konuşma · %1$s + Kullanım ilk yanıttan sonra görünür + %1$d saatlik sınır + %1$d dakikalık sınır + Haftalık sınır + %1$d%% · %2$s sıfırlanır + + %1$d dosya + %1$d dosya + + Önce planla + Plan + Hiçbir şeyi değiştirmeden bir plan önerir + Konuşmalar + Henüz konuşma yok + Az önce + Sil + Konuşmayı ve eklerini siler + Süreçler + Linux kullanıcı alanında hiçbir şey çalışmıyor + AJAN + Durdur + Lab derlemesi + Lab derlemeleri hazırlanıyor + %1$d%% · yaklaşık %2$s kaldı + yaklaşık %1$s kaldı + İptal + Derlemeyi iptal et + Başlatılıyor + %1$d%% + Paketleniyor + DroidDeck üzerinde yeniden başlatılıyor + Tamamlandı + Başarısız: %1$s + Ajanı kur + Önce Kurulum\'da Linux çalışma zamanını yükleyin. + Yeniden dene + Sohbete başla + Cihaz bağlantısı + Kablosuz hata ayıklama; ajan DroidDeck\'i görüp yönetebilsin diye + %1$s yükle + git, gh ve adb ile Linux kullanıcı alanına + %1$s hesabına giriş yap + Tarayıcınızı açar + GitHub + İsteğe bağlı, pull request açmak için + Derleme araçları + İsteğe bağlı, bu cihazda Lab derlemeleri için · yaklaşık 5 GB + Aracı hazır + Aracı kurulumunu tamamla + %1$s hesabına giriş yapıldı + Lab derlemeleri + hızlı derlemeler + Hızlı Lab derlemeleri + Bu sürümü önceden derler, böylece Lab derlemeleri dakikalar sürer · tek seferlik yaklaşık 20 dakika + Derleniyor · %1$d%% · yaklaşık %2$s kaldı + Hazırla + Kablosuz hata ayıklamaya ulaşılamıyor; Eşleştir ile açılır + Eşleştir + Yükle + Giriş yap PR #%1$d Bu DroidDeck kopyası için derlenmedi Güncellendi %1$s @@ -1246,6 +1443,14 @@ Uygulamalar Kurulum Güncellemeler + Diğer + Sekmeleri düzenle + Sekmeler + Görünür + Diğer\'de + Gizli + %1$s sekmesini yukarı taşı + %1$s sekmesini aşağı taşı %%%1$d Devam et: %1$s Her oturumda /root/ROMs olarak görünür. Dahili depolama /root/Storage konumundadır. @@ -1267,6 +1472,15 @@ Sıradakini iptal et Android klavyesi Gizle ✕ + Ekrandaki boyut + Başlık dahil, klavyenin ekranda kapladığı oran. + Opaklık + Klavyenin arkasındaki oyunu görmek için azaltın. + Gizli tuşlar + Az kullandığınız tuşlar klavyede gösterilmez. + Esc ve işlev tuşları sırası + Ins / Del / Home / End / PgUp / PgDn + Ok tuşları Başlat: %1$s Bir ekran seçin. İkincil: %1$s. İkincil ekran artık kullanılamıyor. @@ -1768,7 +1982,24 @@ Terminal Deck tutamakları + dokunmatik yüzeyler Gösterge paneli + Masaüstü + Masaüstünü başlat + Masaüstü · %1$s + Dokunmatik yüzey + Doğrudan dokunma + Dokunmatik yüzey. Doğrudan dokunmaya geçmek için dokun + Doğrudan dokunma. Dokunmatik yüzeye geçmek için dokun + KDE masaüstü başlatılıyor… + Masaüstü kapandı. + Masaüstü başlatılamadı. Günlükleri bu oturumun bottom-desktop klasöründe. + Masaüstü kapalı. Burada henüz gösterilecek bir şey yok. + Ekranları değiştir + Alt ekran şu anda boş değil + Oyun ekranı + Oyunun gösterileceği ekran + Üst ekran + Alt ekran İndirmeler Devam eden indirme yok. Steam @@ -1803,6 +2034,20 @@ Yakıt, t Ana %1$s t Yedek %1$s t + Kare süresi + son %1$d sn + ort. kare + En düşük yüzde 1 + 33 ms üzeri kareler + %1$d / dk + %1$s süredir oynanıyor + %1$d çekirdek, en fazla %2$s GHz + %1$d çekirdek + oyun + %1$d Hz\'de FPS + Kırmızı işaret, sıcaklığın HUD üzerinde kırmızı göründüğü yerdir. + tüm cihaz + pil Gösterge verilerini gönder Otomatik Sonradan bulunanlar dahil, burada listelenen her oyun için açar. Kapattığınız oyunlar kapalı kalır. @@ -1826,6 +2071,10 @@ Bu oyun için mikrofon kapalı. Konuşmak için DroidDeck\'in Steam ayarlarında (Ses) Mikrofon\'u açın ve oyunu yeniden başlatın. Ses düzeyi %1$d%% Oyun içi istatistikler + Alt ekrandaki HUD + Her sekmede şerit + En düşük yüzde 1 ve 0,1 + CPU sıcaklığı FPS CPU GPU @@ -1998,6 +2247,7 @@ Oturum başlatılıyor… %1$d:%2$02d geçti · hâlâ çalışıyor Steam istemcisi güncellemesi indiriliyor · %1$d%% + Steam istemcisi güncellemesi uygulanıyor… Steam istemcisi indiriliyor · %1$s Zaten çalışan bir uyumluluk aracı yüklemesi var @@ -2074,11 +2324,29 @@ Çizgi film konturları ve keskinleştirme. Adreno GPU değil + Sistem PowerVR sürücüsü: uyumluluk cihaza göre değişir + Deneysel: RADV veya sistem Xclipse sürücüsü + Sistem PowerVR + Bu GPU için yerleşik sürücüleri kullanır + Çalışma zamanı ve ekran için sistem PowerVR sürücüsü seçili. + Bu Mali modelini henüz açık kaynaklı bir sürücü desteklemiyor: Mali köprüsü açık. + Bu, Snapdragon olmayan test sürümü: buradaki resmi sürümler yalnızca Adreno üzerinde çalışır, bu yüzden bunun üzerine kurulmaz. Yeni test sürümleri github.com/The412Banner/droiddeck-nonadreno-drivers adresinde. + Son oturum bir çökme yüzünden değil, Android bellek açmak için DroidDeck uygulamasını kapattığı için sona erdi. Diğer uygulamaları kapatın veya oyunun doku ayarlarını düşürün, ardından yeniden deneyin. + Mali (Venus) + Mali köprüsü + Bu Mali modelini henüz açık kaynaklı bir sürücü desteklemiyor: telefonun kendi sürücüsü üzerinde %1$s kullanılıyor. + %1$s henüz yayınlanmadı: yayınlanana kadar %2$s kullanılıyor. + %1$s kullanılamıyor ve bu telefonun sürücüsü Vulkan %2$s sürümünü bildiriyor (Venus için 1.2 gerekli): Mali köprüsü kullanılıyor. + %1$s henüz yayınlanmadı: yayınlanana kadar Mali köprüsü açık. + Sırada: %1$s (farklı bir çalışma zamanı sürücüsü bekleniyor) + DXVK, sistem PowerVR çalışma zamanı tarafından sağlanır. Diğer DXVK paketleri saklanabilir, ancak bu sürücüyle uygulanmaz. Destekleniyor Deneysel: sürücüleri test derlemeleri Deneysel Adreno 850 desteği: uyumlu deneysel ekran ve oyun sürücüleri gerekir; bu cihazda doğrulanmadı Test edilen donanımın altında (Adreno 725 ve daha yenisi): çalışmayabilir Desteklenmiyor: bu GPU için uyumlu bir grafik arka ucu yok + Telefonun kendi Vulkan sürücüsü üzerinde, Mali köprüsü aracılığıyla çalışır + Mali köprüsü kapalıyken desteklenmez: Turnip, Adreno (Snapdragon) GPU gerektirir GitHub\'ın hız sınırına ulaşıldı - daha sonra yeniden deneyin GitHub HTTP %1$d yanıtı verdi @@ -2279,6 +2547,13 @@ Sırala Kenar çubuğu etiketleri Kenar çubuğu simgelerinin altında adları gösterir. Daha ince bir kenar çubuğu için kapatın. + Ajan evcil hayvanı + DeeDee başlatıcının ve oyunların üzerinde görünür; ajanın ne yaptığını gösterir. + Diğer uygulamaların üzerinde + DeeDee\'nin her uygulamanın üzerinde görünmesine ve sohbetini orada açmasına izin ver + İzin ver + DeeDee + DeeDee ile sohbet et Görünüm Daha büyük kartlar Daha küçük kartlar @@ -2563,6 +2838,11 @@ Geliştirici Derleme etiketi filigranı Test veya Lab derlemesinin etiketini ekranda gösterir. Varsayılan olarak açıktır. + Tanılama paketlerini paylaş + Oturum ve cihaz + Grafikler + Oyunlar ve uyumluluk + Tüm paketler Oynamaya hazır Henüz oynamaya hazır değil çalışma ortamı %1$s @@ -2601,6 +2881,9 @@ Mağaza ayarlarında GOG başarımlarını aç Başarımlar kullanılamıyor; oturum günlüklerini kontrol et Başarımın kilidi açıldı + Mali (Venus): kapalı + Mali (Venus): açık + %1$s üzerindeki sürücü Vulkan %2$s sürümünü bildiriyor. Mali (Venus) için Vulkan 1.2 veya üzeri gerekir (daha eski sürümlerde gamescope başlamaz), bu yüzden oturumlar Venus yerine PanVK sürücü çiftini kullanır. Yapıştır Sol analog çubuk Sağ analog çubuk @@ -2967,6 +3250,7 @@ Oyunların istediği VC++ ve DirectX yükleyicileri Linux x86 oyunlarını çalıştırır Steam aracı + Steam, anti-cheat ile gelen oyunlar için bunu anti-cheat kapalıyken de indirir. Kaldırırsanız bu oyunların kurulumu 0% noktasında takılır. DroidDeck oyunları bu çalışma zamanı olmadan çalıştırır x86 Proton, DroidDeck bunu çalıştıramaz Her oyun için varsayılan @@ -3077,6 +3361,8 @@ DroidDeck · %1$d fps 60 fps daha akıcı görünür ama Steam açılırken işlemciyi daha çok kullanır. Steam\'in kendi ayarlarında seçilen bir video da burada görünür. Ses + Açılış videosunu atla + Steam\'in açılış videosu olarak 0,1 saniyelik siyah bir klip kullanılır. Sonraki oturumda geçerli olur. Kendi videon MP4, MOV, MKV veya WebM. Diğer biçimler ve %1$d MB üzeri dosyalar cihazda 720p WebM\'e dönüştürülür, en fazla %2$d saniye. İçe aktar @@ -3538,6 +3824,7 @@ Alt+Tab, Win tuşu ve Ana Ekran düğmesini Android yerine etkin DroidDeck oturumunda tutar. Kurulum → Steam entegrasyonu bölümünde Parlaklık\'ı açın Mali köprüsü: kapalı + %1$s Mali köprüsünü kullanamaz (sistem sürücüsü yolu olmayan bir Mali GPU gerekir), bu yüzden bu anahtarın burada etkisi yok. Mali köprüsü: açık %1$s bir Adreno değil. Deneysel Vulkan köprüsü açık: oturum, telefonun kendi sürücüsü üzerinden çizer. Hatalar olabilir; oturum günlüklerini gönderin. Güvenli mod @@ -3697,6 +3984,7 @@ Bu düzen içe aktarılamadı Kızıl Kar + Kırmızı vurgulu beyaz yüzeyler. Oyun müzikleri Müzik @@ -3760,4 +4048,6 @@ Birini tekrarla Ses düzeyi Bu oyun müziğinde ses dosyası yok + Başlatma kullanılamıyor + Bu bağlantıyı açmak için kullanılabilir bir web tarayıcısı yok. diff --git a/app/src/main/res/values-uk/input_library.xml b/app/src/main/res/values-uk/input_library.xml new file mode 100644 index 0000000000..c00c0b1a39 --- /dev/null +++ b/app/src/main/res/values-uk/input_library.xml @@ -0,0 +1,132 @@ + + + Нечитні налаштування введення збережено в резервній копії. Ви можете далі редагувати відновлені профілі. + Властивості + Властивості натискання + %1$s · Натискання + Кнопки + Стіки, тачпади й тригери + Сховати інструменти + Контролер + Надсилати введення контролера в Steam Input або гру. + Цей елемент не надсилає введення контролера, миші чи клавіатури. + Натискання миші + Дія DroidDeck + Дія + Швидкість прокрутки: %1$d кроків/с + + Новий профіль + + Нове компонування + %1$s · Використовується профілями: %2$d. Зміни застосовуються до кожного профілю з цими прив\'язками. + Перейменувати + Видалити + Додайте елементи до компонування, перш ніж призначати їм дії. + Не вдалося зберегти налаштування введення + Назва + Почати з + Кнопка + Стік + Тачпад + Хрестовина + Тригер + Готово + Скасувати + + Додати + Перетягніть, щоб перемістити. Потягніть за кут, щоб змінити розмір. Торкніться «Властивості», щоб призначити дію. + Редагування на другому екрані + Вибраний екран недоступний. Підключіть його, щоб редагувати це компонування в реальному розмірі. + Відхилити незбережені зміни компонування? + Це компонування використовується профілями: %1$d. Збережені зміни застосуються до всіх. + Профілі за замовчуванням + Режим робочого столу + Ігровий режим + За замовчуванням для робочого столу й гри + За замовчуванням для ігрового режиму + За замовчуванням для режиму робочого столу + Налаштування пристрою + Керування + Кнопки, стіки, тригери та додаткові клавіші + Копіювати профіль + Скинути дії + Скинути дії в %1$s до значень базового профілю? Компонування та інші профілі залишаться без змін. + Видалити %1$s? Режими, що його використовують, повернуться до вбудованого профілю за замовчуванням. Збережені компонування й спільні налаштування залишаться доступними. + Видимість + Застосовується до всіх профілів. Auto показує керування основного екрана, коли в ігровому режимі не підключено контролер. + Редагувати на екрані + Збережені компонування… + Виберіть компонування або створіть своє + Виберіть «Керування профілю» в меню сеансу другого екрана. Селектори «Профіль» і «Другий екран» у меню контролера визначають, яке керування показувати. + Дії кнопок + Спільний доступ із %1$s. Зміни застосуються й до цих профілів. + Повторно використати налаштування + Використати налаштування з… + Скопіювати з іншого профілю або залишити налаштування спільними + Зробити незалежним + Залишити поточне налаштування й припинити ділитися змінами + Компонування зберігають елементи та їхні позиції. Кожен профіль може призначати власні дії. Редагуйте в повному розмірі на цільовому екрані. + Поточне компонування + Видалити невикористане компонування %1$s та його збережені дії? + Перейменувати поточне компонування + Повторно використати %1$s з іншого профілю. Інші джерела керування залишаться без змін. + Залишити фізичне керування спільним + За замовчуванням усі елементи керування й користувацькі компонування — незалежні копії. Спільний доступ пов\'язує лише фізичне керування. + Використати ці елементи й позиції. Спільний доступ синхронізує майбутні зміни геометрії; дії кнопок залишаться незалежними. Інше компонування починається з непризначеними діями. + Скопіювати ці елементи керування й дії або зв\'язати їх, щоб майбутні зміни застосовувалися до обох профілів. + Залишити спільним + Незалежна копія + Починати стік від точки дотику + Ховати стік, коли він не використовується + Інструменти + Авто (%1$s) + Користувацький (%1$s) + Зберегти як новий профіль + Керування профілю + Профіль + Жести тачпада миші + Якщо призначено вказівнику миші: торкніться для кліку, утримуйте для перетягування та прокручуйте двома пальцями. + Для %1$s задано перевизначення швидкого меню. Виберіть «Авто», щоб використати профіль за замовчуванням і всі три збережені частини. + Введення DroidDeck + Утримується, поки стік відхилено в будь-якому напрямку: натискання вище 55%, відпускання нижче 35%. Використовуйте «Клавіші напрямків», щоб призначити кожен напрямок окремо. Команди DroidDeck спрацьовують раз на відхилення. Натискання стіка налаштовується окремо. + Утримується, поки ви торкаєтесь тачпада; відпускається, коли піднімаєте палець. Команди DroidDeck спрацьовують раз на дотик. Натискання тачпада налаштовується окремо. + Утримується, коли тригер переходить 55%; відпускається нижче 35%. Команди DroidDeck спрацьовують раз на натискання. + Напрямок прокрутки + Вертикально + Горизонтально + Прокручувати горизонтально + Вимірювання + Увімкніть запис, використайте керування в запущеному сеансі, потім поверніться й прочитайте результати. Вимірюється лише час надсилання DroidDeck, без затримки екрана. Запис завершується, коли процес застосунку закривається. + Елементів керування: %1$d + Інші збережені компонування (%1$d) ▾ + Сховати інші збережені компонування (%1$d) ▴ + Домівка / Guide + Назад · одне натискання + Назад · подвійне натискання + Назад · двічі в Steam, один раз у робочому столі + У режимі Steam. Утримання «Назад» також відкриває швидкий доступ. + Відновити типове + Ваш вибір панелі запам\'ятовується. Робочий стіл відкриває другий робочий простір; він не перемикає сеанс або його профіль введення. + Віртуальний контролер + Тип контролера, який бачать Steam або гра. + Сенсорний екран + Як обробляються дотики на екрані гри. Кнопки профілю зберігають призначені дії. + Курсор дотику + Показувати вказівник для прямих дотиків на екрані гри. + Торкнутися й утримувати + Дія миші при утриманні пальця на екрані гри. + Натискання кнопки «Назад» + Перша дія: одне натискання. Друга дія: подвійне натискання. + Кнопка-перемикач + Торкніться, щоб утримувати, торкніться ще раз, щоб відпустити. Відкриття меню або зміна профілю відпускає кнопку. + Форма + Заокруглена + Капсула + Коло + Прямокутник + Підпис кнопки + Текст + Імпортоване зображення + Окремі клавіші діагоналей + Призначте клавішу кожній діагоналі. Порожня діагональ натискає два сусідні напрямки. + Сусідні напрямки + Ваші старі екранні клавіші збережено нижче як імпортовані профілі. Виберіть один, щоб використати або змінити. Поточні вибрані профілі збережено. + Старі екранні клавіші не вдалося імпортувати автоматично. Початкові налаштування збережено. + diff --git a/app/src/main/res/values-uk/input_strings.xml b/app/src/main/res/values-uk/input_strings.xml new file mode 100644 index 0000000000..665ae8d468 --- /dev/null +++ b/app/src/main/res/values-uk/input_strings.xml @@ -0,0 +1,38 @@ + + + Профілі введення + Профілі + Фізичний контролер + Головний екран + Додатковий екран + Власний / Steam Input + Власний: %1$s + Надіслати іншу команду контролера + Вимкнено + Клавіша або комбінація клавіш + Клавіші напрямків + Рухати вказівник + Швидкість вказівника: %1$d + Прокрутка + Прокрутка вертикально + Ліва кнопка миші + Права кнопка миші + Середня кнопка миші + Відкрити меню DroidDeck + Показати клавіатуру + Відкрити меню Steam + Відкрити швидкий доступ Steam + Видалити елемент + Додати елемент + Кнопки конкретного пристрою + Призначити фізичну кнопку + Відпустіть кнопку, потім виберіть «Редагувати», «Повторити» або «Скасувати». B або «Назад» скасовує після відпускання. + Повторити + Натисніть кнопку, зокрема «Назад», якщо вона передається як клавіша. Клавіші гучності та системні клавіші Android зарезервовані. Призначення діє лише на цьому пристрої. + Видалити призначення + Діагностика введення + Записувати час надсилання введення + Прочитати вимірювання + Вимірює шлях від диспетчеризації Android до публікації в наявному транспорті введення. Не враховує надходження через Bluetooth, опитування гостьової системи, рендеринг і затримку екрана. Запис вимкнено за замовчуванням. + Використовувати звичайне призначення введення + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0197150d07..bc0f9f4b83 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -185,6 +185,7 @@ Не вдалося завантажити графічне середовище PowerVR. Перевірте підключення й повторіть спробу. Не вдалося завантажити DirectAudio, тому в цьому сеансі звук ігор іде повільнішим шляхом. Ця програма + Сеанс не зміг вивести зображення на екран: %1$s. Замість чорного екрана тут показано причину; подробиці — у журналах сеансу. Не вдалося завантажити клієнт Steam. Можливо, ваша мережа або VPN блокує сервери Steam; перевірте з’єднання та спробуйте ще раз. Не вдалося налаштувати клієнт Steam. Перевірте з’єднання та вільне місце, потім спробуйте ще раз. %1$s зібрано для ПК x86; для запуску потрібен FEX, який ще не встановлено. Один раз запустіть Steam, увійшовши в обліковий запис, дайте йому завантажити FEX і Steam Linux Runtime, а потім запустіть це знову. @@ -389,6 +390,9 @@ Тут поки не підтримується Завантаження компонентів… Не вдалося встановити: %1$s + Для цього завантаження потрібне оновлення. + Оновлення в черзі. + Повторити оновлення Завантажено Завантаження %1$s Установлення: %1$s @@ -419,6 +423,22 @@ Лише внутрішня пам’ять Папка: %1$s Друга бібліотека + Додаткові бібліотеки Steam + Папки, в які Steam може встановлювати ігри та з яких може їх запускати, кожна під власною назвою. Після видалення папки її ігри залишаються на диску. + Додати бібліотеку + Перейменувати + Назва бібліотеки + Виберіть папку для бібліотеки + Не більше %1$d доданих бібліотек + Ця папка вже є бібліотекою або міститься в іншій + %1$s · недоступна + Діє з наступного сеансу Steam + Знайдено на цьому пристрої · %1$s · %2$s + Додати + Знайти бібліотеки у внутрішньому сховищі + Дозвольте доступ до всіх файлів, щоб DroidDeck міг бачити бібліотеки Steam, які інші програми зберігають у внутрішньому сховищі + Дозволити + Додано %1$s — бібліотеку Steam у вибраній папці Ігри, які підвантажують ресурси з SD-карти або спільного сховища, можуть працювати ривками. Діагностика сховища Записує результати виділення місця та вибіркові заміри швидкості сховища в «Поділитися журналами». Поки ввімкнено, встановлення може сповільнюватися. Застосовується в наступному сеансі. @@ -609,7 +629,10 @@ Вимикає помічник Proton для навігації геймпадом, який споживає ресурси CPU в кожній грі. Запускати proot без seccomp Може усунути помилки відсутніх системних викликів на деяких ядрах. Може знизити продуктивність. + Запуск без proot (експериментально) + Запускає середовище Linux безпосередньо на Android. Діє з наступного сеансу. Вимкніть, якщо щось не запускається. Швидкий шлях proot + Не використовується без proot. Потребує фільтра seccomp у proot. Швидший пошук файлів і менше запинок. Вимкніть, якщо програма не може знайти свої файли. Малювати курсор усередині gamescope @@ -821,6 +844,7 @@ Пристрій підтримується GPU не перевірено GPU не підтримується + GPU через міст Mali %1$s · %2$s %1$s: %2$s Для %1$s немає сумісного графічного бекенда. Steam може показувати чорний екран. @@ -850,15 +874,38 @@ Сеанс Журнали сеансу Зберігаються після кожного сеансу + Розширена діагностика для наступного сеансу + Збирає детальні журнали протягом одного сеансу. Може знизити продуктивність і зайняти більше місця. Вимикається автоматично на початку сеансу; перегляньте журнали перед тим, як ділитися ними. Журнали налагодження ігор Додавати діагностику Proton, Wine і графіки під час наступного запуску гри. Може знизити продуктивність і зайняти більше місця. Перезапустіть цей сеанс, щоб зберігати журнали налагодження ігор Не вдалося оновити журналювання. Перевірте перемикач і спробуйте ще раз. Засоби діагностики + Детальні журнали графіки + Інтерфейс Steam: малювання на GPU + Із парою драйверів Xclipse Steam малює свої сторінки програмно (малювання на GPU давало пошкоджені фрагменти). Увімкніть для швидшого інтерфейсу Steam, якщо на цьому телефоні все виглядає правильно. + зібрано %1$s + %1$s оновлено до найновішої збірки + Міст Mali не пройшов самоперевірку на %1$s під час минулого сеансу (зображення або відрисовка), тому в ньому використовувалася пара драйверів PanVK. + Під час минулого сеансу міст Mali не знайшов способу спільно використовувати пам’ять із драйвером на %1$s, тому в ньому використовувалася пара драйверів PanVK. На цьому телефоні міст не може працювати; якщо вимкнути його, використовуватиметься пара PanVK. + Журнали Proton, DXVK і драйверів для кожної гри зберігаються в журналах сеансу. Завжди увімкнено, якщо це не GPU Adreno. Останні журнали сеансу Збережені журнали сеансу Зберігає %1$d найновіших Очистити журнали + Доступні журнали сеансів + Збережених журналів сеансів ще немає. + ZIP-архіви для надсилання та збереження містять журнали вибраного сеансу та пов’язані діагностичні дані Steam, магазину, інструментів і Battle.net. + %1$s · %2$s + Поточний сеанс + Поділитися + Зберегти на пристрої + Видалити + Видалити журнали сеансу? + Видалити %1$s? Цю дію не можна скасувати. + Журнали сеансу збережено. + Не вдалося зберегти журнали сеансу. + Не вдалося видалити журнали сеансу. Скинути всі налаштування Повернути кожне налаштування до типового значення Скинути @@ -885,6 +932,8 @@ Використовувати як головний екран DroidDeck може бути додатком головного екрана DroidDeck ніколи не пропонується як додаток головного екрана + Кнопка «Додому» відкриває + Сторінка, яка відкривається, коли DroidDeck є застосунком головного екрана й ви натискаєте «Додому» У розділі «Додати ігри» перемкніть DroidDeck на «Включити» Орієнтація Орієнтація лаунчера @@ -898,15 +947,22 @@ Повний екран Приховує рядок стану та панель навігації Android Показує рядок стану та панель навігації Android + Лаунчер для двох екранів + Автоматичний режим розміщує розділи лаунчера (Steam, Бібліотека, Магазини тощо) на вбудованому другому екрані портативних пристроїв. У режимі «Увімкнено» використовується будь-який другий дисплей. У режимі «Вимкнено» лаунчер залишається на одному екрані. + Сеанси для двох екранів + Автоматичний режим закріплює меню в грі на вбудованому другому екрані замість спливного вікна. У режимі «Увімкнено» використовується будь-який другий дисплей. У режимі «Вимкнено» меню залишається на екрані гри; з нього й далі можна вибрати другий екран. Автоматично Увімк. Вимк. Керування на нижньому екрані в іграх + Клавіатура Android для текстових полів Відкриває тачпад і клавіатуру на другому екрані під час запуску сеансу. Введення для верхнього екрана Готово Стандартний додаток головного екрана Виберіть додаток головного екрана + Приховувати лаунчер у списку останніх програм під час простою + Діє лише тоді, коли DroidDeck є типовим застосунком головного екрана й не запущено жодного сеансу. Вибрати Додатки Linux (бета) Файли @@ -1021,6 +1077,149 @@ Тестові збірки Спробуйте виправлення до його випуску Поки що немає + Експериментальна збірка + Експериментальні збірки + Використовується + Призупинено після того, як Android повторно оптимізував DroidDeck + Не завантажено: %1$s + Очікує перезапуску + Залишено + Для іншої версії + Перезібрати + Видаляє цю збірку з пристрою + Перезапустити на ній + Вимкнути + Використати + Видалити + Видалити зараз + Не вдалося підготувати перезапуск: %1$s. Створіть пару для бездротового налагодження в розділі «Налаштування» та спробуйте ще раз. + Експериментальну збірку встановлено + DroidDeck перезапущено на %1$s + Збірку Lab призупинено + Android повторно оптимізував DroidDeck, тому %1$s не завантажено. Відкрийте «Оновлення», щоб перезапуститися на цій збірці. + Збірку Lab вимкнено + Її зібрано для іншої версії DroidDeck. Вона зберігається в «Оновленнях». + DroidDeck двічі не запустився на цій збірці + Агент + Агент + Агент працює + Встановіть Claude Code у користувацькому середовищі Linux, щоб користуватися агентом. + Запитайте про гру, збій або зміни в DroidDeck + Надіслати + Нова розмова + Зупинити + Сховище + Видалити + Видалити зараз + Claude Code + Codex + Вихідний код DroidDeck + Кеші завантажень + Зміни, які не відправлено, буде втрачено + Збірки завантажать їх знову + Налаштування зможе встановити це знову; дані для входу зберігаються + DroidDeck перезапустився на вашій збірці Lab. Продовжуйте з того місця, де зупинилися. + Запитайте, чому гра не запускається, попросіть пояснити журнал або змінити DroidDeck і випробувати зміну на цьому пристрої. + Помилка: %1$s + %1$s завершився (код виходу %2$d) + Зупинено + Завершено без відповіді + Повторити + Налаштовуємо агента + Перезібрати мою збірку Lab %1$s для встановленої версії DroidDeck і перезапуститися на ній. + %1$s на вході · %2$s на виході + Міркує + Міркування + Міркує · %1$s + %1$s · %2$s + ВХІД + ВИХІД + Виконується… + Немає результату: хід завершився раніше + Немає виводу + Введіть текст, щоб поставити наступне повідомлення в чергу + Поставити в чергу + Далі: %1$s + Не надсилати + Прикріпити + Видалити + За замовчуванням + Рівень міркувань + Почати + Переглянути + Поки нічого не змінено + Виконайте план. + Надіслати зараз + Повідомлення + Ще + Закрити + Найновіше + Працює + Контекст + %1$s з %2$s + Ця розмова · %1$s + Використання відобразиться після першої відповіді + %1$d-годинний ліміт + %1$d-хвилинний ліміт + Тижневий ліміт + %1$d%% · скидання %2$s + + %1$d файли + %1$d файлів + %1$d файл + %1$d файлів + + Спочатку план + План + Пропонує план, нічого не змінюючи + Розмови + Розмов ще немає + Щойно + Видалити + Видаляє розмову та її вкладення + Процеси + У користувацькому просторі Linux нічого не запущено + АГЕНТ + Зупинити + Лабораторна збірка + Підготовка лабораторних збірок + %1$d%% · залишилося близько %2$s + Залишилося близько %1$s + Скасувати + Скасувати збірку + Запуск + %1$d%% + Пакування + Перезапуск DroidDeck на ній + Готово + Не вдалося: %1$s + Налаштувати агента + Спочатку встановіть середовище виконання Linux у розділі Налаштування. + Повторити + Почати розмову + Підключення пристрою + Бездротове налагодження, щоб агент міг бачити DroidDeck і керувати ним + Встановити %1$s + У користувацький простір Linux, із git, gh та adb + Увійти в %1$s + Відкриє браузер + GitHub + Необов’язково, щоб відкривати pull requests + Інструменти збирання + Необов’язково, для збирань Lab на цьому пристрої · близько 5 ГБ + Агент готовий + Завершіть налаштування агента + Ви увійшли в %1$s + Збирання Lab + швидкі збирання + Швидкі збирання Lab + Компілює цю версію заздалегідь, тому збирання Lab займають кілька хвилин · близько 20 хвилин один раз + Компіляція · %1$d%% · залишилося близько %2$s + Підготувати + Бездротове налагодження недоступне; «Сполучити» увімкне його + Сполучити + Установити + Увійти PR #%1$d Не зібрано для цієї копії DroidDeck Оновлено %1$s @@ -1268,6 +1467,14 @@ Додатки Налаштування Оновлення + Ще + Редагувати вкладки + Вкладки + Показано + У «Ще» + Приховано + Перемістити %1$s вгору + Перемістити %1$s вниз %1$d%% Продовжити %1$s У кожному сеансі з’являється як /root/ROMs. Внутрішня пам’ять доступна в /root/Storage. @@ -1289,6 +1496,15 @@ Прибрати з черги Клавіатура Android Сховати ✕ + Розмір на екрані + Частка екрана, яку займає клавіатура, включно з заголовком. + Непрозорість + Зменште, щоб бачити гру під клавіатурою. + Приховані клавіші + Клавіші, якими ви рідко користуєтеся, не відображаються на клавіатурі. + Esc і рядок функційних клавіш + Ins / Del / Home / End / PgUp / PgDn + Клавіші зі стрілками Запустити %1$s Виберіть екран. Додатковий: %1$s. Додатковий дисплей більше не доступний. @@ -1824,7 +2040,24 @@ Термінал Задні кнопки + трекпади Deck Панель + Робочий стіл + Запустити робочий стіл + Робочий стіл · %1$s + Тачпад + Прямий дотик + Тачпад. Торкніться, щоб перейти на прямий дотик + Прямий дотик. Торкніться, щоб перейти на тачпад + Запуск робочого стола KDE… + Робочий стіл закрився. + Не вдалося запустити робочий стіл. Його журнали — у папці bottom-desktop цього сеансу. + Робочий стіл закрито. Тут поки нічого показати. + Поміняти екрани місцями + Нижній екран зараз зайнятий + Ігровий екран + Показувати гру на + Верхній екран + Нижній екран Завантаження Немає активних завантажень. Steam @@ -1859,6 +2092,20 @@ Пальне, t Основне %1$s t Резерв %1$s t + Час кадру + за останні %1$d с + у середньому + найнижчі 1% + кадри понад 33 мс + %1$d / хв + У грі вже %1$s + %1$d ядер, до %2$s ГГц + %1$d ядер + гра + FPS на %1$d Гц + Червона позначка — це поріг, після якого HUD показує температуру червоним. + весь пристрій + акумулятор Надсилати дані для панелі Автоматично Вмикає це для кожної гри в цьому списку, зокрема для знайдених пізніше. Ігри, які ви вимкнете, лишаються вимкненими. @@ -1882,6 +2129,10 @@ Для цієї гри мікрофон вимкнено. Щоб говорити, увімкніть «Мікрофон» у налаштуваннях Steam у DroidDeck (Звук) і запустіть гру знову. Гучність %1$d%% Ігрова статистика + HUD на нижньому екрані + Смуга на кожній вкладці + Найнижчі 1% і 0,1% + Температура процесора FPS CPU GPU @@ -2056,6 +2307,7 @@ Запуск сеансу… %1$d:%2$02d минуло · досі триває Завантаження оновлення клієнта Steam · %1$d%% + Застосування оновлення клієнта Steam… Завантаження клієнта Steam · %1$s Встановлення інструмента сумісності вже триває @@ -2132,11 +2384,29 @@ Контури у стилі мультфільму плюс різкість. Не GPU Adreno + Системний драйвер PowerVR: сумісність залежить від пристрою + Експериментально: RADV або системний драйвер Xclipse + Системний PowerVR + Використовує вбудовані драйвери для цього графічного процесора + Для середовища виконання та відображення вибрано системний драйвер PowerVR. + Жоден відкритий драйвер ще не підтримує цей Mali: увімкнено міст Mali. + Це тестова збірка для пристроїв без Snapdragon: офіційні збірки тут працюють лише на Adreno, тому їх не встановлюють поверх неї. Нові тестові збірки розміщено на github.com/The412Banner/droiddeck-nonadreno-drivers. + Останній сеанс завершився тому, що Android закрив DroidDeck, щоб звільнити пам\'ять, а не через збій. Закрийте інші програми або знизьте налаштування текстур гри, потім спробуйте знову. + Mali (Venus) + міст Mali + Жоден відкритий драйвер ще не підтримує цей Mali: використовується %1$s на власному драйвері телефону. + %1$s ще не опубліковано: поки що використовується %2$s. + %1$s недоступний, а драйвер цього телефону повідомляє Vulkan %2$s (Venus потребує 1.2): використовується міст Mali. + %1$s ще не опубліковано: до того часу увімкнено міст Mali. + У черзі: %1$s (очікування іншого драйвера середовища виконання) + DXVK надається системним середовищем виконання PowerVR. Інші пакети DXVK можна зберігати, але з цим драйвером вони не застосовуються. Підтримується Експериментально: його драйвери - тестові збірки Експериментальна підтримка Adreno 850: потрібні сумісні експериментальні драйвери дисплея та ігор; не перевірено на цьому пристрої Нижче за протестоване обладнання (Adreno 725 і новіші): може не запрацювати Не підтримується: для цього GPU немає сумісного графічного бекенда + Працює через міст Mali на власному драйвері Vulkan телефону + Не підтримується, коли міст Mali вимкнено: Turnip потребує GPU Adreno (Snapdragon) Перевищено ліміт запитів GitHub - спробуйте пізніше GitHub відповів HTTP %1$d @@ -2337,6 +2607,13 @@ Сортувати Підписи бічної панелі Показувати назви під значками бічної панелі. Вимкніть, щоб зробити панель вужчою. + Віртуальний улюбленець агента + DeeDee відображається поверх лаунчера та ігор і показує, що робить агент. + Поверх інших застосунків + Дозволити DeeDee відображатися поверх усіх застосунків і відкривати там чат + Дозволити + DeeDee + Чат з DeeDee Вигляд Великі картки Малі картки @@ -2628,6 +2905,11 @@ Розробник Водяний знак із міткою збірки Показувати на екрані мітку тестової збірки або збірки Lab. Увімкнено за замовчуванням. + Поділитися пакетами діагностики + Сеанс і пристрій + Графіка + Ігри та сумісність + Усі пакети Готово до гри Ще не готово до гри середовище %1$s @@ -2666,6 +2948,9 @@ Увімкніть досягнення GOG у налаштуваннях магазинів Досягнення недоступні; перевірте журнали сесії Досягнення відкрито + Mali (Venus): вимкнено + Mali (Venus): увімкнено + Драйвер на %1$s повідомляє Vulkan %2$s. Mali (Venus) потребує Vulkan 1.2 або новішої версії (на старіших gamescope не запускається), тому сеанси пропускають Venus і натомість використовують пару драйверів PanVK. Вставити Лівий стик Правий стик @@ -3025,6 +3310,7 @@ Інсталятори VC++ і DirectX, потрібні іграм Запускає ігри Linux x86 Інструмент Steam + Steam завантажує це для ігор із античитом, навіть коли його вимкнено. Видалення зупиняє їхнє встановлення на 0% DroidDeck запускає ігри без цього середовища виконання Proton x86, який DroidDeck не може запустити Типове для всіх ігор @@ -3153,6 +3439,8 @@ DroidDeck · %1$d кадр/с 60 кадр/с виглядає плавніше, але більше навантажує процесор під час запуску Steam. Відео, вибране в налаштуваннях самого Steam, також з\'являється тут. Звук + Пропускати відео запуску + Використовувати 0,1-секундний чорний кліп як вступне відео Steam. Застосовується з наступного сеансу. Власне відео MP4, MOV, MKV або WebM. Інші формати й файли понад %1$d МБ перетворюються на пристрої на WebM 720p, до %2$d секунд. Імпорт @@ -3614,6 +3902,7 @@ Залишає Alt+Tab, клавішу Win і кнопку «Додому» в активному сеансі DroidDeck, а не в Android. Увімкніть «Яскравість» у «Налаштування → Інтеграція зі Steam» Міст Mali: вимк. + %1$s не може використовувати міст Mali (для цього потрібен GPU Mali без маршруту через системний драйвер), тому цей перемикач тут не діє. Міст Mali: увімк. %1$s — не Adreno. Увімкнено експериментальний міст Vulkan: сеанс малює через власний драйвер телефона. Можливі помилки; надішліть журнали сеансу. Безпечний режим @@ -3775,6 +4064,7 @@ Не вдалося імпортувати цю розкладку Багряний сніг + Білі поверхні з червоними акцентами. Саундтреки Музика @@ -3838,4 +4128,6 @@ Повторювати один Гучність У цьому саундтреку немає аудіофайлів + Запуск недоступний + Немає веббраузера, щоб відкрити це посилання. diff --git a/app/src/main/res/values-vi/input_library.xml b/app/src/main/res/values-vi/input_library.xml new file mode 100644 index 0000000000..6b75fe7fd8 --- /dev/null +++ b/app/src/main/res/values-vi/input_library.xml @@ -0,0 +1,132 @@ + + + Cài đặt đầu vào không đọc được đã được giữ trong bản sao khôi phục. Bạn có thể tiếp tục chỉnh sửa các hồ sơ đã khôi phục. + Thuộc tính + Thuộc tính nhấp + %1$s · Nhấp + Nút + Cần, bàn phím cảm ứng và cò + Ẩn công cụ + Tay cầm + Gửi đầu vào tay cầm tới Steam Input hoặc trò chơi. + Phần tử này không gửi đầu vào tay cầm, chuột hay bàn phím. + Nhấp chuột + Hành động DroidDeck + Hành động + Tốc độ cuộn: %1$d bước/giây + + Hồ sơ mới + + Bố cục mới + %1$s · Được %2$d hồ sơ sử dụng. Thay đổi áp dụng cho mọi hồ sơ dùng các gán này. + Đổi tên + Xóa + Thêm phần tử vào bố cục trước khi gán hành động cho chúng. + Không thể lưu cài đặt đầu vào + Tên + Bắt đầu từ + Nút + Cần + Bàn di chuột + Phím điều hướng + Cò + Xong + Hoàn tác + + Thêm + Kéo để di chuyển. Kéo góc để đổi kích thước. Nhấn Thuộc tính để gán hành động. + Đang chỉnh sửa trên màn hình phụ + Màn hình đã chọn không khả dụng. Kết nối nó để chỉnh sửa bố cục này ở kích thước thật. + Bỏ các thay đổi bố cục chưa lưu? + Bố cục này được %1$d hồ sơ sử dụng. Thay đổi đã lưu áp dụng cho tất cả. + Hồ sơ mặc định + Chế độ máy tính + Chế độ chơi game + Mặc định cho máy tính và trò chơi + Mặc định cho chế độ chơi game + Mặc định cho chế độ máy tính + Cài đặt thiết bị + Điều khiển + Nút, cần, cò và phím bổ sung + Sao chép hồ sơ + Đặt lại hành động + Đặt lại hành động trong %1$s về mặc định của hồ sơ gốc? Bố cục và các hồ sơ khác giữ nguyên. + Xóa %1$s? Các chế độ đang dùng sẽ quay về hồ sơ mặc định tích hợp. Bố cục đã lưu và cài đặt chia sẻ vẫn khả dụng. + Hiển thị + Áp dụng cho mọi hồ sơ. Auto hiện điều khiển màn hình chính khi không có tay cầm kết nối ở chế độ chơi game. + Chỉnh sửa trên màn hình + Bố cục đã lưu… + Chọn một bố cục hoặc tạo bố cục riêng + Chọn Điều khiển hồ sơ trong menu phiên của màn hình phụ. Bộ chọn Hồ sơ và Màn hình phụ trong menu tay cầm quyết định điều khiển nào được hiển thị. + Hành động của nút + Chia sẻ với %1$s. Chỉnh sửa cũng áp dụng cho các hồ sơ đó. + Dùng lại cài đặt + Dùng cài đặt từ… + Sao chép từ hồ sơ khác hoặc giữ cài đặt chia sẻ + Làm cho độc lập + Giữ thiết lập hiện tại và ngừng chia sẻ thay đổi + Bố cục lưu phần tử và vị trí. Mỗi hồ sơ có thể gán hành động riêng. Chỉnh sửa ở kích thước đầy đủ trên màn hình đích. + Bố cục hiện tại + Xóa bố cục không dùng %1$s và các hành động đã lưu? + Đổi tên bố cục hiện tại + Dùng lại %1$s từ hồ sơ khác. Các nguồn điều khiển khác giữ nguyên. + Giữ điều khiển vật lý được chia sẻ + Mặc định, mọi điều khiển và bố cục tùy chỉnh là bản sao độc lập. Chia sẻ chỉ liên kết điều khiển vật lý. + Dùng các phần tử và vị trí này. Chia sẻ giữ các thay đổi hình học sau này đồng bộ; hành động nút của bạn vẫn độc lập. Bố cục khác bắt đầu với hành động chưa gán. + Sao chép các điều khiển và hành động này, hoặc liên kết để thay đổi sau này áp dụng cho cả hai hồ sơ. + Giữ chia sẻ + Bản sao độc lập + Bắt đầu cần tại điểm chạm + Ẩn cần khi không dùng + Công cụ + Tự động (%1$s) + Tùy chỉnh (%1$s) + Lưu thành hồ sơ mới + Điều khiển hồ sơ + Hồ sơ + Cử chỉ bàn di chuột + Khi gán cho con trỏ chuột: chạm để nhấp, giữ để kéo và cuộn bằng hai ngón. + %1$s có ghi đè menu nhanh. Chọn Tự động ở đó để dùng hồ sơ mặc định và cả ba phần đã lưu. + Đầu vào DroidDeck + Giữ khi cần được đẩy theo mọi hướng: nhấn trên 55%, nhả dưới 35%. Dùng Phím hướng để gán từng hướng riêng. Lệnh DroidDeck chạy một lần mỗi lần lệch. Nhấp cần được cấu hình riêng. + Giữ khi chạm bàn di chuột; nhả khi nhấc ngón tay. Lệnh DroidDeck chạy một lần mỗi lần chạm. Nhấp bàn di chuột được cấu hình riêng. + Giữ khi cò vượt 55%; nhả dưới 35%. Lệnh DroidDeck chạy một lần mỗi lần nhấn. + Hướng cuộn + Dọc + Ngang + Cuộn ngang + Số đo + Bật ghi, dùng điều khiển trong phiên đang chạy, rồi quay lại đọc kết quả. Chỉ đo thời gian gửi của DroidDeck, không đo độ trễ màn hình. Ghi kết thúc khi tiến trình ứng dụng đóng. + %1$d điều khiển + Bố cục đã lưu khác (%1$d) ▾ + Ẩn bố cục đã lưu khác (%1$d) ▴ + Trang chủ / Guide + Quay lại · một lần chạm + Quay lại · chạm hai lần + Quay lại · hai lần trong Steam, một lần trên máy tính + Ở chế độ Steam. Giữ Quay lại cũng mở truy cập nhanh. + Khôi phục mặc định + Lựa chọn bảng của bạn được ghi nhớ. Máy tính mở không gian làm việc thứ hai; không chuyển phiên hay hồ sơ đầu vào của nó. + Tay cầm ảo + Loại tay cầm mà Steam hoặc trò chơi thấy. + Màn hình cảm ứng + Cách xử lý các lần chạm trên màn hình trò chơi. Các nút hồ sơ giữ hành động đã gán. + Con trỏ chạm + Hiện con trỏ cho các lần chạm trực tiếp trên màn hình trò chơi. + Chạm và giữ + Hành động chuột khi giữ ngón tay trên màn hình trò chơi. + Chạm nút Quay lại + Hành động thứ nhất: một lần chạm. Hành động thứ hai: hai lần chạm. + Nút bật/tắt + Chạm để giữ, chạm lại để nhả. Mở menu hoặc đổi hồ sơ sẽ nhả nút. + Hình dạng + Bo tròn + Viên nang + Tròn + Chữ nhật + Nhãn nút + Văn bản + Hình ảnh đã nhập + Phím chéo riêng + Gán phím cho từng đường chéo. Đường chéo trống sẽ nhấn hai hướng bên cạnh. + Hướng bên cạnh + Các phím màn hình cũ được lưu thành hồ sơ đã nhập bên dưới. Chọn một để dùng hoặc chỉnh sửa. Các lựa chọn hồ sơ hiện tại được giữ nguyên. + Không thể nhập tự động các phím màn hình cũ. Cài đặt gốc được giữ nguyên. + diff --git a/app/src/main/res/values-vi/input_strings.xml b/app/src/main/res/values-vi/input_strings.xml new file mode 100644 index 0000000000..3b2a6cff52 --- /dev/null +++ b/app/src/main/res/values-vi/input_strings.xml @@ -0,0 +1,38 @@ + + + Hồ sơ đầu vào + Hồ sơ + Tay cầm vật lý + Màn hình chính + Màn hình phụ + Gốc / Steam Input + Gốc: %1$s + Gửi điều khiển tay cầm khác + Đã tắt + Phím hoặc tổ hợp phím + Phím hướng + Di chuyển con trỏ + Tốc độ con trỏ: %1$d + Cuộn + Cuộn dọc + Nút chuột trái + Nút chuột phải + Nút chuột giữa + Mở menu DroidDeck + Hiện bàn phím + Mở menu Steam + Mở truy cập nhanh Steam + Xóa điều khiển + Thêm điều khiển + Nút riêng cho thiết bị + Gán một nút vật lý + Nhả nút, sau đó chọn Sửa, Thử lại hoặc Hủy. B hoặc Quay lại sẽ hủy sau khi nhả. + Thử lại + Nhấn một nút, kể cả nút Quay lại được báo là phím. Các phím âm lượng và hệ thống Android được dành riêng. Việc gán chỉ áp dụng cho thiết bị này. + Xóa gán + Chẩn đoán đầu vào + Ghi thời gian gửi đầu vào + Đọc số đo + Đo quá trình gửi từ Android đến khi công bố vào kênh đầu vào hiện có. Không gồm việc đến qua Bluetooth, thăm dò khách, kết xuất và độ trễ màn hình. Ghi mặc định tắt. + Dùng gán đầu vào thông thường + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 32c69c9011..5da35222aa 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -185,6 +185,7 @@ Không thể tải môi trường đồ họa PowerVR. Hãy kiểm tra kết nối rồi thử lại. Không thể tải DirectAudio, nên âm thanh game dùng đường chậm hơn trong phiên này. Chương trình này + Phiên không thể vẽ lên màn hình: %1$s. Màn hình này cho biết lý do thay vì màn hình đen; chi tiết nằm trong nhật ký phiên. 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. @@ -386,6 +387,9 @@ Chưa được hỗ trợ ở đây Đang tải các thành phần… Không thể cài: %1$s + Bản tải xuống này cần được cập nhật. + Đã đưa bản cập nhật vào hàng đợi. + Thử cập nhật lại Đã tải Đang tải %1$s Đang cài: %1$s @@ -416,6 +420,22 @@ Chỉ bộ nhớ trong Thư mục: %1$s Thư viện thứ hai + Thêm thư viện Steam + Các thư mục để Steam cài đặt và chạy game, mỗi thư mục có tên riêng. Xóa một thư mục vẫn giữ game trên bộ nhớ. + Thêm thư viện + Đổi tên + Tên thư viện + Chọn thư mục cho thư viện + Tối đa %1$d thư viện được thêm + Thư mục đó đã là thư viện hoặc nằm trong một thư viện + %1$s · không khả dụng + Có hiệu lực từ phiên Steam tiếp theo + Tìm thấy trên thiết bị này · %1$s · %2$s + Thêm + Tìm thư viện trên bộ nhớ trong + Cấp quyền truy cập tất cả tệp để DroidDeck thấy được các thư viện Steam do ứng dụng khác lưu trên bộ nhớ trong + Cho phép + Đã thêm %1$s, thư viện Steam nằm trong thư mục bạn chọn Game truyền dữ liệu từ thẻ SD hoặc bộ nhớ dùng chung có thể bị giật. Chẩn đoán lưu trữ Ghi lại kết quả cấp phát và thời gian lưu trữ mẫu vào Share logs. Có thể làm chậm cài đặt khi đang bật. Áp dụng từ phiên sau. @@ -603,7 +623,10 @@ Tắt trình hỗ trợ điều hướng bằng tay cầm của Proton, vốn tốn CPU trong mọi game. Chạy proot không có seccomp Có thể sửa lỗi thiếu syscall trên một số kernel. Có thể giảm hiệu năng. + Chạy không dùng proot (thử nghiệm) + Khởi động phần Linux trực tiếp trên Android. Áp dụng từ phiên tiếp theo. Tắt nếu có thành phần không khởi động được. Fast path của proot + Không dùng khi chạy không có proot. Cần bộ lọc seccomp của proot. Tra cứu tệp nhanh hơn và ít giật hơn. Tắt nếu một chương trình không tìm thấy tệp của nó. Vẽ con trỏ bên trong gamescope @@ -812,6 +835,7 @@ Thiết bị được hỗ trợ GPU chưa được kiểm thử GPU không được hỗ trợ + GPU qua cầu nối Mali %1$s · %2$s %1$s: %2$s Không có backend đồ họa tương thích cho %1$s. Steam có thể hiển thị màn hình đen. @@ -841,15 +865,38 @@ Phiên Log phiên Được lưu sau mỗi phiên + Chẩn đoán nâng cao cho phiên tiếp theo + Ghi nhật ký chi tiết trong một phiên. Có thể làm giảm hiệu năng và tốn thêm dung lượng. Tự tắt khi phiên bắt đầu; hãy xem lại nhật ký trước khi chia sẻ. Nhật ký gỡ lỗi game Thêm chẩn đoán Proton, Wine và đồ họa vào lần khởi chạy game tiếp theo. Có thể giảm hiệu năng và tốn thêm bộ nhớ. Khởi động lại phiên này để lưu nhật ký gỡ lỗi game Không thể cập nhật ghi nhật ký. Hãy kiểm tra công tắc rồi thử lại. Công cụ gỡ lỗi + Nhật ký đồ họa chi tiết + Giao diện Steam: vẽ bằng GPU + Với cặp driver Xclipse, Steam vẽ các trang bằng phần mềm (vẽ bằng GPU làm vỡ các ô hiển thị). Bật để có giao diện Steam nhanh hơn nếu hình hiển thị đúng trên máy này. + dựng ngày %1$s + %1$s đã được cập nhật lên bản build mới nhất + Cầu nối Mali không đạt bài tự kiểm tra trên %1$s ở phiên trước (hình ảnh hoặc lệnh vẽ), nên phiên đó đã dùng cặp driver PanVK thay thế. + Cầu nối Mali không tìm được cách chia sẻ bộ nhớ với driver trên %1$s ở phiên trước, nên phiên đó đã dùng cặp driver PanVK thay thế. Cầu nối này không hoạt động được trên điện thoại này; tắt đi sẽ vẫn giữ cặp PanVK. + Nhật ký Proton, DXVK và driver của từng game có trong nhật ký của phiên. Luôn bật khi GPU không phải Adreno. Log phiên gần nhất Log phiên đã lưu Giữ lại %1$d bản mới nhất Xóa log + Nhật ký phiên có sẵn + Chưa có nhật ký phiên nào được lưu. + Tệp ZIP chia sẻ và lưu đều bao gồm phiên đã chọn cùng dữ liệu chẩn đoán liên quan của Steam, cửa hàng, công cụ và Battle.net. + %1$s · %2$s + Phiên hiện tại + Chia sẻ + Lưu vào thiết bị + Xóa + Xóa nhật ký phiên? + Xóa %1$s? Thao tác này không thể hoàn tác. + Đã lưu nhật ký phiên. + Không thể lưu nhật ký phiên. + Không thể xóa nhật ký phiên. Đặt lại toàn bộ thiết lập Đưa mọi thiết lập về giá trị mặc định Đặt lại @@ -876,6 +923,8 @@ Dùng làm màn hình chính DroidDeck có thể là ứng dụng Màn hình chính DroidDeck không bao giờ được đề xuất làm ứng dụng Màn hình chính + Nút Màn hình chính mở + Trang hiển thị khi DroidDeck là ứng dụng Màn hình chính và bạn nhấn nút Màn hình chính Trong Thêm trò chơi, đặt DroidDeck thành Bao gồm Hướng màn hình Hướng màn hình launcher @@ -889,15 +938,22 @@ Toàn màn hình Ẩn thanh trạng thái và thanh điều hướng của Android Hiện thanh trạng thái và thanh điều hướng của Android + Trình khởi chạy hai màn hình + Tự động đưa các phần của trình khởi chạy (Steam, Thư viện, Cửa hàng và phần còn lại) lên màn hình thứ hai tích hợp của máy cầm tay. Bật dùng bất kỳ màn hình thứ hai nào. Tắt giữ trình khởi chạy trên một màn hình. + Phiên chơi hai màn hình + Tự động gắn menu trong game lên màn hình thứ hai tích hợp thay vì dạng cửa sổ nổi. Bật dùng bất kỳ màn hình thứ hai nào. Tắt giữ menu trên màn hình chơi game; bạn vẫn có thể chọn màn hình thứ hai từ menu đó. Tự động Bật Tắt Điều khiển màn hình dưới khi chơi game + Bàn phím Android cho ô nhập văn bản Mở bàn di chuột và bàn phím trên màn hình thứ hai khi phiên bắt đầu. Đang nhập cho màn hình trên Xong Ứng dụng Màn hình chính mặc định Chọn một ứng dụng Màn hình chính + Ẩn trình khởi chạy khỏi mục Gần đây khi không có phiên chạy + Chỉ áp dụng khi DroidDeck là ứng dụng Màn hình chính mặc định và không có phiên nào đang chạy. Chọn Ứng dụng Linux (beta) Tệp @@ -1012,6 +1068,147 @@ Bản thử nghiệm Thử một bản sửa trước khi nó được phát hành Hiện không có + Bản build thử nghiệm + Các bản build thử nghiệm + Đang dùng + Đã tạm dừng sau khi Android tối ưu lại DroidDeck + Chưa tải: %1$s + Đang chờ khởi động lại + Đã giữ lại + Dành cho phiên bản khác + Tạo lại + Xóa bản build này khỏi thiết bị + Khởi động lại bằng bản này + Tắt + Dùng + Xóa + Xóa ngay + Không thể chuẩn bị thao tác khởi động lại: %1$s. Hãy ghép đôi gỡ lỗi không dây trong Cài đặt rồi thử lại. + Đã cài bản build thử nghiệm + DroidDeck đã khởi động lại trên %1$s + Đã tạm dừng bản dựng thử nghiệm + Android đã tối ưu hóa lại DroidDeck nên %1$s chưa được nạp. Mở Cập nhật để khởi động lại bằng bản dựng đó. + Đã tắt bản dựng thử nghiệm + Bản dựng này được tạo cho một phiên bản DroidDeck khác. Bản dựng vẫn được giữ trong Cập nhật. + DroidDeck đã không khởi động được bằng bản dựng này hai lần + Trợ lý + Trợ lý + Trợ lý đang xử lý + Cài Claude Code trong môi trường người dùng Linux để sử dụng trợ lý. + Hỏi về một trò chơi, một sự cố hoặc một thay đổi cho DroidDeck + Gửi + Cuộc hội thoại mới + Dừng + Bộ nhớ + Xóa + Xóa ngay + Claude Code + Codex + Mã nguồn DroidDeck + Bộ nhớ đệm tải xuống + Các thay đổi chưa được đẩy sẽ bị mất + Bản dựng sẽ tải lại các tệp này + Thiết lập có thể cài lại; thông tin đăng nhập được giữ nguyên + DroidDeck đã khởi động lại bằng bản dựng thử nghiệm của bạn. Tiếp tục từ chỗ bạn đang dở. + Hỏi tại sao một trò chơi không khởi động được, yêu cầu giải thích nhật ký, hoặc thay đổi DroidDeck và thử trên thiết bị này. + Thất bại: %1$s + %1$s đã kết thúc (mã thoát %2$d) + Đã dừng + Kết thúc mà không có phản hồi + Thử lại + Đang thiết lập trợ lý + Dựng lại bản dựng thử nghiệm %1$s của tôi cho phiên bản DroidDeck đã cài và khởi động lại bằng bản dựng đó. + %1$s vào · %2$s ra + Đang suy nghĩ + Suy nghĩ + Đang suy nghĩ · %1$s + %1$s · %2$s + ĐẦU VÀO + ĐẦU RA + Đang chạy… + Không có kết quả: lượt đã kết thúc trước + Không có đầu ra + Nhập để xếp tin nhắn tiếp theo vào hàng đợi + Xếp hàng + Tiếp theo: %1$s + Không gửi + Đính kèm + Xóa + Mặc định + Mức độ lập luận + Thực hiện + Chỉnh sửa + Chưa có thay đổi nào + Hãy tiến hành kế hoạch. + Gửi ngay + Tin nhắn + Khác + Đóng + Mới nhất + Đang làm việc + Ngữ cảnh + %1$s trong %2$s + Cuộc trò chuyện này · %1$s + Mức sử dụng hiển thị sau phản hồi đầu tiên + Giới hạn %1$d giờ + Giới hạn %1$d phút + Giới hạn hàng tuần + %1$d%% · đặt lại %2$s + + %1$d tệp + %1$d tệp + + Lên kế hoạch trước + Lên kế hoạch + Đề xuất kế hoạch mà không thay đổi gì + Cuộc hội thoại + Chưa có cuộc hội thoại nào + Vừa xong + Xóa + Xóa cuộc hội thoại và các tệp đính kèm + Tiến trình + Không có gì đang chạy trong không gian người dùng Linux + TÁC NHÂN + Dừng + Bản dựng Lab + Đang chuẩn bị các bản dựng Lab + %1$d%% · còn khoảng %2$s + còn khoảng %1$s + Hủy + Hủy bản dựng + Đang khởi động + %1$d%% + Đang đóng gói + Đang khởi động lại DroidDeck trên đó + Hoàn tất + Thất bại: %1$s + Thiết lập tác nhân + Hãy cài đặt môi trường chạy Linux trong phần Thiết lập trước. + Thử lại + Bắt đầu trò chuyện + Kết nối thiết bị + Gỡ lỗi không dây để tác nhân có thể quan sát và điều khiển DroidDeck + Cài đặt %1$s + Vào môi trường người dùng Linux, với git, gh và adb + Đăng nhập vào %1$s + Mở trình duyệt của bạn + GitHub + Tùy chọn, để mở pull request + Công cụ build + Tùy chọn, cho bản build Lab trên thiết bị này · khoảng 5 GB + Agent sẵn sàng + Hoàn tất thiết lập Agent + Đã đăng nhập vào %1$s + Bản build Lab + bản build nhanh + Bản build Lab nhanh + Biên dịch sẵn phiên bản này để bản build Lab chỉ mất vài phút · khoảng 20 phút cho một lần + Đang biên dịch · %1$d%% · còn khoảng %2$s + Chuẩn bị + Không truy cập được gỡ lỗi không dây; Ghép đôi sẽ bật tính năng này + Ghép đôi + Cài đặt + Đăng nhập PR #%1$d Không được build cho bản DroidDeck này Đã cập nhật %1$s @@ -1247,6 +1444,14 @@ Ứng dụng Thiết lập Cập nhật + Khác + Chỉnh sửa thẻ + Thẻ + Hiển thị + Trong mục Khác + Ẩn + Chuyển %1$s lên + Chuyển %1$s xuống %1$d%% Tiếp tục %1$s Hiển thị như /root/ROMs trong mỗi phiên. Bộ nhớ trong ở /root/Storage. @@ -1268,6 +1473,15 @@ Hủy hàng chờ Bàn phím Android Ẩn ✕ + Kích thước trên màn hình + Tỷ lệ màn hình mà bàn phím chiếm, bao gồm cả thanh tiêu đề. + Độ mờ + Giảm giá trị này để thấy game phía sau bàn phím. + Phím ẩn + Những phím ít dùng sẽ không xuất hiện trên bàn phím. + Esc và hàng phím chức năng + Ins / Del / Home / End / PgUp / PgDn + Phím mũi tên Khởi chạy %1$s Chọn một màn hình. Phụ: %1$s. Màn hình phụ không còn khả dụng. @@ -1752,7 +1966,24 @@ Terminal Grip + trackpad Deck Bảng điều khiển + Máy tính để bàn + Khởi động máy tính để bàn + Máy tính để bàn · %1$s + Bàn di chuột + Chạm trực tiếp + Bàn di chuột. Nhấn để dùng chạm trực tiếp + Chạm trực tiếp. Nhấn để dùng bàn di chuột + Đang khởi động máy tính để bàn KDE… + Máy tính để bàn đã đóng. + Máy tính để bàn không thể khởi động. Nhật ký nằm trong thư mục bottom-desktop của phiên này. + Máy tính để bàn đã tắt. Chưa có gì để hiển thị ở đây. + Hoán đổi màn hình + Màn hình dưới hiện đang bận + Màn hình trò chơi + Hiển thị trò chơi trên + Màn hình trên + Màn hình dưới Tải xuống Không có lượt tải nào đang chạy. Steam @@ -1787,6 +2018,20 @@ Nhiên liệu, t Chính %1$s t Dự trữ %1$s t + Thời gian khung hình + %1$d giây qua + khung hình trung bình + 1% thấp nhất + khung hình trên 33 ms + %1$d / phút + Đã chơi %1$s + %1$d nhân, tối đa %2$s GHz + %1$d nhân + trò chơi + FPS tại %1$d Hz + Vạch đỏ là vị trí HUD hiển thị nhiệt độ bằng màu đỏ. + toàn thiết bị + pin Gửi dữ liệu bảng đồng hồ Tự động Bật cho mọi game trong danh sách này, kể cả game được tìm thấy sau này. Game bạn đã tắt sẽ vẫn tắt. @@ -1810,6 +2055,10 @@ Micro đang tắt cho game này. Để nói chuyện, hãy bật Micro trong thiết lập Steam của DroidDeck (Âm thanh) rồi khởi động lại game. Âm lượng %1$d%% Thông số trong game + HUD màn hình dưới + Thanh trên mọi tab + 1% và 0,1% thấp nhất + Nhiệt độ CPU FPS CPU GPU @@ -1981,6 +2230,7 @@ Đang khởi động phiên… %1$d:%2$02d đã trôi qua · vẫn đang xử lý Đang tải bản cập nhật client Steam · %1$d%% + Đang áp dụng bản cập nhật ứng dụng Steam… Đang tải client Steam · %1$s Một lượt cài công cụ tương thích đang chạy @@ -2057,11 +2307,29 @@ Viền hoạt hình cộng làm nét. Không phải GPU Adreno + Trình điều khiển PowerVR của hệ thống: khả năng tương thích tùy thiết bị + Thử nghiệm: RADV hoặc trình điều khiển Xclipse của hệ thống + PowerVR hệ thống + Sử dụng trình điều khiển tích hợp sẵn cho GPU này + Trình điều khiển PowerVR của hệ thống được chọn cho runtime và hiển thị. + Chưa có trình điều khiển mã nguồn mở nào hỗ trợ Mali này: cầu nối Mali đang bật. + Đây là bản thử nghiệm cho máy không dùng Snapdragon: các bản chính thức ở đây chỉ chạy trên Adreno, nên không được cài đè lên bản này. Các bản thử nghiệm mới có tại github.com/The412Banner/droiddeck-nonadreno-drivers. + Phiên chạy trước kết thúc vì Android đã đóng DroidDeck để giải phóng bộ nhớ, không phải do sự cố. Hãy đóng các ứng dụng khác hoặc giảm thiết lập texture của game, rồi thử lại. + Mali (Venus) + cầu nối Mali + Chưa có trình điều khiển mã nguồn mở nào hỗ trợ Mali này: dùng %1$s, trên trình điều khiển gốc của máy. + %1$s chưa được phát hành: tạm dùng %2$s cho đến khi ra mắt. + %1$s không khả dụng, và trình điều khiển gốc của máy báo Vulkan %2$s (Venus cần 1.2): cầu nối Mali được dùng. + %1$s chưa được phát hành: cầu nối Mali đang bật cho đến khi ra mắt. + Đã xếp hàng: %1$s (đang đợi một trình điều khiển runtime khác) + DXVK được cung cấp bởi runtime PowerVR của hệ thống. Các gói DXVK khác vẫn có thể được lưu nhưng không được áp dụng với trình điều khiển này. Được hỗ trợ Thử nghiệm: driver của nó là bản build thử nghiệm Hỗ trợ thử nghiệm Adreno 850: cần driver hiển thị và driver game thử nghiệm tương thích; chưa được xác minh trên thiết bị này Dưới mức phần cứng đã kiểm thử (Adreno 725 và mới hơn): có thể không chạy được Không được hỗ trợ: không có backend đồ họa tương thích cho GPU này + Chạy qua cầu nối Mali, trên trình điều khiển Vulkan gốc của máy + Không hỗ trợ khi tắt cầu nối Mali: Turnip cần GPU Adreno (Snapdragon) Đã đạt giới hạn tốc độ của GitHub - hãy thử lại sau GitHub trả về HTTP %1$d @@ -2262,6 +2530,13 @@ Sắp xếp Nhãn thanh bên Hiện tên dưới các biểu tượng thanh bên. Tắt để thanh bên gọn hơn. + Thú cưng của trợ lý + DeeDee nổi trên trình khởi chạy và các trò chơi, cho thấy điều trợ lý đang làm. + Trên các ứng dụng khác + Cho DeeDee nổi trên mọi ứng dụng và mở khung trò chuyện của DeeDee ngay tại đó + Cho phép + DeeDee + Trò chuyện với DeeDee Hiển thị Thẻ lớn hơn Thẻ nhỏ hơn @@ -2547,6 +2822,11 @@ Nhà phát triển Hình mờ nhãn bản dựng Hiển thị nhãn bản dựng thử nghiệm hoặc Lab trên màn hình. Được bật theo mặc định. + Chia sẻ các gói chẩn đoán + Phiên và thiết bị + Đồ họa + Game và khả năng tương thích + Tất cả các gói Sẵn sàng để chơi Chưa sẵn sàng để chơi runtime %1$s @@ -2585,6 +2865,9 @@ Bật thành tích GOG trong phần cài đặt Stores Không có thành tích; hãy kiểm tra nhật ký phiên Đã mở khóa thành tích + Mali (Venus): tắt + Mali (Venus): bật + Trình điều khiển trên %1$s báo Vulkan %2$s. Mali (Venus) cần Vulkan 1.2 trở lên (gamescope không khởi động trên bản cũ hơn), nên các phiên chạy bỏ qua Venus và dùng cặp trình điều khiển PanVK thay vào đó. Dán Cần analog trái Cần analog phải @@ -2938,6 +3221,7 @@ Bộ cài VC++ và DirectX mà game cần Chạy game Linux x86 Công cụ Steam + Steam tải mục này cho các game có anti-cheat, kể cả khi đang tắt. Xóa nó sẽ khiến quá trình cài đặt của các game đó bị kẹt ở 0% DroidDeck chạy game mà không cần runtime này Proton x86, DroidDeck không chạy được Mặc định cho mọi game @@ -3048,6 +3332,8 @@ DroidDeck · %1$d fps 60 fps mượt hơn nhưng tốn CPU hơn khi Steam đang khởi động. Video chọn trong cài đặt của chính Steam cũng hiện ở đây. Âm thanh + Bỏ qua phim khởi động + Dùng đoạn clip đen 0,1 giây làm phim khởi động của Steam. Áp dụng trong phiên chạy tiếp theo. Video của bạn MP4, MOV, MKV hoặc WebM. Định dạng khác và tệp trên %1$d MB được chuyển sang WebM 720p ngay trên thiết bị, tối đa %2$d giây. Nhập @@ -3509,6 +3795,7 @@ Giữ Alt+Tab, phím Win và nút Trang chủ trong phiên DroidDeck đang dùng thay vì Android. Bật Độ sáng trong Thiết lập → Tích hợp Steam Cầu Mali: tắt + %1$s không thể dùng cầu nối Mali (cần GPU Mali không có đường dẫn qua trình điều khiển hệ thống), nên công tắc này không có tác dụng ở đây. Cầu Mali: bật %1$s không phải Adreno. Cầu Vulkan thử nghiệm đang bật: phiên vẽ qua trình điều khiển của chính điện thoại. Có thể gặp lỗi; hãy gửi nhật ký phiên. Chế độ an toàn @@ -3667,6 +3954,7 @@ Không thể nhập bố cục này Tuyết đỏ thẫm + Bề mặt trắng với điểm nhấn màu đỏ. Nhạc nền Nhạc @@ -3730,4 +4018,6 @@ Lặp lại một bài Âm lượng Không có tệp âm thanh trong nhạc nền này + Không thể khởi chạy + Không có trình duyệt web nào để mở liên kết này. diff --git a/app/src/main/res/values-zh-rCN/input_library.xml b/app/src/main/res/values-zh-rCN/input_library.xml new file mode 100644 index 0000000000..00c716c4cc --- /dev/null +++ b/app/src/main/res/values-zh-rCN/input_library.xml @@ -0,0 +1,132 @@ + + + 无法读取的输入设置已保存在恢复副本中。你可以继续编辑恢复的配置。 + 属性 + 点击属性 + %1$s · 点击 + 按键 + 摇杆、触控板和扳机 + 隐藏工具 + 手柄 + 把柄输入发送给 Steam Input 或游戏。 + 此控件不发送手柄、鼠标或键盘输入。 + 鼠标点击 + DroidDeck 动作 + 动作 + 滚动速度:%1$d 步/秒 + + 新建配置 + + 新建布局 + %1$s · 有 %2$d 个配置在用。修改会应用到所有使用这些绑定的配置。 + 重命名 + 删除 + 先往布局里添加控件,再为它们指定动作。 + 无法保存输入设置 + 名称 + 起始自 + 按键 + 摇杆 + 触控板 + 十字键 + 扳机 + 完成 + 撤销 + + 添加 + 拖动可移动,拖角可调整大小,点「属性」可指定动作。 + 正在副屏上编辑 + 所选显示器不可用。连上它才能按实际尺寸编辑此布局。 + 丢弃未保存的布局修改? + 此布局有 %1$d 个配置在用。保存的修改会应用到全部。 + 默认配置 + 桌面模式 + 游戏模式 + 桌面和游戏的默认 + 游戏模式的默认 + 桌面模式的默认 + 设备设置 + 控制 + 按键、摇杆、扳机和额外按键 + 复制配置 + 重置动作 + 把 %1$s 的动作重置为基础配置的默认值?布局和其它配置不变。 + 删除 %1$s?使用它的模式会回到内置默认配置。已保存的布局和共享设置仍可用。 + 显示 + 对所有配置生效。游戏模式下没接手柄时,Auto 会显示主屏控制。 + 在屏幕上编辑 + 已保存的布局… + 选择一个布局或自建一个 + 在副屏会话菜单里选「配置控制」。控制菜单里的配置和副屏选择决定显示哪些控件。 + 按键动作 + 与 %1$s 共享。修改也会应用到这些配置。 + 复用设置 + 使用设置来自… + 从另一个配置复制,或保持设置共享 + 设为独立 + 保留当前设置并停止共享修改 + 布局保存控件和位置。每个配置可各自指定动作。在目标屏幕上按实际尺寸编辑。 + 当前布局 + 删除未使用的布局 %1$s 及其保存的动作? + 重命名当前布局 + 从另一个配置复用 %1$s。其它控制来源保持不变。 + 保持物理控制共享 + 默认情况下所有控件和自定义布局都是独立副本。共享只连接物理控制。 + 使用这些控件和位置。共享会让之后的几何修改保持同步,按键动作仍各自独立。换用其它布局时动作是未指定的。 + 复制这些控件和动作,或链接它们,让之后的修改同时作用于两个配置。 + 保持共享 + 独立副本 + 从按下位置开始 + 不使用时隐藏摇杆 + 工具 + 自动 (%1$s) + 自定义 (%1$s) + 另存为新配置 + 配置控制 + 配置 + 鼠标触控板手势 + 绑定到鼠标指针时:轻点点击、按住拖动、双指滚动。 + %1$s 有快捷菜单覆盖。在那里选「自动」会使用它的默认配置和全部三个已保存部分。 + DroidDeck 输入 + 摇杆朝任意方向推动期间保持:超过 55% 时按下,低于 35% 时松开。用「方向键」逐方向指定。DroidDeck 动作每次推动只执行一次。摇杆点击单独设置。 + 按住触控板期间保持,抬手时松开。DroidDeck 动作每次触摸执行一次。触控板点击单独设置。 + 扳机超过 55% 时保持,低于 35% 时松开。DroidDeck 动作每次按下执行一次。 + 滚动方向 + 垂直 + 水平 + 水平滚动 + 测量 + 打开记录,在运行中的会话里使用控件,然后回来读取结果。只测 DroidDeck 的发送时间,不含显示延迟。App 进程关闭时记录结束。 + %1$d 个控件 + 其它已保存的布局 (%1$d) ▾ + 隐藏其它已保存的布局 (%1$d) ▴ + 主页 / Guide + 返回 · 单击 + 返回 · 双击 + 返回 · Steam 里两下,桌面上一下 + Steam 模式下。按住返回也会打开快捷菜单。 + 恢复默认 + 面板选择会被记住。桌面会打开第二个工作区,不切换会话或它的输入配置。 + 虚拟手柄 + Steam 或游戏看到的手柄类型。 + 触摸屏 + 游戏画面上的触摸如何处理。配置里的按键保持各自指定的动作。 + 触摸光标 + 在游戏画面上直接触摸时显示指针。 + 触摸并按住 + 手指按住游戏画面时的鼠标动作。 + 返回键点击 + 第一个动作:单击。第二个动作:双击。 + 开关按键 + 点一下按住,再点一下松开。打开菜单或切换配置会松开按键。 + 形状 + 圆角 + 胶囊 + 圆形 + 矩形 + 按键文字 + 文字 + 导入的图片 + 独立斜向键 + 给每个斜向指定一个键。空的斜向会按相邻的两个方向。 + 相邻方向 + 旧的屏幕按键已存为下方的导入配置。选一个使用或编辑。当前选中的配置保持不变。 + 无法自动导入旧的屏幕按键。原设置已保留。 + diff --git a/app/src/main/res/values-zh-rCN/input_strings.xml b/app/src/main/res/values-zh-rCN/input_strings.xml new file mode 100644 index 0000000000..dabfb3b4ee --- /dev/null +++ b/app/src/main/res/values-zh-rCN/input_strings.xml @@ -0,0 +1,38 @@ + + + 输入配置 + 配置 + 物理手柄 + 主屏 + 副屏 + 原生 / Steam Input + 原生:%1$s + 发送另一个手柄按键 + 已禁用 + 按键或组合键 + 方向键 + 移动指针 + 指针速度:%1$d + 滚动 + 垂直滚动 + 鼠标左键 + 鼠标右键 + 鼠标中键 + 打开 DroidDeck 菜单 + 显示键盘 + 打开 Steam 菜单 + 打开 Steam 快捷菜单 + 移除控件 + 添加控件 + 本设备专用按键 + 指定物理按键 + 松开按键,然后选择编辑、重试或取消。松开后按 B 或返回可取消。 + 重试 + 按下任意按键,包括被识别为键盘按键的返回键。音量键和 Android 系统键保留。指定仅对本设备生效。 + 移除指定 + 输入诊断 + 记录输入发送耗时 + 读取测量结果 + 测量从 Android 派发到发送至现有输入通道的耗时。不含蓝牙接收、客户机轮询、渲染和显示延迟。默认不记录。 + 使用普通输入绑定 + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9dd55ac618..4b50bd95a7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -185,6 +185,7 @@ 无法下载 PowerVR 图形环境。请检查网络连接后重试。 无法下载 DirectAudio,本次会话的游戏音频将使用较慢的路径。 此程序 + 会话无法向屏幕绘制画面:%1$s。此界面显示原因而非黑屏;详情见会话日志。 无法下载 Steam 客户端。你的网络或 VPN 可能屏蔽了 Steam 的服务器;请检查网络连接后重试。 无法设置 Steam 客户端。请检查网络连接和可用存储空间,然后重试。 %1$s 面向 x86 PC 构建,需经由 FEX 运行,而 FEX 尚未安装。请在登录状态下启动一次 Steam,让其下载 FEX 与 Steam Linux Runtime,然后重新启动。 @@ -386,6 +387,9 @@ 此处暂不支持 正在加载组件… 无法安装:%1$s + 此下载内容需要更新。 + 更新已排队。 + 重试更新 已下载 正在下载 %1$s 正在安装:%1$s @@ -416,6 +420,22 @@ 仅内部存储 文件夹:%1$s 第二个库 + 更多 Steam 库 + Steam 可安装游戏并从中运行的文件夹,每个都有单独名称。移除后,其中的游戏仍保留在磁盘上。 + 添加库 + 重命名 + 库名称 + 为库选择文件夹 + 最多可添加 %1$d 个库 + 该文件夹已是库,或位于某个库内 + %1$s · 不可用 + 从下次 Steam 会话起生效 + 在此设备上找到 · %1$s · %2$s + 添加 + 查找内部存储中的库 + 授予所有文件访问权限,以便 DroidDeck 查看其他应用保存在内部存储中的 Steam 库 + 允许 + 已添加 %1$s,即所选文件夹内的 Steam 库 从 SD 卡或共享存储流式读取资源的游戏可能出现卡顿。 存储诊断 在分享日志中记录分配结果和存储采样耗时。启用期间可能减慢安装。将在下次会话生效。 @@ -603,7 +623,10 @@ 禁用 Proton 的手柄导航助手,它会在每个游戏中消耗 CPU。 不启用 seccomp 运行 proot 可能修复某些内核上的缺失系统调用错误。可能降低性能。 + 不使用 proot 运行(实验性) + Linux 环境直接运行在 Android 上。从下次会话起生效。若有程序无法启动,请关闭此项。 proot 快速路径 + 不使用 proot 时不会启用。 需要 proot 的 seccomp 过滤器。 文件查找更快、卡顿更少。若某个程序找不到它的文件,请关闭。 在 gamescope 内绘制光标 @@ -842,15 +865,38 @@ 会话 会话日志 每次会话后保存 + 下次会话启用增强诊断 + 仅为一个会话采集详细日志。可能降低性能并占用更多存储。会话开始后会自动关闭;分享前请先查看日志。 游戏调试日志 在下次启动游戏时包含 Proton、Wine 和图形诊断信息。可能降低性能并占用更多存储空间。 重启此会话以保存游戏调试日志 无法更新日志设置。请检查开关后重试。 调试工具 + 详细图形日志 + Steam 界面:GPU 绘制 + 使用 Xclipse 驱动组合时,Steam 以软件方式绘制页面(GPU 绘制会出现图块错乱)。若在这台手机上画面正常,开启即可获得更快的 Steam 界面。 + 构建于 %1$s + %1$s 已更新至最新构建版本 + Mali 桥接上次会话在 %1$s 上的自检失败(图像或绘制),因此该会话改用了 PanVK 驱动组合。 + Mali 桥接上次会话在 %1$s 上找不到与驱动共享内存的方式,因此该会话改用了 PanVK 驱动组合。此桥接无法在这部手机上工作;关闭它会继续使用 PanVK 组合。 + 每款游戏的 Proton、DXVK 和驱动日志都会加入会话日志。GPU 不是 Adreno 时始终开启。 最新会话日志 已保存的会话日志 保留最新的 %1$d 个 清除日志 + 可用的会话日志 + 还没有已保存的会话日志。 + 分享和保存的 ZIP 包含所选会话,以及相关的 Steam、商店、工具和 Battle.net 诊断信息。 + %1$s · %2$s + 当前会话 + 分享 + 保存到设备 + 删除 + 删除会话日志? + 删除 %1$s?此操作无法撤销。 + 会话日志已保存。 + 无法保存会话日志。 + 无法删除会话日志。 重置所有设置 将所有设置恢复为默认值 重置 @@ -877,6 +923,8 @@ 用作主屏幕 DroidDeck 可以设为主屏幕应用 系统不会把 DroidDeck 作为主屏幕应用提供 + 主屏幕键打开 + 当 DroidDeck 是默认主屏幕应用且你按主屏幕键时显示的页面 请在“添加游戏”中将 DroidDeck 设为“包含” 屏幕方向 启动器方向 @@ -890,15 +938,22 @@ 全屏 隐藏 Android 状态栏和导航栏 显示 Android 状态栏和导航栏 + 双屏启动器 + 自动会把启动器的各个板块(Steam、库、商店等)放到带内置副屏的掌机的第二块屏幕上。开启使用任意第二块显示屏。关闭则让启动器只显示在一块屏幕上。 + 双屏会话 + 自动会把游戏内菜单停靠在内置副屏上,而不是显示为浮层。开启使用任意第二块显示屏。关闭则菜单留在游戏屏幕上;仍可从菜单中选择第二块屏幕。 自动 开启 关闭 游戏中的下屏控制 + 文本框使用 Android 键盘 会话开始时在第二块屏幕上打开触控板和键盘。 正在为上屏输入 完成 默认主屏幕应用 选择主屏幕应用 + 空闲时从最近任务中隐藏启动器 + 仅当 DroidDeck 是默认主屏幕应用且没有正在运行的会话时生效。 选择 Linux 应用(测试版) 驱动更新会等到会话结束后进行。 @@ -1096,6 +1151,147 @@ 测试构建 在修复正式发布前先试用 当前没有 + 实验版 + 实验版本 + 使用中 + Android 重新优化 DroidDeck 后已暂停 + 未加载:%1$s + 等待重启 + 已保留 + 适用于其他版本 + 重建 + 会从设备中删除此版本 + 用该版本重启 + 关闭 + 使用 + 删除 + 立即删除 + 无法准备重启:%1$s。请在设置中配对无线调试后重试。 + 实验版已安装 + DroidDeck 已使用 %1$s 重启 + 实验版已暂停 + Android 重新优化了 DroidDeck,所以 %1$s 未加载。打开更新即可重启到该构建。 + 实验构建已停用 + 它为其他版本的 DroidDeck 构建,已保留在更新中。 + DroidDeck 在该构建上两次启动失败 + 智能体 + 智能体 + 智能体正在工作 + 在 Linux 用户空间中安装 Claude Code 才能使用智能体。 + 询问游戏、崩溃,或要求修改 DroidDeck + 发送 + 新对话 + 停止 + 存储 + 移除 + 立即移除 + Claude Code + Codex + DroidDeck 源码 + 下载缓存 + 未推送的更改将丢失 + 构建时会重新下载 + 设置流程可重新安装,登录状态保留 + DroidDeck 已重启到你的实验构建,从上次停下的地方继续。 + 让它排查游戏无法启动的原因、解释日志,或修改 DroidDeck 并在本设备上试用改动。 + 失败:%1$s + %1$s 已结束(退出码 %2$d) + 已停止 + 已结束,未收到回复 + 重试 + 正在设置智能体 + 为已安装的 DroidDeck 版本重建我的实验构建 %1$s,并重启到该构建。 + 输入 %1$s · 输出 %2$s + 思考中 + 思考 + 思考中 · %1$s + %1$s · %2$s + 输入 + 输出 + 运行中… + 无结果:本轮对话已提前结束 + 无输出 + 输入以排队下一条消息 + 排队 + 下一条:%1$s + 不发送 + 添加附件 + 移除 + 默认 + 推理强度 + 执行 + 修改 + 尚未更改 + 按计划执行。 + 立即发送 + 消息 + 更多 + 关闭 + 最新 + 处理中 + 上下文 + 已用 %1$s,共 %2$s + 本次对话 · %1$s + 首次回复后显示用量 + %1$d 小时限额 + %1$d 分钟限额 + 每周限额 + %1$d%% · %2$s 重置 + + %1$d 个文件 + %1$d 个文件 + + 先规划 + 规划 + 只提出计划,不改动任何内容 + 会话 + 还没有会话 + 刚刚 + 删除 + 将删除会话及其附件 + 进程 + Linux 用户空间中没有运行中的进程 + 智能体 + 停止 + 实验版构建 + 正在准备实验版构建 + %1$d%% · 约剩 %2$s + 约剩 %1$s + 取消 + 取消构建 + 正在启动 + %1$d%% + 正在打包 + 正在其上重启 DroidDeck + 完成 + 失败:%1$s + 设置智能体 + 请先在设置中安装 Linux 运行时 + 重试 + 开始对话 + 设备连接 + 开启无线调试,以便智能体查看并操控 DroidDeck + 安装 %1$s + 装入 Linux 用户空间,包含 git、gh 和 adb + 登录 %1$s + 打开浏览器 + GitHub + 可选,用于发起拉取请求 + 构建工具 + 可选,用于在此设备上进行 Lab 构建 · 约 5 GB + 智能体已就绪 + 完成智能体设置 + 已登录 %1$s + Lab 构建 + 快速构建 + 快速 Lab 构建 + 预先编译此版本,之后 Lab 构建只需几分钟 · 仅一次,约 20 分钟 + 编译中 · %1$d%% · 约还剩 %2$s + 准备 + 无线调试无法连接;配对即可开启 + 配对 + 安装 + 登录 PR #%1$d 未为此 DroidDeck 副本构建 已于 %1$s 更新 @@ -1331,6 +1527,14 @@ 应用 配置 更新 + 更多 + 编辑标签页 + 标签页 + 显示 + 在“更多”中 + 隐藏 + 将 %1$s 上移 + 将 %1$s 下移 %1$d%% 恢复 %1$s 在每个会话中显示为 /root/ROMs。内部存储位于 /root/Storage。 @@ -1352,6 +1556,15 @@ 取消排队 Android 键盘 隐藏 ✕ + 屏幕占比 + 键盘占屏幕的比例,含标题栏 + 不透明度 + 调低即可看见键盘后的游戏 + 隐藏按键 + 很少用的按键不显示在键盘上 + Esc 和功能键行 + Ins / Del / Home / End / PgUp / PgDn + 方向键 启动 %1$s 选择屏幕。副屏:%1$s。 副显示器已不可用。 @@ -1830,7 +2043,24 @@ 终端 Deck 背键 + 触控板 仪表盘 + 桌面 + 启动桌面 + 桌面 · %1$s + 触控板 + 直接触摸 + 触控板。轻触切换到直接触摸 + 直接触摸。轻触切换到触控板 + 正在启动 KDE 桌面… + 桌面已关闭 + 桌面无法启动。日志在本会话的 bottom-desktop 目录。 + 桌面已关闭 暂无内容。 + 交换屏幕 + 下屏正被占用 + 游戏屏幕 + 游戏显示在 + 上屏 + 下屏 下载 没有正在进行的下载。 Steam @@ -1865,6 +2095,20 @@ 燃料,t 主油箱 %1$s t 备用 %1$s t + 帧时间 + 最近 %1$d 秒 + 平均帧 + 1% 低帧率 + 超过 33 毫秒的帧 + %1$d / 分钟 + 已游玩 %1$s + %1$d 核,最高 %2$s GHz + %1$d 核 + 游戏 + %1$d Hz 下的帧率 + 红色标记处,HUD 会以红色显示温度。 + 整机 + 电池 发送仪表盘数据 自动 为此处列出的所有游戏开启,包括之后发现的游戏。你手动关闭的游戏会保持关闭。 @@ -1888,6 +2132,10 @@ 此游戏的麦克风已关闭。如需语音通话,请在 DroidDeck 的 Steam 设置(音频)中开启麦克风,然后重新启动游戏。 音量 %1$d%% 游戏内数据 + 下屏 HUD + 所有页签显示横条 + 1% 和 0.1% 低帧率 + CPU 温度 FPS CPU GPU @@ -2136,6 +2384,22 @@ 卡通描边加锐化。 不是 Adreno GPU + 系统 PowerVR 驱动:兼容性因设备而异 + 实验性:RADV 或系统 Xclipse 驱动 + 系统 PowerVR + 使用此 GPU 的内置驱动 + 运行时和显示均使用系统 PowerVR 驱动。 + 暂无开源驱动支持此 Mali:已启用 Mali 桥接。 + 这是非骁龙测试版本:此处的官方版本仅能在 Adreno 上运行,因此不会覆盖安装它。新的测试版本在 github.com/The412Banner/droiddeck-nonadreno-drivers 发布。 + 上次会话结束是因为 Android 为释放内存关闭了 DroidDeck,并非崩溃。请关闭其他应用或降低游戏的纹理设置后重试。 + Mali(Venus) + Mali 桥接 + 目前还没有开源驱动适配这款 Mali:使用 %1$s,基于手机自带驱动。 + %1$s 尚未发布:在此之前使用 %2$s。 + %1$s 不可用,且这款手机的驱动报告为 Vulkan %2$s(Venus 需要 1.2):将使用 Mali 桥接。 + %1$s 尚未发布:在此之前启用 Mali 桥接。 + 已排队:%1$s(等待其他运行时驱动) + DXVK 由系统 PowerVR 运行时提供。其他 DXVK 包可以保存,但搭配此驱动时不会生效。 受支持 实验性:其驱动为测试构建 Adreno 850 实验支持:需要配套的实验版显示驱动和游戏驱动;尚未在此设备上验证 @@ -2343,6 +2607,13 @@ 排序 侧边栏标签 在侧边栏图标下方显示名称。关闭后侧边栏更窄。 + 智能体宠物 + DeeDee 会悬浮在启动器和游戏上层,并显示智能体正在做什么。 + 显示在其他应用上层 + 让 DeeDee 悬浮在所有应用上层,并在那里打开聊天 + 允许 + DeeDee + 与 DeeDee 聊天 显示 较大卡片 较小卡片 @@ -2560,6 +2831,11 @@ 开发者 构建标签水印 在屏幕上显示测试版或 Lab 构建标签。默认启用。 + 分享诊断包 + 会话与设备 + 图形 + 游戏与兼容性 + 全部 可以游玩了 暂时还不能游玩 运行时 %1$s @@ -2589,6 +2865,9 @@ 在「商店」设置中开启 GOG 成就 成就不可用;请查看会话日志 成就已解锁 + Mali(Venus):关 + Mali(Venus):开 + %1$s 上的驱动报告 Vulkan %2$s。Mali(Venus)需要 Vulkan 1.2 或更高版本(更低版本下 gamescope 无法启动),因此会话会跳过 Venus,改用 PanVK 驱动组合。 粘贴 左摇杆 右摇杆 @@ -2942,6 +3221,7 @@ 游戏请求的 VC++ 与 DirectX 安装程序 运行 Linux x86 游戏 Steam 工具 + 对于自带反作弊的游戏,即使反作弊处于关闭状态,Steam 也会下载此项。删除后这些游戏的安装会卡在 0% DroidDeck 无需此运行时即可运行游戏 x86 Proton,DroidDeck 无法运行 所有游戏的默认项 @@ -3052,6 +3332,8 @@ DroidDeck · %1$d fps 60 fps 更流畅,但 Steam 启动时会占用更多 CPU。在 Steam 自身设置中选择的动画也会显示在这里。 声音 + 跳过启动影片 + 用一段 0.1 秒的黑色片段作为 Steam 的启动影片。下次会话生效。 自定义视频 MP4、MOV、MKV 或 WebM。其他格式及超过 %1$d MB 的文件会在设备上转换为 720p WebM,最长 %2$d 秒。 导入 @@ -3518,6 +3800,7 @@ 此 GPU 的 Vulkan 版本对 Proton 自带的 DXVK 来说太旧时,改用较旧的 DXVK。 每个 Proton 都使用自带的 DXVK,即使此 GPU 的 Vulkan 版本可能太旧。 Mali 桥接:关 + %1$s 无法使用 Mali 桥接(它要求 Mali GPU 没有系统驱动路线),因此此开关在这里不起作用。 Mali 桥接:开 %1$s 不是 Adreno。实验性 Vulkan 桥接已开启:会话通过手机自带的驱动绘制。可能会有问题,请发送会话日志。 安全模式 @@ -3671,6 +3954,7 @@ 无法导入此布局 猩红之雪 + 白色界面配红色点缀。 原声音乐 音乐 @@ -3734,4 +4018,6 @@ 单曲重复 音量 此原声音乐中没有音频文件 + 无法启动 + 没有可用的浏览器来打开此链接。 diff --git a/app/src/main/res/values-zh-rHK/input_library.xml b/app/src/main/res/values-zh-rHK/input_library.xml new file mode 100644 index 0000000000..20930002a7 --- /dev/null +++ b/app/src/main/res/values-zh-rHK/input_library.xml @@ -0,0 +1,132 @@ + + + 無法讀取的輸入設定已儲存在還原副本中。你可以繼續編輯還原的設定檔。 + 屬性 + 點擊屬性 + %1$s · 點擊 + 按鍵 + 搖桿、觸控板與扳機 + 隱藏工具 + 控制器 + 將控制器輸入傳送給 Steam Input 或遊戲。 + 此控制項不會傳送控制器、滑鼠或鍵盤輸入。 + 滑鼠點擊 + DroidDeck 動作 + 動作 + 捲動速度:%1$d 步/秒 + + 新增設定檔 + + 新增版面 + %1$s · 有 %2$d 個設定檔使用中。變更會套用到所有使用這些綁定的設定檔。 + 重新命名 + 刪除 + 先將控制項加入版面,再指派動作。 + 無法儲存輸入設定 + 名稱 + 起始自 + 按鍵 + 搖桿 + 觸控板 + 十字鍵 + 扳機 + 完成 + 復原 + + 新增 + 拖曳可移動,拖曳角落可調整大小,點一下「屬性」可指派動作。 + 正在副螢幕編輯 + 所選顯示器無法使用。連接後才能依實際大小編輯此版面。 + 捨棄未儲存的版面變更? + 此版面有 %1$d 個設定檔使用中。儲存的變更會套用到全部。 + 預設設定檔 + 桌面模式 + 遊戲模式 + 桌面與遊戲的預設 + 遊戲模式的預設 + 桌面模式的預設 + 裝置設定 + 控制 + 按鍵、搖桿、扳機與額外按鍵 + 複製設定檔 + 重設動作 + 將 %1$s 的動作重設為基礎設定檔的預設值?版面與其他設定檔不變。 + 刪除 %1$s?使用它的模式會回到內建預設設定檔。已儲存的版面與共用設定仍可使用。 + 顯示 + 對所有設定檔生效。遊戲模式下未連接控制器時,Auto 會顯示主螢幕控制。 + 在螢幕上編輯 + 已儲存的版面… + 選擇版面或自行建立 + 在副螢幕工作階段選單中選擇「設定檔控制」。控制器選單中的設定檔與副螢幕選擇決定顯示哪些控制項。 + 按鍵動作 + 與 %1$s 共用。修改也會套用到這些設定檔。 + 重複使用設定 + 使用設定來自… + 從其他設定檔複製,或保持設定共用 + 設為獨立 + 保留目前設定並停止共用修改 + 版面儲存控制項與位置。每個設定檔可各自指定動作。請在目標螢幕上以實際大小編輯。 + 目前版面 + 刪除未使用的版面 %1$s 及其儲存的動作? + 重新命名目前版面 + 從另一個設定檔重複使用 %1$s。其他控制來源保持不變。 + 保持實體控制共用 + 預設情況下所有控制項與自訂版面都是獨立副本。共用只連結實體控制。 + 使用這些控制項與位置。共用會讓之後的幾何修改保持同步,按鍵動作仍各自獨立。換用其他版面時動作是未指定的。 + 複製這些控制項與動作,或連結它們,讓之後的修改同時作用於兩個設定檔。 + 保持共用 + 獨立副本 + 從按下位置開始 + 不使用時隱藏搖桿 + 工具 + 自動 (%1$s) + 自訂 (%1$s) + 另存為新設定檔 + 設定檔控制 + 設定檔 + 滑鼠觸控板手勢 + 綁定到滑鼠指標時:輕點點擊、按住拖曳、雙指捲動。 + %1$s 有快速選單覆寫。在那裡選「自動」會使用它的預設設定檔與全部三個已儲存部分。 + DroidDeck 輸入 + 搖桿朝任意方向推動期間保持:超過 55% 時按下,低於 35% 時放開。用「方向鍵」逐方向指定。DroidDeck 動作每次推動只執行一次。搖桿點擊另外設定。 + 按住觸控板期間保持,抬手時放開。DroidDeck 動作每次觸碰執行一次。觸控板點擊另外設定。 + 扳機超過 55% 時保持,低於 35% 時放開。DroidDeck 動作每次按下執行一次。 + 捲動方向 + 垂直 + 水平 + 水平捲動 + 測量 + 開啟記錄,在執行中的工作階段使用控制項,然後回來讀取結果。只測 DroidDeck 的傳送時間,不含顯示延遲。App 程序關閉時記錄結束。 + %1$d 個控制項 + 其他已儲存的版面 (%1$d) ▾ + 隱藏其他已儲存的版面 (%1$d) ▴ + 首頁 / Guide + 返回 · 單擊 + 返回 · 雙擊 + 返回 · Steam 裡兩下,桌面上一下 + Steam 模式下。按住返回也會開啟快速選單。 + 恢復預設 + 面板選擇會被記住。桌面會開啟第二個工作區,不切換工作階段或其輸入設定檔。 + 虛擬控制器 + Steam 或遊戲看到的控制器類型。 + 觸控螢幕 + 遊戲畫面上的觸碰如何處理。設定檔裡的按鍵保持各自指定的動作。 + 觸碰游標 + 在遊戲畫面上直接觸碰時顯示指標。 + 觸碰並按住 + 手指按住遊戲畫面時的滑鼠動作。 + 返回鍵點擊 + 第一個動作:單擊。第二個動作:雙擊。 + 開關按鍵 + 點一下按住,再點一下放開。開啟選單或切換設定檔會放開按鍵。 + 形狀 + 圓角 + 膠囊 + 圓形 + 矩形 + 按鍵文字 + 文字 + 匯入的圖片 + 獨立斜向鍵 + 給每個斜向指定一個鍵。空的斜向會按相鄰的兩個方向。 + 相鄰方向 + 舊的螢幕按鍵已存為下方的匯入設定檔。選一個使用或編輯。目前選取的設定檔保持不變。 + 無法自動匯入舊的螢幕按鍵。原設定已保留。 + diff --git a/app/src/main/res/values-zh-rHK/input_strings.xml b/app/src/main/res/values-zh-rHK/input_strings.xml new file mode 100644 index 0000000000..713cc729e8 --- /dev/null +++ b/app/src/main/res/values-zh-rHK/input_strings.xml @@ -0,0 +1,38 @@ + + + 輸入設定檔 + 設定檔 + 實體控制器 + 主螢幕 + 副螢幕 + 原生 / Steam Input + 原生:%1$s + 傳送另一個控制器按鍵 + 已停用 + 按鍵或組合鍵 + 方向鍵 + 移動指標 + 指標速度:%1$d + 捲動 + 垂直捲動 + 滑鼠左鍵 + 滑鼠右鍵 + 滑鼠中鍵 + 開啟 DroidDeck 選單 + 顯示鍵盤 + 開啟 Steam 選單 + 開啟 Steam 快速選單 + 移除控制項 + 新增控制項 + 此裝置專用按鍵 + 指定實體按鍵 + 放開按鍵,然後選擇編輯、重試或取消。放開後按 B 或返回可取消。 + 重試 + 按下任意按鍵,包括被識別為鍵盤按鍵的返回鍵。音量鍵與 Android 系統鍵已保留。指定僅適用於此裝置。 + 移除指定 + 輸入診斷 + 記錄輸入傳送時間 + 讀取測量結果 + 測量從 Android 派送到發佈至現有輸入通道的時間。不含藍牙接收、客體輪詢、繪製與顯示延遲。預設不記錄。 + 使用一般輸入綁定 + diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 3ed9ca90e1..89a15f33df 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -185,6 +185,7 @@ 無法下載 PowerVR 圖形環境。請檢查網絡連線後再試。 無法下載 DirectAudio,因此本次會話的遊戲音訊會使用較慢的路徑。 此程式 + 工作階段無法把畫面繪製到螢幕:%1$s。這個畫面會顯示原因,而不是黑畫面;詳情載於工作階段記錄。 無法下載 Steam 用戶端。你的網絡或 VPN 可能封鎖了 Steam 的伺服器;請檢查連線後再試。 無法設定 Steam 用戶端。請檢查連線和可用儲存空間,然後再試。 %1$s 是為 x86 電腦而設,需透過 FEX 執行,但 FEX 尚未安裝。請在登入狀態下啟動一次 Steam,讓它下載 FEX 和 Steam Linux Runtime,然後再啟動此程式。 @@ -386,6 +387,9 @@ 這裏暫不支援 正在載入組件… 無法安裝:%1$s + 這個下載項目需要更新。 + 更新已排隊。 + 重試更新 已下載 正在下載 %1$s 正在安裝:%1$s @@ -416,6 +420,22 @@ 只限內部儲存空間 資料夾:%1$s 第二個收藏庫 + 更多 Steam 程式庫 + Steam 可用來安裝及執行遊戲的資料夾,各有自己的名稱。移除程式庫不會刪除當中的遊戲。 + 新增程式庫 + 重新命名 + 程式庫名稱 + 為程式庫選擇資料夾 + 最多可新增 %1$d 個程式庫 + 這個資料夾已是程式庫,或位於另一個程式庫之內 + %1$s · 無法使用 + 由下一個 Steam 工作階段起生效 + 在此裝置找到 · %1$s · %2$s + 新增 + 尋找內部儲存空間中的程式庫 + 授予所有檔案存取權,DroidDeck 才能查看其他應用程式存放在內部儲存空間的 Steam 程式庫 + 允許 + 已新增 %1$s,即所選資料夾內的 Steam 程式庫 從 SD 卡或共用儲存空間串流資源的遊戲可能會卡頓。 儲存空間診斷 在分享的記錄中加入空間分配結果和抽樣的儲存時間數據。啟用時可能會減慢安裝速度。下次會話生效。 @@ -603,7 +623,10 @@ 停用 Proton 的控制器導覽輔助程式,它在每個遊戲中都會佔用 CPU。 不使用 seccomp 執行 proot 可能修正部分內核上缺少系統呼叫的錯誤,但可能降低效能。 + 不使用 proot 執行(實驗性) + 直接在 Android 上啟動 Linux 環境,於下一個工作階段生效。若有項目無法啟動,請關閉此選項。 proot 快速路徑 + 不使用 proot 時不會用到。 需要 proot 的 seccomp 篩選器。 檔案查找更快,卡頓更少。如果程式找不到其檔案,請關閉此項。 在 gamescope 內繪製游標 @@ -841,15 +864,38 @@ 會話 會話記錄 每次會話後儲存 + 為下一個工作階段啟用進階診斷 + 只為一個工作階段收集詳細記錄,可能影響效能並耗用較多儲存空間。工作階段啟動後會自動關閉;分享前請先查看記錄。 遊戲偵錯記錄 在下次啟動遊戲時加入 Proton、Wine 和圖形診斷資訊。可能降低效能並佔用更多儲存空間。 重新啟動此會話以儲存遊戲偵錯記錄 無法更新記錄設定。請檢查開關後再試一次。 偵錯工具 + 詳細圖形記錄 + Steam 介面:GPU 繪製 + 使用 Xclipse 驅動程式組合時,Steam 會以軟件繪製頁面(GPU 繪製曾出現圖塊破損)。若在這部手機上顯示正常,可開啟以加快 Steam 介面。 + 建置於 %1$s + %1$s 已更新至最新建置 + Mali 橋接在上次工作階段於 %1$s 進行自我測試時失敗(影像或繪製),因此該工作階段改用了 PanVK 驅動程式組合。 + Mali 橋接在上次工作階段找不到與 %1$s 上的驅動程式共用記憶體的方法,因此該工作階段改用了 PanVK 驅動程式組合。此橋接無法在這部手機運作;關閉它可繼續使用 PanVK 組合。 + 各遊戲的 Proton、DXVK 及驅動程式記錄會加入工作階段記錄。GPU 不是 Adreno 時一律開啟。 最新的會話記錄 已儲存的會話記錄 保留最新的 %1$d 個 清除記錄 + 可用的工作階段記錄 + 尚未儲存任何工作階段記錄。 + 分享及儲存的 ZIP 檔包含所選工作階段的記錄,以及相關的 Steam、商店、工具及 Battle.net 診斷資料。 + %1$s · %2$s + 目前工作階段 + 分享 + 儲存至裝置 + 刪除 + 刪除工作階段記錄? + 刪除 %1$s?此動作無法復原。 + 工作階段記錄已儲存。 + 無法儲存工作階段記錄。 + 無法刪除工作階段記錄。 重設所有設定 將所有設定還原為預設值 重設 @@ -876,6 +922,8 @@ 用作主畫面 DroidDeck 可用作主畫面應用程式 DroidDeck 不會作為主畫面應用程式的選項 + 主頁鍵開啟 + 當 DroidDeck 為主畫面應用程式,按下主頁鍵時顯示的分頁。 請在「新增遊戲」中將 DroidDeck 設為「包含」 螢幕方向 啟動器方向 @@ -889,15 +937,22 @@ 全螢幕 隱藏 Android 狀態列和導覽列 顯示 Android 狀態列和導覽列 + 雙螢幕啟動器 + 自動會把啟動器各部分(Steam、收藏庫、商店及其他部分)放到內建雙螢幕手持裝置的第二螢幕。開啟會使用任何第二顯示器。關閉會將啟動器保持在單一螢幕。 + 雙螢幕工作階段 + 自動會把遊戲內選單固定在內建第二螢幕,而非以彈出式視窗顯示。開啟會使用任何第二顯示器。關閉會把選單留在遊戲畫面;你仍可從選單選擇第二螢幕。 自動 開啟 關閉 遊戲中的下屏控制 + 文字欄位使用 Android 鍵盤 工作階段開始時在第二塊螢幕上開啟觸控板和鍵盤。 正在為上屏輸入 完成 預設主畫面應用程式 選擇主畫面應用程式 + 閒置時從「最近使用」中隱藏主畫面 + 僅在 DroidDeck 為預設主畫面應用程式,且沒有工作階段正在執行時生效。 選擇 Linux 應用程式(測試版) 檔案 @@ -1012,6 +1067,147 @@ 測試版本 在正式發佈前試用修正 目前沒有 + 實驗版本 + 實驗版本 + 使用中 + Android 重新最佳化 DroidDeck 後已暫停 + 未載入:%1$s + 等待重新啟動 + 已保留 + 適用於另一個版本 + 重建 + 會從裝置刪除這個版本 + 以此版本重新啟動 + 關閉 + 使用 + 刪除 + 立即刪除 + 無法準備重新啟動:%1$s。請在設定中完成無線偵錯配對,然後再試一次。 + 實驗版本已安裝 + DroidDeck 已以 %1$s 重新啟動 + 實驗版本已暫停 + Android 重新優化了 DroidDeck,因此沒有載入 %1$s。到「更新」重新啟動即可使用它。 + 實驗版已關閉 + 它是為另一個 DroidDeck 版本建置的,現保留在「更新」。 + DroidDeck 兩次都無法在該版本啟動 + 代理 + 代理 + 代理正在運作 + 在 Linux 用戶空間安裝 Claude Code,才可使用代理。 + 可問遊戲、當機原因,或 DroidDeck 改動 + 傳送 + 新對話 + 停止 + 儲存空間 + 移除 + 立即移除 + Claude Code + Codex + DroidDeck 原始碼 + 下載快取 + 未推送的變更會遺失 + 建置時會重新下載 + 設定流程可重新安裝;登入資料會保留 + DroidDeck 已在你的實驗版重新啟動,可從上次停下的地方繼續。 + 叫它解釋遊戲為何無法啟動、解讀記錄檔,或修改 DroidDeck 並在這部裝置試用改動。 + 失敗:%1$s + %1$s 已結束(退出碼 %2$d) + 已停止 + 已結束,沒有回覆 + 重試 + 正在設定代理 + 把我的實驗版 %1$s 按目前安裝的 DroidDeck 版本重新建置,並以它重新啟動。 + 輸入 %1$s · 輸出 %2$s + 思考中 + 思考過程 + 思考中 · %1$s + %1$s · %2$s + 輸入 + 輸出 + 執行中… + 沒有結果:回合已先結束 + 沒有輸出 + 輸入即可排入下一則訊息 + 排入 + 下一則:%1$s + 不要傳送 + 附加 + 移除 + 預設 + 推理強度 + 執行 + 修改 + 尚未有任何更改 + 按計劃執行。 + 立即傳送 + 訊息 + 更多 + 關閉 + 最新 + 處理中 + 上下文 + %1$s / %2$s + 本對話 · %1$s + 首次回覆後才會顯示用量 + %1$d 小時上限 + %1$d 分鐘上限 + 每週上限 + %1$d%% · %2$s 重設 + + %1$d 個檔案 + %1$d 個檔案 + + 先規劃 + 規劃 + 只提出規劃,不變更任何內容 + 對話 + 尚未有對話 + 剛剛 + 刪除 + 將刪除對話及其附加檔案 + 處理程序 + Linux 使用者空間中沒有程式在執行 + 代理程式 + 停止 + 實驗版建置 + 正在準備實驗版建置 + %1$d%% · 約剩 %2$s + 約剩 %1$s + 取消 + 取消建置 + 正在啟動 + %1$d%% + 正在封裝 + 正在以實驗版重新啟動 DroidDeck + 完成 + 失敗:%1$s + 設定代理程式 + 請先在設定中安裝 Linux 執行環境。 + 重試 + 開始對話 + 裝置連線 + 透過無線偵錯,讓代理程式能查看及操作 DroidDeck + 安裝 %1$s + 安裝至 Linux 使用者空間,包含 git、gh 及 adb + 登入 %1$s + 會開啟瀏覽器 + GitHub + 選填,用來發起拉取請求 + 建置工具 + 選填,供此裝置進行 Lab 建置 · 約 5 GB + 代理程式已就緒 + 完成代理程式設定 + 已登入 %1$s + Lab 建置 + 快速建置 + 快速 Lab 建置 + 預先編譯此版本,令 Lab 建置只需數分鐘 · 一次性約 20 分鐘 + 編譯中 · %1$d%% · 約剩 %2$s + 準備 + 無線偵錯無法連線;按「配對」即可開啟 + 配對 + 安裝 + 登入 PR #%1$d 沒有為此 DroidDeck 版本建置 已更新 %1$s @@ -1247,6 +1443,14 @@ 應用程式 設定 更新 + 更多 + 編輯分頁 + 分頁 + 顯示 + 「更多」內 + 隱藏 + 將 %1$s 上移 + 將 %1$s 下移 %1$d%% 繼續 %1$s 在每個會話中顯示為 /root/ROMs。內部儲存空間位於 /root/Storage。 @@ -1268,6 +1472,15 @@ 取消排隊 Android 鍵盤 隱藏 ✕ + 畫面佔比 + 鍵盤佔用的畫面比例,包括標題列。 + 不透明度 + 調低即可看到鍵盤後方的遊戲畫面。 + 隱藏按鍵 + 少用的按鍵不會顯示在鍵盤上。 + Esc 與功能鍵列 + Ins / Del / Home / End / PgUp / PgDn + 方向鍵 啟動 %1$s 選擇螢幕。副螢幕:%1$s。 副螢幕已無法使用。 @@ -1752,7 +1965,24 @@ 終端機 Deck 握把 + 觸控板 儀表板 + 桌面 + 啟動桌面 + 桌面 · %1$s + 觸控板 + 直接觸控 + 觸控板。輕觸切換至直接觸控 + 直接觸控。輕觸切換至觸控板 + 正在啟動 KDE 桌面… + 桌面已結束。 + 桌面無法啟動。其記錄檔位於此工作階段的 bottom-desktop 資料夾。 + 桌面已關閉。 目前沒有可顯示的內容。 + 交換螢幕 + 下方螢幕現正被佔用 + 遊戲螢幕 + 將遊戲顯示於 + 上方螢幕 + 下方螢幕 下載 沒有進行中的下載。 Steam @@ -1787,6 +2017,20 @@ 燃料,t 主油箱 %1$s t 備用 %1$s t + 幀時間 + 最近 %1$d 秒 + 平均幀時間 + 1% 低幀率 + 超過 33 毫秒的幀 + %1$d / 分鐘 + 已遊玩 %1$s + %1$d 核心,最高可達 %2$s GHz + %1$d 核心 + 遊戲 + %1$d Hz 下的 FPS + 紅色標記是 HUD 將溫度顯示為紅色的界線。 + 整機 + 電池 傳送儀表板資料 自動 為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。 @@ -1810,6 +2054,10 @@ 此遊戲的麥克風已關閉。若要說話,請在 DroidDeck 的 Steam 設定(音訊)中開啟麥克風,然後重新啟動遊戲。 音量 %1$d%% 遊戲內數據 + 下方螢幕 HUD + 在所有分頁顯示資訊列 + 1% 及 0.1% 低幀率 + CPU 溫度 FPS CPU GPU @@ -1981,6 +2229,7 @@ 正在啟動會話… 已過 %1$d:%2$02d · 仍在處理 正在下載 Steam 用戶端更新 · %1$d%% + 正在套用 Steam 用戶端更新… 正在下載 Steam 用戶端 · %1$s 已有兼容性工具正在安裝 @@ -2057,6 +2306,22 @@ 卡通描邊加上銳化。 不是 Adreno GPU + 系統 PowerVR 驅動程式:相容性因裝置而異 + 實驗性:RADV 或系統 Xclipse 驅動程式 + 系統 PowerVR + 使用此 GPU 的內建驅動程式 + 已為執行環境及顯示選用系統 PowerVR 驅動程式。 + 目前仍未有開源驅動程式支援這款 Mali:已啟用 Mali 橋接。 + 這是非 Snapdragon 測試版本:這裡的官方版本只能在 Adreno 上執行,因此不會覆蓋安裝到此版本。新測試版本可於 github.com/The412Banner/droiddeck-nonadreno-drivers 取得。 + 上次執行結束是因為 Android 為釋放記憶體關閉了 DroidDeck,並非當機。請關閉其他應用程式或調低遊戲的貼圖設定,再試一次。 + Mali (Venus) + Mali 橋接 + 目前仍未有開源驅動程式支援這款 Mali:會使用 %1$s,搭配手機本身的驅動程式。 + %1$s 尚未發布:在發布前會使用 %2$s。 + %1$s 無法使用,而且這部手機的驅動程式顯示 Vulkan %2$s(Venus 需要 1.2):會改用 Mali 橋接。 + %1$s 尚未發布:在發布前會啟用 Mali 橋接。 + 已排入隊列:%1$s(正等待另一個執行環境驅動程式) + DXVK 由系統 PowerVR 執行環境提供。其他 DXVK 套件可以儲存,但搭配此驅動程式時不會套用。 受支援 實驗性:其驅動程式為測試版本 Adreno 850 實驗性支援:需要相容的實驗版顯示驅動程式及遊戲驅動程式;尚未在此裝置上驗證 @@ -2262,6 +2527,13 @@ 排序 側邊欄標籤 在側邊欄圖示下方顯示名稱。關閉可讓側邊欄更窄。 + 代理寵物 + DeeDee 會浮動於主畫面及遊戲之上,並顯示代理正在做甚麼。 + 浮動於其他應用程式之上 + 讓 DeeDee 浮動於所有應用程式之上,並可在該處開啟對話 + 允許 + DeeDee + 與 DeeDee 對話 顯示 較大卡片 較小卡片 @@ -2547,6 +2819,11 @@ 開發人員 建置標籤浮水印 在畫面上顯示測試版或 Lab 建置標籤。預設啟用。 + 分享診斷資料包 + 工作階段與裝置 + 圖形 + 遊戲與相容性 + 全部資料包 可以開始遊戲 尚未可以開始遊戲 運行環境 %1$s @@ -2585,6 +2862,9 @@ 在「商店」設定中開啟 GOG 成就 成就不可用;請查看工作階段日誌 成就已解鎖 + Mali (Venus):關閉 + Mali (Venus):開啟 + %1$s 上的驅動程式顯示 Vulkan %2$s。Mali (Venus) 需要 Vulkan 1.2 或更新版本(較舊版本無法啟動 gamescope),因此執行時會略過 Venus,改用 PanVK 驅動程式組合。 貼上 左搖桿 右搖桿 @@ -2938,6 +3218,7 @@ 遊戲要求的 VC++ 與 DirectX 安裝程式 運行 Linux x86 遊戲 Steam 工具 + 即使防作弊功能關閉,Steam 仍會為附有防作弊的遊戲下載此項目。移除後,這些遊戲的安裝會卡在 0% DroidDeck 不需要此運行環境即可運行遊戲 x86 Proton,DroidDeck 無法運行 所有遊戲的預設項目 @@ -3048,6 +3329,8 @@ DroidDeck · %1$d fps 60 fps 較流暢,但 Steam 啟動時會使用較多 CPU。在 Steam 本身設定中選擇的動畫也會顯示在這裡。 聲音 + 跳過啟動影片 + 以 0.1 秒全黑片段作為 Steam 的啟動影片。下次工作階段生效。 自訂影片 MP4、MOV、MKV 或 WebM。其他格式及超過 %1$d MB 的檔案會在裝置上轉換為 720p WebM,最長 %2$d 秒。 匯入 @@ -3514,6 +3797,7 @@ 此 GPU 的 Vulkan 版本對 Proton 內建的 DXVK 來說太舊時,改用較舊的 DXVK。 每個 Proton 都使用內建的 DXVK,即使此 GPU 的 Vulkan 版本可能太舊。 Mali 橋接:關 + %1$s 無法使用 Mali 橋接(這項功能需要沒有系統驅動程式途徑的 Mali GPU),因此這個開關在此無效。 Mali 橋接:開 %1$s 不是 Adreno。實驗性 Vulkan 橋接已開啟:工作階段透過手機內建的驅動程式繪製。可能會有問題,請傳送工作階段記錄。 安全模式 @@ -3670,6 +3954,7 @@ 無法匯入此佈局 緋紅之雪 + 白色表面配紅色點綴。 原聲帶 音樂 @@ -3733,4 +4018,6 @@ 單曲重複 音量 此原聲帶中沒有音訊檔案 + 無法啟動 + 沒有可用的網頁瀏覽器可開啟此連結。 diff --git a/app/src/main/res/values-zh-rTW/input_library.xml b/app/src/main/res/values-zh-rTW/input_library.xml new file mode 100644 index 0000000000..20930002a7 --- /dev/null +++ b/app/src/main/res/values-zh-rTW/input_library.xml @@ -0,0 +1,132 @@ + + + 無法讀取的輸入設定已儲存在還原副本中。你可以繼續編輯還原的設定檔。 + 屬性 + 點擊屬性 + %1$s · 點擊 + 按鍵 + 搖桿、觸控板與扳機 + 隱藏工具 + 控制器 + 將控制器輸入傳送給 Steam Input 或遊戲。 + 此控制項不會傳送控制器、滑鼠或鍵盤輸入。 + 滑鼠點擊 + DroidDeck 動作 + 動作 + 捲動速度:%1$d 步/秒 + + 新增設定檔 + + 新增版面 + %1$s · 有 %2$d 個設定檔使用中。變更會套用到所有使用這些綁定的設定檔。 + 重新命名 + 刪除 + 先將控制項加入版面,再指派動作。 + 無法儲存輸入設定 + 名稱 + 起始自 + 按鍵 + 搖桿 + 觸控板 + 十字鍵 + 扳機 + 完成 + 復原 + + 新增 + 拖曳可移動,拖曳角落可調整大小,點一下「屬性」可指派動作。 + 正在副螢幕編輯 + 所選顯示器無法使用。連接後才能依實際大小編輯此版面。 + 捨棄未儲存的版面變更? + 此版面有 %1$d 個設定檔使用中。儲存的變更會套用到全部。 + 預設設定檔 + 桌面模式 + 遊戲模式 + 桌面與遊戲的預設 + 遊戲模式的預設 + 桌面模式的預設 + 裝置設定 + 控制 + 按鍵、搖桿、扳機與額外按鍵 + 複製設定檔 + 重設動作 + 將 %1$s 的動作重設為基礎設定檔的預設值?版面與其他設定檔不變。 + 刪除 %1$s?使用它的模式會回到內建預設設定檔。已儲存的版面與共用設定仍可使用。 + 顯示 + 對所有設定檔生效。遊戲模式下未連接控制器時,Auto 會顯示主螢幕控制。 + 在螢幕上編輯 + 已儲存的版面… + 選擇版面或自行建立 + 在副螢幕工作階段選單中選擇「設定檔控制」。控制器選單中的設定檔與副螢幕選擇決定顯示哪些控制項。 + 按鍵動作 + 與 %1$s 共用。修改也會套用到這些設定檔。 + 重複使用設定 + 使用設定來自… + 從其他設定檔複製,或保持設定共用 + 設為獨立 + 保留目前設定並停止共用修改 + 版面儲存控制項與位置。每個設定檔可各自指定動作。請在目標螢幕上以實際大小編輯。 + 目前版面 + 刪除未使用的版面 %1$s 及其儲存的動作? + 重新命名目前版面 + 從另一個設定檔重複使用 %1$s。其他控制來源保持不變。 + 保持實體控制共用 + 預設情況下所有控制項與自訂版面都是獨立副本。共用只連結實體控制。 + 使用這些控制項與位置。共用會讓之後的幾何修改保持同步,按鍵動作仍各自獨立。換用其他版面時動作是未指定的。 + 複製這些控制項與動作,或連結它們,讓之後的修改同時作用於兩個設定檔。 + 保持共用 + 獨立副本 + 從按下位置開始 + 不使用時隱藏搖桿 + 工具 + 自動 (%1$s) + 自訂 (%1$s) + 另存為新設定檔 + 設定檔控制 + 設定檔 + 滑鼠觸控板手勢 + 綁定到滑鼠指標時:輕點點擊、按住拖曳、雙指捲動。 + %1$s 有快速選單覆寫。在那裡選「自動」會使用它的預設設定檔與全部三個已儲存部分。 + DroidDeck 輸入 + 搖桿朝任意方向推動期間保持:超過 55% 時按下,低於 35% 時放開。用「方向鍵」逐方向指定。DroidDeck 動作每次推動只執行一次。搖桿點擊另外設定。 + 按住觸控板期間保持,抬手時放開。DroidDeck 動作每次觸碰執行一次。觸控板點擊另外設定。 + 扳機超過 55% 時保持,低於 35% 時放開。DroidDeck 動作每次按下執行一次。 + 捲動方向 + 垂直 + 水平 + 水平捲動 + 測量 + 開啟記錄,在執行中的工作階段使用控制項,然後回來讀取結果。只測 DroidDeck 的傳送時間,不含顯示延遲。App 程序關閉時記錄結束。 + %1$d 個控制項 + 其他已儲存的版面 (%1$d) ▾ + 隱藏其他已儲存的版面 (%1$d) ▴ + 首頁 / Guide + 返回 · 單擊 + 返回 · 雙擊 + 返回 · Steam 裡兩下,桌面上一下 + Steam 模式下。按住返回也會開啟快速選單。 + 恢復預設 + 面板選擇會被記住。桌面會開啟第二個工作區,不切換工作階段或其輸入設定檔。 + 虛擬控制器 + Steam 或遊戲看到的控制器類型。 + 觸控螢幕 + 遊戲畫面上的觸碰如何處理。設定檔裡的按鍵保持各自指定的動作。 + 觸碰游標 + 在遊戲畫面上直接觸碰時顯示指標。 + 觸碰並按住 + 手指按住遊戲畫面時的滑鼠動作。 + 返回鍵點擊 + 第一個動作:單擊。第二個動作:雙擊。 + 開關按鍵 + 點一下按住,再點一下放開。開啟選單或切換設定檔會放開按鍵。 + 形狀 + 圓角 + 膠囊 + 圓形 + 矩形 + 按鍵文字 + 文字 + 匯入的圖片 + 獨立斜向鍵 + 給每個斜向指定一個鍵。空的斜向會按相鄰的兩個方向。 + 相鄰方向 + 舊的螢幕按鍵已存為下方的匯入設定檔。選一個使用或編輯。目前選取的設定檔保持不變。 + 無法自動匯入舊的螢幕按鍵。原設定已保留。 + diff --git a/app/src/main/res/values-zh-rTW/input_strings.xml b/app/src/main/res/values-zh-rTW/input_strings.xml new file mode 100644 index 0000000000..713cc729e8 --- /dev/null +++ b/app/src/main/res/values-zh-rTW/input_strings.xml @@ -0,0 +1,38 @@ + + + 輸入設定檔 + 設定檔 + 實體控制器 + 主螢幕 + 副螢幕 + 原生 / Steam Input + 原生:%1$s + 傳送另一個控制器按鍵 + 已停用 + 按鍵或組合鍵 + 方向鍵 + 移動指標 + 指標速度:%1$d + 捲動 + 垂直捲動 + 滑鼠左鍵 + 滑鼠右鍵 + 滑鼠中鍵 + 開啟 DroidDeck 選單 + 顯示鍵盤 + 開啟 Steam 選單 + 開啟 Steam 快速選單 + 移除控制項 + 新增控制項 + 此裝置專用按鍵 + 指定實體按鍵 + 放開按鍵,然後選擇編輯、重試或取消。放開後按 B 或返回可取消。 + 重試 + 按下任意按鍵,包括被識別為鍵盤按鍵的返回鍵。音量鍵與 Android 系統鍵已保留。指定僅適用於此裝置。 + 移除指定 + 輸入診斷 + 記錄輸入傳送時間 + 讀取測量結果 + 測量從 Android 派送到發佈至現有輸入通道的時間。不含藍牙接收、客體輪詢、繪製與顯示延遲。預設不記錄。 + 使用一般輸入綁定 + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1f675e8e91..dcdfb41be2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -185,6 +185,7 @@ 無法下載 PowerVR 圖形環境。請檢查網路連線後再試。 無法下載 DirectAudio,因此本次工作階段的遊戲音訊會使用較慢的路徑。 此程式 + 工作階段無法在螢幕上繪製畫面:%1$s。此畫面會顯示原因,而不是黑畫面;詳細資訊請見工作階段記錄。 無法下載 Steam 用戶端。你的網路或 VPN 可能封鎖了 Steam 的伺服器;請檢查連線後再試一次。 無法設定 Steam 用戶端。請檢查連線和可用儲存空間,然後再試一次。 %1$s 是為 x86 電腦組建的,需透過 FEX 執行,但 FEX 尚未安裝。請在登入狀態下啟動一次 Steam,讓它下載 FEX 和 Steam Linux Runtime,然後再重新啟動此程式。 @@ -386,6 +387,9 @@ 這裡尚不支援 正在載入元件… 無法安裝:%1$s + 此下載項目需要更新。 + 已排定更新。 + 重試更新 已下載 正在下載 %1$s 正在安裝:%1$s @@ -416,6 +420,22 @@ 僅內部儲存空間 資料夾:%1$s 第二收藏庫 + 更多 Steam 收藏庫 + Steam 可安裝遊戲並從中執行的資料夾,各自以名稱區分。移除後,裡面的遊戲仍會保留在儲存空間中。 + 新增收藏庫 + 重新命名 + 收藏庫名稱 + 為收藏庫選擇資料夾 + 最多可新增 %1$d 個收藏庫 + 該資料夾已是收藏庫,或位於某個收藏庫內 + %1$s · 無法使用 + 自下次 Steam 工作階段起生效 + 在此裝置找到 · %1$s · %2$s + 新增 + 尋找內部儲存空間中的收藏庫 + 允許存取所有檔案,讓 DroidDeck 能找到其他應用程式存放在內部儲存空間的 Steam 收藏庫 + 允許 + 已新增 %1$s,即所選資料夾內的 Steam 收藏庫 從 SD 卡或共用儲存空間讀取資源的遊戲可能會卡頓。 儲存空間診斷 在「分享日誌」中記錄空間配置結果和取樣的儲存存取時間。啟用期間可能會減慢安裝速度。下次工作階段生效。 @@ -603,7 +623,10 @@ 停用 Proton 的手把導覽輔助程式,該程式會在每個遊戲中佔用 CPU。 在不使用 seccomp 的情況下執行 proot 可能修正某些核心上缺少系統呼叫的錯誤,但可能降低效能。 + 不使用 proot 執行(實驗性) + 直接在 Android 上啟動 Linux 端。於下次工作階段生效;若有項目無法啟動,請關閉此選項。 proot 快速路徑 + 不使用 proot 時不生效。 需要 proot 的 seccomp 篩選器。 檔案尋找更快、卡頓更少。如果程式找不到檔案,請關閉此項。 在 gamescope 內繪製游標 @@ -841,15 +864,38 @@ 工作階段 工作階段日誌 每次工作階段結束後儲存 + 下次工作階段的進階診斷 + 只收集一個工作階段的詳細記錄。可能降低效能並使用較多儲存空間;工作階段啟動時會自動關閉,分享前請先檢視記錄。 遊戲偵錯日誌 在下次啟動遊戲時加入 Proton、Wine 和圖形診斷資訊。可能降低效能並佔用更多儲存空間。 重新啟動此工作階段以儲存遊戲偵錯日誌 無法更新日誌設定。請檢查開關後再試一次。 偵錯工具 + 詳細圖形記錄 + Steam 介面:GPU 繪製 + 使用 Xclipse 驅動程式組合時,Steam 會改用軟體繪製頁面(GPU 繪製曾出現圖塊破損)。若這支手機上顯示正常,開啟此選項可加快 Steam 介面。 + 建置 %1$s + %1$s 已更新至最新建置 + Mali 橋接上次工作階段在 %1$s 上的自我測試未通過(影像或繪製),因此該工作階段改用 PanVK 驅動程式組。 + Mali 橋接上次工作階段在 %1$s 上找不到與驅動程式共用記憶體的方法,因此該工作階段改用 PanVK 驅動程式組。這支手機無法使用橋接功能;關閉它後仍會使用 PanVK 驅動程式組。 + 各遊戲的 Proton、DXVK 與驅動程式記錄會納入該工作階段的記錄。GPU 不是 Adreno 時一律開啟。 最新工作階段日誌 已儲存的工作階段日誌 保留最新的 %1$d 個 清除日誌 + 可用的工作階段記錄 + 尚無儲存的工作階段記錄。 + 分享與儲存的 ZIP 檔包含所選工作階段,以及相關的 Steam、商店、工具與 Battle.net 診斷資訊。 + %1$s · %2$s + 目前工作階段 + 分享 + 儲存至裝置 + 刪除 + 刪除工作階段記錄? + 刪除 %1$s?此動作無法復原。 + 工作階段記錄已儲存。 + 無法儲存工作階段記錄。 + 無法刪除工作階段記錄。 重設所有設定 將所有設定還原為預設值 重設 @@ -876,6 +922,8 @@ 用作主螢幕 DroidDeck 可以作為主螢幕應用程式 DroidDeck 不會作為主螢幕應用程式提供 + 按主畫面鍵開啟 + 當 DroidDeck 為主畫面應用程式,且按下主畫面鍵時顯示的頁面 請在「新增遊戲」中將 DroidDeck 設為「包含」 螢幕方向 啟動器方向 @@ -889,15 +937,22 @@ 全螢幕 隱藏 Android 狀態列和導覽列 顯示 Android 狀態列和導覽列 + 雙螢幕啟動器 + 自動:在內建第二螢幕的掌機上,將啟動器區塊(Steam、收藏庫、商店等)放到第二螢幕。開啟:使用任一第二螢幕。關閉:啟動器維持在單一螢幕。 + 雙螢幕工作階段 + 自動:將遊戲內選單固定在內建第二螢幕,而不以彈出視窗顯示。開啟:使用任一第二螢幕。關閉:選單維持在遊戲畫面,仍可從中挑選第二螢幕。 自動 開啟 關閉 遊戲中的下螢幕控制 + 文字欄位使用 Android 鍵盤 工作階段開始時在第二個螢幕上開啟觸控板和鍵盤。 正在為上螢幕輸入 完成 預設主螢幕應用程式 選擇主螢幕應用程式 + 閒置時在「最近使用的應用程式」中隱藏啟動器 + 僅在 DroidDeck 為預設主畫面應用程式,且沒有執行中的工作階段時生效。 選擇 Linux 應用程式(測試版) 檔案 @@ -1012,6 +1067,147 @@ 測試組建版本 在正式發布前試用修正 目前沒有 + 實驗版 + 實驗版本 + 使用中 + Android 重新最佳化 DroidDeck 後已暫停 + 未載入:%1$s + 等待重新啟動 + 已保留 + 適用於其他版本 + 重新建置 + 會從裝置刪除此版本 + 以此版本重新啟動 + 關閉 + 使用 + 刪除 + 立即刪除 + 無法準備重新啟動:%1$s。請在設定中配對無線偵錯,然後再試一次。 + 實驗版已安裝 + DroidDeck 已使用 %1$s 重新啟動 + 實驗版已暫停 + Android 重新最佳化了 DroidDeck,因此未載入 %1$s。請到「更新」改用它重新啟動。 + Lab 版本已關閉 + 它是為另一個 DroidDeck 版本建置的,目前保留在「更新」中。 + DroidDeck 用它啟動失敗兩次 + AI 代理 + AI 代理 + AI 代理正在處理 + 請在 Linux 使用者環境安裝 Claude Code,才能使用 AI 代理。 + 問問遊戲、閃退,或想改 DroidDeck 的地方 + 傳送 + 新對話 + 停止 + 儲存空間 + 移除 + 立即移除 + Claude Code + Codex + DroidDeck 原始碼 + 下載快取 + 未推送的變更會遺失 + 建置時會重新下載 + 設定流程可重新安裝,登入狀態會保留 + DroidDeck 已用你的 Lab 版本重新啟動,可從上次離開的地方繼續。 + 問它遊戲為什麼打不開、請它解讀記錄檔,或改 DroidDeck 並在這台裝置上試用修改結果。 + 失敗:%1$s + %1$s 已結束(結束碼 %2$d) + 已停止 + 已結束,但沒有回覆 + 重試 + 正在設定 AI 代理 + 依目前安裝的 DroidDeck 版本重新建置我的 Lab 版本 %1$s,並改用它重新啟動。 + 輸入 %1$s · 輸出 %2$s + 思考中 + 思考內容 + 思考中 · %1$s + %1$s · %2$s + 輸入 + 輸出 + 執行中… + 沒有結果:這回合先結束了 + 沒有輸出 + 輸入以排入下一則訊息 + 排入佇列 + 下一則:%1$s + 不要傳送 + 附加 + 移除 + 預設 + 推理強度 + 執行 + 修改 + 尚未變更 + 按計畫執行。 + 立即傳送 + 訊息 + 更多 + 關閉 + 最新 + 處理中 + 上下文 + 已用 %1$s,共 %2$s + 本次對話 · %1$s + 首次回覆後才會顯示使用量 + %1$d 小時上限 + %1$d 分鐘上限 + 每週上限 + %1$d%% · 將於 %2$s 重設 + + %1$d 個檔案 + %1$d 個檔案 + + 先規劃 + 規劃 + 只提出計畫,不變更任何內容 + 對話 + 尚無對話 + 剛剛 + 刪除 + 將刪除該對話及其附件 + 處理程序 + Linux 使用者空間中沒有執行中的處理程序 + 代理程式 + 停止 + 實驗室建置 + 正在準備實驗室建置 + %1$d%% · 約剩 %2$s + 約剩 %1$s + 取消 + 取消建置 + 正在啟動 + %1$d%% + 正在封裝 + 正在於該建置上重新啟動 DroidDeck + 完成 + 失敗:%1$s + 設定代理程式 + 請先在「設定」中安裝 Linux 執行環境。 + 重試 + 開始對話 + 裝置連線 + 無線偵錯,讓代理程式能查看並操控 DroidDeck + 安裝 %1$s + 安裝至 Linux 使用者空間,包含 git、gh 與 adb + 登入 %1$s + 開啟瀏覽器 + GitHub + 選填,用於開啟提取要求 + 建置工具 + 選填,用於在此裝置上進行 Lab 建置 · 約 5 GB + 代理程式已就緒 + 完成代理程式設定 + 已登入 %1$s + Lab 建置 + 快速建置 + 快速 Lab 建置 + 預先編譯此版本,讓 Lab 建置只需幾分鐘 · 僅需一次,約 20 分鐘 + 編譯中 · %1$d%% · 約剩 %2$s + 準備 + 無線偵錯無法連線;配對即可開啟 + 配對 + 安裝 + 登入 PR #%1$d 未為此 DroidDeck 複本組建 已更新 %1$s @@ -1247,6 +1443,14 @@ 應用程式 設定 更新 + 更多 + 編輯頁籤 + 頁籤 + 顯示 + 放在「更多」 + 隱藏 + 將 %1$s 上移 + 將 %1$s 下移 %1$d%% 繼續 %1$s 每個工作階段中顯示為 /root/ROMs。內部儲存空間位於 /root/Storage。 @@ -1268,6 +1472,15 @@ 取消排隊 Android 鍵盤 隱藏 ✕ + 在螢幕上的大小 + 鍵盤佔用螢幕的比例,包含標題列。 + 不透明度 + 調低即可看見鍵盤後方的遊戲畫面。 + 隱藏按鍵 + 少用的按鍵不會顯示在鍵盤上。 + Esc 與功能鍵列 + Ins / Del / Home / End / PgUp / PgDn + 方向鍵 啟動 %1$s 選擇螢幕。副螢幕:%1$s。 副螢幕已無法使用。 @@ -1752,7 +1965,24 @@ 終端機 Deck 握把 + 觸控板 儀表板 + 桌面 + 啟動桌面 + 桌面 · %1$s + 觸控板 + 直接觸控 + 觸控板。輕觸切換為直接觸控 + 直接觸控。輕觸切換為觸控板 + 正在啟動 KDE 桌面… + 桌面已關閉。 + 桌面無法啟動。記錄檔位於此工作階段的 bottom-desktop 資料夾。 + 桌面已關閉。 目前沒有可顯示的內容。 + 交換螢幕 + 下螢幕目前已被佔用 + 遊戲螢幕 + 遊戲顯示於 + 上螢幕 + 下螢幕 下載 沒有進行中的下載。 Steam @@ -1787,6 +2017,20 @@ 燃料,t 主油箱 %1$s t 備用 %1$s t + 幀時間 + 最近 %1$d 秒 + 平均幀 + 1% 低幀率 + 超過 33 ms 的幀數 + %1$d / 分鐘 + 已遊玩 %1$s + %1$d 核心,最高 %2$s GHz + %1$d 核心 + 遊戲 + %1$d Hz 的 FPS + 紅色標記是 HUD 將溫度顯示為紅色的位置。 + 整台裝置 + 電池 傳送儀表板資料 自動 為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。 @@ -1810,6 +2054,10 @@ 此遊戲的麥克風已關閉。若要說話,請在 DroidDeck 的 Steam 設定(音訊)中開啟麥克風,然後重新啟動遊戲。 音量 %1$d%% 遊戲內數據 + 下螢幕 HUD + 在每個分頁顯示資訊列 + 1% 與 0.1% 低幀率 + CPU 溫度 FPS CPU GPU @@ -1981,6 +2229,7 @@ 正在啟動工作階段… 已經過 %1$d:%2$02d · 仍在處理中 正在下載 Steam 用戶端更新 · %1$d%% + 正在套用 Steam 用戶端更新… 正在下載 Steam 用戶端 · %1$s 已有相容性工具正在安裝 @@ -2057,6 +2306,22 @@ 卡通描邊加上銳化。 不是 Adreno GPU + 系統 PowerVR 驅動程式:相容性依裝置而異 + 實驗性:RADV 或系統 Xclipse 驅動程式 + 系統 PowerVR + 使用此 GPU 的內建驅動程式 + 已為執行階段與顯示選用系統 PowerVR 驅動程式。 + 目前還沒有開源驅動程式支援這顆 Mali:Mali 橋接已開啟。 + 這是非 Snapdragon 測試版:這裡的官方版本只能在 Adreno 上執行,因此不會覆蓋安裝這個版本。新版測試版請至 github.com/The412Banner/droiddeck-nonadreno-drivers。 + 上次工作階段會結束,是因為 Android 為了釋放記憶體關閉了 DroidDeck,並非當機。請關閉其他應用程式或調低遊戲的材質設定,然後再試一次。 + Mali (Venus) + Mali 橋接 + 目前還沒有開源驅動程式支援這顆 Mali:會使用 %1$s,並以手機本身的驅動程式運作。 + %1$s 尚未發布:發布前會先使用 %2$s。 + %1$s 無法使用,且這支手機的驅動程式回報 Vulkan %2$s(Venus 需要 1.2):因此使用 Mali 橋接。 + %1$s 尚未發布:發布前 Mali 橋接會保持開啟。 + 已排入佇列:%1$s(等待另一個執行環境驅動程式) + DXVK 由系統 PowerVR 執行環境提供。其他 DXVK 套件仍可存放,但搭配此驅動程式時不會套用。 受支援 實驗性:其驅動程式為測試版本 Adreno 850 實驗性支援:需要相容的實驗版顯示驅動程式及遊戲驅動程式;尚未在此裝置上驗證 @@ -2262,6 +2527,13 @@ 排序 側邊欄標籤 在側邊欄圖示下方顯示名稱。關閉可讓側邊欄更窄。 + 助理寵物 + DeeDee 會浮動顯示在啟動器與遊戲上方,並顯示助理目前正在做的事。 + 顯示在其他應用程式上層 + 讓 DeeDee 浮動顯示在所有應用程式上方,並在該處開啟與 DeeDee 的聊天視窗 + 允許 + DeeDee + 與 DeeDee 聊天 顯示 較大的卡片 較小的卡片 @@ -2547,6 +2819,11 @@ 開發人員 組建標籤浮水印 在畫面上顯示測試版或 Lab 組建標籤。預設啟用。 + 分享診斷資料包 + 工作階段與裝置 + 圖形 + 遊戲與相容性 + 所有資料包 已可開始遊戲 尚未準備好開始遊戲 執行環境 %1$s @@ -2585,6 +2862,9 @@ 在「商店」設定中開啟 GOG 成就 成就無法使用;請查看工作階段記錄 成就已解鎖 + Mali (Venus):關閉 + Mali (Venus):開啟 + %1$s 上的驅動程式回報 Vulkan %2$s。Mali (Venus) 需要 Vulkan 1.2 或更新版本(較舊版本無法啟動 gamescope),因此工作階段會略過 Venus,改用 PanVK 驅動程式組合。 貼上 左搖桿 右搖桿 @@ -2938,6 +3218,7 @@ 遊戲要求的 VC++ 與 DirectX 安裝程式 執行 Linux x86 遊戲 Steam 工具 + 即使反作弊已關閉,Steam 仍會為內建反作弊機制的遊戲下載此項目。移除後,這些遊戲的安裝會卡在 0% DroidDeck 不需要此執行環境即可執行遊戲 x86 Proton,DroidDeck 無法執行 所有遊戲的預設項目 @@ -3048,6 +3329,8 @@ DroidDeck · %1$d fps 60 fps 較流暢,但 Steam 啟動時會使用較多 CPU。在 Steam 本身設定中選擇的動畫也會顯示在這裡。 聲音 + 跳過啟動影片 + 使用 0.1 秒的黑色影片片段作為 Steam 的啟動影片。將於下次工作階段生效。 自訂影片 MP4、MOV、MKV 或 WebM。其他格式及超過 %1$d MB 的檔案會在裝置上轉換為 720p WebM,最長 %2$d 秒。 匯入 @@ -3514,6 +3797,7 @@ 此 GPU 的 Vulkan 版本對 Proton 內建的 DXVK 來說太舊時,改用較舊的 DXVK。 每個 Proton 都使用內建的 DXVK,即使此 GPU 的 Vulkan 版本可能太舊。 Mali 橋接:關 + %1$s 無法使用 Mali 橋接(它需要沒有系統驅動程式路由的 Mali GPU),因此這個開關在這裡不會生效。 Mali 橋接:開 %1$s 不是 Adreno。實驗性 Vulkan 橋接已開啟:工作階段透過手機內建的驅動程式繪製。可能會有問題,請傳送工作階段記錄。 安全模式 @@ -3670,6 +3954,7 @@ 無法匯入此版面配置 緋紅之雪 + 白色表面搭配紅色點綴。 原聲帶 音樂 @@ -3733,4 +4018,6 @@ 單曲重複 音量 此原聲帶中沒有音訊檔案 + 無法啟動 + 沒有可用的網頁瀏覽器可開啟此連結。 From 76c4de5b5d0492ac37bd304847cb228c8d7dd6bd Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 14 Nov 2026 09:03:36 -0500 Subject: [PATCH 091/101] docs: name droid-deck.dev as the official website (#2611) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73c18762b1..e94de30150 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ DroidDeck brings the SteamOS experience to Android: Steam Gaming Mode, full Linu

On a Retroid Pocket Duo: Play Steam from the DroidDeck launcher, open Pac-Man in Steam Big Picture and play it, exit the game, then Switch to Desktop from the Power menu

-> DroidDeck has no website. Only download it from this repository's [Releases](https://github.com/Droid-Deck/DroidDeck/releases). +> The official website is [droid-deck.dev](https://droid-deck.dev). Only download DroidDeck from this repository's [Releases](https://github.com/Droid-Deck/DroidDeck/releases).

The Library switching source chips, changing the card size and opening the Filter menu From 50fbcf8b2a34f82b126448d573a35a8f77f0b795 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Sat, 14 Nov 2026 18:08:27 +0300 Subject: [PATCH 092/101] feat(library): add a Favorites tab and a heart button on the game page (#2613) * Add a Favorites tab to the Library with a heart on the game page * Fix favorites test helper call --- .../launcher/session/SessionPrefs.kt | 6 +++ .../com/droiddeck/launcher/ui/GameDetail.kt | 20 ++++++- .../droiddeck/launcher/ui/LibraryFavorites.kt | 35 ++++++++++++ .../com/droiddeck/launcher/ui/LibraryPage.kt | 28 +++++++--- .../launcher/ui/LibraryFavoritesTest.kt | 53 +++++++++++++++++++ 5 files changed, 134 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt 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 ae64425b77..e6a8befb90 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -277,6 +277,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("libraryShowUninstalled", show).apply() } + fun libraryFavorites(context: Context): Set = prefs(context).getStringSet("libraryFavorites", null)?.toSet().orEmpty() + + fun setLibraryFavorites(context: Context, keys: Set) { + prefs(context).edit().putStringSet("libraryFavorites", keys.toSet()).apply() + } + fun storesTabOrder(context: Context): List = idList(prefs(context).getString("storesTabOrder", null)) fun setStoresTabOrder(context: Context, order: List) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 7aba7feb45..d692af4f2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -35,6 +35,8 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.FavoriteBorder import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Edit @@ -165,6 +167,7 @@ internal fun GameDetail( if (nothing) return val source = game?.source ?: store?.id ?: Library.SOURCE_STEAM val title = game?.name ?: item?.title ?: installed?.sidecar?.title ?: id.orEmpty() + val favoriteKey = if (store != null && id != null) "${store.id}:$id" else game?.let { GameRef.key(it) } ?: key val scores = if (source != Library.ADDED) rememberGameScores(title.takeIf { it.isNotBlank() && it != id }) else null val achievements = remember(store, id, item?.accessible, installed) { when { @@ -225,6 +228,7 @@ internal fun GameDetail( Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { if (installed != null && installed.sidecar.store == Store.ITCH) ItchCheckButton(installed) if (installed != null && installed.sidecar.store == Store.GAMEJOLT) GameJoltCheckButton(installed) + FavoriteButton(favoriteKey) RemoveButton(title, game, installed, a) } } @@ -632,7 +636,7 @@ private fun GameMoreMenu(g: Library.SteamGame, a: FrontEndActions) { } @Composable -internal fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, id: String, danger: Boolean = false, enabled: Boolean = true, frosted: Boolean = false, onClick: () -> Unit) { +internal fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, id: String, danger: Boolean = false, enabled: Boolean = true, frosted: Boolean = false, tint: Color? = null, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pill = LocalPillButtons.current val shape = if (pill) CircleShape else Shape12 @@ -657,12 +661,24 @@ internal fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, l .controllerConfirm(enabled = enabled, onClick = onClick) .semantics { contentDescription = label }, ) { - Icon(icon, contentDescription = null, tint = if (danger && hot) colors.error else if (danger && !pill) Color.White else colors.onBackground, modifier = Modifier.size(18.dp)) + Icon(icon, contentDescription = null, tint = tint ?: if (danger && hot) colors.error else if (danger && !pill) Color.White else colors.onBackground, modifier = Modifier.size(18.dp)) } } if (frosted) Box(Modifier.glass(CircleShape)) { button() } else button() } +@Composable +internal fun FavoriteButton(key: String) { + val ctx = LocalContext.current + remember { LibraryFavorites.load(ctx) } + val on = key in LibraryFavorites.keys + IconAction( + if (on) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder, + stringResource(if (on) R.string.fm_favorite_remove else R.string.fm_favorite_add), + "game:favorite", frosted = true, tint = if (on) FavoritesColours.dot else null, + ) { LibraryFavorites.toggle(ctx, key) } +} + @Composable internal fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) { val ctx = LocalContext.current diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt new file mode 100644 index 0000000000..2aab3b4b9f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.SessionPrefs + +internal const val LIBRARY_FAVORITES = "favorites" + +internal object LibraryFavorites { + var keys by mutableStateOf>(emptySet()) + private set + private var loaded = false + + fun load(context: Context) { + if (loaded) return + loaded = true + keys = SessionPrefs.libraryFavorites(context) + } + + fun toggle(context: Context, key: String) { + load(context) + keys = toggled(keys, key) + SessionPrefs.setLibraryFavorites(context, keys) + } +} + +internal fun toggled(keys: Set, key: String): Set = if (key in keys) keys - key else keys + key + +internal fun inLibrarySource(source: String, entry: LibraryEntry, favorites: Set): Boolean = when (source) { + LIBRARY_ALL -> true + LIBRARY_FAVORITES -> entry.favoriteKey in favorites + else -> entry.source == source +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index e3d76dcd1f..d4210f326b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -126,6 +126,7 @@ internal class LibraryEntry( val game: Library.SteamGame?, val item: CatalogItem?, val installed: Boolean, ) { val storeKey: String? get() = item?.key ?: game?.storeId?.let { "${game.source}:$it" } + val favoriteKey: String get() = storeKey ?: key } internal fun libraryEntries( @@ -162,9 +163,12 @@ internal fun collectionEntries(all: List, items: List internal fun installedFirst(entries: List): List = entries.partition { it.installed }.let { (on, off) -> on + off } internal const val LIBRARY_ALL = "all" -internal fun librarySources(entries: List, order: List, always: Set = emptySet()): List = - (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION) - .filter { source -> source in always || entries.any { it.source == source } } +internal fun librarySources(entries: List, order: List, always: Set = emptySet(), favorites: Set = emptySet()): List = + (listOf(LIBRARY_FAVORITES, Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION) + .filter { source -> + if (source == LIBRARY_FAVORITES) entries.any { it.favoriteKey in favorites } + else source in always || entries.any { it.source == source } + } internal object LibraryDisplay { val scales = listOf(0.75f, 0.875f, 1f, 1.2f, 1.45f) @@ -222,7 +226,9 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current LaunchedEffect(Unit) { StoresState.refresh(ctx) } remember { LibraryDisplay.load(ctx) } + remember { LibraryFavorites.load(ctx) } val soundMode = selected == "soundtracks" || selected.startsWith("sound:") + val favorites = if (soundMode) emptySet() else LibraryFavorites.keys val stores = s.gameStoresEnabled && !s.shortcutPicker && !soundMode val signedIn = Store.entries.filter { StoresState.isSignedIn(it) } LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } } @@ -260,6 +266,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val sources = librarySources( all, SessionPrefs.storesTabOrder(ctx), listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }, Library.SOURCE_COLLECTION.takeIf { soundMode }).toSet(), + favorites, ) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() @@ -282,7 +289,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) val matching = pool.filter { - (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) + inLibrarySource(source, it, favorites) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } val listUninstalled = if (collectionId == null) showUninstalled else collectionShows?.takeIf { it.first == collectionId }?.second ?: true val trackHits by produceState>(emptyList(), soundMode, q, source, s.soundtracks) { @@ -522,7 +529,7 @@ private fun LibraryGrid( } val picker = s.shortcutPicker && e.game != null val choose = if (picker) ({ a.onSteamGame(e.game!!) }) else null - if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL) + if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES) } LazyVerticalGrid( columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(tileWidth), state = grid, @@ -672,10 +679,19 @@ private fun LibraryFilters(sources: List, source: String, onSource: (Str val store = Store.byId(src) val dot = when { store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) + src == LIBRARY_FAVORITES -> FavoritesColours.dot src == Library.SOURCE_STEAM || src == Library.ADDED || src == Library.SOURCE_COLLECTION -> sourceColours(src).dot else -> null } - SourceFilterChip(src, if (src == Library.ADDED) stringResource(R.string.library_filter_added) else store?.shortLabel ?: sourceLabel(src), source == src, dot) { onSource(src) } + SourceFilterChip( + src, + when (src) { + Library.ADDED -> stringResource(R.string.library_filter_added) + LIBRARY_FAVORITES -> stringResource(R.string.soundtracks_favorites) + else -> store?.shortLabel ?: sourceLabel(src) + }, + source == src, dot, + ) { onSource(src) } } } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt new file mode 100644 index 0000000000..699ca03720 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class LibraryFavoritesTest { + private fun steam(id: Int, name: String) = LibraryEntry("app:$id", Library.SOURCE_STEAM, name, Library.SteamGame(id, name, null, "Steam library"), null, true) + + private fun owned(id: String, name: String): LibraryEntry { + val item = CatalogItem(Store.GOG, id, name, imageUrl = null, owned = true) + return LibraryEntry("app:gog:$id", Store.GOG.id, name, null, item, false) + } + + @Test fun togglingAddsThenRemovesAKey() { + val on = toggled(emptySet(), "app:440") + assertEquals(setOf("app:440"), on) + assertEquals(emptySet(), toggled(on, "app:440")) + } + + @Test fun aStoreGameIsKeyedByItsStoreProductSoInstallingItKeepsTheHeart() { + val entry = owned("123", "Witcher") + assertEquals("gog:123", entry.favoriteKey) + val installed = LibraryEntry("app:-5", "gog", "Game", Library.SteamGame(-5, "Game", null, Library.ADDED, source = "gog", storeId = "123"), null, true) + assertEquals(entry.favoriteKey, installed.favoriteKey) + } + + @Test fun aGameWithoutAStoreIsKeyedByItsLibraryKey() { + assertEquals("app:440", steam(440, "Team Fortress 2").favoriteKey) + } + + @Test fun theFavoritesSourceKeepsOnlyHeartedGamesFromEveryStore() { + val tf2 = steam(440, "Team Fortress 2") + val witcher = owned("123", "Witcher") + val other = steam(10, "Counter-Strike") + val hearts = setOf(tf2.favoriteKey, witcher.favoriteKey) + val shown = listOf(tf2, witcher, other).filter { inLibrarySource(LIBRARY_FAVORITES, it, hearts) } + assertEquals(listOf(tf2, witcher), shown) + assertTrue(inLibrarySource(LIBRARY_ALL, other, hearts)) + assertFalse(inLibrarySource(Store.GOG.id, tf2, hearts)) + } + + @Test fun theFavoritesTabComesFirstAndOnlyAppearsOnceSomethingIsHearted() { + val entries = listOf(steam(440, "Team Fortress 2"), owned("123", "Witcher")) + assertEquals(listOf("steam", "gog"), librarySources(entries, listOf("gog"))) + assertEquals(listOf(LIBRARY_FAVORITES, "steam", "gog"), librarySources(entries, listOf("gog"), favorites = setOf("gog:123"))) + assertEquals(listOf("steam", "gog"), librarySources(entries, listOf("gog"), favorites = setOf("gog:999"))) + } +} From 84b7295f1118934a4ac562510f4e9db2592378d1 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 14 Nov 2026 10:58:06 -0500 Subject: [PATCH 093/101] fix(session): keep the session awake while a browser hand-off is pending (#2615) * fix(session): keep the session awake while a browser hand-off is pending When a program in the session opens a link in the Android browser, the session view goes to the background and auto or manual suspend froze the session within a couple of seconds. Programs that wait for the browser to call back to a local listener (external sign-in flows) were frozen before the callback arrived, so the sign-in never completed, and the session then needed a tap to continue. An open-url request now starts a browser hand-off that counts as a visible surface until the session view comes back to the front or ten minutes pass. Ordinary backgrounding still suspends as before. * fix(session): hold through a display power change and only after the browser opens --- .../launcher/session/BrowserHandoff.kt | 26 +++++++++ .../launcher/session/SessionService.kt | 30 +++++++++- .../launcher/stores/StoreLaunchRequests.kt | 1 + .../launcher/session/BrowserHandoffTest.kt | 58 +++++++++++++++++++ 4 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/BrowserHandoff.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/BrowserHandoffTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/session/BrowserHandoff.kt b/app/src/main/java/com/droiddeck/launcher/session/BrowserHandoff.kt new file mode 100644 index 0000000000..062afbfc78 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BrowserHandoff.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.session + +internal class BrowserHandoff(private val timeoutMs: Long) { + private var startedAt = -1L + private var sessionLeft = false + + fun begin(now: Long) { + startedAt = now + sessionLeft = false + } + + fun sessionHidden() { + if (startedAt >= 0) sessionLeft = true + } + + fun sessionShown() { + if (sessionLeft) clear() + } + + fun clear() { + startedAt = -1L + sessionLeft = false + } + + fun active(now: Long): Boolean = startedAt >= 0 && now - startedAt < timeoutMs +} 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 8da979cc39..d45bc531a6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -23,6 +23,7 @@ import android.os.IBinder import android.os.Handler import android.os.Looper import android.os.PowerManager +import android.os.SystemClock import android.hardware.display.DisplayManager import android.view.Display import android.util.Log @@ -85,7 +86,12 @@ class SessionService : Service() { private var activityDisplayId = Display.DEFAULT_DISPLAY private var xrActivityVisible = false private var signInHold = false - private val hasVisibleSurface get() = !SessionVisibilityPolicy.isHidden( + private val browserHandoff = BrowserHandoff(BROWSER_HANDOFF_TIMEOUT_MS) + private val browserHandoffExpired = Runnable { + suspendAttemptFailed = false + updateSuspendPolicy() + } + private val hasVisibleSurface get() = browserHandoff.active(SystemClock.elapsedRealtime()) || !SessionVisibilityPolicy.isHidden( activityStarted = activityVisible || signInHold, defaultDisplayOn = (getSystemService(Context.POWER_SERVICE) as? PowerManager)?.isInteractive ?: screenOn, activityOnDefaultDisplay = activityDisplayId == Display.DEFAULT_DISPLAY, @@ -235,6 +241,7 @@ class SessionService : Service() { ACTION_ACTIVITY_VISIBLE -> { if (!SessionState.pipActive) pipTask = false activityVisible = true + browserHandoff.sessionShown() activityDisplayId = intent.getIntExtra(EXTRA_ACTIVITY_DISPLAY_ID, activityDisplayId) sessionDisplayId = intent.getIntExtra(EXTRA_DISPLAY_ID, sessionDisplayId) screenOn = readScreenOn() @@ -258,6 +265,7 @@ class SessionService : Service() { } ACTION_ACTIVITY_HIDDEN -> { activityVisible = false + browserHandoff.sessionHidden() activityDisplayId = intent.getIntExtra(EXTRA_ACTIVITY_DISPLAY_ID, activityDisplayId) suspendAttemptFailed = false updateSuspendPolicy() @@ -287,6 +295,17 @@ class SessionService : Service() { updateSuspendPolicy() return START_NOT_STICKY } + ACTION_BROWSER_HANDOFF -> { + if (!SessionState.running) return START_NOT_STICKY + browserHandoff.begin(SystemClock.elapsedRealtime()) + if (!activityVisible) browserHandoff.sessionHidden() + mainHandler.removeCallbacks(browserHandoffExpired) + mainHandler.postDelayed(browserHandoffExpired, BROWSER_HANDOFF_TIMEOUT_MS) + if (!manualHold) manualPauseRequested = false + suspendAttemptFailed = false + updateSuspendPolicy() + return START_NOT_STICKY + } ACTION_MIC_CHANGED -> { if (SessionState.running && SessionState.micAvailable && !SessionState.suspended) { val enabled = intent.getBooleanExtra("enabled", false) @@ -343,6 +362,8 @@ class SessionService : Service() { activityVisible = true xrActivityVisible = false signInHold = false + browserHandoff.clear() + mainHandler.removeCallbacks(browserHandoffExpired) sessionDisplayId = intent?.getIntExtra(EXTRA_DISPLAY_ID, Display.DEFAULT_DISPLAY) ?: Display.DEFAULT_DISPLAY activityDisplayId = intent?.getIntExtra(EXTRA_ACTIVITY_DISPLAY_ID, sessionDisplayId) ?: sessionDisplayId screenOn = readScreenOn() @@ -2409,6 +2430,8 @@ class SessionService : Service() { private const val ACTION_XR_ACTIVITY_HIDDEN = "com.droiddeck.launcher.XR_ACTIVITY_HIDDEN" private const val ACTION_SIGN_IN_HOLD = "com.droiddeck.launcher.SIGN_IN_HOLD" private const val EXTRA_HOLD = "hold" + private const val ACTION_BROWSER_HANDOFF = "com.droiddeck.launcher.BROWSER_HANDOFF" + private const val BROWSER_HANDOFF_TIMEOUT_MS = 10 * 60_000L private const val ACTION_TRACK_AUXILIARY = "com.droiddeck.launcher.TRACK_AUXILIARY" private const val ACTION_STOP_AUXILIARY = "com.droiddeck.launcher.STOP_AUXILIARY" private const val ACTION_AUXILIARY_EXITED = "com.droiddeck.launcher.AUXILIARY_EXITED" @@ -2511,6 +2534,11 @@ class SessionService : Service() { context.startService(Intent(context, SessionService::class.java).setAction(ACTION_SIGN_IN_HOLD).putExtra(EXTRA_HOLD, hold)) } + fun holdForBrowserHandoff(context: Context) { + if (!SessionState.running) return + context.startService(Intent(context, SessionService::class.java).setAction(ACTION_BROWSER_HANDOFF)) + } + fun pause(context: Context) { context.startService(Intent(context, SessionService::class.java).setAction(ACTION_PAUSE_NOW)) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index c89ada3f93..979e363ccd 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -114,6 +114,7 @@ object StoreLaunchRequests { if (!(url.startsWith("https://") || url.startsWith("http://"))) JSONObject().put("ok", false).put("reason", "not-http") else try { app.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)) + com.droiddeck.launcher.session.SessionService.holdForBrowserHandoff(app) Log.i(TAG, "open-url: " + StoreLog.redactUrl(url)) JSONObject().put("ok", true) } catch (e: Exception) { diff --git a/app/src/test/java/com/droiddeck/launcher/session/BrowserHandoffTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BrowserHandoffTest.kt new file mode 100644 index 0000000000..0d01833441 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BrowserHandoffTest.kt @@ -0,0 +1,58 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BrowserHandoffTest { + private fun hidden(handoff: BrowserHandoff, activityStarted: Boolean, now: Long) = + SessionVisibilityPolicy.isHidden(activityStarted || handoff.active(now), true, true, true) + + @Test fun pendingHandoffKeepsBackgroundedSessionAwake() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.sessionHidden() + assertFalse(hidden(handoff, activityStarted = false, now = 500)) + } + + @Test fun handoffEndsWhenSessionViewReturns() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.sessionHidden() + handoff.sessionShown() + assertFalse(handoff.active(10)) + assertTrue(hidden(handoff, activityStarted = false, now = 20)) + } + + @Test fun shownBeforeLeavingDoesNotEndHandoff() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.sessionShown() + handoff.sessionHidden() + assertFalse(hidden(handoff, activityStarted = false, now = 100)) + } + + @Test fun handoffExpiresAfterTimeout() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.sessionHidden() + assertTrue(handoff.active(999)) + assertTrue(hidden(handoff, activityStarted = false, now = 1_000)) + } + + @Test fun normalBackgroundingStillHidesSession() { + val handoff = BrowserHandoff(1_000) + handoff.sessionHidden() + assertFalse(handoff.active(0)) + assertTrue(hidden(handoff, activityStarted = false, now = 0)) + } + + @Test fun newHandoffRestartsTimer() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.begin(900) + assertTrue(handoff.active(1_500)) + handoff.clear() + assertFalse(handoff.active(1_500)) + } +} From d8b3c66b9579c33050462647b054801f7be7a970 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 14 Nov 2026 10:58:42 -0500 Subject: [PATCH 094/101] fix(battlenet): a download that stops moving ends with Retry, and a killed update comes back as an update (#2602) * fix(battlenet): a Battle.net download that stops moving ends as retryable, and a killed update comes back as an update A job reply without a state or byte counts no longer counts as a started download, and an Agent job that reports no change for ten minutes is stopped with its Agent and fails with a Retry instead of waiting forever. Updates remember their game folder in the saved queue, so one restored after the app was closed runs agent-update on that folder instead of a fresh install. * fix(battlenet): a stalled job stops only the Agent it started A game or Battle.net client running in the prefix keeps running when a stalled Agent job is ended, and the progress test keeps the job alive across polls with a controlled clock. * fix(battlenet): only real progress holds off the stall timeout The download rate and time estimate can change while no bytes move, so the stall timer now resets only on byte counts, progress, state, phase, pause or error. * test(battlenet): bound the stalled-rate fake child's polls --- .../stores/battlenet/BattleNetInstall.kt | 15 +- .../stores/battlenet/BattleNetStore.kt | 1 + app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../stores/battlenet/BattleNetInstallTest.kt | 12 ++ .../overlay/usr/local/bin/droiddeck-battlenet | 31 +++- tools/tests/test_battlenet.py | 132 ++++++++++++++++++ 38 files changed, 218 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt index fdd4db2495..f0eae9767f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -111,16 +111,22 @@ object BattleNetInstall { fun update(context: Context, game: InstalledStoreGame) { val app = context.applicationContext Thread({ - val item = CatalogItem( - Store.BATTLENET, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, owned = true, - extra = mapOf(INSTALL_UID to installUid(app, game)), - ) + val item = updateItem(game, installUid(app, game)) game.folder.parentFile?.parentFile?.let { com.droiddeck.launcher.stores.download.SavedQueue.remember(app, item, it) } enqueue(app, item, game.folder, update = true) }, "battlenet-update").start() } + internal fun updateItem(game: InstalledStoreGame, uid: String) = CatalogItem( + Store.BATTLENET, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, owned = true, + extra = mapOf(INSTALL_UID to uid, UPDATE_FOLDER to game.folder.absolutePath), + ) + + internal fun updateFolder(item: CatalogItem): File? = item.extra[UPDATE_FOLDER]?.let(::File) + internal const val INSTALL_UID = "installUid" + internal const val UPDATE_FOLDER = "updateFolder" + internal const val STALLED = "stalled" internal fun installUid(context: Context, game: InstalledStoreGame): String = runCatching { BattleNet.games(context).firstOrNull { it.uid == game.sidecar.id }?.installUid }.getOrNull() ?: game.sidecar.id @@ -219,6 +225,7 @@ object BattleNetInstall { val detail = when { reason == null -> "exit $code" reason == "client" -> return context.getString(R.string.bnet_dl_client_first) + reason == STALLED -> return context.getString(R.string.bnet_dl_stalled) reason.startsWith("agent ") -> context.getString(R.string.bnet_dl_agent_error, reason.removePrefix("agent ")) else -> reason.removePrefix("stopped ") } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt index 403b867538..426d3616a9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt @@ -192,6 +192,7 @@ object BattleNetBackend : StoreBackend { override fun install(context: Context, item: CatalogItem, root: File) { if (!BattleNetInstall.headless(item)) return BattleNetClient.installGame(context, item.id, root) val app = context.applicationContext + BattleNetInstall.updateFolder(item)?.let { return BattleNetInstall.enqueue(app, item, it, update = true) } BattleNetInstall.enqueue(app, item, StoreInstallRoot.folderFor(app, store, item.id, item.title, root)) } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fc3a68d12b..7f85d0b48e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2605,6 +2605,7 @@ في انتظار تنزيل Battle.net الآخر… افتح Battle.net وسجّل الدخول مرة واحدة، ثم ثبّت ألعابه من هنا. توقفت أداة التنزيل من Blizzard: %1$s + توقفت أداة التنزيل من Blizzard عن التقدم. خطأ Blizzard %1$s تحديث ألعاب Blizzard 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 0a11b9e776..4df2942308 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2571,6 +2571,7 @@ Esperando la otra descarga de Battle.net… Abre Battle.net e inicia sesión una vez; luego instala sus juegos desde aquí. El descargador de Blizzard se detuvo: %1$s + El descargador de Blizzard dejó de avanzar. Error de Blizzard %1$s Actualizar Juegos de Blizzard diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3c13f1b753..a1b25df939 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2501,6 +2501,7 @@ Изчакване на другото изтегляне от Battle.net… Отворете Battle.net и влезте веднъж, след това инсталирайте игрите му оттук. Програмата за изтегляне на Blizzard спря: %1$s + Програмата за изтегляне на Blizzard спря да напредва. Грешка на Blizzard %1$s Актуализиране Игри на Blizzard diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 34afc84da9..1bff370cb9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2553,6 +2553,7 @@ Čekání na druhé stahování z Battle.net… Otevřete Battle.net a jednou se přihlaste, pak instalujte jeho hry odsud. Stahovač Blizzardu se zastavil: %1$s + Stahovač Blizzardu přestal postupovat. Chyba Blizzardu %1$s Aktualizovat Hry od Blizzardu diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c96ed3820e..92cb365844 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2501,6 +2501,7 @@ Venter på den anden Battle.net-download… Åbn Battle.net, og log ind én gang, og installer derefter dets spil herfra. Blizzards downloader stoppede: %1$s + Blizzards downloader holdt op med at gøre fremskridt. Blizzard-fejl %1$s Opdater Blizzard-spil diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 134515a891..023270ad4a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2493,6 +2493,7 @@ Warten auf den anderen Battle.net-Download… Öffne Battle.net und melde dich einmal an, dann installiere seine Spiele hier. Blizzards Downloader wurde beendet: %1$s + Blizzards Downloader kommt nicht mehr voran. Blizzard-Fehler %1$s Aktualisieren Blizzard-Spiele diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index acb11e1eec..06eb0360d5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2501,6 +2501,7 @@ Αναμονή για την άλλη λήψη από το Battle.net… Ανοίξτε το Battle.net και συνδεθείτε μία φορά, έπειτα εγκαταστήστε τα παιχνίδια του από εδώ. Το πρόγραμμα λήψης της Blizzard σταμάτησε: %1$s + Το πρόγραμμα λήψης της Blizzard σταμάτησε να προχωρά. Σφάλμα Blizzard %1$s Ενημέρωση Παιχνίδια της Blizzard diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 224a8f59cb..368eae4dbf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2527,6 +2527,7 @@ Esperando a la otra descarga de Battle.net… Abre Battle.net e inicia sesión una vez; después instala sus juegos desde aquí. El descargador de Blizzard se ha detenido: %1$s + El descargador de Blizzard ha dejado de avanzar. Error de Blizzard %1$s Actualizar Juegos de Blizzard diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c1aa0d9083..e3352837fa 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2501,6 +2501,7 @@ Odotetaan toista Battle.net-latausta… Avaa Battle.net ja kirjaudu sisään kerran, asenna sitten sen pelit täältä. Blizzardin latausohjelma pysähtyi: %1$s + Blizzardin latausohjelma lakkasi etenemästä. Blizzard-virhe %1$s Päivitä Blizzardin pelit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5544d8f5fd..b84be7d3bb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2526,6 +2526,7 @@ En attente de l\'autre téléchargement Battle.net… Ouvrez Battle.net et connectez-vous une fois, puis installez ses jeux ici. Le téléchargeur de Blizzard s\'est arrêté : %1$s + Le téléchargeur de Blizzard n\'avance plus. Erreur Blizzard %1$s Mettre à jour Jeux Blizzard diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index da5307b714..ddd33a79d0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2501,6 +2501,7 @@ दूसरे Battle.net डाउनलोड का इंतज़ार… Battle.net खोलें और एक बार साइन इन करें, फिर इसके गेम यहाँ से इंस्टॉल करें। Blizzard का डाउनलोडर रुक गया: %1$s + Blizzard का डाउनलोडर आगे नहीं बढ़ रहा। Blizzard त्रुटि %1$s अपडेट करें Blizzard के गेम diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3778e08320..0e759a2c85 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2501,6 +2501,7 @@ Várakozás a másik Battle.net-letöltésre… Nyisd meg a Battle.netet, és jelentkezz be egyszer, majd innen telepítsd a játékait. A Blizzard letöltője leállt: %1$s + A Blizzard letöltője nem halad tovább. Blizzard-hiba: %1$s Frissítés Blizzard-játékok diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b8208ba633..9096439ca9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2476,6 +2476,7 @@ Menunggu unduhan Battle.net lainnya… Buka Battle.net dan masuk sekali, lalu instal gamenya dari sini. Pengunduh Blizzard berhenti: %1$s + Pengunduh Blizzard berhenti berjalan. Kesalahan Blizzard %1$s Perbarui Game Blizzard diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e4b446af4b..7cedfc55c4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2518,6 +2518,7 @@ In attesa dell\'altro download di Battle.net… Apri Battle.net ed esegui l\'accesso una volta, poi installa qui i suoi giochi. Il downloader di Blizzard si è fermato: %1$s + Il downloader di Blizzard ha smesso di avanzare. Errore Blizzard %1$s Aggiorna Giochi Blizzard diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 91e779bd6e..2677770caa 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2476,6 +2476,7 @@ もう一つの Battle.net のダウンロードを待っています… Battle.net を開いて一度サインインしてから、ここでゲームをインストールしてください。 Blizzard のダウンローダーが停止しました: %1$s + Blizzard のダウンローダーが進まなくなりました。 Blizzard エラー %1$s アップデート Blizzard のゲーム diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9a16daf7de..ab8ddf62f2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2476,6 +2476,7 @@ 다른 Battle.net 다운로드를 기다리는 중… Battle.net을 열고 한 번 로그인한 다음 여기에서 게임을 설치하세요. Blizzard 다운로더가 중지됨: %1$s + Blizzard 다운로더가 더 이상 진행되지 않습니다. Blizzard 오류 %1$s 업데이트 Blizzard 게임 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 726edcd452..e6054e288d 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2476,6 +2476,7 @@ Menunggu muat turun Battle.net yang lain… Buka Battle.net dan log masuk sekali, kemudian pasang permainannya dari sini. Pemuat turun Blizzard berhenti: %1$s + Pemuat turun Blizzard berhenti bergerak. Ralat Blizzard %1$s Kemas kini Permainan Blizzard diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 03cceb6dff..af3ee5933f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2501,6 +2501,7 @@ Venter på den andre Battle.net-nedlastingen… Åpne Battle.net og logg på én gang, og installer deretter spillene herfra. Blizzards nedlaster stoppet: %1$s + Blizzards nedlaster sluttet å gjøre fremgang. Blizzard-feil %1$s Oppdater Blizzard-spill diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2d02446e51..e7234f03d5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2501,6 +2501,7 @@ Wachten op de andere Battle.net-download… Open Battle.net en meld je één keer aan, installeer daarna de games hier. Blizzards downloader is gestopt: %1$s + Blizzards downloader maakt geen voortgang meer. Blizzard-fout %1$s Bijwerken Blizzard-games diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d1813d6ebe..48d92490c2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2553,6 +2553,7 @@ Oczekiwanie na drugie pobieranie z Battle.net… Otwórz Battle.net i zaloguj się raz, a potem instaluj jego gry tutaj. Program pobierający Blizzarda zatrzymał się: %1$s + Program pobierający Blizzarda przestał robić postępy. Błąd Blizzarda %1$s Aktualizuj Gry Blizzarda diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index df607acd02..bba489d30a 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2518,6 +2518,7 @@ A aguardar a outra transferência do Battle.net… Abra o Battle.net e inicie sessão uma vez; depois instale os jogos dele aqui. O programa de transferência da Blizzard parou: %1$s + O programa de transferência da Blizzard deixou de avançar. Erro da Blizzard %1$s Atualizar Jogos da Blizzard diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 29e6152dfa..786e7ffc9f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2519,6 +2519,7 @@ Aguardando o outro download do Battle.net… Abra o Battle.net e entre uma vez; depois instale os jogos dele aqui. O downloader da Blizzard parou: %1$s + O downloader da Blizzard parou de avançar. Erro da Blizzard %1$s Atualizar Jogos da Blizzard diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index ac3b76c54c..024db62c03 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2527,6 +2527,7 @@ Se așteaptă cealaltă descărcare Battle.net… Deschide Battle.net și conectează-te o dată, apoi instalează jocurile de aici. Programul de descărcare Blizzard s-a oprit: %1$s + Programul de descărcare Blizzard nu mai avansează. Eroare Blizzard %1$s Actualizează Jocuri Blizzard diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 81f4f3370c..b293f9c475 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2553,6 +2553,7 @@ Ожидание другой загрузки Battle.net… Откройте Battle.net и войдите один раз, затем устанавливайте его игры здесь. Загрузчик Blizzard остановился: %1$s + Загрузчик Blizzard перестал продвигаться. Ошибка Blizzard %1$s Обновить Игры Blizzard diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f560640f76..804e397fc7 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2501,6 +2501,7 @@ Väntar på den andra Battle.net-nedladdningen… Öppna Battle.net och logga in en gång, installera sedan dess spel här. Blizzards nedladdare stoppades: %1$s + Blizzards nedladdare slutade göra framsteg. Blizzard-fel %1$s Uppdatera Blizzard-spel diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 06a2ed2cd5..e773c3f043 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2476,6 +2476,7 @@ กำลังรอการดาวน์โหลด Battle.net อีกรายการ… เปิด Battle.net และลงชื่อเข้าใช้หนึ่งครั้ง แล้วติดตั้งเกมจากที่นี่ ตัวดาวน์โหลดของ Blizzard หยุดทำงาน: %1$s + ตัวดาวน์โหลดของ Blizzard ไม่คืบหน้า ข้อผิดพลาดของ Blizzard %1$s อัปเดต เกมของ Blizzard diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 33e9152668..31a6bf9165 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2493,6 +2493,7 @@ Diğer Battle.net indirmesi bekleniyor… Battle.net\'i açıp bir kez oturum açın, ardından oyunlarını buradan yükleyin. Blizzard indiricisi durdu: %1$s + Blizzard indiricisi ilerlemeyi durdurdu. Blizzard hatası %1$s Güncelle Blizzard oyunları diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bc0f9f4b83..cf4fca1a71 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2553,6 +2553,7 @@ Очікування іншого завантаження Battle.net… Відкрийте Battle.net і увійдіть один раз, потім встановлюйте його ігри тут. Завантажувач Blizzard зупинився: %1$s + Завантажувач Blizzard перестав просуватися. Помилка Blizzard %1$s Оновити Ігри Blizzard diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 5da35222aa..145bd62237 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2476,6 +2476,7 @@ Đang chờ lượt tải Battle.net khác… Mở Battle.net và đăng nhập một lần, sau đó cài trò chơi của nó tại đây. Trình tải xuống của Blizzard đã dừng: %1$s + Trình tải xuống của Blizzard không còn tiến triển. Lỗi Blizzard %1$s Cập nhật Trò chơi Blizzard diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4b50bd95a7..65e48021b5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2553,6 +2553,7 @@ 正在等待另一个 Battle.net 下载… 请先打开 Battle.net 并登录一次,然后在这里安装其游戏。 暴雪下载器已停止:%1$s + 暴雪下载器已停止进展。 暴雪错误 %1$s 更新 暴雪游戏 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 89a15f33df..512ebecb02 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2473,6 +2473,7 @@ 正在等待另一個 Battle.net 下載… 請先開啟 Battle.net 並登入一次,然後在這裡安裝其遊戲。 暴雪下載器已停止:%1$s + 暴雪下載器已停止進展。 暴雪錯誤 %1$s 更新 Blizzard 遊戲 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dcdfb41be2..b92a9adae8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2473,6 +2473,7 @@ 正在等待另一個 Battle.net 下載… 請先開啟 Battle.net 並登入一次,然後在這裡安裝其遊戲。 暴雪下載器已停止:%1$s + 暴雪下載器已停止進度。 暴雪錯誤 %1$s 更新 Blizzard 遊戲 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3bb9dde90f..02c7a61c2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2636,6 +2636,7 @@ Waiting for the other Battle.net download… Open Battle.net and sign in once, then install its games here. Blizzard\'s downloader stopped: %1$s + Blizzard\'s downloader stopped making progress. Blizzard error %1$s Update Blizzard games diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt index 05a5708158..92d1716292 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt @@ -2,12 +2,15 @@ package com.droiddeck.launcher.stores.battlenet import com.droiddeck.launcher.runtime.BattleNet import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test +import java.io.File import java.nio.file.Files import java.util.Locale @@ -89,4 +92,13 @@ class BattleNetInstallTest { assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1003, 2000, 1, 9)) assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1004, 1000, 0, 0)) } + + @Test fun aSavedUpdateComesBackAsAnUpdateOfItsOwnFolder() { + val folder = File("/data/Games/Stores/Battle.net/World of Warcraft") + val game = InstalledStoreGame(StoreGameSidecar(Store.BATTLENET, "wow", "World of Warcraft", "Wow.exe"), folder) + val item = BattleNetInstall.updateItem(game, "wow_enus") + assertEquals("wow_enus", item.extra[BattleNetInstall.INSTALL_UID]) + assertEquals(folder, BattleNetInstall.updateFolder(item)) + assertNull(BattleNetInstall.updateFolder(CatalogItem(Store.BATTLENET, "wow", "World of Warcraft", null))) + } } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 3473e7dead..b43bd25a6f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -88,6 +88,8 @@ COUNTRY = re.compile(r"[A-Z]{3}") REGION = re.compile(r"[A-Z]{2}") REPORT = "BNET" ETA_LIMIT = 30 * 86400 +STALL = 600 +MOVING = ("download_current", "download_total", "progress", "playable_progress", "state", "phase", "paused", "error") DONE_STATE = 1004 REPORTED = ("progress", "playable_progress", "download_rate", "download_remaining", "estimated_time_in_sec", "state", "playable", "paused", "download_complete", "installed", "error") @@ -118,6 +120,12 @@ function field(text, name) { return m ? m[1] : ""; } +function job(text) { + if (/"error"\s*:\s*[1-9]/.test(text)) return false; + var bare = text.replace(/"extended_status"\s*:\s*\{[^}]*\}/, ""); + return /"state"\s*:\s*\d+/.test(bare) || /"download_current"\s*:/.test(bare); +} + function install() { // Blizzard's China repository moved to cn.patch.battlenet.com.cn; cn.patch.battle.net only redirects away from it. var patch = zone == "cn" ? "cn.patch.battlenet.com.cn" : zone + ".patch.battle.net"; @@ -140,7 +148,7 @@ function watch(path) { if (/"error"\s*:\s*[1-9]/.test(s)) break; var state = /"state"\s*:\s*(\d+)/.exec(s.replace(/"extended_status"\s*:\s*\{[^}]*\}/, "")), complete = /"download_complete"\s*:\s*true/.test(s); state = state ? +state[1] : 0; - if (state == 1000 || state == 1003 || !complete) started = true; + if (state == 1000 || state == 1003 || job(s) && !complete) started = true; if (started && (state == 1004 || complete && /"playable"\s*:\s*true/.test(s))) break; if (!started && state == 1004 && i >= 20) break; if (!started && i >= 180) { @@ -1376,7 +1384,7 @@ def summary(status): return out -def agent_job(root, action, uid, product="", folder="", locale="enUS", country="USA", region="US", poll=None, wait=None): +def agent_job(root, action, uid, product="", folder="", locale="enUS", country="USA", region="US", poll=None, wait=None, stall=None): pfx = os.path.join(prefix(root), "pfx") if not installed(root) or agent_exe(root) is None: emit("ERROR", "client") @@ -1432,6 +1440,7 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" os.replace(output, output + ".1") except OSError: pass + before = {pid for pid, _ in wine_processes(pfx)} with open(output, "ab") as log: try: child = subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=log, stderr=log, env=env) @@ -1439,6 +1448,9 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" emit("ERROR", "stopped gamescope: %s" % error) return 1 seen = None + mark = None + moved = time.monotonic() + stalled = False while True: done = child.poll() is not None status = read_status(base + ".json") @@ -1447,12 +1459,27 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" if brief != seen: emit("PROGRESS", json.dumps(brief, sort_keys=True)) seen = brief + signature = tuple(brief.get(key) for key in MOVING) + if signature != mark: + mark = signature + moved = time.monotonic() if done: break + if action != "uninstall" and time.monotonic() - moved > (STALL if stall is None else stall): + say("the %s of %s made no progress for %d s; stopping it" % (action, uid, STALL if stall is None else stall)) + stalled = True + child.kill() + child.wait() + break time.sleep(POLL if poll is None else poll) leftovers = wine_processes(pfx) if leftovers and idle(leftovers): stop(leftovers) + elif stalled: + stop([(pid, argv) for pid, argv in leftovers if pid not in before and program(argv) == AGENT]) + if stalled: + emit("ERROR", "stalled") + return 6 answer = read_status(base + ".game") game = answer or {} status = read_status(base + ".json") or {} diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index ec20e81777..2dbe844e72 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -1441,6 +1441,138 @@ class AgentJobTest(Harness): self.assertEqual(BNET["agent_job"](self.root, "update", "gryphon", poll=0), 1) self.assertEqual(self.lines[-1][0], "ERROR") + def test_a_job_that_stops_moving_is_ended_as_stalled_and_its_agent_stopped(self): + self.install() + self.files = {".json": json.dumps({"state": 1003, "paused": True, "download_current": [10, 0, 0], "download_total": [99, 0, 0]})} + killed = [] + stopped = [] + + class Hung: + returncode = None + + def __init__(self, cmd, **kwargs): + base = cmd[-1][2:].replace("\\", "/") + with open(base + ".json", "wb") as f: + f.write(self_files[".json"].encode("utf-16")) + + def poll(self): + return None + + def kill(self): + killed.append(True) + + def wait(self): + return -9 + + self_files = self.files + with mock.patch.object(BNET["subprocess"], "Popen", Hung), \ + mock.patch.dict(BNET, {"wine_processes": lambda pfx: [(5, ["agent.exe"])], "stop": lambda p: stopped.append(p)}): + code = BNET["agent_job"](self.root, "install", "s1", "s1", str(self.tmp / "S1"), "enUS", "USA", "US", poll=0, stall=0.05) + self.assertEqual(code, 6) + self.assertEqual(killed, [True]) + self.assertEqual(stopped, [[(5, ["agent.exe"])]]) + self.assertEqual(self.lines[-1], ("ERROR", "stalled")) + + def test_a_stalled_job_leaves_a_game_or_client_in_the_prefix_running(self): + self.install() + self.files = {".json": json.dumps({"state": 1003, "download_current": [10, 0, 0], "download_total": [99, 0, 0]})} + stopped = [] + calls = [] + + class Hung: + returncode = None + + def __init__(self, cmd, **kwargs): + calls.append(True) + + def poll(self): + return None + + def kill(self): + pass + + def wait(self): + return -9 + + def processes(pfx): + if not calls: + return [(3, ["agent.exe"])] + return [(3, ["agent.exe"]), (5, ["Agent.exe"]), (6, ["wineserver"]), (7, ["Wow.exe"])] + + with mock.patch.object(BNET["subprocess"], "Popen", Hung), \ + mock.patch.dict(BNET, {"wine_processes": processes, "stop": lambda p: stopped.append(p)}): + code = BNET["agent_job"](self.root, "install", "s1", "s1", str(self.tmp / "S1"), "enUS", "USA", "US", poll=0, stall=0.05) + self.assertEqual(code, 6) + self.assertEqual(stopped, [[(5, ["Agent.exe"])]]) + + def test_only_a_changing_rate_or_estimate_does_not_hold_off_the_stall(self): + self.install() + clock = [0.0] + + class Spinning: + returncode = None + + def __init__(self, cmd, **kwargs): + self.base = cmd[-1][2:].replace("\\", "/") + self.polls = 0 + + def poll(self): + self.polls += 1 + if self.polls > 10: + raise AssertionError("the stall timeout never ended the job") + clock[0] += 10 + with open(self.base + ".json", "wb") as f: + f.write(json.dumps({"state": 1003, "download_current": [4, 0, 0], "download_total": [9, 0, 0], + "download_rate": self.polls, "estimated_time_in_sec": self.polls}).encode("utf-16")) + return None + + def kill(self): + pass + + def wait(self): + return -9 + + fake = mock.Mock(monotonic=lambda: clock[0], sleep=lambda s: None) + with mock.patch.object(BNET["subprocess"], "Popen", Spinning), mock.patch.dict(BNET, {"time": fake, "stop": lambda p: None}): + code = BNET["agent_job"](self.root, "update", "gryphon", poll=0, stall=25) + self.assertEqual(code, 6) + self.assertEqual(self.lines[-1], ("ERROR", "stalled")) + + def test_a_moving_job_is_not_ended_as_stalled(self): + self.install() + done = json.dumps({"installed": True, "playable": True, "install_dir": "Z:/g", "local_version": "2"}) + clock = [0.0] + + class Moving: + returncode = 0 + + def __init__(self, cmd, **kwargs): + self.base = cmd[-1][2:].replace("\\", "/") + self.polls = 0 + + def poll(self): + self.polls += 1 + clock[0] += 10 + with open(self.base + ".json", "wb") as f: + f.write(json.dumps({"state": 1003, "download_current": [self.polls, 0, 0], "download_total": [9, 0, 0]}).encode("utf-16")) + if self.polls < 6: + return None + with open(self.base + ".game", "wb") as f: + f.write(done.encode("utf-16")) + return 0 + + fake = mock.Mock(monotonic=lambda: clock[0], sleep=lambda s: None) + with mock.patch.object(BNET["subprocess"], "Popen", Moving), mock.patch.dict(BNET, {"time": fake}): + code = BNET["agent_job"](self.root, "update", "gryphon", poll=0, stall=15) + self.assertEqual(code, 0) + self.assertNotIn(("ERROR", "stalled"), self.lines) + + def test_only_a_real_job_reply_counts_as_started(self): + script = BNET["AGENT_SCRIPT"] + self.assertIn("if (state == 1000 || state == 1003 || job(s) && !complete) started = true;", script) + self.assertIn('return /"state"\\s*:\\s*\\d+/.test(bare) || /"download_current"\\s*:/.test(bare);', script) + self.assertIn('if (/"error"\\s*:\\s*[1-9]/.test(text)) return false;', script) + def test_the_driver_only_stops_once_the_agent_has_really_run(self): script = BNET["AGENT_SCRIPT"] self.assertIn("if (started && (state == 1004 || complete && /\"playable\"\\s*:\\s*true/.test(s))) break;", script) From 269d462825694e3c5612465814294704bd4cbaa3 Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Sun, 15 Nov 2026 03:49:47 +0800 Subject: [PATCH 095/101] feat(hud): every reading gets its own switch and a row order (#2454) * feat: every HUD reading has its own switch and a row order * feat: readings get a reorder dialog of their own * refactor: drag alone moves a reading * fix: the readings list is one column with a switch per row * fix: one scrolling readings list, titled HUD info * refactor: derive the readings order from the defaults instead of a second list * fix: the readings dialog loses its doubled title and follows the saved order * refactor: no title in the readings dialog, its actions sit beside the list * refactor: readings dialog actions take the free side on landscape, the foot on portrait * fix: the readings list follows the size it draws and drags with a live gap * fix: the readings dialog fills the window and keeps scrolling under a held drag * fix: reset restores every size's order, and the new HUD strings are translated * refactor: one table for each size's rows and one for its text sizes * refactor: the readings list swaps rows as the drag passes them, and the list animates the rest * refactor: give the readings rows test tags for the local UI test * refactor: HUD readings follow one configurable row table * refactor: the Strip HUD draws its rows from the same table * refactor: each size orders its rows by its own table, and the frame graph is a row * fix: the readings dialog keeps the row order a drag leaves * fix: each size keeps its own row order, and reset clears only the order * refactor: the graph's size lives in one place, and the section markers are gone * fix: a size change and the first save of a legacy config both keep the order * chore: retrigger the build * feat: a reading can be grabbed with Y and shuffled with the d-pad * feat: controller hints float beside the dialog, and a moved row stays in view * feat: Y grabs on a hold and drops on release, and a touch no longer flips the dialog * fix: keep the key hints off the rows on narrow windows, and let Enter toggle a row --- .../com/droiddeck/launcher/SessionActivity.kt | 2 + .../launcher/hud/DroidDeckHudConfig.kt | 76 +- .../launcher/hud/DroidDeckHudModels.kt | 95 ++- .../launcher/hud/DroidDeckHudView.kt | 784 ++++++------------ .../com/droiddeck/launcher/ui/AddAppDialog.kt | 32 +- .../launcher/ui/DroidDeckHudSettings.kt | 106 +-- .../launcher/ui/HudReadingsDialog.kt | 389 +++++++++ .../droiddeck/launcher/ui/SessionOverlay.kt | 2 + app/src/main/res/values-ar/strings.xml | 11 + app/src/main/res/values-b+es+419/strings.xml | 11 + app/src/main/res/values-bg/strings.xml | 11 + app/src/main/res/values-cs/strings.xml | 11 + app/src/main/res/values-da/strings.xml | 11 + app/src/main/res/values-de/strings.xml | 11 + app/src/main/res/values-el/strings.xml | 11 + app/src/main/res/values-es/strings.xml | 11 + app/src/main/res/values-fi/strings.xml | 11 + app/src/main/res/values-fr/strings.xml | 11 + app/src/main/res/values-hi/strings.xml | 11 + app/src/main/res/values-hu/strings.xml | 11 + app/src/main/res/values-in/strings.xml | 11 + app/src/main/res/values-it/strings.xml | 11 + app/src/main/res/values-ja/strings.xml | 11 + app/src/main/res/values-ko/strings.xml | 11 + app/src/main/res/values-ms/strings.xml | 11 + app/src/main/res/values-nb/strings.xml | 11 + app/src/main/res/values-nl/strings.xml | 11 + app/src/main/res/values-pl/strings.xml | 11 + app/src/main/res/values-pt-rPT/strings.xml | 11 + app/src/main/res/values-pt/strings.xml | 11 + app/src/main/res/values-ro/strings.xml | 11 + app/src/main/res/values-ru/strings.xml | 11 + app/src/main/res/values-sv/strings.xml | 11 + app/src/main/res/values-th/strings.xml | 11 + app/src/main/res/values-tr/strings.xml | 11 + app/src/main/res/values-uk/strings.xml | 11 + app/src/main/res/values-vi/strings.xml | 11 + app/src/main/res/values-zh-rCN/strings.xml | 11 + app/src/main/res/values-zh-rHK/strings.xml | 11 + app/src/main/res/values-zh-rTW/strings.xml | 11 + app/src/main/res/values/strings.xml | 11 + .../launcher/hud/DroidDeckHudPanelTest.kt | 98 ++- 42 files changed, 1322 insertions(+), 625 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 5e7a39b639..5648e6e847 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1330,7 +1330,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde selectedSecondScreenDisplay = selectedSecondScreenDisplay, onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, onHudSetting = { key, value -> hudConfig = DroidDeckHudConfig.set(this@SessionActivity, key, value); hud.applyConfig() }, + onHudOrder = { switches, order -> hudConfig = DroidDeckHudConfig.choose(this@SessionActivity, switches, order); hud.applyConfig() }, onHudReset = { hudConfig = DroidDeckHudConfig.reset(this@SessionActivity); hud.applyConfig() }, + onHudOrderReset = { hudConfig = DroidDeckHudConfig.clearOrder(this@SessionActivity); hud.applyConfig() }, onHudExport = { exportHudDiagnostics() }, onUpscaler = { m -> SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt index 151d4a03d4..63afa4c167 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt @@ -7,15 +7,21 @@ internal object DroidDeckHudConfig { val DEFAULTS: Map = linkedMapOf( "hudSize" to "minimal", "hudLocked" to "1", "hudSnap" to "1", "hudScale" to "100", "hudDock" to "none", "hudOpacity" to "80", "hudColor" to "mid", "hudOutline" to "40", "hudOutlineAccent" to "1", - "showFPS" to "1", "showFPSGraph" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", "showGPULoad" to "1", - "showVram" to "1", "showRAM" to "1", "showPower" to "1", "showTemp" to "1", "showBatteryTemp" to "1", - "showGpuTemp" to "0", "showBattery" to "0", "showBatteryTime" to "0", "showLow1" to "1", "showLow01" to "1", "showLow001" to "1", "fpsDecimal" to "1", "showPerCore" to "1", - "showSwap" to "1", "showNet" to "1", "showResolution" to "1", "showProton" to "1", "showSession" to "1", - "showClock" to "1", "showEngine" to "1", "showRenderer" to "1", "showGpuModel" to "1", + "showGpuModel" to "1", "showGPULoad" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", + "showPerCore" to "1", "showTemp" to "1", "showBatteryTemp" to "1", "showGpuTemp" to "0", + "showVram" to "1", "showRAM" to "1", "showSwap" to "1", "showBattery" to "0", "showBatteryTime" to "0", "showPower" to "1", + "showFPS" to "1", "showFPSGraph" to "1", "fpsDecimal" to "1", + "showLatency" to "1", "showAvg" to "1", "showLow1" to "1", "showLow01" to "1", "showLow001" to "1", + "showEngine" to "1", "showRenderer" to "1", + "showDisplay" to "1", "showHdr" to "1", "showNet" to "1", "showResolution" to "1", + "showProton" to "1", "showSession" to "1", "showClock" to "1", "hudOrder" to "", "tempUnit" to "c", "tempBands" to "1", "tempAuto" to "1", "tempRedCpu" to "90", "tempRedGpu" to "90", "tempRedBat" to "48", ) - private val TWINS = mapOf("showCPUUsage" to "showCPULoad", "showTemp" to "showBatteryTemp", "showEngine" to "showRenderer") + private val NOT_READINGS = setOf("showCPULoad", "showRenderer", "fpsDecimal") + + /** Orders saved before the GPU switch was named after the alias the HUD actually reads. */ + private val RENAMED = mapOf("showGPU" to "showGPULoad") fun load(context: Context): MutableMap { val values = LinkedHashMap(DEFAULTS) @@ -36,7 +42,31 @@ internal object DroidDeckHudConfig { val values = load(context) if (key !in DEFAULTS) return values values[key] = value - TWINS[key]?.let { values[it] = value } + SessionPrefs.setDroidDeckHudConfig(context, encode(values)) + return values + } + + /** Writes several switches and the row order in one go, so the HUD is rebuilt once. */ + fun choose(context: Context, switches: Map, order: List): Map { + val values = load(context) + for ((key, on) in switches) if (key in DEFAULTS) { + values[key] = flag(on) + } + val size = DroidDeckHudSize.from(values["hudSize"]) + val groups = sizeOrders(values).toMutableMap() + if (groups.isEmpty()) { + val legacy = legacyOrder(values) + if (legacy.isNotEmpty()) for (each in DroidDeckHudSize.values()) groups[each] = legacy.filter { it in each.rows } + } + groups[size] = order.filter { it in ORDER } + values["hudOrder"] = encodeOrders(groups) + SessionPrefs.setDroidDeckHudConfig(context, encode(values)) + return values + } + + fun clearOrder(context: Context): Map { + val values = load(context) + values["hudOrder"] = "" SessionPrefs.setDroidDeckHudConfig(context, encode(values)) return values } @@ -46,5 +76,37 @@ internal object DroidDeckHudConfig { return DEFAULTS } + /** Every metric switch, in the order the HUD lists them before the user moves any. Derived from + * [DEFAULTS], so a switch added there shows up here without a second list to keep in step. */ + val ORDER: List = DEFAULTS.keys.filter { it.startsWith("show") && it !in NOT_READINGS } + + /** Only the rows the user moved for [size], in the order they left them. */ + fun storedOrder(values: Map, size: DroidDeckHudSize): List = + sizeOrders(values)[size] ?: legacyOrder(values) + + /** Orders saved before each size kept its own: one list, applied to every size. */ + private fun legacyOrder(values: Map): List { + val raw = values["hudOrder"].orEmpty() + if (raw.isBlank() || raw.contains(':')) return emptyList() + return raw.split('|').map { RENAMED[it] ?: it }.filter { it in ORDER } + } + + private fun sizeOrders(values: Map): Map> { + val raw = values["hudOrder"].orEmpty() + if (raw.isBlank()) return emptyMap() + val groups = LinkedHashMap>() + for (group in raw.split(';')) { + val colon = group.indexOf(':') + if (colon <= 0) continue + val size = DroidDeckHudSize.values().firstOrNull { it.token == group.substring(0, colon) } ?: continue + groups[size] = group.substring(colon + 1).split('|').map { RENAMED[it] ?: it }.filter { it in ORDER } + } + return groups + } + + private fun encodeOrders(groups: Map>): String = + groups.entries.filter { it.value.isNotEmpty() } + .joinToString(";") { "${it.key.token}:${it.value.joinToString("|")}" } + private fun flag(on: Boolean) = if (on) "1" else "0" } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt index dd6936f860..e88997a09b 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt @@ -13,6 +13,27 @@ package com.droiddeck.launcher.hud +/** + * Size modes for the DroidDeck HUD (the 4th selectable in-game overlay style). One shared color-coded + * visual language, four amounts of detail — see the approved mockup. The config value is the lower-case + * token stored under the `hudSize` key; the label is the user-facing string. + */ +/** The text sizes and spacing a [DroidDeckHudSize] lays its rows out with, in sp. */ +data class DroidDeckHudStyle( + val row: Float, + val unit: Float, + val pad: Float, + val lineGap: Float, + val labelGap: Float, + val key: Float = 0f, + val sub: Float = 0f, + val foot: Float = 0f, + val band: Float = 0f, + val gutter: Float = 0f, + val tileGap: Float = 0f, + val innerPad: Float = 0f, +) + enum class DroidDeckHudSize(val token: String, val label: String) { FULL("full", "Full"), TILES("tiles", "Tiles"), @@ -26,27 +47,73 @@ enum class DroidDeckHudSize(val token: String, val label: String) { return all[(ordinal + 1) % all.size] } - fun supportedChips(): Set = when (this) { - MINIMAL -> MINIMAL_CHIPS - PILL -> PILL_CHIPS - FULL, TILES, STRIP -> STANDARD_CHIPS - MEGA -> MEGA_CHIPS - } + /** + * The rows this size draws, in the order it draws them before the user moves any. This is the single + * source of truth for both surfaces: [DroidDeckHudView] draws exactly these and the settings screen + * offers exactly these. A switch outside the set is ignored by the size, so the two cannot drift. + */ + val rows: List get() = ROWS.getValue(this) + + /** This size's rows: the ones the user moved first, then the rest in the order [rows] lists them. */ + fun rowsIn(stored: List): List = + stored.filter { it in rows } + rows.filter { it !in stored } + /** + * The numbers each size sets its text in, in sp. One table so a size's scale can be read (and changed) + * in one place instead of hunting the `sp(...)` literals scattered through its builder. + */ + val style: DroidDeckHudStyle get() = STYLE.getValue(this) + companion object { fun from(token: String?): DroidDeckHudSize = values().firstOrNull { it.token.equals(token, ignoreCase = true) } ?: FULL - val MINIMAL_CHIPS = setOf("FPS", "Battery time", "FPS graph", "1% low", "0.1% low", "0.01% low", "FPS .1", "Engine", "Clock") - val PILL_CHIPS = setOf("FPS", "Battery time", "FPS graph", "GPU", "CPU", "VRAM", "RAM", "Battery", "GPU model", "FPS .1", "Engine", "Clock") - val STANDARD_CHIPS = setOf( - "FPS", "FPS graph", "GPU", "GPU temp", "CPU", "VRAM", "RAM", "Power", "Temp", - "Battery", "Battery time", "GPU model", "Engine", "1% low", "0.1% low", "0.01% low", "FPS .1", "Clock", + private val EXTRAS = setOf("showClock") + + val ROWS: Map> = mapOf( + FULL to listOf( + "showFPS", "showFPSGraph", "showGpuModel", "showDisplay", "showHdr", "showGPULoad", "showGpuTemp", + "showCPUUsage", "showTemp", "showVram", "showRAM", "showBattery", "showBatteryTemp", "showBatteryTime", + "showPower", "showLatency", "showAvg", "showLow1", "showLow01", "showLow001", + ), + TILES to listOf( + "showFPS", "showFPSGraph", "showLatency", "showGPULoad", "showGpuTemp", "showCPUUsage", "showTemp", + "showVram", "showRAM", "showEngine", "showDisplay", "showHdr", "showAvg", "showLow1", + "showLow01", "showLow001", "showGpuModel", "showBattery", "showBatteryTemp", "showBatteryTime", "showPower", + ), + PILL to listOf( + "showFPS", "showFPSGraph", "showGpuModel", "showGPULoad", "showGpuTemp", "showCPUUsage", "showTemp", + "showRAM", "showBattery", "showBatteryTemp", "showBatteryTime", "showPower", "showLatency", "showDisplay", + "showVram", "showHdr", + ), + MINIMAL to listOf( + "showFPS", "showBatteryTime", "showFPSGraph", "showLow1", "showLow01", "showLow001", "showAvg", "showLatency", + "showEngine", "showDisplay", "showHdr", + ), + MEGA to DroidDeckHudConfig.ORDER.filter { it !in EXTRAS }, + STRIP to listOf( + "showFPS", "showFPSGraph", "showLow1", "showLow01", "showLow001", "showGPULoad", "showGpuTemp", + "showCPUUsage", "showTemp", "showVram", "showRAM", "showBattery", "showBatteryTemp", "showBatteryTime", + "showPower", "showDisplay", "showHdr", "showGpuModel", + ), ) - val MEGA_ONLY = setOf( - "Per-core", "Swap", "Network", "Resolution", "Proton", "Wrapper", "DX ver", "Session", + + + val STYLE: Map = mapOf( + FULL to DroidDeckHudStyle(row = 12f, unit = 12f * 0.62f, pad = 10f, lineGap = 4f, labelGap = 8f), + TILES to DroidDeckHudStyle(row = 18f, unit = 11f, pad = 9f, lineGap = 4f, labelGap = 8f, + key = 10f, sub = 10f, tileGap = 6f, innerPad = 8f), + PILL to DroidDeckHudStyle(row = 30f, unit = 30f * 0.36f, pad = 10f, lineGap = 3f, labelGap = 12f, + sub = 11.5f), + MINIMAL to DroidDeckHudStyle(row = 34f, unit = 34f * 0.32f, pad = 10f, lineGap = 4f, labelGap = 8f, + sub = 11.5f, foot = 9.5f), + MEGA to DroidDeckHudStyle(row = 11.5f, unit = 11.5f * 0.62f, pad = 10f, lineGap = 3.5f, labelGap = 7f, + band = 9.5f, gutter = 16f), + STRIP to DroidDeckHudStyle(row = 11.5f, unit = 11.5f * 0.8f, pad = 10f, lineGap = 0f, labelGap = 13f), ) - val MEGA_CHIPS = STANDARD_CHIPS + MEGA_ONLY + + fun rowsFor(size: DroidDeckHudSize, values: Map): List = + size.rowsIn(DroidDeckHudConfig.storedOrder(values, size)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index 2d289a4185..f7211d69e2 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -69,6 +69,7 @@ class DroidDeckHudView(context: Context) : View(context) { private val density = resources.displayMetrics.density + private var cfg: KeyValueSet = KeyValueSet() private var size = DroidDeckHudSize.FULL private var scale = 1f private var bgOpacity = 0.8f @@ -87,7 +88,6 @@ class DroidDeckHudView(context: Context) : View(context) { private var showVram = true private var showRAM = true private var showBattery = true - private var showBatteryTime = true private var showPower = true private var showBatteryTemp = false private var showGraph = false @@ -96,13 +96,16 @@ class DroidDeckHudView(context: Context) : View(context) { private var showLow001 = true private var fpsDecimal = true private var showClockTime = true + private var showLatency = true + private var showAvg = true + private var showDisplay = true + private var showHdr = true + private var storedOrder: List = emptyList() private var showPerCore = true private var showSwap = true private var showNet = true private var showResolution = true private var showProton = true - private var showWrapper = true - private var showDxVer = true private var showSession = true private var engineLabel = "" @@ -178,7 +181,7 @@ class DroidDeckHudView(context: Context) : View(context) { fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, glow) } private class Span(val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) - private class HudRow(val label: Span, val vals: List, val inline: Boolean = false) + private class HudRow(val key: String, val label: Span, val vals: List, val inline: Boolean = false) private val glyphs = ArrayList() private val tileRects = ArrayList() private var graphRect: RectF? = null @@ -290,42 +293,52 @@ class DroidDeckHudView(context: Context) : View(context) { private fun cycleSize() { size = size.next() + refreshOrder() onSizeCycledListener?.accept(size.token) rebuildAndInvalidate() } + private fun refreshOrder() { + storedOrder = DroidDeckHudConfig.storedOrder(mapOf("hudOrder" to cfg.get("hudOrder", "")), size) + } + + private fun switchOn(key: String): Boolean = + cfg.get(key, DroidDeckHudConfig.DEFAULTS[key] ?: "1") == "1" + fun applyConfig(configString: String?) { if (configString.isNullOrEmpty()) return - val cfg = KeyValueSet(configString) + cfg = KeyValueSet(configString) size = DroidDeckHudSize.from(cfg.get("hudSize", "minimal")) - showFPS = cfg.get("showFPS", "1") == "1" - showEngine = cfg.get("showEngine", "1") == "1" - showGpuModel = cfg.get("showGpuModel", "1") == "1" - showCPU = cfg.get("showCPUUsage", cfg.get("showCPULoad", "1")) == "1" - showGPU = cfg.get("showGPULoad", "1") == "1" - showCpuTemp = cfg.get("showTemp", "1") == "1" - showGpuTemp = cfg.get("showGpuTemp", "0") == "1" - showVram = cfg.get("showVram", "1") == "1" - showRAM = cfg.get("showRAM", "1") == "1" - showBattery = cfg.get("showBattery", "1") == "1" - showBatteryTime = cfg.get("showBatteryTime", "1") == "1" - showPower = cfg.get("showPower", "1") == "1" - showBatteryTemp = cfg.get("showBatteryTemp", "0") == "1" - showGraph = cfg.get("showFPSGraph", "0") == "1" - showLow1 = cfg.get("showLow1", "1") == "1" - showLow01 = cfg.get("showLow01", "1") == "1" - showLow001 = cfg.get("showLow001", "1") == "1" + showFPS = switchOn("showFPS") + showEngine = switchOn("showEngine") + showGpuModel = switchOn("showGpuModel") + showCPU = switchOn("showCPUUsage") + showGPU = switchOn("showGPULoad") + showCpuTemp = switchOn("showTemp") + showGpuTemp = switchOn("showGpuTemp") + showVram = switchOn("showVram") + showRAM = switchOn("showRAM") + showBattery = switchOn("showBattery") + showPower = switchOn("showPower") + showBatteryTemp = switchOn("showBatteryTemp") + showGraph = switchOn("showFPSGraph") + showLow001 = switchOn("showLow001") fpsDecimal = cfg.get("fpsDecimal", "1") == "1" - showClockTime = cfg.get("showClock", "1") == "1" - showPerCore = cfg.get("showPerCore", "1") == "1" - showSwap = cfg.get("showSwap", "1") == "1" - showNet = cfg.get("showNet", "1") == "1" - showResolution = cfg.get("showResolution", "1") == "1" - showProton = cfg.get("showProton", "1") == "1" - showWrapper = cfg.get("showWrapper", "1") == "1" - showDxVer = cfg.get("showDxVer", "1") == "1" - showSession = cfg.get("showSession", "1") == "1" + showClockTime = switchOn("showClock") + showLatency = switchOn("showLatency") + showAvg = switchOn("showAvg") + showLow1 = switchOn("showLow1") + showLow01 = switchOn("showLow01") + showDisplay = switchOn("showDisplay") + showHdr = switchOn("showHdr") + refreshOrder() + showPerCore = switchOn("showPerCore") + showSwap = switchOn("showSwap") + showNet = switchOn("showNet") + showResolution = switchOn("showResolution") + showProton = switchOn("showProton") + showSession = switchOn("showSession") tempDisplay = HudMetrics.TempDisplay.from(cfg) lockController.setLocked(cfg.get("hudLocked", "1") == "1") dock = DroidDeckHudDock.from(cfg.get("hudDock", "none")) @@ -460,6 +473,8 @@ class DroidDeckHudView(context: Context) : View(context) { return w } + private fun showHdrLine(): Boolean = showHdr && hdrState != DroidDeckHudHdr.NONE + private fun placeRun(startX: Float, baseline: Float, spans: List, glow: Boolean = false): Float { var x = startX for (s in spans) { @@ -541,13 +556,15 @@ class DroidDeckHudView(context: Context) : View(context) { val s = snap if (s == null) { contentW = 0f; contentH = 0f; return } if (dock != DroidDeckHudDock.NONE) { buildDockTab(); return } + if (size == DroidDeckHudSize.STRIP) { buildStrip(s); return } + buildRows(s) + if (contentW <= 0f || contentH <= 0f) return + if (size == DroidDeckHudSize.PILL) addSubtleClock(sp(10f), leftAligned = true) + val pad = sp(size.style.pad) when (size) { - DroidDeckHudSize.FULL -> { buildFull(s); intoPanel(sp(10f), header = true) } - DroidDeckHudSize.TILES -> { buildTiles(s); intoPanel(sp(9f), header = true) } - DroidDeckHudSize.PILL -> { buildPill(s); intoPanel(sp(10f), header = false) } - DroidDeckHudSize.MINIMAL -> buildMinimal(s) - DroidDeckHudSize.MEGA -> { buildMega(s); intoPanel(sp(10f), header = true) } - DroidDeckHudSize.STRIP -> buildStrip(s) + DroidDeckHudSize.MINIMAL -> intoPanel(pad, header = true, halfRound = true) + DroidDeckHudSize.PILL -> intoPanel(pad, header = false) + else -> intoPanel(pad, header = true) } } @@ -617,7 +634,12 @@ class DroidDeckHudView(context: Context) : View(context) { return Pair(dDividerTop + max(1f, density), x) } - private fun intoPanel(pad: Float, header: Boolean) { + /** + * Moves a size's content, laid out from [pad] at the origin, into the panel: under the header, or after + * the logo chip on the Pill. Lines that start on the content's left edge are lined up by their ink, so + * the logo, labels and numbers share one edge. + */ + private fun intoPanel(pad: Float, header: Boolean, halfRound: Boolean = !header) { if (contentW <= 0f || contentH <= 0f) return for (i in glyphs.indices) { val g = glyphs[i] @@ -643,7 +665,7 @@ class DroidDeckHudView(context: Context) : View(context) { val panel = RectF(panelLeft(), panelInset(), max(contentW - pad + dx, headerRight) + sp(18f), contentH - pad + dy + sp(10f) + stroke) chipRect?.let { it.offsetTo(it.left, panel.centerY() - it.height() / 2f) } - finishPanel(panel, halfRound = !header) + finishPanel(panel, halfRound = halfRound) } private fun finishPanel(panel: RectF, halfRound: Boolean) { @@ -714,289 +736,188 @@ class DroidDeckHudView(context: Context) : View(context) { contentW = max(contentW, pad + w + pad) } - private fun hasGpuStats(s: HudMetrics.Snapshot): Boolean = - s.gpuPercent != null || s.gpuTempC != null || s.gpuClockMhz != null - - private fun buildFull(s: HudMetrics.Snapshot) { - val rowPx = sp(12f); val unitPx = rowPx * 0.62f - val pad = sp(10f); val lineGap = sp(4f); val lvGap = sp(8f) - val rows = ArrayList() - - if (showGpuModel && gpuNameText().isNotBlank()) - rows.add(HudRow(Span("GPU", colGpu, rowPx), gpuModelSpans(rowPx, colValue))) - if (displayServer.isNotBlank()) - rows.add(HudRow(Span("DISP", colDisp, rowPx), listOf(Span(displayServer, colValue, rowPx)))) - if (hdrState != DroidDeckHudHdr.NONE) - rows.add(HudRow(Span("HDR", colHdr, rowPx), hdrValue(rowPx))) - if (showGPU && hasGpuStats(s)) { - val v = ArrayList() - v += numUnit(s.gpuPercent?.toString(), "%", rowPx, unitPx) - if (showGpuTemp) tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) - .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } - v += gap(unitPx); v += numUnit(s.gpuClockMhz?.toString(), "MHz", rowPx, unitPx) - rows.add(HudRow(Span("GPU", colGpu, rowPx), v)) - } - if (showCPU) { - val v = ArrayList() - v += numUnit(s.cpuPercent?.toString(), "%", rowPx, unitPx) - v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) - if (showCpuTemp) tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) - .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } - rows.add(HudRow(Span("CPU", colCpu, rowPx), v)) - } - if (showVram && s.vramText() != null) - rows.add(HudRow(Span("VRAM", colVram, rowPx), valueUnit(s.vramText()!!, rowPx, unitPx))) - if (showRAM) { - val v = ArrayList() - v += valueUnit(s.ramUsedText(), rowPx, unitPx) - v += gap(unitPx); v += numUnit(s.ramPercent.roundToInt().toString(), "%", rowPx, unitPx) - rows.add(HudRow(Span("RAM", colRam, rowPx), v)) - } - if (showBattery || showPower || showBatteryTemp) { - val v = ArrayList(); var any = false - if (showBattery && s.battery.percent != null) { v += numUnit(s.battery.percent.toString(), "%", rowPx, unitPx); any = true } - if (showBatteryTemp) tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, rowPx, unitPx) - .let { if (it.isNotEmpty()) { if (any) v += gap(unitPx); v += it; any = true } } - if (showPower && s.battery.watts > 0f) { if (any) v += gap(unitPx); v += numUnit(fmt1(s.battery.watts), "W", rowPx, unitPx); any = true } - if (any) rows.add(HudRow(Span("BAT", colBat, rowPx), v)) - } - if (showBatteryTime) rows.add(HudRow(Span("TIME", colBat, rowPx), listOf(Span(s.battery.runtimeText ?: "—", colValue, rowPx)))) - if (showFPS) { - val v = ArrayList() - v += glowing(numUnit(fpsText(fpsNow), "FPS", rowPx, unitPx)) - v += gap(unitPx); v += numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", rowPx, unitPx) - rows.add(HudRow(Span(apiLabel(), colFps, rowPx), v)) - rows.add(HudRow(Span("AVG", colLo, rowPx), numUnit(fmt1(fpsAvg), "FPS", rowPx, unitPx))) - if (showLow1) - rows.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) - if (showLow01) - rows.add(HudRow(Span("0.1%", colLo, rowPx), numUnit(lowText(lows.low01Fps), "FPS", rowPx, unitPx))) - if (showLow001) - rows.add(HudRow(Span("0.01%", colLo, rowPx), numUnit(lowText(lows.low001Fps), "FPS", rowPx, unitPx))) - } - - var labelCol = 0f - for (r in rows) if (!r.inline) labelCol = max(labelCol, measure(r.label.text, rowPx)) - val h = lineH(rowPx); val asc = ascent(rowPx) - var y = pad; var maxRight = pad - for (r in rows) { - val baseline = y - asc - placeRun(pad, baseline, listOf(r.label)) - val valX = if (r.inline) pad + measure(r.label.text, rowPx) + lvGap - else pad + labelCol + lvGap - val end = placeRun(valX, baseline, r.vals) - maxRight = max(maxRight, end) - y += h + lineGap - } - - if (showFPS && showGraph) { - val ftPx = unitPx * 1.15f - val baseline = y - asc - placeRun(pad, baseline, listOf(Span("Frametime", colFps, ftPx))) - val stat = "min:${fmt1(graphMinMs)} max:${fmt1(graphMaxMs)}" - val statX = pad + max(labelCol, measure("Frametime", ftPx)) + lvGap - val end = placeRun(statX, baseline, listOf(Span(stat, colDim, unitPx))) - maxRight = max(maxRight, end) - y += h + lineGap - val gh = sp(22f) - val right = max(maxRight, pad + sp(160f)) - graphRect = RectF(pad, y, right, y + gh) - maxRight = max(maxRight, right) - y += gh - } - - contentW = maxRight + pad - contentH = y + pad - addSubtleClock(pad) + private fun switchLabel(key: String): Pair = when (key) { + "showGpuModel" -> "MODEL" to colGpu + "showGPULoad" -> "GPU" to colGpu + "showGpuTemp" -> "GPU.T" to colGpu + "showCPUUsage" -> "CPU" to colCpu + "showTemp" -> "CPU.T" to colCpu + "showBatteryTemp" -> "BAT.T" to colBat + "showPower" -> "PWR" to colBat + "showBattery" -> "BAT" to colBat + "showBatteryTime" -> "BAT TIME" to colBat + "showVram" -> "VRAM" to colVram + "showRAM" -> "RAM" to colRam + "showSwap" -> "SWP" to colRam + "showNet" -> "NET" to colFps + "showPerCore" -> "CORE" to colCpu + "showFPS" -> "FPS" to colFps + "showLatency" -> "MS" to colDim + "showAvg" -> "AVG" to colLo + "showLow1" -> "1%" to colLo + "showLow01" -> "0.1%" to colLo + "showLow001" -> "0.01%" to colLo + "showEngine" -> "API" to colFps + "showDisplay" -> "DISP" to colDisp + "showHdr" -> "HDR" to colHdr + "showResolution" -> "RES" to colDim + "showProton" -> "PROTON" to colVram + "showSession" -> "TIME" to colDim + else -> key.removePrefix("show") to colDim } - private fun buildTiles(s: HudMetrics.Snapshot) { - val keyPx = sp(10f); val valPx = sp(18f); val subPx = sp(10f); val unitPx = sp(11f) - val pad = sp(9f); val innerPad = sp(8f); val tileGap = sp(6f); val lineGap = sp(4f) - - class Tile(val key: String, val keyColor: Int, val value: List, val sub: String?, val wide: Boolean) - val tiles = ArrayList() - - if (showFPS) tiles.add(Tile("FPS", colFps, listOf(Span(fpsText(fpsNow), colValue, valPx, glow = true)), - "${fmt1(fpsAvg)} avg" + (if (showLow1) " · ${lowText(lows.low1Fps) ?: "—"} 1%" else ""), false)) - if (showFPS) tiles.add(Tile("FRAME", colDim, numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", valPx, unitPx), - "${fmt1(graphMinMs)} – ${fmt1(graphMaxMs)}", false)) - if (showGPU && hasGpuStats(s)) tiles.add(Tile("GPU", colGpu, numUnit(s.gpuPercent?.toString(), "%", valPx, unitPx), - if (showGpuTemp && s.gpuTempC != null) HudMetrics.formatTemp(s.gpuTempC.toFloat(), tempDisplay, false) - else s.gpuClockMhz?.let { "${it}MHz" }, false)) - if (showCPU) tiles.add(Tile("CPU", colCpu, numUnit(s.cpuPercent?.toString(), "%", valPx, unitPx), - listOfNotNull(s.cpuClockMhz?.let { "${it}MHz" }, - if (showCpuTemp) s.cpuTempC?.let { HudMetrics.formatTemp(it.toFloat(), tempDisplay, false) } else null) - .joinToString(" · ").ifBlank { null }, false)) - if (showVram && s.vramText() != null) tiles.add(Tile("VRAM", colVram, valueUnit(s.vramText()!!, valPx, unitPx), null, false)) - if (showRAM) tiles.add(Tile("RAM", colRam, numUnit(s.ramPercent.roundToInt().toString(), "%", valPx, unitPx), - "${s.ramUsedText()} / ${s.ramTotalText()}", false)) - if (showEngine && engineLabel.isNotBlank()) - tiles.add(Tile("API", colFps, listOf(Span(engineLabel, colValue, valPx)), - dxVersion().ifBlank { null }, false)) - if (displayServer.isNotBlank()) - tiles.add(Tile("DISPLAY", colDisp, listOf(Span(displayServer, colValue, valPx)), - if (hdrState != DroidDeckHudHdr.NONE) hdrText() else null, false)) - if (showGpuModel && gpuNameText().isNotBlank()) - tiles.add(Tile("GPU", colGpu, gpuModelSpans(valPx, colValue), null, true)) - if (showBattery || showPower || showBatteryTemp) { - val parts = ArrayList(); var any = false - if (showBattery && s.battery.percent != null) { parts += numUnit(s.battery.percent.toString(), "%", valPx, unitPx); any = true } - if (showBatteryTemp && s.battery.tempC != null) { if (any) parts += Span(" · ", colDim, subPx); parts += tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, valPx, unitPx); any = true } - if (showPower && s.battery.watts > 0f) { if (any) parts += Span(" · ", colDim, subPx); parts += numUnit(fmt1(s.battery.watts), "W", valPx, unitPx); any = true } - if (any) tiles.add(Tile("BAT", colBat, parts, null, true)) + private fun reading(key: String, s: HudMetrics.Snapshot, labelPx: Float, valuePx: Float, unitPx: Float): HudRow { + if (key == "showFPSGraph") return HudRow(key, Span("", colDim, 0f), emptyList()) + val (label, color) = switchLabel(key) + val values: List = when (key) { + "showGpuModel" -> if (gpuNameText().isBlank()) numUnit(null, "", valuePx, unitPx) + else gpuModelSpans(valuePx, colValue) + "showGPULoad" -> numUnit(s.gpuPercent?.toString(), "%", valuePx, unitPx) + "showGpuTemp" -> tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, valuePx, unitPx) + "showCPUUsage" -> numUnit(s.cpuPercent?.toString(), "%", valuePx, unitPx) + "showTemp" -> tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, valuePx, unitPx) + "showBatteryTemp" -> tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, valuePx, unitPx) + "showPower" -> numUnit(if (s.battery.watts > 0f) fmt1(s.battery.watts) else null, "W", valuePx, unitPx) + "showBattery" -> numUnit(s.battery.percent?.toString(), "%", valuePx, unitPx) + "showBatteryTime" -> valueUnit(s.battery.runtimeText ?: "—", valuePx, unitPx) + "showVram" -> valueUnit(s.vramText() ?: "—", valuePx, unitPx) + "showRAM" -> numUnit(s.ramPercent.roundToInt().toString(), "%", valuePx, unitPx) + "showSwap" -> valueUnit(s.swapUsedText() ?: "—", valuePx, unitPx) + "showNet" -> listOf( + Span("↓", colDim, unitPx), Span(((s.netDownBps ?: 0L) / 1024L).toString(), colValue, valuePx), + Span(" ↑", colDim, unitPx), Span(((s.netUpBps ?: 0L) / 1024L).toString(), colValue, valuePx), + ) + "showPerCore" -> listOf(Span(s.perCorePercent.size.toString(), colValue, valuePx)) + "showFPS" -> glowing(numUnit(fpsText(fpsNow), "", valuePx, unitPx)) + "showLatency" -> numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", valuePx, unitPx) + "showAvg" -> numUnit(fmt1(fpsAvg), "", valuePx, unitPx) + "showLow1" -> numUnit(lowText(lows.low1Fps), "", valuePx, unitPx) + "showLow01" -> numUnit(lowText(lows.low01Fps), "", valuePx, unitPx) + "showLow001" -> numUnit(lowText(lows.low001Fps), "", valuePx, unitPx) + "showEngine" -> listOf(Span(engineLabel.ifBlank { "—" }, colValue, valuePx)) + "showDisplay" -> listOf(Span(displayServer.ifBlank { "—" }, colDisp, valuePx)) + "showHdr" -> if (showHdrLine()) hdrValue(valuePx) else listOf(Span("off", colDim, valuePx)) + "showResolution" -> listOf(Span(resolutionString(), colValue, valuePx)) + "showProton" -> listOf(Span(wineVersion.ifBlank { "—" }, colVram, valuePx)) + "showSession" -> listOf(Span(elapsedString(), colValue, valuePx)) + else -> listOf(Span("—", colDim, valuePx)) } - if (showBatteryTime) tiles.add(Tile("BAT TIME", colBat, listOf(Span(s.battery.runtimeText ?: "—", colValue, valPx)), "", true)) - if (tiles.isEmpty()) { contentW = 0f; contentH = 0f; return } + return HudRow(key, Span(label, color, labelPx), values.ifEmpty { listOf(Span("—", colDim, valuePx)) }) + } - val keyH = lineH(keyPx); val valH = lineH(valPx); val subH = lineH(subPx) - fun tileW(t: Tile) = max(max(measure(t.key, keyPx), runWidth(t.value)), - t.sub?.let { measure(it, subPx) } ?: 0f) + innerPad * 2 - var normalW = 0f - for (t in tiles) if (!t.wide) normalW = max(normalW, tileW(t)) - if (normalW == 0f) for (t in tiles) normalW = max(normalW, tileW(t) / 2f) - val tileH = innerPad * 2 + keyH + lineGap + valH + lineGap + subH - val fullW = normalW * 2 + tileGap + private fun buildRows(s: HudMetrics.Snapshot) { + val st = size.style + val pad = sp(st.pad); val lineGap = sp(st.lineGap); val lvGap = sp(st.labelGap) + val gutter = sp(if (st.gutter > 0f) st.gutter else 14f) + val unitPx = sp(if (st.unit > 0f) st.unit else st.row * 0.62f) + val basePx = sp(if (st.sub > 0f) st.sub else st.row) - var x = pad; var y = pad; var col = 0 - fun place(t: Tile, tx: Float, ty: Float, tw: Float) { - tileRects.add(RectF(tx, ty, tx + tw, ty + tileH)) - var by = ty + innerPad - ascent(keyPx) - placeRun(tx + innerPad, by, listOf(Span(t.key, t.keyColor, keyPx))) - by = ty + innerPad + keyH + lineGap - ascent(valPx) - placeRun(tx + innerPad, by, t.value) - if (t.sub != null) { - by = ty + innerPad + keyH + lineGap + valH + lineGap - ascent(subPx) - placeRun(tx + innerPad, by, listOf(Span(t.sub, colDim, subPx))) + val keys = size.rowsIn(storedOrder).filter { switchOn(it) } + if (keys.isEmpty()) { contentW = 0f; contentH = 0f; return } + val hero = (size == DroidDeckHudSize.PILL || size == DroidDeckHudSize.MINIMAL) && keys.firstOrNull() == "showFPS" + val tiles = size == DroidDeckHudSize.TILES + val bigPx = sp(st.row); val bigUnitPx = sp(st.unit) + val heroSpans = listOf( + Span(fpsText(fpsNow), colValue, bigPx, glow = true), + Span("fps", colDim, bigUnitPx), + ) + val listed = keys.filter { !hero || it != "showFPS" }.flatMap { key -> + val labelPx = if (tiles) sp(st.key) else basePx + val valuePx = if (tiles) sp(st.row) else basePx + if (key == "showPerCore" && size == DroidDeckHudSize.MEGA) + perCoreRows(s, labelPx, valuePx, unitPx) + else listOf(reading(key, s, labelPx, valuePx, unitPx)) + } + val maxCols = if (size == DroidDeckHudSize.MEGA) 3 else 2 + val cols = when { + listed.size >= 9 -> maxCols + listed.size >= 4 -> minOf(2, maxCols) + else -> 1 + } + + if (tiles) { + val innerPad = sp(st.innerPad); val tileGap = sp(st.tileGap) + val keyH = lineH(sp(st.key)); val valH = lineH(sp(st.row)) + val cellW = listed.maxOf { max(measure(it.label.text, it.label.sizePx), runWidth(it.vals)) } + innerPad * 2f + val graphMin = if (listed.any { it.key == "showFPSGraph" }) sp(GRAPH_MIN_WIDTH_SP) else 0f + val cellMin = graphMin + innerPad * 2f + val cellH = innerPad * 2f + keyH + lineGap + valH + for ((i, r) in listed.withIndex()) { + val x = pad + (i % cols) * (cellW + tileGap) + val y = pad + (i / cols) * (cellH + tileGap) + tileRects.add(RectF(x, y, x + cellW, y + cellH)) + if (r.key == "showFPSGraph") { + graphRect = RectF(x + innerPad, y + innerPad, x + max(cellW, cellMin) - innerPad, y + cellH - innerPad) + continue + } + placeRun(x + innerPad, y + innerPad - ascent(r.label.sizePx), listOf(r.label)) + placeRun(x + innerPad, y + innerPad + keyH + lineGap - ascent(sp(st.row)), r.vals) } - } - for (t in tiles) { - if (t.wide) { - if (col != 0) { y += tileH + tileGap; col = 0; x = pad } - place(t, pad, y, fullW) - y += tileH + tileGap; col = 0; x = pad - } else { - place(t, x, y, normalW) - col++; x += normalW + tileGap - if (col == 2) { col = 0; x = pad; y += tileH + tileGap } + val lines = (listed.size + cols - 1) / cols + contentW = pad + cols * (cellW + tileGap) - tileGap + pad + contentH = pad + lines * (cellH + tileGap) - tileGap + pad + } else { + val columns = (0 until cols).map { c -> listed.filterIndexed { i, _ -> i % cols == c } } + val labelW = columns.map { col -> col.maxOfOrNull { measure(it.label.text, it.label.sizePx) } ?: 0f } + val colW = columns.mapIndexed { c, col -> + val body = if (col.isEmpty()) 0f else labelW[c] + lvGap + (col.maxOfOrNull { runWidth(it.vals) } ?: 0f) + val graph = if (col.any { it.key == "showFPSGraph" }) sp(GRAPH_MIN_WIDTH_SP) + labelW[c] + lvGap else 0f + max(body, graph) } + val gaps = (0 until cols).count { columns[it].isNotEmpty() }.coerceAtLeast(1) - 1 + val bodyW = colW.sum() + gutter * gaps + var bodyH = 0f + for (col in columns) { + var y = 0f + for (r in col) y += rowHeight(r) + lineGap + if (col.isNotEmpty()) bodyH = max(bodyH, y - lineGap) + } + val heroW = if (hero) runWidth(heroSpans) else 0f + val heroH = if (hero) lineH(bigPx) else 0f + val x0 = pad + if (hero && listed.isNotEmpty()) heroW + gutter else 0f + val top = pad + (max(bodyH, heroH) - bodyH) / 2f + var x = x0 + for (c in 0 until cols) { + if (columns[c].isEmpty()) continue + var y = top + for (r in columns[c]) { + if (r.key == "showFPSGraph") { + val left = x + labelW[c] + lvGap + graphRect = RectF(left, y, max(x + colW[c], left + sp(GRAPH_MIN_WIDTH_SP)), y + sp(GRAPH_HEIGHT_SP)) + y += sp(GRAPH_HEIGHT_SP) + lineGap + continue + } + val px = maxOf(r.label.sizePx, r.vals.maxOfOrNull { it.sizePx } ?: 0f) + val baseline = y - ascent(px) + placeRun(x, baseline, listOf(r.label)) + placeRun(x + labelW[c] + lvGap, baseline, r.vals) + y += lineH(px) + lineGap + } + x += colW[c] + gutter + } + if (hero) { + val baseline = pad + (max(bodyH, heroH) - heroH) / 2f - ascent(bigPx) + placeRun(pad, baseline, heroSpans, glow = true) + } + contentW = max(x0 + bodyW, pad + heroW) + pad + contentH = pad + max(bodyH, heroH) + pad } - if (col != 0) y += tileH + tileGap - if (showFPS && showGraph) { - graphRect = RectF(pad, y, pad + fullW, y + sp(22f)) - y += sp(22f) + tileGap - } - contentW = pad + fullW + pad - contentH = y + (pad - tileGap) - addSubtleClock(pad) } - private fun buildPill(s: HudMetrics.Snapshot) { - val bigPx = sp(30f); val bigUnitPx = bigPx * 0.36f; val stkPx = sp(11.5f) - val pad = sp(10f); val midGap = sp(12f); val stkLineGap = sp(3f) - val left = ArrayList() - val generating = differs(fpsNow) - val fpsPx = if (generating) bigPx * 0.55f else bigPx - if (showFPS) { - left += Span(fpsText(fpsNow), colValue, fpsPx, glow = true) - left += Span("fps", colDim, if (generating) bigUnitPx * 0.8f else bigUnitPx) - } else if (showBatteryTime) left += Span(s.battery.runtimeText ?: "TIME —", colBat, bigPx * 0.8f) + private fun rowHeight(r: HudRow): Float = + if (r.key == "showFPSGraph") sp(GRAPH_HEIGHT_SP) + else lineH(maxOf(r.label.sizePx, r.vals.maxOfOrNull { it.sizePx } ?: 0f)) - val stack = ArrayList>() - val gpuName = if (showGpuModel && gpuNameText().isNotBlank()) gpuModelSpans(stkPx, colDim, compact = true) else null - run { - val l = ArrayList() - if (showGPU && s.gpuPercent != null) l += Span("GPU ${s.gpuPercent}%", colGpu, stkPx) - if (showCPU) { if (l.isNotEmpty()) l += Span(" · ", colDim, stkPx); l += Span("CPU ${s.cpuPercent ?: "—"}%", colCpu, stkPx) } - if (l.isNotEmpty()) stack.add(l) + private fun perCoreRows(s: HudMetrics.Snapshot, labelPx: Float, valuePx: Float, unitPx: Float): List { + val pct = s.perCorePercent + val clk = s.perCoreClockMhz + return (0 until max(pct.size, clk.size)).map { i -> + val vals = ArrayList() + vals += numUnit(if (i < pct.size && pct[i] >= 0) pct[i].toString() else null, "%", valuePx, unitPx) + vals += Span(" ", colDim, unitPx) + vals += numUnit(if (i < clk.size && clk[i] > 0) clk[i].toString() else null, "MHz", valuePx, unitPx) + HudRow("showPerCore", Span("C$i", colCpu, labelPx), vals) } - if (showRAM) stack.add(listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, stkPx))) - if (showBattery || showPower || showBatteryTemp) { - val l = ArrayList() - fun part(spans: List) { l += if (l.isEmpty()) Span("BAT ", colBat, stkPx) else Span(" · ", colDim, stkPx); l += spans } - if (showBattery && s.battery.percent != null) part(listOf(Span("${s.battery.percent}%", colBat, stkPx))) - if (showBatteryTemp && s.battery.tempC != null) part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, stkPx, stkPx * 0.62f)) - if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, stkPx))) - if (l.isNotEmpty()) stack.add(l) - } - if (showBatteryTime) stack.add(listOf(Span("BAT TIME ${s.battery.runtimeText ?: "—"}", colBat, stkPx))) - run { - val l = ArrayList() - if (showFPS) l += Span("${fmt1(1000f / max(fpsNow, 1f))}ms", colDim, stkPx) - if (showFPS && displayServer.isNotBlank()) { l += Span(" · ", colDim, stkPx); l += Span(displayServer, colDisp, stkPx) } - else if (displayServer.isNotBlank()) l += Span(displayServer, colDisp, stkPx) - if (showVram && s.vramText() != null) { if (l.isNotEmpty()) l += Span(" · ", colDim, stkPx); l += Span("${s.vramText()} vram", colDim, stkPx) } - if (l.isNotEmpty()) stack.add(l) - } - if (hdrState != DroidDeckHudHdr.NONE) stack.add(hdrLine(stkPx)) - - var statsW = 0f - for (l in stack) statsW = max(statsW, runWidth(l)) - val nameOnTop = gpuName != null && runWidth(gpuName) > statsW - if (gpuName != null && !nameOnTop) stack.add(0, gpuName) - val apiStr = apiLabel() - val hasApi = showFPS && apiStr != "FPS" - val apiH = if (hasApi) lineH(stkPx) else 0f - val apiGap = if (hasApi) stkLineGap else 0f - val leftW = runWidth(left); val leftH = if (left.isEmpty()) 0f else lineH(bigPx) - val apiW = if (hasApi) measure(apiStr, stkPx) else 0f - val leftBlockW = max(leftW, apiW) - val leftColH = apiH + apiGap + leftH - val stkH = lineH(stkPx) - var stackW = 0f - for (l in stack) stackW = max(stackW, runWidth(l)) - val stackTotalH = stack.size * stkH + (stack.size - 1).coerceAtLeast(0) * stkLineGap - val innerH = max(leftColH, stackTotalH) - val topLineH = if (nameOnTop) stkH + stkLineGap else 0f - contentW = pad + leftBlockW + midGap + stackW + pad - contentH = pad + topLineH + innerH + pad - var ly = pad + topLineH + (innerH - leftColH) / 2f - if (hasApi) { placeRun(pad, ly - ascent(stkPx), listOf(Span(apiStr, colFps, stkPx))); ly += apiH + apiGap } - if (left.isNotEmpty()) placeRun(pad, ly - ascent(bigPx), left) - var sy = pad + topLineH + (innerH - stackTotalH) / 2f - for (l in stack) { placeRun(pad + leftBlockW + midGap, sy - ascent(stkPx), l); sy += stkH + stkLineGap } - addSubtleClock(pad, leftAligned = true) - if (nameOnTop && gpuName != null) { val end = placeRun(pad, pad - ascent(stkPx), gpuName); contentW = max(contentW, end + pad) } - } - - private fun buildMinimal(s: HudMetrics.Snapshot) { - val bigPx = sp(34f); val bigUnitPx = bigPx * 0.32f; val subPx = sp(11.5f); val footPx = sp(9.5f) - val stroke = outlineWidth() - val left = contentLeft() - val inner = panelInset() + stroke - val runtime = if (showBatteryTime) s.battery.runtimeText ?: "TIME —" else null - val minGenerating = differs(fpsNow) - val big = when { - showFPS -> listOf(Span(fpsText(fpsNow), colValue, if (minGenerating) bigPx * 0.55f else bigPx), Span("fps", colDim, if (minGenerating) bigUnitPx * 0.8f else bigUnitPx)) - runtime != null -> listOf(Span(runtime, colBat, sp(24f))) - else -> emptyList() - } - val sub = ArrayList() - fun low(label: String, value: Float) { - if (sub.isNotEmpty()) sub += Span(" · ", colDim, subPx) - sub += Span("$label ", colDim, subPx) - sub += Span(lowText(value) ?: "—", colFps, subPx) - } - if (showFPS && showLow1) low("1%", lows.low1Fps) - if (showFPS && showLow01) low("0.1%", lows.low01Fps) - if (showFPS && showLow001) low("0.01%", lows.low001Fps) - if (showBatteryTime) { - if (sub.isNotEmpty()) sub += Span(" · ", colDim, subPx) - sub += Span("BAT TIME ", colBat, subPx) - sub += Span(s.battery.runtimeText ?: "—", colBat, subPx) - } - val footerLabel = listOf(if (showFPS && showEngine) engineLabel else "", if (showFPS) displayServer else "").filter { it.isNotBlank() }.joinToString(" · ") - val hdr = if (hdrState != DroidDeckHudHdr.NONE) hdrLine(footPx) else emptyList() - val (headerBottom, headerRight) = addPanelHeader(left, inner) - val colW = maxOf(runWidth(big), runWidth(sub), headerRight - left, max(measure(footerLabel, footPx), runWidth(hdr)), if (showFPS && showGraph) sp(120f) else 0f) - var last = headerBottom + sp(8f) - if (big.isNotEmpty()) { last += capHeight(big[0].sizePx); placeRun(left - inkLeft(big[0].text, big[0].sizePx), last, big, glow = showFPS) } - if (sub.isNotEmpty()) { last += sp(10f) + capHeight(subPx); placeRun(left - inkLeft(sub[0].text, subPx), last, sub) } - if (showFPS && showGraph) { val top = last + sp(9f); graphRect = RectF(left, top, left + colW, top + sp(24f)); last = top + sp(24f) } - if (footerLabel.isNotBlank()) { val base = last + sp(8f) + capHeight(footPx); glyphs.add(Glyph(left - inkLeft(footerLabel, footPx), base, footerLabel, blend(colDim), footPx)); last = base } - if (hdr.isNotEmpty()) { val base = last + sp(6f) + capHeight(footPx); placeRun(left - inkLeft(hdr[0].text, footPx), base, hdr); last = base } - measurePaint.textSize = footPx - finishPanel(RectF(panelLeft(), panelInset(), left + colW + sp(34f), last + measurePaint.fontMetrics.descent + sp(9f) + stroke), halfRound = true) } private fun buildStrip(s: HudMetrics.Snapshot) { @@ -1020,70 +941,28 @@ class DroidDeckHudView(context: Context) : View(context) { right -= groupGap } - if (showFPS) { - val generating = differs(fpsNow) - val fps = ArrayList() - if (apiLabel() != "FPS") fps += Span("${apiLabel()} ", colDim, rowPx) - fps += Span(fpsText(fpsNow), colValue, if (generating) fpsPx * 0.8f else fpsPx, glow = true) - fps += Span("fps", colDim, unitPx) - x = placeRun(x, baseline, fps) + groupGap - } - - if (showFPS && showGraph) { - val gw = sp(72f); val gh = h * 0.55f - if (x + gw <= right) { + val generating = differs(fpsNow) + for (key in size.rowsIn(storedOrder)) { + if (!switchOn(key)) continue + if (key == "showFPSGraph") { + val gw = sp(72f); val gh = h * 0.55f + if (x + gw > right) break graphRect = RectF(x, mid - gh / 2f, x + gw, mid + gh / 2f) x += gw + groupGap + continue } - } - - val groups = ArrayList>() - run { - val l = ArrayList() - fun low(label: String, value: Float) { - if (l.isNotEmpty()) l += Span(" ", colDim, rowPx) - l += Span("$label ", colDim, rowPx) - l += Span(lowText(value) ?: "—", colFps, rowPx) + val spans = if (key == "showFPS") { + val fps = ArrayList() + if (apiLabel() != "FPS") fps += Span("${apiLabel()} ", colDim, rowPx) + fps += Span(fpsText(fpsNow), colValue, if (generating) fpsPx * 0.8f else fpsPx, glow = true) + fps += Span("fps", colDim, unitPx) + fps + } else { + val row = reading(key, s, rowPx, rowPx, unitPx) + listOf(row.label, Span(" ", colDim, rowPx)) + row.vals } - if (showFPS && showLow1) low("1%", lows.low1Fps) - if (showFPS && showLow01) low("0.1%", lows.low01Fps) - if (showFPS && showLow001) low("0.01%", lows.low001Fps) - if (l.isNotEmpty()) groups += l - } - if (showGPU || showGpuTemp) { - val l = arrayListOf(Span("GPU", colGpu, rowPx)) - if (showGPU) l += Span(" ${s.gpuPercent ?: "—"}%", colGpu, rowPx) - if (showGpuTemp && s.gpuTempC != null) { l += Span(" ", colDim, rowPx); l += tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) } - groups += l - } - if (showCPU || showCpuTemp) { - val l = arrayListOf(Span("CPU", colCpu, rowPx)) - if (showCPU) l += Span(" ${s.cpuPercent ?: "—"}%", colCpu, rowPx) - if (showCpuTemp && s.cpuTempC != null) { l += Span(" ", colDim, rowPx); l += tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) } - groups += l - } - if (showVram) s.vramText()?.let { groups += listOf(Span("VRAM $it", colVram, rowPx)) } - if (showRAM) groups += listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, rowPx)) - if (showBattery || showPower || showBatteryTemp) { - val l = ArrayList() - fun part(spans: List) { - l += if (l.isEmpty()) Span("BAT ", colBat, rowPx) else Span(" ", colDim, rowPx) - l += spans - } - if (showBattery && s.battery.percent != null) part(listOf(Span("${s.battery.percent}%", colBat, rowPx))) - if (showBatteryTemp && s.battery.tempC != null) - part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, rowPx, unitPx)) - if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, rowPx))) - if (l.isNotEmpty()) groups += l - } - if (showBatteryTime) groups += listOf(Span("BAT TIME ${s.battery.runtimeText ?: "—"}", colBat, rowPx)) - if (displayServer.isNotBlank()) groups += listOf(Span(displayServer, colDisp, rowPx)) - if (hdrState != DroidDeckHudHdr.NONE) groups += hdrLine(rowPx) - if (showGpuModel && gpuNameText().isNotBlank()) groups += gpuModelSpans(rowPx, colDim, compact = true) - - for (g in groups) { - if (x + runWidth(g) > right) break - x = placeRun(x, baseline, g) + groupGap + if (x + runWidth(spans) > right) break + x = placeRun(x, baseline, spans) + groupGap } stripRect = RectF(0f, 0f, w, h) @@ -1103,169 +982,6 @@ class DroidDeckHudView(context: Context) : View(context) { return inkRect.left.toFloat() } - private fun layoutColumn(rows: List, x: Float, y0: Float, - rowPx: Float, lineGap: Float, lvGap: Float): Pair { - if (rows.isEmpty()) return Pair(y0, x) - var labelCol = 0f - for (r in rows) if (!r.inline) labelCol = max(labelCol, measure(r.label.text, rowPx)) - val h = lineH(rowPx); val asc = ascent(rowPx) - var y = y0; var right = x - for (r in rows) { - val baseline = y - asc - placeRun(x, baseline, listOf(r.label)) - val valX = if (r.inline) x + measure(r.label.text, rowPx) + lvGap - else x + labelCol + lvGap - val end = placeRun(valX, baseline, r.vals) - right = max(right, end) - y += h + lineGap - } - return Pair(y - lineGap, right) - } - - private fun layoutWrap(fragments: List>, x: Float, y0: Float, maxWidth: Float, - px: Float, lineGap: Float): Pair { - if (fragments.isEmpty()) return Pair(y0, x) - val h = lineH(px); val asc = ascent(px) - val sepW = measure(" · ", px) - var cx = x; var y = y0; var right = x; var firstOnLine = true - for (frag in fragments) { - val w = runWidth(frag) - if (!firstOnLine && (cx + sepW + w - x) > maxWidth) { y += h + lineGap; cx = x; firstOnLine = true } - if (!firstOnLine) { placeRun(cx, y - asc, listOf(Span(" · ", colDim, px))); cx += sepW } - val end = placeRun(cx, y - asc, frag) - cx = end; right = max(right, end); firstOnLine = false - } - return Pair(y + h, right) - } - - private fun buildMega(s: HudMetrics.Snapshot) { - val rowPx = sp(11.5f); val unitPx = rowPx * 0.62f; val bandPx = sp(9.5f) - val pad = sp(10f); val lineGap = sp(3.5f); val lvGap = sp(7f); val gutter = sp(16f) - - val left = ArrayList() - if (showGpuModel && gpuNameText().isNotBlank()) - left.add(HudRow(Span("GPU", colGpu, rowPx), gpuModelSpans(rowPx, colValue))) - if (showGPU && hasGpuStats(s)) { - val v = ArrayList() - v += numUnit(s.gpuPercent?.toString(), "%", rowPx, unitPx) - if (showGpuTemp) tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) - .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } - v += gap(unitPx); v += numUnit(s.gpuClockMhz?.toString(), "MHz", rowPx, unitPx) - left.add(HudRow(Span("GPU", colGpu, rowPx), v)) - } - if (showCPU) { - val v = ArrayList() - v += numUnit(s.cpuPercent?.toString(), "%", rowPx, unitPx) - v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) - if (showCpuTemp) tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) - .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } - left.add(HudRow(Span("CPU", colCpu, rowPx), v)) - } - if (showPerCore) { - val pct = s.perCorePercent; val clk = s.perCoreClockMhz - val n = max(pct.size, clk.size) - for (i in 0 until n) { - val v = ArrayList() - v += numUnit(if (i < pct.size && pct[i] >= 0) pct[i].toString() else null, "%", rowPx, unitPx) - v += gap(unitPx) - v += numUnit(if (i < clk.size && clk[i] > 0) clk[i].toString() else null, "MHz", rowPx, unitPx) - left.add(HudRow(Span("C$i", colCpu, rowPx), v)) - } - } - - val right = ArrayList() - if (showVram && s.vramText() != null) - right.add(HudRow(Span("VRAM", colVram, rowPx), valueUnit(s.vramText()!!, rowPx, unitPx))) - if (showRAM) { - val v = ArrayList() - v += valueUnit(s.ramUsedText(), rowPx, unitPx) - v += Span("/", colDim, unitPx); v += valueUnit(s.ramTotalText(), rowPx, unitPx) - v += gap(unitPx); v += numUnit(s.ramPercent.roundToInt().toString(), "%", rowPx, unitPx) - right.add(HudRow(Span("RAM", colRam, rowPx), v)) - } - if (showSwap && s.swapUsedText() != null) { - val v = ArrayList() - v += valueUnit(s.swapUsedText()!!, rowPx, unitPx) - s.swapTotalText()?.let { v += Span("/", colDim, unitPx); v += valueUnit(it, rowPx, unitPx) } - right.add(HudRow(Span("SWP", colRam, rowPx), v)) - } - if (showNet && s.netDownBps != null) { - val d = (s.netDownBps ?: 0L) / 1024L - val u = (s.netUpBps ?: 0L) / 1024L - val v = ArrayList() - v += Span("↓", colDim, unitPx); v += Span(d.toString(), colValue, rowPx) - v += Span(" ↑", colDim, unitPx); v += Span(u.toString(), colValue, rowPx) - v += Span("KB/s", colDim, unitPx) - right.add(HudRow(Span("NET", colFps, rowPx), v)) - } - if (showBattery || showPower || showBatteryTemp) { - val v = ArrayList(); var any = false - if (showBattery && s.battery.percent != null) { v += numUnit(s.battery.percent.toString(), "%", rowPx, unitPx); any = true } - if (showBatteryTemp) tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, rowPx, unitPx) - .let { if (it.isNotEmpty()) { if (any) v += gap(unitPx); v += it; any = true } } - if (showPower && s.battery.watts > 0f) { if (any) v += gap(unitPx); v += numUnit(fmt1(s.battery.watts), "W", rowPx, unitPx); any = true } - if (any) right.add(HudRow(Span("BAT", colBat, rowPx), v)) - } - if (showBatteryTime) right.add(HudRow(Span("TIME", colBat, rowPx), listOf(Span(s.battery.runtimeText ?: "—", colValue, rowPx)))) - if (showFPS) { - val v = ArrayList() - v += glowing(numUnit(fpsText(fpsNow), "FPS", rowPx, unitPx)) - v += gap(unitPx); v += numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", rowPx, unitPx) - right.add(HudRow(Span(apiLabel(), colFps, rowPx), v)) - right.add(HudRow(Span("AVG", colLo, rowPx), numUnit(fmt1(fpsAvg), "FPS", rowPx, unitPx))) - if (showLow1) - right.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) - if (showLow01) - right.add(HudRow(Span("0.1%", colLo, rowPx), numUnit(lowText(lows.low01Fps), "FPS", rowPx, unitPx))) - if (showLow001) - right.add(HudRow(Span("0.01%", colLo, rowPx), numUnit(lowText(lows.low001Fps), "FPS", rowPx, unitPx))) - } - - val (leftBottom, leftRight) = layoutColumn(left, pad, pad, rowPx, lineGap, lvGap) - val rightX = (if (left.isEmpty()) pad else leftRight + gutter) - val (rightBottom, rightRight) = layoutColumn(right, rightX, pad, rowPx, lineGap, lvGap) - var y = max(leftBottom, rightBottom) - var maxRight = max(leftRight, rightRight) - - val band = ArrayList>() - if (showResolution) band.add(listOf(Span("RES ", colDim, bandPx), Span(resolutionString(), colValue, bandPx))) - if (displayServer.isNotBlank()) band.add(listOf(Span("DISP ", colDim, bandPx), Span(displayServer, colDisp, bandPx))) - if (hdrState != DroidDeckHudHdr.NONE) band.add(listOf(Span("HDR ", colDim, bandPx)) + hdrValue(bandPx)) - if (showProton && wineVersion.isNotBlank()) band.add(listOf(Span(wineVersion, colVram, bandPx))) - if (showSession) band.add(listOf(Span("elapsed ", colDim, bandPx), Span(elapsedString(), colValue, bandPx))) - if (band.isNotEmpty()) { - y += sp(4f) - val (bBottom, bRight) = layoutWrap(band, pad, y, max(maxRight - pad, sp(180f)), bandPx, lineGap) - y = bBottom; maxRight = max(maxRight, bRight) - } - - if (showGraph) { - y += sp(3f) - val gh = sp(22f) - val gr = max(maxRight, pad + sp(220f)) - graphRect = RectF(pad, y, gr, y + gh) - maxRight = max(maxRight, gr) - y += gh - } - - val dxLine = dxVersionLabeled() - val hasDx = showDxVer && dxLine.isNotBlank() - if (hasDx) { - y += sp(4f) - maxRight = max(maxRight, placeRun(pad, y - ascent(bandPx), listOf(Span(dxLine, colDim, bandPx)))) - y += lineH(bandPx) - } - if (showWrapper && graphicsWrapper.isNotBlank()) { - y += if (hasDx) sp(1f) else sp(4f) - maxRight = max(maxRight, placeRun(pad, y - ascent(bandPx), listOf(Span(graphicsWrapper, colDim, bandPx)))) - y += lineH(bandPx) - } - - contentW = maxRight + pad - contentH = y + pad - addSubtleClock(pad) - } - override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { if (stripRect != null) { setMeasuredDimension(contentW.roundToInt(), resolveSize(contentH.roundToInt(), heightMeasureSpec)); return } setMeasuredDimension( @@ -1546,6 +1262,8 @@ class DroidDeckHudView(context: Context) : View(context) { const val MIN_SCALE = 0.5f const val MAX_SCALE = 2f const val GRAPH_CLIP_MS = 49.9f + const val GRAPH_HEIGHT_SP = 22f + const val GRAPH_MIN_WIDTH_SP = 160f fun parseIntOr(s: String?, d: Int): Int = try { s?.trim()?.toInt() ?: d } catch (e: Exception) { d } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt index 8e7aaf9966..3acc241b17 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt @@ -301,6 +301,9 @@ internal fun rememberShown(onDismiss: () -> Unit): MutableTransitionState, close: () -> Unit, label: String, wide: Boolean, @@ -309,17 +312,23 @@ internal fun AppDialog( back: (() -> Unit)? = null, scrollable: Boolean = true, scrollState: androidx.compose.foundation.ScrollState = rememberScrollState(), + side: (@Composable () -> Unit)? = null, + sideRoom: Dp = 0.dp, content: @Composable ColumnScope.() -> Unit, ) { val pal = LocalPalette.current + val panelCap = maxWidth ?: if (wide) 860.dp else 560.dp VeilRing() Dialog(onDismissRequest = back ?: close, properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false)) { CompositionLocalProvider(LocalFrontFocus provides null) { - Box( + BoxWithConstraints( contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize().imePadding() .tapOutside(close), ) { + val panel = (this.maxWidth - DIALOG_MARGIN * 2).coerceAtMost(panelCap) + val free = (this.maxWidth - panel) / 2 - SIDE_GAP + val beside = side != null && free >= sideRoom AnimatedVisibility( visibleState = shown, enter = fadeIn(Motion.tw(180)) + scaleIn(Motion.sp(0.7f), initialScale = 0.94f), @@ -329,8 +338,8 @@ internal fun AppDialog( Column( verticalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier - .padding(12.dp) - .widthIn(max = maxWidth ?: if (wide) 860.dp else 560.dp) + .padding(DIALOG_MARGIN) + .widthIn(max = panelCap) .then( when { width != null -> Modifier.width(width) @@ -348,8 +357,21 @@ internal fun AppDialog( .then(modifier) .then(if (scrollable) Modifier.verticalScroll(scrollState) else Modifier) .padding(horizontal = 18.dp, vertical = 16.dp), - content = content, - ) + ) { + content() + if (side != null && !beside) side() + } + } + if (side != null && beside) { + AnimatedVisibility( + visibleState = shown, + enter = fadeIn(Motion.tw(180)), + exit = fadeOut(Motion.tw(140)), + modifier = Modifier.align(Alignment.CenterEnd).padding(end = SIDE_GAP), + label = "$label-side", + ) { + Box(Modifier.widthIn(max = free).blockTouches()) { side() } + } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 7ef5dd3567..65a65502f2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.ui +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -8,7 +10,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.DroidDeckHudConfig import com.droiddeck.launcher.hud.DroidDeckHudSize import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.StripMetric @@ -55,30 +59,34 @@ internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (Stri ChoiceRow(host, "hud-outline-color", stringResource(R.string.hud_outline_color), null, listOf("0" to stringResource(R.string.hud_outline_gray), "1" to stringResource(R.string.hud_outline_theme)), if (cfg["hudOutlineAccent"] == "0") "0" else "1", chipModifier = track("hud-outline-color")) { a.onHudSetting("hudOutlineAccent", it) } + ToggleRow(host, "hud-fps-decimal", stringResource(R.string.hud_metric_decimal), null, on("fpsDecimal"), + chipModifier = track("hud-fps-decimal")) { a.onHudSetting("fpsDecimal", flag(it)) } + ToggleRow(host, "hud-clock", stringResource(R.string.hud_metric_clock), null, on("showClock"), + chipModifier = track("hud-clock")) { a.onHudSetting("showClock", flag(it)) } + ToggleRow(host, "hud-graph", stringResource(R.string.hud_metric_graph), null, on("showFPSGraph"), + chipModifier = track("hud-graph")) { a.onHudSetting("showFPSGraph", flag(it)) } } - val size = DroidDeckHudSize.from(cfg["hudSize"]) - val chips = size.supportedChips() + EXTRA[size].orEmpty() + var editing by remember { mutableStateOf(false) } SettingsGroup(stringResource(R.string.hud_group_metrics)) { - for (metric in METRICS) { - if (metric.chip !in chips || metric.chip in HIDDEN[size].orEmpty()) continue - ToggleRow(host, "hud-${metric.key}", stringResource(metric.label), null, on(metric.key), - chipModifier = track("hud-${metric.key}")) { a.onHudSetting(metric.key, flag(it)) } - if (metric.key == "showBattery" && size != DroidDeckHudSize.MINIMAL) { - ToggleRow(host, "hud-showBatteryTime", stringResource(R.string.hud_metric_battery_time), null, on("showBatteryTime"), - chipModifier = track("hud-showBatteryTime")) { a.onHudSetting("showBatteryTime", flag(it)) } - } - } - - if (size == DroidDeckHudSize.MINIMAL && "Battery time" in chips && - "Battery time" !in HIDDEN[size].orEmpty()) { - ToggleRow(host, "hud-showBatteryTime", stringResource(R.string.hud_metric_battery_time), null, on("showBatteryTime"), - chipModifier = track("hud-showBatteryTime")) { a.onHudSetting("showBatteryTime", flag(it)) } + ActionRow(stringResource(R.string.hud_group_metrics), null, stringResource(R.string.common_edit), + onClick = { editing = true }, modifier = track("hud-readings")) + val rows = DroidDeckHudSize.rowsFor(DroidDeckHudSize.from(cfg["hudSize"]), cfg) + SettingsRow(stringResource(R.string.hud_readings_shown), null) { + Text(stringResource(R.string.hud_readings_count, rows.count { on(it) }, rows.size), + fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) } + if (editing) HudReadingsDialog( + visible = rows, + initialOrder = rows, + initialOn = rows.associateWith { on(it) }, + onDismiss = { editing = false }, + onSave = { switches, order -> a.onHudOrder(switches, order) }, + onReset = a.onHudOrderReset, + ) } - val tempsShown = ("Temp" in chips && on("showTemp")) || ("GPU temp" in chips && on("showGpuTemp")) - if (tempsShown) SettingsGroup(stringResource(R.string.hud_group_temps)) { + if (on("showTemp") || on("showGpuTemp") || on("showBatteryTemp")) SettingsGroup(stringResource(R.string.hud_group_temps)) { ChoiceRow(host, "hud-temp-unit", stringResource(R.string.hud_temp_unit), null, listOf("c" to "°C", "f" to "°F"), if (cfg["tempUnit"].equals("f", true)) "f" else "c", chipModifier = track("hud-temp-unit")) { a.onHudSetting("tempUnit", it) } @@ -155,37 +163,39 @@ private val BOTTOM_STRIP_ROWS = listOf( StripMetric.CLOCK to R.string.hud_metric_clock, ) -private val EXTRA = mapOf(DroidDeckHudSize.PILL to setOf("Temp", "Power")) - -private class HudMetric(val chip: String, val key: String, val label: Int) +private class HudMetric(val key: String, val label: Int) +// Wrapper and DX version have nothing to show in DroidDeck. private val METRICS = listOf( - HudMetric("FPS", "showFPS", R.string.drawer_hud_fps), - HudMetric("FPS graph", "showFPSGraph", R.string.hud_metric_graph), - HudMetric("FPS .1", "fpsDecimal", R.string.hud_metric_decimal), - HudMetric("1% low", "showLow1", R.string.hud_metric_low1), - HudMetric("0.1% low", "showLow01", R.string.hud_metric_low01), - HudMetric("0.01% low", "showLow001", R.string.hud_metric_low001), - HudMetric("Engine", "showEngine", R.string.hud_metric_engine), - HudMetric("GPU model", "showGpuModel", R.string.hud_metric_gpu_model), - HudMetric("GPU", "showGPULoad", R.string.hud_metric_gpu), - HudMetric("GPU temp", "showGpuTemp", R.string.hud_metric_gpu_temp), - HudMetric("CPU", "showCPUUsage", R.string.hud_metric_cpu), - HudMetric("Per-core", "showPerCore", R.string.hud_metric_per_core), - HudMetric("Temp", "showTemp", R.string.hud_metric_temp), - HudMetric("RAM", "showRAM", R.string.hud_metric_ram), - HudMetric("VRAM", "showVram", R.string.hud_metric_vram), - HudMetric("Swap", "showSwap", R.string.hud_metric_swap), - HudMetric("Battery", "showBattery", R.string.hud_metric_battery), - HudMetric("Power", "showPower", R.string.hud_metric_power), - HudMetric("Network", "showNet", R.string.hud_metric_network), - HudMetric("Resolution", "showResolution", R.string.hud_metric_resolution), - HudMetric("Proton", "showProton", R.string.hud_metric_proton), - HudMetric("Session", "showSession", R.string.hud_metric_session), - HudMetric("Clock", "showClock", R.string.hud_metric_clock), + HudMetric("showGpuModel", R.string.hud_metric_gpu_model), + HudMetric("showGPULoad", R.string.hud_metric_gpu), + HudMetric("showCPUUsage", R.string.hud_metric_cpu), + HudMetric("showPerCore", R.string.hud_metric_per_core), + HudMetric("showTemp", R.string.hud_metric_temp), + HudMetric("showBatteryTemp", R.string.drawer_hud_battery), + HudMetric("showGpuTemp", R.string.hud_metric_gpu_temp), + HudMetric("showVram", R.string.hud_metric_vram), + HudMetric("showRAM", R.string.hud_metric_ram), + HudMetric("showSwap", R.string.hud_metric_swap), + HudMetric("showBattery", R.string.hud_metric_battery), + HudMetric("showBatteryTime", R.string.hud_metric_battery_time), + HudMetric("showPower", R.string.hud_metric_power), + HudMetric("showFPS", R.string.drawer_hud_fps), + HudMetric("showFPSGraph", R.string.hud_metric_graph), + HudMetric("showLatency", R.string.hud_metric_latency), + HudMetric("showAvg", R.string.hud_metric_avg), + HudMetric("showLow1", R.string.hud_metric_low1), + HudMetric("showLow01", R.string.hud_metric_low01), + HudMetric("showLow001", R.string.hud_metric_low001), + HudMetric("showEngine", R.string.hud_metric_engine), + HudMetric("showDisplay", R.string.hud_metric_display), + HudMetric("showHdr", R.string.hud_metric_hdr), + HudMetric("showNet", R.string.hud_metric_network), + HudMetric("showResolution", R.string.hud_metric_resolution), + HudMetric("showProton", R.string.hud_metric_proton), + HudMetric("showSession", R.string.hud_metric_session), + HudMetric("showClock", R.string.hud_metric_clock), ) -private val HIDDEN = mapOf( - DroidDeckHudSize.PILL to setOf("FPS graph"), - DroidDeckHudSize.TILES to setOf("FPS graph", "0.1% low", "0.01% low"), -) +internal fun hudMetricLabel(key: String): Int? = + METRICS.firstOrNull { it.key == key }?.label diff --git a/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt new file mode 100644 index 0000000000..29faced7a6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt @@ -0,0 +1,389 @@ +package com.droiddeck.launcher.ui + +import android.view.KeyEvent +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.background +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.foundation.border +import androidx.compose.foundation.focusable +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.DragHandle +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.runtime.withFrameNanos +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.material3.LocalTextStyle +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.PlatformTextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.zIndex +import com.droiddeck.launcher.R +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlin.math.roundToInt + +private val ROW_HEIGHT = 44.dp +private val HANDLE_WIDTH = 40.dp +private const val RESET_HOLD_MS = 5_000 +private const val TAP_HOLD_MS = 400 +private val HINT_LABEL_WIDTH = 92.dp +private val HINT_KEY_SIZE = 18.dp +private val HINT_GAP = 8.dp +private val HINT_LABEL_MIN = 24.dp +private val HINT_ROOM = HINT_LABEL_MIN + HINT_KEY_SIZE + HINT_GAP + +@Composable +internal fun ResetHold(held: Boolean, onFire: () -> Unit): Float { + val fill by animateFloatAsState( + if (held) 1f else 0f, + if (held) tween(RESET_HOLD_MS, easing = LinearEasing) else tween(120), + label = "resetHold", + ) + LaunchedEffect(held) { + if (!held) return@LaunchedEffect + delay(RESET_HOLD_MS.toLong()) + onFire() + } + return fill +} + +@Composable +private fun HudKeyHints(grabbed: String?, resetFill: Float) { + Column( + horizontalAlignment = Alignment.End, + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + KeyHint("X", stringResource(R.string.hud_hint_reset), resetFill) + KeyHint("Y", stringResource(if (grabbed != null) R.string.hud_hint_drop else R.string.hud_hint_grab)) + KeyHint("B", stringResource(R.string.hud_hint_save)) + } +} + +@Composable +private fun KeyHint(key: String, label: String, fill: Float = 0f) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(HINT_GAP), + ) { + Text( + label, + fontSize = 11.sp, + lineHeight = 14.sp, + textAlign = TextAlign.End, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 2, + modifier = Modifier.widthIn(max = HINT_LABEL_WIDTH), + ) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(HINT_KEY_SIZE).clip(RoundedCornerShape(5.dp)) + .background( + if (fill > 0f) MaterialTheme.colorScheme.primary.copy(alpha = 0.15f + 0.55f * fill) + else MaterialTheme.colorScheme.surfaceVariant, + ) + .border(1.dp, MaterialTheme.colorScheme.outline, RoundedCornerShape(5.dp)), + ) { + Text( + key, + fontSize = 10.sp, + lineHeight = 10.sp, + textAlign = TextAlign.Center, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface, + style = LocalTextStyle.current.copy( + platformStyle = PlatformTextStyle(includeFontPadding = false), + ), + ) + } + } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +internal fun HudReadingsDialog( + visible: List, + initialOrder: List, + initialOn: Map, + onDismiss: () -> Unit, + onSave: (Map, List) -> Unit, + onReset: () -> Unit, + controller: Boolean = LocalInputModeManager.current.inputMode == InputMode.Keyboard, +) { + val order = remember { mutableStateListOf().apply { addAll(initialOrder.filter { it in visible }) } } + val enabled = remember { mutableStateMapOf() } + remember(initialOn) { for (key in initialOrder) enabled[key] = initialOn[key] == true; true } + val merged = { + val moved = order.toList() + var i = 0 + initialOrder.map { if (it in visible) moved[i++] else it } + } + val shown = rememberShown { onDismiss() } + val close = { shown.targetState = false } + val save = { onSave(enabled.toMap(), merged()); close() } + val restore = { onReset(); close() } + val rowPx = with(LocalDensity.current) { ROW_HEIGHT.toPx() } + var pad by remember { mutableStateOf(controller) } + var yHeld by remember { mutableStateOf(false) } + var yLong by remember { mutableStateOf(false) } + var yStartedGrab by remember { mutableStateOf(false) } + LaunchedEffect(yHeld) { + if (!yHeld) return@LaunchedEffect + delay(TAP_HOLD_MS.toLong()) + yLong = true + } + + var resetHeld by remember { mutableStateOf(false) } + val resetFill = ResetHold(resetHeld, restore) + + var dragging by remember { mutableStateOf(-1) } + var dragOffset by remember { mutableFloatStateOf(0f) } + + val panelFocus = remember { FocusRequester() } + val firstKey = remember { order.firstOrNull() } + val firstFocus = remember { FocusRequester() } + LaunchedEffect(Unit) { + runCatching { panelFocus.requestFocus() } + repeat(30) { + if (runCatching { firstFocus.requestFocus() }.isSuccess) return@LaunchedEffect + withFrameNanos { } + } + } + var focusedKey by remember { mutableStateOf(null) } + var grabbed by remember { mutableStateOf(null) } + val before = remember { mutableStateListOf() } + val grab = { + val target = focusedKey ?: order.firstOrNull() + if (target != null && grabbed == null && dragging < 0) { + before.clear() + before.addAll(order) + grabbed = target + } + } + val cancel = { + val held = grabbed + if (held != null) { + order.clear() + order.addAll(before) + grabbed = null + } + } + + AppDialog( + shown, close, "hudReadings", wide = false, scrollable = false, + modifier = Modifier.fillMaxHeight(), + back = { if (grabbed != null) cancel() else if (pad) save() else close() }, + side = if (pad) { + { HudKeyHints(grabbed, resetFill) } + } else { + null + }, + sideRoom = HINT_ROOM, + ) { + val state = rememberLazyListState() + val scope = rememberCoroutineScope() + val handlePx = with(LocalDensity.current) { HANDLE_WIDTH.toPx() } + Column( + Modifier.fillMaxWidth().weight(1f).focusRequester(panelFocus).focusable() + .onPreviewKeyEvent { event -> + val key = event.nativeKeyEvent + val down = key.action == KeyEvent.ACTION_DOWN + if (down) pad = true + val first = down && key.repeatCount == 0 + val held = grabbed + when { + key.keyCode == KeyEvent.KEYCODE_BUTTON_Y -> { + when { + down && first -> { + yHeld = true + yLong = key.flags and KeyEvent.FLAG_LONG_PRESS != 0 + yStartedGrab = grabbed == null + if (yStartedGrab) grab() + } + down -> if (key.repeatCount > 0) yLong = true + else -> { + val drop = grabbed != null && (!yStartedGrab || yLong) + yHeld = false + if (drop) grabbed = null + } + } + true + } + key.keyCode == KeyEvent.KEYCODE_BUTTON_X && pad -> { + resetHeld = down + true + } + key.keyCode == KeyEvent.KEYCODE_BUTTON_A || + key.keyCode == KeyEvent.KEYCODE_ENTER || + key.keyCode == KeyEvent.KEYCODE_SPACE -> { + val target = focusedKey + when { + held != null -> { + if (first) grabbed = null + true + } + target == null -> false + else -> { + if (first) enabled[target] = !(enabled[target] == true) + true + } + } + } + held == null -> false + key.keyCode == KeyEvent.KEYCODE_DPAD_UP || key.keyCode == KeyEvent.KEYCODE_DPAD_DOWN -> { + if (down) { + val from = order.indexOf(held) + val step = if (key.keyCode == KeyEvent.KEYCODE_DPAD_UP) -1 else 1 + val to = (from + step).coerceIn(0, order.lastIndex) + if (to != from) { + order.add(to, order.removeAt(from)) + val visible = state.layoutInfo.visibleItemsInfo + if (visible.isNotEmpty()) { + val first = visible.first().index + val last = visible.last().index + val target = when { + to <= first -> to + to > last -> (to - visible.size + 1).coerceAtLeast(0) + else -> null + } + if (target != null) scope.launch { state.animateScrollToItem(target) } + } + } + } + true + } + else -> false + } + }, + ) { + val list = @Composable { m: Modifier -> + LazyColumn(state = state, modifier = m.pointerInput(Unit) { + awaitEachGesture { + val down = awaitFirstDown(requireUnconsumed = false) + val item = state.layoutInfo.visibleItemsInfo.firstOrNull { + it.offset <= down.position.y && down.position.y < it.offset + it.size + } + if (item == null || down.position.x > handlePx || grabbed != null) return@awaitEachGesture + val start = item.index + dragging = start + dragOffset = 0f + while (true) { + val change = awaitPointerEvent(PointerEventPass.Initial).changes.firstOrNull { it.id == down.id } ?: break + val travel = change.position.y - down.position.y + change.consume() + if (!change.pressed) break + val target = (start + (travel / rowPx).roundToInt()).coerceIn(0, order.lastIndex) + while (target != dragging) { + val step = if (target > dragging) 1 else -1 + order.add(dragging + step, order.removeAt(dragging)) + dragging += step + } + dragOffset = travel - (dragging - start) * rowPx + } + dragging = -1 + dragOffset = 0f + } + }) { + itemsIndexed(order, key = { _, key -> key }) { index, key -> + val held = index == dragging || key == grabbed + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().height(ROW_HEIGHT).testTag("hud-row-$key") + .then(if (key == firstKey) Modifier.focusRequester(firstFocus) else Modifier) + .onFocusChanged { if (it.isFocused) focusedKey = key else if (focusedKey == key) focusedKey = null } + .zIndex(if (held) 1f else 0f) + .graphicsLayer { translationY = if (index == dragging) dragOffset else 0f } + .clip(Shape12) + .background( + if (held) MaterialTheme.colorScheme.surfaceVariant + else MaterialTheme.colorScheme.surface, + ) + .then( + if (key == focusedKey) Modifier.border(2.dp, LocalPalette.current.signal, Shape12) + else Modifier, + ) + .focusable() + .padding(start = 4.dp, end = 6.dp), + ) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(width = HANDLE_WIDTH, height = ROW_HEIGHT).testTag("hud-handle-$key"), + ) { + Icon( + Icons.Filled.DragHandle, null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(20.dp), + ) + } + val label = hudMetricLabel(key) + Text( + if (label != null) stringResource(label) else key, + fontSize = 14.sp, color = MaterialTheme.colorScheme.onBackground, maxLines = 1, + modifier = Modifier.weight(1f).padding(start = 2.dp), + ) + ToggleSwitch( + enabled[key] == true, true, null, + modifier = Modifier.testTag("hud-switch-$key").focusProperties { canFocus = false }, + ) { enabled[key] = !(enabled[key] == true) } + } + } + } + } + list(Modifier.weight(1f).fillMaxWidth()) + if (!pad) { + Row(Modifier.fillMaxWidth().padding(top = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Box(Modifier.weight(1f)) + PrimaryButton(stringResource(R.string.common_ok), compact = true, onClick = save) + SecondaryButton(stringResource(R.string.hud_reset_button), compact = true, onClick = restore) + } + } + } + } +} 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 92ba3727e1..2e57de51cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -262,6 +262,8 @@ class DrawerActions( val selectedSecondScreenDisplay: Int, val onHud: (Boolean) -> Unit, val onHudSetting: (String, String) -> Unit = { _, _ -> }, + val onHudOrder: (Map, List) -> Unit = { _, _ -> }, + val onHudOrderReset: () -> Unit = {}, val onHudReset: () -> Unit = {}, val onHudExport: () -> Unit = {}, val onFrameGenPick: (FrameGen.Mode) -> Unit, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 7f85d0b48e..b16f0b1821 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -4211,4 +4211,15 @@ لا توجد ملفات صوتية في هذه الموسيقى التصويرية التشغيل غير متاح لا يتوفر متصفح ويب لفتح هذا الرابط. + التقاط + إفلات + حفظ + اضغط مطولاً لإعادة الضبط + المتاجر + زمن الإطار + متوسط معدل الإطارات + خادم العرض + حالة HDR + المعروض + %1$d من %2$d 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 4df2942308..ae1cc67b96 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -4062,4 +4062,15 @@ No hay archivos de audio en esta banda sonora Inicio no disponible No hay un navegador web disponible para abrir este enlace. + Agarrar + Soltar + Guardar + Mantén para restablecer + Tiendas + Tiempo de fotograma + Frecuencia media de fotogramas + Servidor de pantalla + Estado HDR + Mostrados + %1$d de %2$d diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index a1b25df939..68b60481bc 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -4051,4 +4051,15 @@ В този саундтрак няма аудиофайлове Стартирането е недостъпно Няма наличен уеб браузър за отваряне на тази връзка. + Хвани + Пусни + Запиши + Задръж за нулиране + Магазини + Време на кадър + Средна честота на кадрите + Сървър за показване + Състояние на HDR + Показани + %1$d от %2$d diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 1bff370cb9..e12cf6ab72 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -4131,4 +4131,15 @@ V tomto soundtracku nejsou žádné zvukové soubory Spuštění není dostupné K otevření tohoto odkazu není k dispozici žádný webový prohlížeč. + Uchopit + Pustit + Uložit + Podrž pro obnovení + Obchody + Doba snímku + Průměrná snímková frekvence + Zobrazovací server + Stav HDR + Zobrazeno + %1$d z %2$d diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 92cb365844..f380f5c2e6 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -4051,4 +4051,15 @@ Ingen lydfiler i dette soundtrack Start er ikke tilgængelig Der er ingen tilgængelig webbrowser til at åbne dette link. + Tag + Slip + Gem + Hold for at nulstille + Butikker + Billedtid + Gennemsnitlig billedhastighed + Visningsserver + HDR-status + Vist + %1$d af %2$d diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 023270ad4a..caac47913b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -4051,4 +4051,15 @@ Keine Audiodateien in diesem Soundtrack Start nicht verfügbar Es ist kein Webbrowser verfügbar, um diesen Link zu öffnen. + Greifen + Loslassen + Speichern + Halten zum Zurücksetzen + Stores + Frame-Zeit + Durchschnittliche Bildrate + Anzeigeserver + HDR-Status + Angezeigt + %1$d von %2$d diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 06eb0360d5..affba8acb3 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -4051,4 +4051,15 @@ Δεν υπάρχουν αρχεία ήχου σε αυτό το soundtrack Η εκκίνηση δεν είναι διαθέσιμη Δεν είναι διαθέσιμο πρόγραμμα περιήγησης ιστού για το άνοιγμα αυτού του συνδέσμου. + Πιάσε + Άφησε + Αποθήκευση + Κράτησε για επαναφορά + Καταστήματα + Χρόνος καρέ + Μέσος ρυθμός καρέ + Διακομιστής προβολής + Κατάσταση HDR + Εμφανίζονται + %1$d από %2$d diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 368eae4dbf..415c11ec37 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -4091,4 +4091,15 @@ No hay archivos de audio en esta banda sonora Inicio no disponible No hay ningún navegador web disponible para abrir este enlace. + Agarrar + Soltar + Guardar + Mantén para restablecer + Tiendas + Tiempo de fotograma + Frecuencia media de fotogramas + Servidor de pantalla + Estado HDR + Mostrados + %1$d de %2$d diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index e3352837fa..1bdd0d6c7a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -4051,4 +4051,15 @@ Tässä soundtrackissa ei ole äänitiedostoja Käynnistäminen ei ole mahdollista Tämän linkin avaamiseen ei ole käytettävissä verkkoselainta. + Tartu + Pudota + Tallenna + Pidä palauttaaksesi + Kaupat + Kuvan aika + Keskimääräinen kuvataajuus + Näyttöpalvelin + HDR-tila + Näkyvissä + %1$d / %2$d diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b84be7d3bb..9b28c3ffe4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -4090,4 +4090,15 @@ Aucun fichier audio dans cette bande originale Lancement indisponible Aucun navigateur Web n’est disponible pour ouvrir ce lien. + Saisir + Déposer + Enregistrer + Maintenir pour réinitialiser + Boutiques + Temps de frame + Frequence moyenne des images + Serveur graphique + État HDR + Affichés + %1$d sur %2$d diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index ddd33a79d0..6cfb2f4fa9 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -4051,4 +4051,15 @@ इस साउंडट्रैक में कोई ऑडियो फ़ाइल नहीं है लॉन्च उपलब्ध नहीं इस लिंक को खोलने के लिए कोई वेब ब्राउज़र उपलब्ध नहीं है। + पकड़ें + छोड़ें + सेव करें + रीसेट के लिए दबाए रखें + स्टोर + फ़्रेम समय + औसत फ़्रेम दर + डिस्प्ले सर्वर + HDR स्थिति + दिखाए गए + %2$d में से %1$d diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0e759a2c85..4c91fda1c0 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -4051,4 +4051,15 @@ Nincs hangfájl ebben a soundtrackben Indítás nem elérhető Nincs elérhető webböngésző a hivatkozás megnyitásához. + Megfogás + Elengedés + Mentés + Tartsd nyomva a visszaállításhoz + Áruházak + Képkockaidő + Átlagos képkockasebesség + Megjelenítő kiszolgáló + HDR állapot + Megjelenítve + %1$d / %2$d diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 9096439ca9..1850ac323a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -4021,4 +4021,15 @@ Tidak ada file audio di soundtrack ini Peluncuran tidak tersedia Tidak ada browser web yang tersedia untuk membuka tautan ini. + Ambil + Lepas + Simpan + Tahan untuk setel ulang + Toko + Waktu frame + Rata-rata laju frame + Server tampilan + Status HDR + Ditampilkan + %1$d dari %2$d diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7cedfc55c4..13fef9c32a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -4090,4 +4090,15 @@ Nessun file audio in questa colonna sonora Avvio non disponibile Non è disponibile alcun browser web per aprire questo link. + Afferra + Rilascia + Salva + Tieni premuto per ripristinare + Negozi + Tempo frame + Frequenza media fotogrammi + Server di visualizzazione + Stato HDR + Mostrati + %1$d di %2$d diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2677770caa..eb20cfd0f0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -4021,4 +4021,15 @@ このサウンドトラックに音声ファイルがありません 起動できません このリンクを開けるウェブブラウザがありません。 + 掴む + 離す + 保存 + 長押しでリセット + ストア + フレーム時間 + 平均フレームレート + 表示サーバー + HDR 状態 + 表示中 + %2$d 中 %1$d diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ab8ddf62f2..7460521d62 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -4021,4 +4021,15 @@ 이 사운드트랙에 오디오 파일이 없습니다 실행할 수 없음 이 링크를 열 수 있는 웹 브라우저가 없습니다. + 잡기 + 놓기 + 저장 + 길게 눌러 초기화 + 스토어 + 프레임 시간 + 평균 프레임 속도 + 디스플레이 서버 + HDR 상태 + 표시됨 + %2$d 중 %1$d diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index e6054e288d..76ea30bf09 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -4021,4 +4021,15 @@ Tiada fail audio dalam runut bunyi ini Pelancaran tidak tersedia Tiada penyemak imbas web tersedia untuk membuka pautan ini. + Ambil + Lepas + Simpan + Tahan untuk set semula + Kedai + Masa bingkai + Purata kadar bingkai + Pelayan paparan + Keadaan HDR + Dipaparkan + %1$d daripada %2$d diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index af3ee5933f..452f343a26 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -4051,4 +4051,15 @@ Ingen lydfiler i dette lydsporet Start utilgjengelig Ingen nettleser er tilgjengelig for å åpne denne lenken. + Ta tak + Slipp + Lagre + Hold for å tilbakestille + Butikker + Bildetid + Gjennomsnittlig bildefrekvens + Visningstjener + HDR-status + Vist + %1$d av %2$d diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e7234f03d5..ce006058d7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -4051,4 +4051,15 @@ Geen audiobestanden in deze soundtrack Starten niet beschikbaar Er is geen webbrowser beschikbaar om deze link te openen. + Pakken + Loslaten + Opslaan + Houd vast om te resetten + Winkels + Frametijd + Gemiddelde framesnelheid + Weergaveserver + HDR-status + Getoond + %1$d van %2$d diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 48d92490c2..e0089c2f7b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -4131,4 +4131,15 @@ Brak plików audio w tej ścieżce dźwiękowej Uruchomienie niedostępne Brak przeglądarki internetowej do otwarcia tego linku. + Chwyć + Upuść + Zapisz + Przytrzymaj, aby zresetować + Sklepy + Czas klatki + Średnia liczba klatek + Serwer wyświetlania + Stan HDR + Pokazane + %1$d z %2$d diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index bba489d30a..19f5b4feee 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -4090,4 +4090,15 @@ Nenhum ficheiro de áudio nesta banda sonora Início indisponível Não há nenhum navegador disponível para abrir esta ligação. + Agarrar + Largar + Guardar + Mantenha para repor + Lojas + Tempo de frame + Taxa média de frames + Servidor de ecrã + Estado HDR + Mostrados + %1$d de %2$d diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 786e7ffc9f..44bd83f4fb 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -4091,4 +4091,15 @@ Nenhum arquivo de áudio nesta trilha sonora Inicialização indisponível Nenhum navegador está disponível para abrir este link. + Agarrar + Soltar + Salvar + Segure para redefinir + Lojas + Tempo de quadro + Taxa média de quadros + Servidor de exibição + Estado HDR + Exibidos + %1$d de %2$d diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 024db62c03..24f25ba356 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -4091,4 +4091,15 @@ Niciun fișier audio în această coloană sonoră Lansare indisponibilă Nu este disponibil niciun browser web pentru a deschide acest link. + Prinde + Lasă + Salvează + Ține apăsat pentru resetare + Magazine + Timp cadru + Rata medie de cadre + Server de afișare + Stare HDR + Afișate + %1$d din %2$d diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b293f9c475..d11a3f5a71 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4131,4 +4131,15 @@ В этом саундтреке нет аудиофайлов Запуск недоступен Нет доступного веб-браузера для открытия этой ссылки. + Взять + Отпустить + Сохранить + Удерживайте для сброса + Магазины + Время кадра + Средняя частота кадров + Сервер вывода + Состояние HDR + Показано + %1$d из %2$d diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 804e397fc7..ee0b3ee885 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -4051,4 +4051,15 @@ Inga ljudfiler i detta soundtrack Kan inte starta Ingen webbläsare är tillgänglig för att öppna den här länken. + Greppa + Släpp + Spara + Håll för att återställa + Butiker + Bildtid + Genomsnittlig bildfrekvens + Visningsserver + HDR-status + Visade + %1$d av %2$d diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e773c3f043..d0e63d7f7e 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -4021,4 +4021,15 @@ ไม่พบไฟล์เสียงในซาวด์แทร็กนี้ ไม่สามารถเปิดได้ ไม่มีเว็บเบราว์เซอร์ที่เปิดลิงก์นี้ได้ + หยิบ + วาง + บันทึก + กดค้างเพื่อรีเซ็ต + สโตร์ + เวลาเฟรม + อัตราเฟรมเฉลี่ย + เซิร์ฟเวอร์แสดงผล + สถานะ HDR + ที่แสดง + %1$d จาก %2$d diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 31a6bf9165..6c21b94ccf 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -4051,4 +4051,15 @@ Bu oyun müziğinde ses dosyası yok Başlatma kullanılamıyor Bu bağlantıyı açmak için kullanılabilir bir web tarayıcısı yok. + Tut + Bırak + Kaydet + Sıfırlamak için basılı tut + Mağazalar + Kare süresi + Ortalama kare hızı + Görüntü sunucusu + HDR durumu + Gösterilen + %1$d / %2$d diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cf4fca1a71..0f555ebca8 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -4131,4 +4131,15 @@ У цьому саундтреку немає аудіофайлів Запуск недоступний Немає веббраузера, щоб відкрити це посилання. + Взяти + Відпустити + Зберегти + Утримуйте для скидання + Магазини + Час кадру + Середня частота кадрів + Сервер виводу + Стан HDR + Показано + %1$d з %2$d diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 145bd62237..a8c2808cc1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -4021,4 +4021,15 @@ Không có tệp âm thanh trong nhạc nền này Không thể khởi chạy Không có trình duyệt web nào để mở liên kết này. + Nắm + Thả + Lưu + Giữ để đặt lại + Cửa hàng + Thời gian khung hình + Tốc độ khung hình trung bình + Máy chủ hiển thị + Trạng thái HDR + Đang hiển thị + %1$d trên %2$d diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 65e48021b5..bd57054084 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -4021,4 +4021,15 @@ 此原声音乐中没有音频文件 无法启动 没有可用的浏览器来打开此链接。 + 抓取 + 放下 + 保存 + 长按重置 + 游戏商店 + 帧时间 + 平均帧率 + 显示服务器 + HDR 状态 + 已显示 + %1$d / %2$d diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 512ebecb02..68ed43f73f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -4021,4 +4021,15 @@ 此原聲帶中沒有音訊檔案 無法啟動 沒有可用的網頁瀏覽器可開啟此連結。 + 抓取 + 放下 + 儲存 + 長按重設 + 商店 + 幀時間 + 平均幀率 + 顯示服務 + HDR 狀態 + 已顯示 + %1$d / %2$d diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b92a9adae8..037afc6039 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -4021,4 +4021,15 @@ 此原聲帶中沒有音訊檔案 無法啟動 沒有可用的網頁瀏覽器可開啟此連結。 + 抓取 + 放下 + 儲存 + 長按重設 + 遊戲商店 + 幀時間 + 平均幀率 + 顯示伺服器 + HDR 狀態 + 已顯示 + %1$d / %2$d diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 02c7a61c2f..ba42f01bf9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4090,4 +4090,15 @@ No audio files found in this soundtrack Launch unavailable No web browser is available to open this link. + Grab + Drop + Save + Hold to reset + Stores + Frame time + Average frame rate + Display server + HDR state + Shown + %1$d of %2$d diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt index a439e703b9..5a534ceb3a 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt @@ -51,11 +51,12 @@ class DroidDeckHudPanelTest { key to if (mask and (1 shl index) != 0) "1" else "0" }.toMap() view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + - ("hudSize" to size.token) + settings)) + DroidDeckHudConfig.ORDER.associateWith { "0" } + settings + mapOf( + "hudSize" to size.token, "showFPSGraph" to "0", "showClock" to "0"))) view.showForTest(SNAPSHOT, "DXVK", 0L) val lines = view.linesForTest().joinToString(" ") for ((index, metric) in metrics.withIndex()) { - val supported = size != DroidDeckHudSize.TILES || index == 0 + val supported = metrics[index].first in size.rows val expected = supported && mask and (1 shl index) != 0 val label = Regex("(?): List { + val values = LinkedHashMap(DroidDeckHudConfig.DEFAULTS) + values["hudSize"] = DroidDeckHudSize.FULL.token + for ((key, value) in settings) values[key] = value + val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) + view.applyConfig(DroidDeckHudConfig.encode(values)) + view.showForTest(SNAPSHOT, "DXVK", 0L) + return view.linesForTest() + } + assertTrue(full().toString(), full().any { "RAM67%" in it }) + val noRam = full("showRAM" to "0") + assertFalse(noRam.toString(), noRam.any { "RAM67%" in it }) + assertTrue(noRam.toString(), noRam.any { "FPS0.0" in it }) + } + + @Test fun theSavedOrderDecidesTheRowOrder() { + fun only(order: String): List { + val off = DroidDeckHudConfig.ORDER.associateWith { "0" } + val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) + view.applyConfig(DroidDeckHudConfig.encode( + DroidDeckHudConfig.DEFAULTS + off + mapOf( + "hudSize" to DroidDeckHudSize.FULL.token, + "showPower" to "1", "showFPS" to "1", "showRAM" to "1", + "showFPSGraph" to "0", "showClock" to "0", "hudOrder" to order, + ))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + return view.linesForTest().filter { !it.startsWith("DroidDeck") } + } + val powerFirst = only("full:showPower|showFPS|showRAM") + assertEquals(powerFirst.toString(), listOf("PWR", "FPS", "RAM"), powerFirst.map { it.take(3) }) + val ramFirst = only("full:showRAM|showFPS|showPower") + assertEquals(ramFirst.toString(), listOf("RAM", "FPS", "PWR"), ramFirst.map { it.take(3) }) + } + + @Test fun aSaveKeepsTheLegacyOrderForTheOtherSizes() { + val app = RuntimeEnvironment.getApplication() + SessionPrefs.setDroidDeckHudConfig(app, "hudSize=strip,hudOrder=showRAM|showFPS") + val saved = DroidDeckHudConfig.choose(app, emptyMap(), listOf("showFPS", "showRAM")) + assertEquals(listOf("showRAM", "showFPS"), DroidDeckHudConfig.storedOrder(saved, DroidDeckHudSize.FULL)) + assertEquals(listOf("showFPS", "showRAM"), DroidDeckHudConfig.storedOrder(saved, DroidDeckHudSize.STRIP)) + } + + @Test fun thePillHeroIsWhicheverRowTheUserPutsFirst() { + fun pill(order: String): List { + val off = DroidDeckHudConfig.ORDER.associateWith { "0" } + val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) + view.applyConfig(DroidDeckHudConfig.encode( + DroidDeckHudConfig.DEFAULTS + off + mapOf( + "hudSize" to DroidDeckHudSize.PILL.token, + "showFPS" to "1", "showRAM" to "1", "showPower" to "1", + "showFPSGraph" to "0", "showClock" to "0", + "hudOrder" to order, + ))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + return view.linesForTest() + } + val fpsFirst = pill("pill:showFPS|showRAM|showPower") + assertTrue(fpsFirst.toString(), fpsFirst.any { it.trim() == "0.0fps" }) + val fpsLast = pill("pill:showRAM|showPower|showFPS") + assertTrue(fpsLast.toString(), fpsLast.any { it.trim().startsWith("FPS") }) + assertFalse(fpsLast.toString(), fpsLast.any { it.trim() == "0.0fps" }) + } + @Test fun stripIsOneLineAcrossTheParentWithTheClockOnTheRight() { val app = RuntimeEnvironment.getApplication() val parent = FrameLayout(app) @@ -232,27 +297,24 @@ class DroidDeckHudPanelTest { } @Test fun pillShowsEachBatteryPartOnItsOwnSwitch() { - fun pill(vararg settings: Pair): List { + fun pill(vararg settings: Pair): String { val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.PILL.token) + settings)) view.showForTest(SNAPSHOT, "DXVK", 0L) - return view.linesForTest() + return view.linesForTest().toString() } - val all = pill("showBattery" to "1") - assertTrue(all.toString(), all.any { "BAT 79% · 34°C · 16.0W" in it }) - assertEquals(all.toString(), 1, all.count { "BAT" in it }) - assertFalse(all.toString(), all.single { "RAM" in it }.contains("BAT")) - - val noMemory = pill("showBattery" to "1", "showRAM" to "0") - assertTrue(noMemory.toString(), noMemory.none { "RAM" in it }) - assertTrue(noMemory.toString(), noMemory.any { "BAT 79% · 34°C · 16.0W" in it }) - val defaults = pill() - assertTrue(defaults.toString(), defaults.any { "BAT 34°C · 16.0W" in it }) - val wattsOnly = pill("showBatteryTemp" to "0") - assertTrue(wattsOnly.toString(), wattsOnly.any { "BAT 16.0W" in it }) - val nothing = pill("showBatteryTemp" to "0", "showPower" to "0") - assertTrue(nothing.toString(), nothing.none { "BAT" in it }) + assertTrue(defaults, defaults.contains("BAT.T")) + assertTrue(defaults, defaults.contains("PWR")) + assertFalse(defaults, defaults.contains("BAT79%")) + val levelOn = pill("showBattery" to "1") + assertTrue(levelOn, levelOn.contains("BAT79%")) + val tempOff = pill("showBatteryTemp" to "0") + assertFalse(tempOff, tempOff.contains("BAT.T")) + assertTrue(tempOff, tempOff.contains("PWR")) + val powerOff = pill("showPower" to "0") + assertFalse(powerOff, powerOff.contains("PWR")) + assertTrue(powerOff, powerOff.contains("BAT.T")) } @Test fun aLockedHudLetsTouchesThroughOnlyWhereAControlTakesThem() { From 2cb51103acd7df24fa502030fc1560d794de87fa Mon Sep 17 00:00:00 2001 From: Tapuuk Date: Sat, 14 Nov 2026 20:50:12 +0100 Subject: [PATCH 096/101] fix(game-env): the VRAM cap also caps the shared memory DXGI reports (#2607) With a single GPU heap DXVK reports the whole heap as shared memory too, so games still saw ~8 GB as shared even with the cap on. Set dxgi.maxSharedMemory to the same value, like BattleNet already does. Co-authored-by: Tapuuk <177422350+Tapuuk@users.noreply.github.com> --- docs/development/vram-budget.md | 2 +- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 2 +- tools/tests/test_game_environment.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/development/vram-budget.md b/docs/development/vram-budget.md index 50e3becf70..8877bd7bf3 100644 --- a/docs/development/vram-budget.md +++ b/docs/development/vram-budget.md @@ -1,6 +1,6 @@ # Reported video memory budget -The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives its existing `dxgi.maxDeviceMemory` setting, which separately reduces the adapter's advertised dedicated video memory, and, for caps below DXVK's 4096 MiB D3D9 default, `d3d9.maxAvailableMemory`, which caps the texture memory DXVK's D3D9 frontend reports, since D3D9 games do not read the DXGI setting. Higher caps leave the D3D9 setting alone so DXVK's lower per-game limits still apply. OpenGL games are not covered. A lower driver budget remains lower; the layer never increases it. +The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives `dxgi.maxDeviceMemory` and `dxgi.maxSharedMemory`, which separately reduce the adapter's advertised dedicated and shared video memory (on a single-heap GPU DXVK reports the heap as both, so a game adding the two would otherwise still see the whole heap as shared), and, for caps below DXVK's 4096 MiB D3D9 default, `d3d9.maxAvailableMemory`, which caps the texture memory DXVK's D3D9 frontend reports, since D3D9 games do not read the DXGI setting. Higher caps leave the D3D9 setting alone so DXVK's lower per-game limits still apply. OpenGL games are not covered. A lower driver budget remains lower; the layer never increases it. This does not make vkd3d-proton automatically enforce the selected budget. In the [upstream allocator inspected during this investigation](https://github.com/HansKristian-Work/vkd3d-proton/blob/865b12ba0cc20796b3709397ce5d6d3b8a205b04/libs/vkd3d/memory.c), `heapBudget` is used for diagnostic reporting, while the [DXVK adapter](https://github.com/doitsujin/dxvk/blob/cf0a0d90f8965147741ad17dcd0b263817572ab3/src/dxgi/dxgi_adapter.cpp) returns the Vulkan budget to applications. Seeing a smaller budget in a VKD3D log verifies reporting, not reduced allocation or eviction. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 75c740a58e..bbe3c868d7 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -407,7 +407,7 @@ def vram_cap(env): if not re.fullmatch(r"[1-9][0-9]{0,6}", value): return env result = env.copy() - cap = "dxgi.maxDeviceMemory = {0}".format(int(value)) + cap = "dxgi.maxDeviceMemory = {0}; dxgi.maxSharedMemory = {0}".format(int(value)) if int(value) < D3D9_DEFAULT_MEMORY_MB: cap += "; d3d9.maxAvailableMemory = {0}".format(int(value)) own = result.get("DXVK_CONFIG", "").strip().strip(";").strip() diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index d423d8a355..04864df7f3 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1008,11 +1008,11 @@ class GameEnvironmentTest(unittest.TestCase): def test_the_vram_cap_comes_before_the_games_own_dxvk_settings(self): cap = MODULE["vram_cap"] - self.assertEqual(cap({"BL_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096") - self.assertEqual(cap({"BL_VRAM_MB": "8192"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 8192") - self.assertEqual(cap({"BL_VRAM_MB": "4095"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4095; d3d9.maxAvailableMemory = 4095") + self.assertEqual(cap({"BL_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096; dxgi.maxSharedMemory = 4096") + self.assertEqual(cap({"BL_VRAM_MB": "8192"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 8192; dxgi.maxSharedMemory = 8192") + self.assertEqual(cap({"BL_VRAM_MB": "4095"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4095; dxgi.maxSharedMemory = 4095; d3d9.maxAvailableMemory = 4095") self.assertEqual(cap({"BL_VRAM_MB": "2048", "DXVK_CONFIG": "dxvk.maxFrameRate = 60;"})["DXVK_CONFIG"], - "dxgi.maxDeviceMemory = 2048; d3d9.maxAvailableMemory = 2048; dxvk.maxFrameRate = 60") + "dxgi.maxDeviceMemory = 2048; dxgi.maxSharedMemory = 2048; d3d9.maxAvailableMemory = 2048; dxvk.maxFrameRate = 60") for off in ({}, {"BL_VRAM_MB": "0"}, {"BL_VRAM_MB": "lots"}, {"BL_VRAM_MB": "²"}, {"BL_VRAM_MB": "-1"}): self.assertNotIn("DXVK_CONFIG", cap(off)) self.assertNotIn("DROIDDECK_VRAM_CAP", cap(off)) From aa3a599ec6893d366f4185b7ec5061874b13b7fd Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 14 Nov 2026 14:51:29 -0500 Subject: [PATCH 097/101] fix(runtime): record why a runtime install failed in the session events (#2591) * fix(runtime): record why a runtime install failed in the session events * fix(runtime): report empty or invalid runtime catalogs in the failure event * fix(runtime): keep each install failure reason on its own job * fix(runtime): name the busy reason for rejected installs and drop the owner's listener * fix(runtime): keep each install call's failure reason on its calling thread * fix(runtime): keep the interrupted reason when a joined install finishes during the wait --- .../com/droiddeck/launcher/SessionActivity.kt | 9 +- .../com/droiddeck/launcher/core/AddonPack.kt | 25 +- .../droiddeck/launcher/core/Downloader.java | 33 ++- .../runtime/LinuxRuntimeInstaller.java | 110 ++++++-- .../droiddeck/launcher/core/AddonPackTest.kt | 7 + .../launcher/core/DownloaderFailureTest.kt | 85 ++++++ .../runtime/RuntimeCatalogFailureTest.kt | 72 +++++ .../runtime/RuntimeInstallRollbackTest.kt | 250 ++++++++++++++++-- 8 files changed, 538 insertions(+), 53 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/core/DownloaderFailureTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/RuntimeCatalogFailureTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 5648e6e847..949bcd74e0 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2235,11 +2235,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun installRuntime(): String? { val release = com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.fetchRelease() - ?: return getString(R.string.session_runtime_catalog_unreachable) + if (release == null) { + SessionEvents.record("runtime.failed", mapOf("step" to "catalog", "reason" to com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.catalogError())) + return getString(R.string.session_runtime_catalog_unreachable) + } runCatching { com.droiddeck.launcher.runtime.RuntimeInstallService.start(this, release) } val ok = com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.install(this, release, progressFor(RUNTIME_LINES, release.size / 1_000_000)) - return if (ok) null else getString(R.string.session_runtime_install_failed) + if (ok) return null + SessionEvents.record("runtime.failed", mapOf("step" to "install", "reason" to com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.installError())) + return getString(R.string.session_runtime_install_failed) } private fun installDesktop(): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt index 9e0452771d..1d270abbc8 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt @@ -31,6 +31,9 @@ internal class AddonPack( val state: StateFlow = mutableState.asStateFlow() private val lock = Any() + @Volatile var failure: String? = null + private set + val available: Boolean get() = sha256.isNotEmpty() private val tag get() = "pack-$name-${sha256.take(16)}" private val urls get() = listOfNotNull( @@ -67,9 +70,13 @@ internal class AddonPack( if (installed(app)) { mutableState.value = State.Ready; return } if (mutableState.value is State.Downloading) return mutableState.value = State.Downloading(0f) + failure = null } scope.launch { - val ok = runCatching { install(app) }.onFailure { Log.w(TAG, "$name: install failed", it) }.getOrDefault(false) + val ok = runCatching { install(app) }.onFailure { + Log.w(TAG, "$name: install failed", it) + failure = it.toString() + }.getOrDefault(false) mutableState.value = if (ok) State.Ready else State.Failed if (ok) onReady(app) } @@ -93,20 +100,28 @@ internal class AddonPack( private fun install(context: Context): Boolean { if (!available) { - Log.w(TAG, if (reuseDeviceCopy) "$name: this build has no pack and none is installed" else "$name: this build has no pack") + failure = if (reuseDeviceCopy) "this build has no pack and none is installed" else "this build has no pack" + Log.w(TAG, "$name: $failure") return false } val root = root(context).apply { mkdirs() } val archive = File(root, "$sha256.tar.zst") + val problems = mutableListOf() val downloaded = bundled(context, archive) || urls.any { url -> Downloader.downloadFile(url, archive, true, sha256) { p -> mutableState.value = State.Downloading(p.coerceIn(0f, 1f)) } - .also { if (!it) archive.delete() } + .also { if (!it) { archive.delete(); Downloader.lastFailure()?.let(problems::add) } } + } + if (!downloaded) { + failure = problems.joinToString("; ").ifEmpty { "download failed" } + return false } - if (!downloaded) return false val staging = File(root, "$sha256.partial") staging.deleteRecursively() try { - if (!FileInputStream(archive).use { TarZst.extract(it, staging) }) return false + if (!FileInputStream(archive).use { TarZst.extract(it, staging) }) { + failure = "could not unpack the pack" + return false + } check(required.all { File(staging, it).isFile }) { "$name pack is incomplete" } File(staging, COMPLETE).writeText(sha256) val target = dir(context) diff --git a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java index 9bd86c5719..7d5427a8cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -31,8 +31,26 @@ public final class Downloader { return thread; }); + private static final ThreadLocal LAST_FAILURE = new ThreadLocal<>(); + private Downloader() {} + public static String lastFailure() { + return LAST_FAILURE.get(); + } + + private static void failed(String url, String reason) { + String host; + try { host = new java.net.URI(url).getHost(); } catch (java.net.URISyntaxException e) { host = null; } + String entry = (host == null ? url : host) + ": " + reason; + String earlier = LAST_FAILURE.get(); + LAST_FAILURE.set(earlier == null ? entry : earlier + "; " + entry); + } + + private static String describe(Exception e) { + return e.getMessage() == null ? e.getClass().getSimpleName() : e.getClass().getSimpleName() + ": " + e.getMessage(); + } + public static final class Cancellation implements java.util.function.BooleanSupplier { private final AtomicBoolean cancelled = new AtomicBoolean(); private final AtomicReference connection = new AtomicReference<>(); @@ -87,12 +105,14 @@ public final class Downloader { public static String downloadString(String url, java.util.function.BooleanSupplier cancelled) { List sources = DownloadSource.INSTANCE.candidates(url); + LAST_FAILURE.remove(); for (int i = 0; i < sources.size(); i++) { if (isCancelled(cancelled)) return null; if (i > 0) Log.i(TAG, "retrying " + url + " via " + sources.get(i)); Fetch fetch = fetch(sources.get(i), cancelled); if (isCancelled(cancelled)) return null; if (fetch.body != null) { + LAST_FAILURE.remove(); DownloadSource.INSTANCE.succeeded(sources.get(i)); return fetch.body; } @@ -103,6 +123,7 @@ public final class Downloader { } public static String downloadDirect(String url) { + LAST_FAILURE.remove(); return fetch(url).body; } @@ -138,6 +159,7 @@ public final class Downloader { String expectedSha256, java.util.function.BooleanSupplier cancelled, java.util.function.Consumer progress) { Identity identity = loadIdentity(destination, resume, expectedSha256); + LAST_FAILURE.remove(); for (int i = 0; i < sources.size(); i++) { String source = sources.get(i); if (isCancelled(cancelled)) return false; @@ -150,12 +172,14 @@ public final class Downloader { if (isCancelled(cancelled)) return false; if (!expectedSha256.equalsIgnoreCase(actualSha256)) { Log.w(TAG, "checksum mismatch from " + source + "; trying another source"); + failed(source, "checksum mismatch"); if (!discardPartial(destination, identity)) return false; continue; } } if (isCancelled(cancelled)) return false; resumeFile(destination).delete(); + LAST_FAILURE.remove(); DownloadSource.INSTANCE.succeeded(source); if (progress != null) progress.accept(1f); return true; @@ -260,6 +284,7 @@ public final class Downloader { } if (code / 100 != 2) { Log.w(TAG, url + " -> HTTP " + code); + failed(url, "HTTP " + code); return code == HttpURLConnection.HTTP_NOT_FOUND || code == HttpURLConnection.HTTP_GONE ? Outcome.FATAL : Outcome.RETRY; } @@ -308,11 +333,15 @@ public final class Downloader { if (cancelled instanceof Cancellation) ((Cancellation) cancelled).detach(input); } if (isCancelled(cancelled)) return Outcome.CANCELLED; - if (total > 0 && written < total) return Outcome.RETRY; + if (total > 0 && written < total) { + failed(url, "connection closed after " + written + " of " + total + " bytes"); + return Outcome.RETRY; + } return Outcome.DONE; } catch (Exception e) { if (isCancelled(cancelled)) return Outcome.CANCELLED; Log.w(TAG, "download " + url, e); + failed(url, describe(e)); return Outcome.RETRY; } finally { if (connection != null) { @@ -357,6 +386,7 @@ public final class Downloader { int code = connection.getResponseCode(); if (code / 100 != 2) { Log.w(TAG, url + " -> HTTP " + code); + failed(url, "HTTP " + code); return new Fetch(null, code == HttpURLConnection.HTTP_NOT_FOUND || code == HttpURLConnection.HTTP_GONE); } try (InputStream in = connection.getInputStream(); @@ -367,6 +397,7 @@ public final class Downloader { } catch (Exception e) { if (isCancelled(cancelled)) return new Fetch(null, false); Log.w(TAG, "GET " + url, e); + failed(url, describe(e)); return new Fetch(null, false); } finally { if (connection != null) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index cf613008bb..fe853326ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -70,6 +70,7 @@ public final class LinuxRuntimeInstaller { volatile Step step = Step.OTHER; volatile int percent = -1; volatile boolean ok; + volatile String failure; final boolean removal; boolean maintenance; Job(boolean removal, String stage) { this.removal = removal; this.stage = stage; } @@ -78,6 +79,9 @@ public final class LinuxRuntimeInstaller { private static final Object JOB_LOCK = new Object(); private static Job running; private static volatile String removalError; + private static final ThreadLocal LAST_INSTALL = new ThreadLocal<>(); + private static final ThreadLocal CURRENT_INSTALL = new ThreadLocal<>(); + private static final ThreadLocal CATALOG_ERROR = new ThreadLocal<>(); private LinuxRuntimeInstaller() {} @@ -105,34 +109,66 @@ public final class LinuxRuntimeInstaller { } public static Release fetchRelease() { - String body = Downloader.downloadString(catalogUrl()); - if (body == null || body.isEmpty()) return null; + return fetchRelease(catalogUrl()); + } + + public static String catalogError() { return CATALOG_ERROR.get(); } + + static Release fetchRelease(String catalogUrl) { + CATALOG_ERROR.remove(); + String body = Downloader.downloadString(catalogUrl); + if (body == null) return catalogFailed(Downloader.lastFailure()); + if (body.isEmpty()) return catalogFailed("empty catalog"); try { JSONObject json = new JSONObject(body); String version = json.optString("version", ""); String url = json.optString("url", ""); String sha256 = json.optString("sha256", ""); - if (version.isEmpty() || url.isEmpty() || sha256.isEmpty()) return null; + if (version.isEmpty() || url.isEmpty() || sha256.isEmpty()) { + return catalogFailed("catalog lacks version, url or sha256"); + } return new Release(version, url, sha256, json.optLong("size", 0L)); } catch (Exception e) { - Log.w(TAG, "catalog: " + e); - return null; + return catalogFailed("invalid catalog: " + e); } } + private static Release catalogFailed(String reason) { + CATALOG_ERROR.set(reason); + Log.w(TAG, "catalog: " + reason); + return null; + } + private static final String USER_DATA = "root"; public static boolean install(Context context, Release release, ProgressListener listener) { Job job; boolean owner; synchronized (JOB_LOCK) { - if (running != null && (running.removal || running.maintenance)) return false; + if (running != null && (running.removal || running.maintenance)) { + Job rejected = new Job(false, null); + rejected.failure = running.removal ? "Runtime busy: removal in progress" : "Runtime busy: maintenance in progress"; + Log.w(TAG, rejected.failure); + LAST_INSTALL.set(rejected); + return false; + } owner = running == null; if (owner) { running = new Job(false, context.getString(R.string.user_apps_starting)); removalError = null; } job = running; if (listener != null) job.listeners.add(listener); } - if (!owner) return join(job, listener); + if (!owner) { + Boolean ok = await(job, listener); + if (ok != null) { + LAST_INSTALL.set(job); + return ok; + } + Job interrupted = new Job(false, null); + interrupted.failure = "Runtime install interrupted while waiting for the running install"; + LAST_INSTALL.set(interrupted); + return false; + } + CURRENT_INSTALL.set(job); try { Context app = context.getApplicationContext(); ProgressListener progress = new ProgressListener() { @@ -156,9 +192,10 @@ public final class LinuxRuntimeInstaller { if (job.ok && desktop) keepDesktop(app, progress); return job.ok; } finally { - synchronized (JOB_LOCK) { - running = null; - } + CURRENT_INSTALL.remove(); + LAST_INSTALL.set(job); + synchronized (JOB_LOCK) { running = null; } + if (listener != null) job.listeners.remove(listener); job.done.countDown(); } } @@ -247,6 +284,21 @@ public final class LinuxRuntimeInstaller { public static String removalError() { return removalError; } + public static String installError() { + Job job = LAST_INSTALL.get(); + return job == null ? null : job.failure; + } + + private static boolean fail(String step, String detail) { + String reason = detail == null || detail.isEmpty() ? step : step + ": " + detail; + Job job = CURRENT_INSTALL.get(); + if (job != null) job.failure = reason; + Log.w(TAG, reason); + return false; + } + + private static final String SWAP_FAILED = "Cannot replace the previous runtime"; + public static boolean hasRemovalPending(Context context) { return removalDirectory(LinuxRuntime.rootDir(context)).exists(); } @@ -266,13 +318,17 @@ public final class LinuxRuntimeInstaller { } private static boolean join(Job job, ProgressListener listener) { + return Boolean.TRUE.equals(await(job, listener)); + } + + private static Boolean await(Job job, ProgressListener listener) { try { if (listener != null) listener.onProgress(job.step, job.stage, job.percent); job.done.await(); return job.ok; } catch (InterruptedException e) { Thread.currentThread().interrupt(); - return false; + return null; } finally { if (listener != null) job.listeners.remove(listener); } @@ -329,8 +385,9 @@ public final class LinuxRuntimeInstaller { if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0); if (!LinuxRuntime.patchedProot(context) && !AddonPack.PROOT.await(context, () -> true, packProgress(listener, downloading)) && !SessionPrefs.allowStockProot(context)) - throw new IOException("Cannot download proot"); - if (!AddonPack.DIRECTAUDIO.await(context, () -> true, packProgress(listener, downloading))) throw new IOException("Cannot download DirectAudio"); + return fail("Cannot download proot", AddonPack.PROOT.getFailure()); + if (!AddonPack.DIRECTAUDIO.await(context, () -> true, packProgress(listener, downloading))) + return fail("Cannot download DirectAudio", AddonPack.DIRECTAUDIO.getFailure()); boolean ok = Downloader.downloadFile(release.url, archive, true, release.sha256, (fraction) -> { if (listener != null) { listener.onProgress(Step.DOWNLOADING, downloading, @@ -338,39 +395,36 @@ public final class LinuxRuntimeInstaller { } }); if (!ok) { - Log.w(TAG, "download failed"); keepPartial = true; - return false; + return fail("Cannot download the runtime", Downloader.lastFailure()); } if (listener != null) listener.onProgress(Step.VERIFYING, context.getString(R.string.rtinst_verifying), -1); String actual = Hashes.sha256(archive); - if (!release.sha256.equalsIgnoreCase(actual)) { - Log.w(TAG, "checksum mismatch: wanted " + release.sha256 + ", got " + actual); - return false; - } + if (!release.sha256.equalsIgnoreCase(actual)) + return fail("Runtime checksum mismatch", "wanted " + release.sha256 + ", got " + actual); File root = LinuxRuntime.rootDir(context); File staging = new File(root.getParentFile(), LinuxRuntime.DIR + ".new"); File old = new File(root.getParentFile(), LinuxRuntime.DIR + ".old"); recoverInterruptedSwap(root, staging, old); - if (!discard(staging, null) || !staging.mkdirs()) return false; + if (!discard(staging, null) || !staging.mkdirs()) return fail("Cannot prepare " + staging.getName(), null); if (listener != null) listener.onProgress(context.getString(R.string.rtinst_extracting), -1); if (!extract(context, archive, staging, root, listener)) { RuntimeFileTree.delete(staging, null); - return false; + return fail("Cannot unpack the runtime", null); } FileUtils.writeString(new File(staging, VERSION_FILE), release.version); if (!discard(old, null)) { discard(staging, null); - return false; + return fail(SWAP_FAILED, null); } java.util.List carryPaths = root.isDirectory() ? RuntimeFileTree.existingUserPaths(root, staging) : java.util.Collections.emptyList(); if (root.isDirectory() && !root.renameTo(old)) { RuntimeFileTree.delete(staging, null); - return false; + return fail(SWAP_FAILED, null); } File carryMarker = new File(staging, CARRY_MARKER); java.util.List encodedPaths = new java.util.ArrayList<>(); @@ -379,7 +433,7 @@ public final class LinuxRuntimeInstaller { if (old.isDirectory() && !old.renameTo(root)) Log.w(TAG, "could not restore the previous runtime; retained at " + old); discard(staging, null); - return false; + return fail(SWAP_FAILED, null); } java.util.List carried; @@ -396,7 +450,7 @@ public final class LinuxRuntimeInstaller { } else { Log.w(TAG, "incomplete rollback; retaining user data in " + staging); } - return false; + return fail("Cannot carry user data into the new runtime", e.getMessage()); } if (!staging.renameTo(root)) { @@ -407,7 +461,7 @@ public final class LinuxRuntimeInstaller { } catch (IOException e) { Log.w(TAG, "could not move all user data back after a failed swap", e); } old.renameTo(root); } - return false; + return fail(SWAP_FAILED, null); } new File(root, CARRY_MARKER).delete(); try { RuntimeFileTree.dropStaleState(root); } @@ -415,10 +469,10 @@ public final class LinuxRuntimeInstaller { discard(old, null); try { com.droiddeck.launcher.session.SessionFiles.INSTANCE.stage(context, root, false); } catch (Exception e) { Log.w(TAG, "could not stage the session files into the new runtime", e); } - return LinuxRuntime.isInstalled(context); + return LinuxRuntime.isInstalled(context) || fail("The runtime is incomplete after unpacking", null); } catch (Exception e) { Log.e(TAG, "install", e); - return false; + return fail("Install stopped", e.toString()); } finally { if (!keepPartial) archive.delete(); } diff --git a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt index c367c63ecc..6e81d46a7d 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt @@ -74,6 +74,13 @@ class AddonPackTest { assertEquals("a".repeat(64), pack.dir(context).name) } + @Test fun aBuildWithoutThePackSaysSoWhenAwaited() { + val pack = AddonPack("sample", "", 0L, listOf("tool"), reuseDeviceCopy = false) + + assertFalse(pack.await(context)) + assertEquals("this build has no pack", pack.failure) + } + @Test fun localBuildInstallsTheBundledPackWithoutDownloading() { val archive = tarZst("tool" to "x") val pack = AddonPack("sample", Hashes.sha256(archive), archive.length(), listOf("tool"), bundle = { archive.inputStream() }) diff --git a/app/src/test/java/com/droiddeck/launcher/core/DownloaderFailureTest.kt b/app/src/test/java/com/droiddeck/launcher/core/DownloaderFailureTest.kt new file mode 100644 index 0000000000..c177d63f6b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/DownloaderFailureTest.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.core + +import java.io.File +import java.net.ServerSocket +import java.nio.file.Files +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test + +class DownloaderFailureTest { + private lateinit var dir: File + + @Before fun setUp() { + dir = Files.createTempDirectory("downloader-failure").toFile() + } + + @After fun tearDown() { + dir.deleteRecursively() + } + + private fun serve(status: String, body: ByteArray = ByteArray(0)): ServerSocket { + val server = ServerSocket(0) + Thread { + runCatching { + server.accept().use { socket -> + val input = socket.getInputStream().bufferedReader(Charsets.ISO_8859_1) + while (true) { + val line = input.readLine() ?: break + if (line.isEmpty()) break + } + socket.getOutputStream().apply { + write("HTTP/1.1 $status\r\nContent-Length: ${body.size}\r\nConnection: close\r\n\r\n".toByteArray()) + write(body) + flush() + } + } + } + }.apply { isDaemon = true; start() } + return server + } + + private fun download(url: String): Boolean = + Downloader.downloadCandidates(url, listOf(url), File(dir, "file"), false, null, null) + + @Test fun anHttpRefusalIsReportedWithTheHostAndCode() { + serve("403 Forbidden").use { server -> + assertFalse(download("http://127.0.0.1:${server.localPort}/pack.tar.zst")) + } + assertEquals("127.0.0.1: HTTP 403", Downloader.lastFailure()) + } + + @Test fun aRefusedConnectionIsReportedWithItsException() { + val port = ServerSocket(0).use { it.localPort } + assertFalse(download("http://127.0.0.1:$port/pack.tar.zst")) + val failure = Downloader.lastFailure().orEmpty() + assertTrue(failure, failure.startsWith("127.0.0.1: ConnectException")) + } + + @Test fun aSuccessfulDownloadClearsTheEarlierFailure() { + serve("500 Internal Server Error").use { server -> + assertFalse(download("http://127.0.0.1:${server.localPort}/pack.tar.zst")) + } + serve("200 OK", "data".toByteArray()).use { server -> + assertTrue(download("http://127.0.0.1:${server.localPort}/pack.tar.zst")) + } + assertNull(Downloader.lastFailure()) + } + + @Test fun everyFailedSourceIsListedInOrder() { + val first = serve("403 Forbidden") + val second = serve("503 Service Unavailable") + val urls = listOf(first, second).map { "http://127.0.0.1:${it.localPort}/pack.tar.zst" } + try { + assertFalse(Downloader.downloadCandidates(urls[0], urls, File(dir, "file"), false, null, null)) + } finally { + first.close() + second.close() + } + assertEquals("127.0.0.1: HTTP 403; 127.0.0.1: HTTP 503", Downloader.lastFailure()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeCatalogFailureTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeCatalogFailureTest.kt new file mode 100644 index 0000000000..bf2bc01340 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeCatalogFailureTest.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import java.net.ServerSocket +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], application = Application::class) +class RuntimeCatalogFailureTest { + private fun serve(body: String): ServerSocket { + val server = ServerSocket(0) + val bytes = body.toByteArray() + Thread { + runCatching { + server.accept().use { socket -> + val input = socket.getInputStream().bufferedReader(Charsets.ISO_8859_1) + while (true) { + val line = input.readLine() ?: break + if (line.isEmpty()) break + } + socket.getOutputStream().apply { + write("HTTP/1.1 200 OK\r\nContent-Length: ${bytes.size}\r\nConnection: close\r\n\r\n".toByteArray()) + write(bytes) + flush() + } + } + } + }.apply { isDaemon = true; start() } + return server + } + + private fun fetch(body: String): LinuxRuntimeInstaller.Release? = + serve(body).use { LinuxRuntimeInstaller.fetchRelease("http://127.0.0.1:${it.localPort}/linuxfs.json") } + + @Test fun anEmptyCatalogIsReported() { + assertNull(fetch("")) + assertEquals("empty catalog", LinuxRuntimeInstaller.catalogError()) + } + + @Test fun aMalformedCatalogIsReported() { + assertNull(fetch("captive portal")) + val error = LinuxRuntimeInstaller.catalogError().orEmpty() + assertTrue(error, error.startsWith("invalid catalog: ")) + } + + @Test fun aCatalogMissingFieldsIsReported() { + assertNull(fetch("""{"version":"1","url":"http://127.0.0.1/rootfs.tar.zst"}""")) + assertEquals("catalog lacks version, url or sha256", LinuxRuntimeInstaller.catalogError()) + } + + @Test fun anUnreachableCatalogKeepsTheDownloadReason() { + val port = ServerSocket(0).use { it.localPort } + assertNull(LinuxRuntimeInstaller.fetchRelease("http://127.0.0.1:$port/linuxfs.json")) + val error = LinuxRuntimeInstaller.catalogError().orEmpty() + assertTrue(error, error.startsWith("127.0.0.1: ConnectException")) + } + + @Test fun aValidCatalogClearsTheEarlierError() { + assertNull(fetch("")) + val release = fetch("""{"version":"2","url":"http://127.0.0.1/rootfs.tar.zst","sha256":"${"a".repeat(64)}","size":5}""") + assertNotNull(release) + assertEquals("2", release!!.version) + assertNull(LinuxRuntimeInstaller.catalogError()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt index 45b8019bb8..ac17c29c82 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt @@ -40,7 +40,7 @@ class RuntimeInstallRollbackTest { private data class Attempt(val root: File, val staging: File, val old: File, val result: Boolean) - private fun attempt(failRollback: Boolean): Attempt { + private fun packedContext(): Context { val files = tmp.newFolder("files") val cache = tmp.newFolder("cache") val context = object : ContextWrapper(RuntimeEnvironment.getApplication()) { @@ -58,6 +58,29 @@ class RuntimeInstallRollbackTest { required.forEach { put(directory, it, "test pack") } put(directory, AddonPack.COMPLETE, version) } + return context + } + + private fun serveOnce(server: ServerSocket, head: String, body: ByteArray = ByteArray(0)) = Thread { + runCatching { + server.accept().use { socket -> + socket.soTimeout = 5000 + val input = socket.getInputStream().bufferedReader(Charsets.ISO_8859_1) + while (true) { + val line = input.readLine() ?: break + if (line.isEmpty()) break + } + val out = socket.getOutputStream() + out.write(("$head\r\nContent-Length: ${body.size}\r\nConnection: close\r\n\r\n").toByteArray()) + out.write(body) + out.flush() + } + } + }.apply { isDaemon = true; start() } + + private fun attempt(failRollback: Boolean): Attempt { + val context = packedContext() + val files = context.filesDir val root = LinuxRuntime.rootDir(context) val staging = File(files, LinuxRuntime.DIR + ".new") val old = File(files, LinuxRuntime.DIR + ".old") @@ -87,22 +110,7 @@ class RuntimeInstallRollbackTest { } else failRollback && path == File(old, "root/rollback-block").toPath() } val server = ServerSocket(0) - val thread = Thread { - runCatching { - server.accept().use { socket -> - socket.soTimeout = 5000 - val input = socket.getInputStream().bufferedReader(Charsets.ISO_8859_1) - while (true) { - val line = input.readLine() ?: break - if (line.isEmpty()) break - } - val out = socket.getOutputStream() - out.write(("HTTP/1.1 200 OK\r\nContent-Length: ${payload.size}\r\nConnection: close\r\n\r\n").toByteArray()) - out.write(payload) - out.flush() - } - } - }.apply { isDaemon = true; start() } + val thread = serveOnce(server, "HTTP/1.1 200 OK", payload) try { val release = LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:${server.localPort}/runtime.tar.zst", digest, payload.size.toLong()) val result = LinuxRuntimeInstaller.install(context, release, null) @@ -137,4 +145,212 @@ class RuntimeInstallRollbackTest { assertEquals("original app", File(attempt.root, "opt/appimages/user/game/app.AppImage").readText()) assertFalse(attempt.staging.exists()) } + + private fun failedInstall(context: Context, head: String): String? { + val server = ServerSocket(0) + val thread = serveOnce(server, head) + try { + val release = LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:${server.localPort}/runtime.tar.zst", "a".repeat(64), 1L) + assertFalse(LinuxRuntimeInstaller.install(context, release, null)) + return LinuxRuntimeInstaller.installError() + } finally { + server.close() + thread.join(1000) + } + } + + @Test fun aRefusedRuntimeDownloadNamesTheStepAndTheServerAnswer() { + val context = packedContext() + assertEquals("Cannot download the runtime: 127.0.0.1: HTTP 403", failedInstall(context, "HTTP/1.1 403 Forbidden")) + } + + @Test fun eachInstallReportsItsOwnFailureOnly() { + val context = packedContext() + failedInstall(context, "HTTP/1.1 403 Forbidden") + assertEquals("Cannot download the runtime: 127.0.0.1: HTTP 404", failedInstall(context, "HTTP/1.1 404 Not Found")) + } + + @Test fun anInstallInFlightKeepsTheLastFailureReadable() { + val context = packedContext() + val first = failedInstall(context, "HTTP/1.1 403 Forbidden") + val server = ServerSocket(0) + val accepted = java.util.concurrent.CountDownLatch(1) + val release = java.util.concurrent.CountDownLatch(1) + val stall = Thread { + runCatching { + server.accept().use { socket -> + accepted.countDown() + release.await() + socket.getOutputStream().write("HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\nConnection: close\r\n\r\n".toByteArray()) + } + } + }.apply { isDaemon = true; start() } + var secondReason: String? = null + val second = Thread { + LinuxRuntimeInstaller.install(context, + LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:${server.localPort}/runtime.tar.zst", "a".repeat(64), 1L), null) + secondReason = LinuxRuntimeInstaller.installError() + }.apply { isDaemon = true; start() } + try { + assertTrue(accepted.await(10, java.util.concurrent.TimeUnit.SECONDS)) + assertTrue(LinuxRuntimeInstaller.isInstalling()) + assertEquals(first, LinuxRuntimeInstaller.installError()) + } finally { + release.countDown() + second.join(10000) + server.close() + stall.join(1000) + } + assertEquals("Cannot download the runtime: 127.0.0.1: HTTP 404", secondReason) + assertEquals(first, LinuxRuntimeInstaller.installError()) + } + + @Test fun anInstallRejectedDuringMaintenanceReportsItsOwnReason() { + val context = packedContext() + failedInstall(context, "HTTP/1.1 403 Forbidden") + val maintenance = LinuxRuntimeInstaller.beginMaintenance(context, "maintenance")!! + try { + assertFalse(LinuxRuntimeInstaller.install(context, + LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:1/runtime.tar.zst", "a".repeat(64), 1L), null)) + assertEquals("Runtime busy: maintenance in progress", LinuxRuntimeInstaller.installError()) + } finally { + assertTrue(maintenance.run(null) { null }) + } + assertEquals("Cannot download the runtime: 127.0.0.1: HTTP 404", failedInstall(context, "HTTP/1.1 404 Not Found")) + } + + @Test fun aRejectedInstallKeepsItsBusyReasonAfterALaterInstallCompletes() { + val context = packedContext() + val maintenance = LinuxRuntimeInstaller.beginMaintenance(context, "maintenance")!! + try { + assertFalse(LinuxRuntimeInstaller.install(context, + LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:1/runtime.tar.zst", "a".repeat(64), 1L), null)) + } finally { + assertTrue(maintenance.run(null) { null }) + } + var later: String? = null + Thread { later = failedInstall(context, "HTTP/1.1 404 Not Found") }.apply { start(); join(10000) } + assertEquals("Cannot download the runtime: 127.0.0.1: HTTP 404", later) + assertEquals("Runtime busy: maintenance in progress", LinuxRuntimeInstaller.installError()) + } + + @Test fun aJoinedInstallReportsTheReasonOfTheInstallItJoined() { + val context = packedContext() + val server = ServerSocket(0) + val accepted = java.util.concurrent.CountDownLatch(1) + val answer = java.util.concurrent.CountDownLatch(1) + val attached = java.util.concurrent.CountDownLatch(1) + val joinedDone = java.util.concurrent.CountDownLatch(1) + val readNow = java.util.concurrent.CountDownLatch(1) + val stall = Thread { + runCatching { + server.accept().use { socket -> + accepted.countDown() + answer.await() + socket.getOutputStream().write("HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\nConnection: close\r\n\r\n".toByteArray()) + } + } + }.apply { isDaemon = true; start() } + val release = LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:${server.localPort}/runtime.tar.zst", "a".repeat(64), 1L) + val owner = Thread { LinuxRuntimeInstaller.install(context, release, null) }.apply { isDaemon = true; start() } + var joinedResult = true + var joinedReason: String? = null + val joiner = Thread { + joinedResult = LinuxRuntimeInstaller.install(context, release) { _, _ -> attached.countDown() } + joinedDone.countDown() + readNow.await() + joinedReason = LinuxRuntimeInstaller.installError() + } + try { + assertTrue(accepted.await(10, java.util.concurrent.TimeUnit.SECONDS)) + joiner.apply { isDaemon = true; start() } + assertTrue(attached.await(10, java.util.concurrent.TimeUnit.SECONDS)) + answer.countDown() + assertTrue(joinedDone.await(10, java.util.concurrent.TimeUnit.SECONDS)) + owner.join(10000) + assertEquals("Cannot download the runtime: 127.0.0.1: HTTP 403", failedInstall(context, "HTTP/1.1 403 Forbidden")) + readNow.countDown() + joiner.join(10000) + } finally { + answer.countDown() + readNow.countDown() + server.close() + stall.join(1000) + } + assertFalse(joinedResult) + assertEquals("Cannot download the runtime: 127.0.0.1: HTTP 404", joinedReason) + } + + @Test fun anInterruptedJoinKeepsItsInterruptedReasonWhenTheOwnerFinishesFirst() { + val context = packedContext() + val server = ServerSocket(0) + val accepted = java.util.concurrent.CountDownLatch(1) + val answer = java.util.concurrent.CountDownLatch(1) + val stall = Thread { + runCatching { + server.accept().use { socket -> + accepted.countDown() + answer.await() + socket.getOutputStream().write("HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\nConnection: close\r\n\r\n".toByteArray()) + } + } + }.apply { isDaemon = true; start() } + val release = LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:${server.localPort}/runtime.tar.zst", "a".repeat(64), 1L) + val ownerReason = arrayOfNulls(1) + val owner = Thread { + LinuxRuntimeInstaller.install(context, release, null) + ownerReason[0] = LinuxRuntimeInstaller.installError() + }.apply { isDaemon = true; start() } + var joinedResult = true + var joinedReason: String? = null + val ownerFinished = AtomicBoolean() + lateinit var joiner: Thread + joiner = Thread { + joinedResult = LinuxRuntimeInstaller.install(context, release) { _, _ -> + if (Thread.currentThread() === joiner && ownerFinished.compareAndSet(false, true)) { + answer.countDown() + owner.join(10000) + Thread.currentThread().interrupt() + } + } + joinedReason = LinuxRuntimeInstaller.installError() + Thread.interrupted() + } + try { + assertTrue(accepted.await(10, java.util.concurrent.TimeUnit.SECONDS)) + joiner.apply { isDaemon = true; start() } + joiner.join(10000) + } finally { + answer.countDown() + owner.join(10000) + server.close() + stall.join(1000) + } + assertTrue(ownerFinished.get()) + assertFalse(owner.isAlive) + assertEquals("Cannot download the runtime: 127.0.0.1: HTTP 404", ownerReason[0]) + assertFalse(joinedResult) + assertEquals("Runtime install interrupted while waiting for the running install", joinedReason) + } + + @Test fun aFinishedInstallKeepsNoReferenceToItsListener() { + val context = packedContext() + val server = ServerSocket(0) + val thread = serveOnce(server, "HTTP/1.1 403 Forbidden") + try { + val release = LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:${server.localPort}/runtime.tar.zst", "a".repeat(64), 1L) + assertFalse(LinuxRuntimeInstaller.install(context, release) { _, _ -> }) + } finally { + server.close() + thread.join(1000) + } + val job = (LinuxRuntimeInstaller::class.java.getDeclaredField("LAST_INSTALL").apply { isAccessible = true }.get(null) as ThreadLocal<*>).get()!! + val listeners = job.javaClass.getDeclaredField("listeners").apply { isAccessible = true }.get(job) as Collection<*> + assertTrue(listeners.isEmpty()) + } + + @Test fun aFailedSwapNamesTheStep() { + assertFalse(attempt(failRollback = false).result) + assertTrue(LinuxRuntimeInstaller.installError().orEmpty().startsWith("Cannot carry user data into the new runtime")) + } } From c847659789e6f8ae7f28a795a8be449a636b4c27 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 14 Nov 2026 15:39:15 -0500 Subject: [PATCH 098/101] feat(setup): arrange tabs in one list with drag handles, a More line and a shown switch (#2627) --- .../launcher/ui/HudReadingsDialog.kt | 2 +- .../java/com/droiddeck/launcher/ui/NavTabs.kt | 29 +- .../com/droiddeck/launcher/ui/TabsSettings.kt | 265 +++++++++++++----- app/src/main/res/values-ar/strings.xml | 5 - app/src/main/res/values-b+es+419/strings.xml | 5 - app/src/main/res/values-bg/strings.xml | 5 - app/src/main/res/values-cs/strings.xml | 5 - app/src/main/res/values-da/strings.xml | 5 - app/src/main/res/values-de/strings.xml | 5 - app/src/main/res/values-el/strings.xml | 5 - app/src/main/res/values-es/strings.xml | 5 - app/src/main/res/values-fi/strings.xml | 5 - app/src/main/res/values-fr/strings.xml | 5 - app/src/main/res/values-hi/strings.xml | 5 - app/src/main/res/values-hu/strings.xml | 5 - app/src/main/res/values-in/strings.xml | 5 - app/src/main/res/values-it/strings.xml | 5 - app/src/main/res/values-ja/strings.xml | 5 - app/src/main/res/values-ko/strings.xml | 5 - app/src/main/res/values-ms/strings.xml | 5 - app/src/main/res/values-nb/strings.xml | 5 - app/src/main/res/values-nl/strings.xml | 5 - app/src/main/res/values-pl/strings.xml | 5 - app/src/main/res/values-pt-rPT/strings.xml | 5 - app/src/main/res/values-pt/strings.xml | 5 - app/src/main/res/values-ro/strings.xml | 5 - app/src/main/res/values-ru/strings.xml | 5 - app/src/main/res/values-sv/strings.xml | 5 - app/src/main/res/values-th/strings.xml | 5 - app/src/main/res/values-tr/strings.xml | 5 - app/src/main/res/values-uk/strings.xml | 5 - app/src/main/res/values-vi/strings.xml | 5 - app/src/main/res/values-zh-rCN/strings.xml | 5 - app/src/main/res/values-zh-rHK/strings.xml | 5 - app/src/main/res/values-zh-rTW/strings.xml | 5 - app/src/main/res/values/strings.xml | 5 - .../com/droiddeck/launcher/ui/NavTabsTest.kt | 77 +++-- 37 files changed, 269 insertions(+), 269 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt index 29faced7a6..4d3cc47af5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt @@ -108,7 +108,7 @@ private fun HudKeyHints(grabbed: String?, resetFill: Float) { } @Composable -private fun KeyHint(key: String, label: String, fill: Float = 0f) { +internal fun KeyHint(key: String, label: String, fill: Float = 0f) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(HINT_GAP), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt index af16570d97..17f1478201 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt @@ -69,23 +69,18 @@ internal object NavTabs { return if (more(s).isEmpty()) shown else shown + MORE } - fun move(context: Context, s: FrontEndState, key: String, step: Int) { - val visible = listed(s) - val at = visible.indexOf(key) - val other = visible.getOrNull(at + step) ?: return - val next = order.toMutableList() - val i = next.indexOf(key) - val j = next.indexOf(other) - next[i] = other - next[j] = key - order = next - SessionPrefs.setNavTabOrder(context, next) - } - - fun setPlace(context: Context, key: String, place: TabPlace) { - shelved = if (place == TabPlace.MORE) shelved + key else shelved - key - hidden = if (place == TabPlace.HIDDEN && hideable(key) && key !in FEATURES) hidden + key else hidden - key - SessionPrefs.setNavTabShelved(context, shelved) + fun setHidden(context: Context, key: String, hide: Boolean) { + hidden = if (hide && hideable(key) && key !in FEATURES) hidden + key else hidden - key SessionPrefs.setNavTabHidden(context, hidden) } + + fun rearrange(context: Context, s: FrontEndState, bar: List, more: List) { + val placed = bar + more + if (placed.toSet() != listed(s).toSet()) return + val next = placed.iterator() + order = order.map { if (it in placed) next.next() else it } + shelved = shelved - placed.toSet() + more + SessionPrefs.setNavTabOrder(context, order) + SessionPrefs.setNavTabShelved(context, shelved) + } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt index 3b964d8983..475c400b16 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt @@ -1,8 +1,10 @@ package com.droiddeck.launcher.ui -import androidx.compose.foundation.LocalIndication +import android.view.KeyEvent import androidx.compose.foundation.background -import androidx.compose.foundation.clickable +import androidx.compose.foundation.focusable +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -17,34 +19,57 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.relocation.BringIntoViewRequester import androidx.compose.foundation.relocation.bringIntoViewRequester -import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.KeyboardArrowDown -import androidx.compose.material.icons.outlined.KeyboardArrowUp +import androidx.compose.material.icons.filled.DragHandle import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue import androidx.compose.runtime.key +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.semantics.contentDescription -import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.compose.ui.zIndex import com.droiddeck.launcher.R import com.droiddeck.launcher.agent.AgentTab +import kotlin.math.roundToInt + +private const val MORE_LINE = "|more|" +private val TAB_ROW = 52.dp +private val TAB_HANDLE = 44.dp + +internal fun tabRows(bar: List, more: List) = bar + MORE_LINE + more + +internal fun moveTabRow(rows: List, key: String, step: Int): List? { + val from = rows.indexOf(key) + val to = from + step + if (from < 0 || to !in rows.indices) return null + return rows.toMutableList().apply { add(to, removeAt(from)) } +} @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable @@ -57,86 +82,188 @@ internal fun TabsSettingsGroup(host: MenuHost, s: FrontEndState, a: FrontEndActi androidx.compose.runtime.withFrameNanos { } reveal.bringIntoView() } - val shown = stringResource(R.string.tabs_place_bar) - val more = stringResource(R.string.tabs_place_more) - val hidden = stringResource(R.string.tabs_place_hidden) - val keys = NavTabs.listed(s) - fun pick(key: String, place: TabPlace) { - when (key) { - "stores" -> if ((place != TabPlace.HIDDEN) != s.gameStoresEnabled) a.onGameStoresEnabled(place != TabPlace.HIDDEN) - "soundtracks" -> if ((place != TabPlace.HIDDEN) != s.soundtracksEnabled) a.onSoundtracksEnabled(place != TabPlace.HIDDEN) - "agent" -> if ((place != TabPlace.HIDDEN) != AgentTab.shown) AgentTab.set(ctx, place != TabPlace.HIDDEN) - } - NavTabs.setPlace(ctx, key, place) + val pad = LocalInputModeManager.current.inputMode == InputMode.Keyboard + val state by rememberUpdatedState(s) + val rows = { + val keys = NavTabs.listed(state) + tabRows(keys.filter { it !in NavTabs.shelved }, keys.filter { it in NavTabs.shelved }) } + val commit = { next: List -> + val split = next.indexOf(MORE_LINE) + NavTabs.rearrange(ctx, state, next.subList(0, split), next.subList(split + 1, next.size)) + } + fun setShown(key: String, show: Boolean) { + when (key) { + "stores" -> if (show != s.gameStoresEnabled) a.onGameStoresEnabled(show) + "soundtracks" -> if (show != s.soundtracksEnabled) a.onSoundtracksEnabled(show) + "agent" -> if (show != AgentTab.shown) AgentTab.set(ctx, show) + } + NavTabs.setHidden(ctx, key, !show) + } + + var dragging by remember { mutableStateOf(null) } + var dragOffset by remember { mutableFloatStateOf(0f) } + var grabbed by remember { mutableStateOf(null) } + var before by remember { mutableStateOf>(emptyList()) } + var focused by remember { mutableStateOf(null) } + val rowPx = with(LocalDensity.current) { TAB_ROW.toPx() } + val handlePx = with(LocalDensity.current) { TAB_HANDLE.toPx() } + val list = rows() + Box(Modifier.bringIntoViewRequester(reveal)) { SettingsGroup(stringResource(R.string.setup_group_tabs)) { - keys.forEachIndexed { index, tab -> - key(tab) { - val options = buildList { - add(TabPlace.BAR to shown) - add(TabPlace.MORE to more) - if (NavTabs.hideable(tab)) add(TabPlace.HIDDEN to hidden) + Column( + Modifier.fillMaxWidth().pointerInput(Unit) { + awaitEachGesture { + val down = awaitFirstDown(requireUnconsumed = false) + val start = (down.position.y / rowPx).toInt() + val key = rows().getOrNull(start) + if (key == null || key == MORE_LINE || down.position.x > handlePx || grabbed != null) return@awaitEachGesture + down.consume() + dragging = key + dragOffset = 0f + while (true) { + val change = awaitPointerEvent(PointerEventPass.Initial).changes.firstOrNull { it.id == down.id } ?: break + change.consume() + if (!change.pressed) break + val travel = change.position.y - down.position.y + val current = rows() + val target = (start + (travel / rowPx).roundToInt()).coerceIn(0, current.lastIndex) + var at = current.indexOf(key) + var next = current + while (target != at) { + next = moveTabRow(next, key, if (target > at) 1 else -1) ?: break + at = next.indexOf(key) + } + if (next !== current) commit(next) + dragOffset = travel - (at - start) * rowPx + } + dragging = null + dragOffset = 0f + } + }, + ) { + list.forEachIndexed { index, tab -> + key(tab) { + if (tab == MORE_LINE) { + MoreLine() + } else { + val shown = NavTabs.place(s, tab) != TabPlace.HIDDEN + val held = tab == dragging || tab == grabbed + val bring = remember { BringIntoViewRequester() } + LaunchedEffect(index, grabbed) { if (grabbed == tab) bring.bringIntoView() } + TabRow( + tab, shown, NavTabs.hideable(tab), held, + offset = if (tab == dragging) dragOffset else 0f, + hint = if (pad && focused == tab) stringResource(if (grabbed == tab) R.string.hud_hint_drop else R.string.hud_hint_grab) else null, + modifier = Modifier.bringIntoViewRequester(bring) + .onPreviewKeyEvent { event -> + val e = event.nativeKeyEvent + val down = e.action == KeyEvent.ACTION_DOWN + val first = down && e.repeatCount == 0 + val mine = grabbed == tab + when (e.keyCode) { + KeyEvent.KEYCODE_BUTTON_Y -> { + if (first) { + if (mine) grabbed = null + else if (grabbed == null) { before = rows(); grabbed = tab } + } + true + } + KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN -> { + if (mine && down) moveTabRow(rows(), tab, if (e.keyCode == KeyEvent.KEYCODE_DPAD_UP) -1 else 1)?.let(commit) + mine + } + KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT -> mine + KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BACK -> { + if (mine && first) { commit(before); grabbed = null } + mine + } + KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_SPACE -> { + if (first) { + if (mine) grabbed = null + else if (NavTabs.hideable(tab)) setShown(tab, !shown) + } + true + } + else -> false + } + }, + onFocus = { if (it) focused = tab else if (focused == tab) { focused = null; if (grabbed == tab) grabbed = null } }, + ) { host.open = null; setShown(tab, it) } + } } - TabRow( - host, tab, NavTabs.place(s, tab), options, - canUp = index > 0, canDown = index < keys.lastIndex, - onMove = { step -> NavTabs.move(ctx, s, tab, step) }, - onPick = { pick(tab, it) }, - ) } } } } } +@Composable +private fun MoreLine() { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column(Modifier.fillMaxWidth().height(TAB_ROW).testTag("tab-more-line")) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().weight(1f).background(colors.surfaceVariant.copy(alpha = 0.35f)).padding(horizontal = 14.dp), + ) { + Icon(railLabelIcon(NavTabs.MORE).second, null, tint = colors.onSurfaceVariant, modifier = Modifier.size(18.dp)) + Text( + stringResource(R.string.rail_more).uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, + letterSpacing = 1.5.sp, color = colors.onSurfaceVariant, + ) + Box(Modifier.weight(1f).height(1.dp).background(pal.line2)) + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } +} + @Composable private fun TabRow( - host: MenuHost, tab: String, place: TabPlace, options: List>, - canUp: Boolean, canDown: Boolean, onMove: (Int) -> Unit, onPick: (TabPlace) -> Unit, + tab: String, shown: Boolean, hideable: Boolean, held: Boolean, offset: Float, hint: String?, + modifier: Modifier, onFocus: (Boolean) -> Unit, onShown: (Boolean) -> Unit, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val (labelRes, icon) = railLabelIcon(tab) val label = stringResource(labelRes) - val open = host.open == "tab-$tab" - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = Modifier.fillMaxWidth() - .background(if (open) pal.signal.copy(alpha = 0.10f) else androidx.compose.ui.graphics.Color.Transparent) - .padding(start = 14.dp, end = 10.dp, top = 6.dp, bottom = 6.dp), + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Column( + modifier.fillMaxWidth().height(TAB_ROW).testTag("tab-row-$tab") + .zIndex(if (held) 1f else 0f) + .graphicsLayer { translationY = offset } + .background(if (held) colors.surfaceVariant else colors.surface) + .glideBorder(hot, Shape12, pal.signal) + .onFocusChanged { onFocus(it.isFocused) } + .hoverable(src) + .focusable(interactionSource = src), ) { Row( verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.weight(1f).alpha(if (place == TabPlace.HIDDEN) 0.5f else 1f), + horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().weight(1f).padding(end = 10.dp), ) { - Icon(icon, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) - Spacer(Modifier.width(12.dp)) - Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(width = TAB_HANDLE, height = TAB_ROW).testTag("tab-handle-$tab")) { + Icon(Icons.Filled.DragHandle, null, tint = if (held) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + } + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f).alpha(if (shown) 1f else 0.5f), + ) { + Icon(icon, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + Spacer(Modifier.width(12.dp)) + Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + if (hint != null) KeyHint("Y", hint) + ToggleSwitch( + shown, hideable, label, + Modifier.testTag("tab-shown-$tab").focusProperties { canFocus = false }, + onChange = onShown, + ) } - MoveButton(Icons.Outlined.KeyboardArrowUp, stringResource(R.string.tabs_move_up, label), canUp, "tab-up-$tab") { onMove(-1) } - MoveButton(Icons.Outlined.KeyboardArrowDown, stringResource(R.string.tabs_move_down, label), canDown, "tab-down-$tab") { onMove(1) } - ChoiceChip(host, "tab-$tab", label, options, place, onPick = onPick) + Box(Modifier.fillMaxWidth().height(1.dp).background(if (held) Color.Transparent else pal.line)) } - Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) -} - -@Composable -private fun MoveButton(icon: ImageVector, description: String, enabled: Boolean, tag: String, onClick: () -> Unit) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.testTag(tag).size(40.dp).clip(CircleShape) - .background(colors.surfaceVariant) - .glideBorder(hot, CircleShape, pal.signal, pal.line2) - .alpha(if (enabled) 1f else 0.35f) - .hoverable(src) - .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button) { if (enabled) onClick() } - .controllerConfirm { if (enabled) onClick() } - .semantics { contentDescription = description }, - ) { Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b16f0b1821..7e7535eabb 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1486,11 +1486,6 @@ المزيد تعديل التبويبات التبويبات - معروض - في المزيد - مخفي - نقل %1$s إلى الأعلى - نقل %1$s إلى الأسفل %1$d%% استئناف %1$s يظهر باسم /root/ROMs في كل جلسة. مساحة التخزين الداخلية متاحة في /root/Storage. 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 ae1cc67b96..02a7a970e0 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1532,11 +1532,6 @@ Más Editar pestañas Pestañas - Mostrada - En Más - Oculta - Mover %1$s hacia arriba - Mover %1$s hacia abajo %1$d%% Reanudar %1$s Aparece como /root/ROMs en cada sesión. El almacenamiento interno está en /root/Storage. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 68b60481bc..c3b6277b4e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1454,11 +1454,6 @@ Още Редактирай раздели Раздели - Показан - В „Още“ - Скрит - Премести %1$s нагоре - Премести %1$s надолу %1$d%% Продължаване на %1$s Показва се като /root/ROMs във всяка сесия. Вътрешната памет е на /root/Storage. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e12cf6ab72..0e14f29976 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1470,11 +1470,6 @@ Více Upravit karty Karty - Zobrazeno - V nabídce Více - Skryto - Posunout %1$s nahoru - Posunout %1$s dolů %1$d%% Obnovit %1$s V každé relaci se zobrazí jako /root/ROMs. Vnitřní úložiště je v /root/Storage. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f380f5c2e6..77e5d84cbe 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1454,11 +1454,6 @@ Mere Rediger faner Faner - Vist - I Mere - Skjult - Flyt %1$s op - Flyt %1$s ned %1$d%% Genoptag %1$s Vises som /root/ROMs i hver session. Intern lagerplads er på /root/Storage. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index caac47913b..29bfc02e8e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1446,11 +1446,6 @@ Mehr Tabs bearbeiten Tabs - Angezeigt - In „Mehr“ - Ausgeblendet - %1$s nach oben verschieben - %1$s nach unten verschieben %1$d %% %1$s fortsetzen Erscheint in jeder Sitzung als /root/ROMs. Der interne Speicher liegt unter /root/Storage. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index affba8acb3..56c2132676 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1454,11 +1454,6 @@ Περισσότερα Επεξεργασία καρτελών Καρτέλες - Εμφανής - Στα Περισσότερα - Κρυφή - Μετακινήστε %1$s προς τα πάνω - Μετακινήστε %1$s προς τα κάτω %1$d%% Συνέχιση %1$s Εμφανίζεται ως /root/ROMs σε κάθε συνεδρία. Ο εσωτερικός χώρος αποθήκευσης βρίσκεται στο /root/Storage. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 415c11ec37..275cc3c2d1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1462,11 +1462,6 @@ Más Editar pestañas Pestañas - Visible - En Más - Oculta - Mover %1$s hacia arriba - Mover %1$s hacia abajo %1$d%% Reanudar %1$s Aparece como /root/ROMs en cada sesión. El almacenamiento interno está en /root/Storage. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1bdd0d6c7a..df6a488e98 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1454,11 +1454,6 @@ Lisää Muokkaa välilehtiä Välilehdet - Näkyvissä - Lisää-valikossa - Piilotettu - Siirrä %1$s ylös - Siirrä %1$s alas %1$d %% Jatka: %1$s Näkyy sessiossa polussa /root/ROMs. Sisäinen tallennustila on /root/Storage. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9b28c3ffe4..8e422b5590 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1461,11 +1461,6 @@ Plus Modifier les onglets Onglets - Affiché - Dans Plus - Masqué - Déplacer %1$s vers le haut - Déplacer %1$s vers le bas %1$d%% Reprendre %1$s Affiché comme /root/ROMs dans chaque session. Le stockage interne se trouve dans /root/Storage. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 6cfb2f4fa9..1c294fdbeb 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1454,11 +1454,6 @@ अधिक टैब्स संपादित करें टैब्स - दिखाया जाए - अधिक में - छिपाया जाए - %1$s को ऊपर ले जाएँ - %1$s को नीचे ले जाएँ %1$d%% %1$s फिर से शुरू करें हर सेशन में /root/ROMs के रूप में दिखता है। इंटरनल स्टोरेज /root/Storage पर है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4c91fda1c0..f8f16f0eea 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1454,11 +1454,6 @@ Továbbiak Fülek szerkesztése Fülek - Látható - A Továbbiakban - Rejtett - %1$s mozgatása felfelé - %1$s mozgatása lefelé %1$d%% %1$s folytatása Minden munkamenetben /root/ROMs néven jelenik meg. A belső tárhely itt található: /root/Storage. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1850ac323a..5b5f5ee99d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1447,11 +1447,6 @@ Lainnya Edit tab Tab - Ditampilkan - Di Lainnya - Disembunyikan - Pindahkan %1$s ke atas - Pindahkan %1$s ke bawah %1$d%% Lanjutkan %1$s Muncul sebagai /root/ROMs di setiap sesi. Penyimpanan internal berada di /root/Storage. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 13fef9c32a..a677a289b0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1453,11 +1453,6 @@ Altro Modifica schede Schede - Visibile - Nella sezione Altro - Nascosta - Sposta %1$s in alto - Sposta %1$s in basso %1$d%% Riprendi %1$s Appare come /root/ROMs in ogni sessione. La memoria interna si trova in /root/Storage. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index eb20cfd0f0..0ebe258634 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1447,11 +1447,6 @@ その他 タブを編集 タブ - 表示 - 「その他」に表示 - 非表示 - %1$s を上に移動 - %1$s を下に移動 %1$d%% %1$sを再開 各セッションで /root/ROMs として表示されます。内部ストレージは /root/Storage にあります。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7460521d62..e0482bcee0 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1447,11 +1447,6 @@ 더보기 탭 편집 탭 - 표시 - 더보기 안 - 숨김 - %1$s 위로 이동 - %1$s 아래로 이동 %1$d%% %1$s 재개 각 세션에서 /root/ROMs로 표시됩니다. 내부 저장 공간은 /root/Storage에 있습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 76ea30bf09..978ab19ffc 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1447,11 +1447,6 @@ Lagi Sunting tab Tab - Dipaparkan - Dalam Lagi - Disembunyikan - Alih %1$s ke atas - Alih %1$s ke bawah %1$d%% Sambung %1$s Muncul sebagai /root/ROMs dalam setiap sesi. Storan dalaman berada di /root/Storage. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 452f343a26..4c9931ca33 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1454,11 +1454,6 @@ Mer Rediger faner Faner - Synlig - I Mer - Skjult - Flytt %1$s opp - Flytt %1$s ned %1$d%% Gjenoppta %1$s Vises som /root/ROMs i hver sesjon. Intern lagring er på /root/Storage. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ce006058d7..68e7983d02 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1454,11 +1454,6 @@ Meer Tabbladen bewerken Tabbladen - Weergegeven - In Meer - Verborgen - %1$s naar boven verplaatsen - %1$s naar beneden verplaatsen %1$d%% %1$s hervatten Verschijnt in elke sessie als /root/ROMs. Interne opslag staat op /root/Storage. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index e0089c2f7b..1a7f2e4f87 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1470,11 +1470,6 @@ Więcej Edytuj karty Karty - Widoczne - W menu Więcej - Ukryte - Przesuń %1$s w górę - Przesuń %1$s w dół %1$d%% Wznów %1$s W każdej sesji widoczny jako /root/ROMs. Pamięć wewnętrzna jest w /root/Storage. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 19f5b4feee..8ed6c78568 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1453,11 +1453,6 @@ Mais Editar separadores Separadores - Visível - Em Mais - Oculto - Mover %1$s para cima - Mover %1$s para baixo %1$d%% Retomar %1$s Aparece como /root/ROMs em cada sessão. O armazenamento interno está em /root/Storage. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 44bd83f4fb..d6623028fb 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1454,11 +1454,6 @@ Mais Editar abas Abas - Visível - Em Mais - Oculto - Mover %1$s para cima - Mover %1$s para baixo %1$d%% Retomar %1$s Aparece como /root/ROMs em cada sessão. O armazenamento interno fica em /root/Storage. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 24f25ba356..4788d92384 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1462,11 +1462,6 @@ Mai multe Editează taburile Taburi - Afișat - În meniul Mai multe - Ascuns - Mută %1$s în sus - Mută %1$s în jos %1$d%% Reluare %1$s Apare ca /root/ROMs în fiecare sesiune. Stocarea internă este la /root/Storage. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d11a3f5a71..007c897ef5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1470,11 +1470,6 @@ Ещё Настроить вкладки Вкладки - Отображается - В «Ещё» - Скрыто - Переместить %1$s вверх - Переместить %1$s вниз %1$d%% Продолжить %1$s Отображается как /root/ROMs в каждой сессии. Внутреннее хранилище находится в /root/Storage. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ee0b3ee885..4b9d2ad460 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1454,11 +1454,6 @@ Mer Redigera flikar Flikar - Visas - I Mer - Dold - Flytta upp %1$s - Flytta ner %1$s %1$d %% Återuppta %1$s Visas som /root/ROMs i varje session. Det interna lagringsutrymmet finns på /root/Storage. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d0e63d7f7e..5e8be9a4d8 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1447,11 +1447,6 @@ เพิ่มเติม แก้ไขแท็บ แท็บ - แสดง - ในเพิ่มเติม - ซ่อน - ย้าย %1$s ขึ้น - ย้าย %1$s ลง %1$d%% ดำเนินการต่อ %1$s แสดงเป็น /root/ROMs ในแต่ละเซสชัน พื้นที่จัดเก็บภายในอยู่ที่ /root/Storage diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 6c21b94ccf..93bbe73c58 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1446,11 +1446,6 @@ Diğer Sekmeleri düzenle Sekmeler - Görünür - Diğer\'de - Gizli - %1$s sekmesini yukarı taşı - %1$s sekmesini aşağı taşı %%%1$d Devam et: %1$s Her oturumda /root/ROMs olarak görünür. Dahili depolama /root/Storage konumundadır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0f555ebca8..60cef3ca95 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1470,11 +1470,6 @@ Ще Редагувати вкладки Вкладки - Показано - У «Ще» - Приховано - Перемістити %1$s вгору - Перемістити %1$s вниз %1$d%% Продовжити %1$s У кожному сеансі з’являється як /root/ROMs. Внутрішня пам’ять доступна в /root/Storage. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a8c2808cc1..90588d0191 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1447,11 +1447,6 @@ Khác Chỉnh sửa thẻ Thẻ - Hiển thị - Trong mục Khác - Ẩn - Chuyển %1$s lên - Chuyển %1$s xuống %1$d%% Tiếp tục %1$s Hiển thị như /root/ROMs trong mỗi phiên. Bộ nhớ trong ở /root/Storage. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bd57054084..45c3669b17 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1530,11 +1530,6 @@ 更多 编辑标签页 标签页 - 显示 - 在“更多”中 - 隐藏 - 将 %1$s 上移 - 将 %1$s 下移 %1$d%% 恢复 %1$s 在每个会话中显示为 /root/ROMs。内部存储位于 /root/Storage。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 68ed43f73f..fdcb636916 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1446,11 +1446,6 @@ 更多 編輯分頁 分頁 - 顯示 - 「更多」內 - 隱藏 - 將 %1$s 上移 - 將 %1$s 下移 %1$d%% 繼續 %1$s 在每個會話中顯示為 /root/ROMs。內部儲存空間位於 /root/Storage。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 037afc6039..eca4bcbe72 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1446,11 +1446,6 @@ 更多 編輯頁籤 頁籤 - 顯示 - 放在「更多」 - 隱藏 - 將 %1$s 上移 - 將 %1$s 下移 %1$d%% 繼續 %1$s 每個工作階段中顯示為 /root/ROMs。內部儲存空間位於 /root/Storage。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba42f01bf9..3b9c7c9c4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1577,11 +1577,6 @@ More Edit tabs Tabs - Shown - In More - Hidden - Move %1$s up - Move %1$s down %1$d%% Resume %1$s Shows up as /root/ROMs in each session. Internal storage is at /root/Storage. diff --git a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt index 41f8333147..c7ff2b12b4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt @@ -11,6 +11,10 @@ import androidx.compose.ui.test.hasTestTag import androidx.compose.ui.test.hasText import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performKeyPress +import androidx.compose.ui.test.requestFocus +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.ui.unit.dp import androidx.test.core.app.ApplicationProvider import org.junit.After @@ -44,23 +48,23 @@ class NavTabsTest { } @Test fun showingMusicOnceKeepsItShownAfterReload() { - NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR) + place("soundtracks", TabPlace.BAR) NavTabs.load(ctx) assertEquals(listOf("steam", "games", "soundtracks", "stores", "desktop", "components", "setup", "updates"), navigationKeys(state())) } @Test fun shelvedTabsLeaveTheBarAndAddMoreAtTheEnd() { - NavTabs.setPlace(ctx, "stores", TabPlace.MORE) - NavTabs.setPlace(ctx, "components", TabPlace.MORE) + place("stores", TabPlace.MORE) + place("components", TabPlace.MORE) val s = state() - assertEquals(listOf("soundtracks", "stores", "components"), NavTabs.more(s)) + assertEquals(listOf("components", "soundtracks", "stores"), NavTabs.more(s)) assertEquals(NavTabs.MORE, navigationKeys(s).last()) assertFalse("stores" in navigationKeys(s)) } @Test fun hiddenTabsAreNowhereAndSetupCannotBeHidden() { - NavTabs.setPlace(ctx, "updates", TabPlace.HIDDEN) - NavTabs.setPlace(ctx, "setup", TabPlace.HIDDEN) + place("updates", TabPlace.HIDDEN) + place("setup", TabPlace.HIDDEN) val s = state() assertFalse("updates" in navigationKeys(s)) assertFalse("updates" in NavTabs.more(s)) @@ -72,8 +76,8 @@ class NavTabsTest { } @Test fun movingSwapsWithTheNextVisibleTabAndPersists() { - NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR) - NavTabs.move(ctx, state(), "stores", -1) + place("soundtracks", TabPlace.BAR) + moveTab("stores", -1) assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) NavTabs.load(ctx) assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) @@ -87,18 +91,18 @@ class NavTabsTest { } @Test fun moreCarriesTheDownloadCountAndBadgesOfShelvedTabs() { - NavTabs.setPlace(ctx, "stores", TabPlace.MORE) - NavTabs.setPlace(ctx, "setup", TabPlace.MORE) + place("stores", TabPlace.MORE) + place("setup", TabPlace.MORE) val s = state(downloads = 3, setupReady = false) assertEquals(3, railCount(s, NavTabs.MORE)) assertTrue(railBadge(s, NavTabs.MORE)) - NavTabs.setPlace(ctx, "stores", TabPlace.BAR) + place("stores", TabPlace.BAR) assertEquals(0, railCount(s, NavTabs.MORE)) assertEquals(3, railCount(s, "stores")) } @Test fun sideRailShowsTheDownloadCountOnMoreWhenStoresIsShelved() { - NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + place("stores", TabPlace.MORE) val s = state(downloads = 2) compose.setContent { DroidDeckTheme { @@ -113,8 +117,8 @@ class NavTabsTest { } @Test fun morePageListsShelvedTabsWithTheirCount() { - NavTabs.setPlace(ctx, "stores", TabPlace.MORE) - NavTabs.setPlace(ctx, "components", TabPlace.MORE) + place("stores", TabPlace.MORE) + place("components", TabPlace.MORE) val s = state(downloads = 4) compose.setContent { DroidDeckTheme { @@ -129,7 +133,7 @@ class NavTabsTest { } @Test fun backFromAShelvedTabReturnsToMore() { - NavTabs.setPlace(ctx, "desktop", TabPlace.MORE) + place("desktop", TabPlace.MORE) var back: androidx.activity.OnBackPressedDispatcher? = null compose.mainClock.autoAdvance = false compose.setContent { @@ -148,8 +152,8 @@ class NavTabsTest { } @Test fun startupWithSteamHiddenNeverLandsOnABareComponentsSelection() { - NavTabs.setPlace(ctx, "steam", TabPlace.HIDDEN) - repeat(NavTabs.ALL.size) { NavTabs.move(ctx, state(), "components", -1) } + place("steam", TabPlace.HIDDEN) + repeat(NavTabs.ALL.size) { moveTab("components", -1) } assertEquals("components", navigationKeys(state()).first()) compose.mainClock.autoAdvance = false compose.setContent { DroidDeckTheme { FrontEndScreen(state(), actions(), page = null) } } @@ -158,6 +162,45 @@ class NavTabsTest { compose.onNode(hasTestTag("rail-games") and androidx.compose.ui.test.isSelected()).assertExists() } + @Test fun setupListMovesATabAcrossTheMoreLineWithTheControllerAndHidesWithItsSwitch() { + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + androidx.compose.foundation.layout.Column(Modifier.height(752.dp).verticalScroll(rememberScrollState())) { + TabsSettingsGroup(MenuHost(), state(), actions()) + } + } + } + } + val last = navigationKeys(state()).last { it != NavTabs.MORE } + compose.onNodeWithTag("tab-row-$last").requestFocus() + compose.onNodeWithTag("tab-row-$last").performKeyPress(pad(android.view.KeyEvent.KEYCODE_BUTTON_Y)) + compose.onNodeWithTag("tab-row-$last").performKeyPress(pad(android.view.KeyEvent.KEYCODE_DPAD_DOWN)) + compose.onNodeWithTag("tab-row-$last").performKeyPress(pad(android.view.KeyEvent.KEYCODE_BUTTON_Y)) + compose.runOnIdle { assertEquals(last, NavTabs.more(state()).first()) } + compose.onNodeWithTag("tab-shown-desktop").performClick() + compose.runOnIdle { assertFalse("desktop" in navigationKeys(state())) } + compose.onNodeWithTag("tab-shown-setup").performClick() + compose.runOnIdle { assertTrue("setup" in navigationKeys(state())) } + } + + private fun pad(code: Int) = androidx.compose.ui.input.key.KeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, code)) + + private fun place(key: String, where: TabPlace, s: FrontEndState = state()) { + NavTabs.setHidden(ctx, key, where == TabPlace.HIDDEN) + if (where == TabPlace.HIDDEN) return + val keys = NavTabs.listed(s) + val more = keys.filter { if (it == key) where == TabPlace.MORE else it in NavTabs.shelved } + NavTabs.rearrange(ctx, s, keys - more.toSet(), more) + } + + private fun moveTab(key: String, step: Int, s: FrontEndState = state()) { + val keys = NavTabs.listed(s) + val rows = moveTabRow(tabRows(keys.filter { it !in NavTabs.shelved }, keys.filter { it in NavTabs.shelved }), key, step) ?: return + val split = rows.indexOf(rows.first { it !in keys }) + NavTabs.rearrange(ctx, s, rows.subList(0, split), rows.subList(split + 1, rows.size)) + } + private fun hasParentTag(tag: String) = androidx.compose.ui.test.hasAnyAncestor(hasTestTag(tag)) private fun state(storesOn: Boolean = true, downloads: Int = 0, setupReady: Boolean = true) = FrontEndState( From 87c571f4432ac3cf3158499fab1c5ad96c3b6439 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 14 Nov 2026 16:20:29 -0500 Subject: [PATCH 099/101] feat(updates): install any kept Preview build, link builds to their PR and commit, flag stale test builds (#2624) * feat(updates): install any kept Preview build, link builds to their PR and commit, flag stale test builds * fix(updates): address review of the Updates tab history and test-build watch * fix(updates): notify on switch to a followed PR, keep higher-version rebuilds installable * fix(ci): let full reruns replace every artifact, note only expired PR builds * fix(ci): leave the rebuild note only when the PR build is too old to rerun * fix(ci): poll unfinished PR builds together and queue version-bump runs * fix(ci): also rebuild PR builds that were running when the versionCode changed * fix(ci): rebuild fork and just-finished PR builds, recheck the PR head before a rerun * fix(ci): fail the rebuild sweep when finding candidates fails * fix(ci): time the bump from the rebuild run's creation and scan unfinished builds of any age * fix(ci): check the latest build of every open PR instead of scanning run history * fix(ci): count PR builds that finish between the version push and the rebuild run * fix(ci): use the push time from the event as the rebuild boundary --- .github/workflows/build.yml | 9 +- .github/workflows/pr-rebuild-on-version.yml | 141 +++++++++ .github/workflows/pr-release-sweep.yml | 6 + app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 4 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../com/droiddeck/launcher/UpdatesMenu.kt | 3 + .../com/droiddeck/launcher/ui/UpdatesPage.kt | 287 +++++++++++++++--- .../droiddeck/launcher/update/AppUpdates.kt | 91 +++++- .../droiddeck/launcher/update/UpdateWatch.kt | 102 +++++++ app/src/main/res/values-ar/strings.xml | 23 ++ app/src/main/res/values-b+es+419/strings.xml | 23 ++ app/src/main/res/values-bg/strings.xml | 23 ++ app/src/main/res/values-cs/strings.xml | 23 ++ app/src/main/res/values-da/strings.xml | 23 ++ app/src/main/res/values-de/strings.xml | 23 ++ app/src/main/res/values-el/strings.xml | 23 ++ app/src/main/res/values-es/strings.xml | 23 ++ app/src/main/res/values-fi/strings.xml | 23 ++ app/src/main/res/values-fr/strings.xml | 23 ++ app/src/main/res/values-hi/strings.xml | 23 ++ app/src/main/res/values-hu/strings.xml | 23 ++ app/src/main/res/values-in/strings.xml | 23 ++ app/src/main/res/values-it/strings.xml | 23 ++ app/src/main/res/values-ja/strings.xml | 23 ++ app/src/main/res/values-ko/strings.xml | 23 ++ app/src/main/res/values-ms/strings.xml | 23 ++ app/src/main/res/values-nb/strings.xml | 23 ++ app/src/main/res/values-nl/strings.xml | 23 ++ app/src/main/res/values-pl/strings.xml | 23 ++ app/src/main/res/values-pt-rPT/strings.xml | 23 ++ app/src/main/res/values-pt/strings.xml | 23 ++ app/src/main/res/values-ro/strings.xml | 23 ++ app/src/main/res/values-ru/strings.xml | 23 ++ app/src/main/res/values-sv/strings.xml | 23 ++ app/src/main/res/values-th/strings.xml | 23 ++ app/src/main/res/values-tr/strings.xml | 23 ++ app/src/main/res/values-uk/strings.xml | 23 ++ app/src/main/res/values-vi/strings.xml | 23 ++ app/src/main/res/values-zh-rCN/strings.xml | 23 ++ app/src/main/res/values-zh-rHK/strings.xml | 23 ++ app/src/main/res/values-zh-rTW/strings.xml | 23 ++ app/src/main/res/values/strings.xml | 23 ++ .../launcher/update/AppUpdatesTest.kt | 76 +++++ tools/release/publish-ci.sh | 5 +- tools/release/update_catalog.py | 159 ++++++++-- tools/tests/test_update_catalog.py | 22 ++ 47 files changed, 1579 insertions(+), 87 deletions(-) create mode 100644 .github/workflows/pr-rebuild-on-version.yml create mode 100644 app/src/main/java/com/droiddeck/launcher/update/UpdateWatch.kt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15f68eb87c..95d036381a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,6 +127,7 @@ jobs: name: xbox-arm64 path: app/src/main/assets/linuxfs/usr/local/lib/droiddeck-xbox retention-days: 14 + overwrite: true - uses: actions/upload-artifact@v4 with: name: xbox-corresponding-source @@ -135,6 +136,7 @@ jobs: app/build/xbox/runtime/*-source.tar.xz if-no-files-found: error retention-days: 14 + overwrite: true components-runner: needs: source @@ -330,6 +332,7 @@ jobs: if-no-files-found: error compression-level: 0 retention-days: 14 + overwrite: true build-runner: needs: [components] @@ -664,6 +667,7 @@ jobs: name: stores-cargo-lock path: app/src/main/rust/stores/Cargo.lock if-no-files-found: ignore + overwrite: true - name: Unit tests id: unit-tests @@ -687,6 +691,7 @@ jobs: app/build/reports/tests/testReleaseUnitTest/ if-no-files-found: ignore retention-days: 14 + overwrite: true - name: Sign with the testkey (v1 + v2 + v3) run: | @@ -724,6 +729,7 @@ jobs: if-no-files-found: error retention-days: 30 compression-level: 0 + overwrite: true - uses: actions/upload-artifact@v4 with: @@ -732,6 +738,7 @@ jobs: if-no-files-found: error retention-days: 30 compression-level: 0 + overwrite: true - name: Report on the pull request if: always() && github.event_name == 'pull_request' @@ -930,7 +937,7 @@ jobs: pull-requests: read env: CI_REPO: Droid-Deck/DroidDeck-CI - KEEP: 10 + KEEP_DAYS: 14 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/pr-rebuild-on-version.yml b/.github/workflows/pr-rebuild-on-version.yml new file mode 100644 index 0000000000..95abedf99f --- /dev/null +++ b/.github/workflows/pr-rebuild-on-version.yml @@ -0,0 +1,141 @@ +name: PR Rebuild On Version Bump +run-name: rebuild test builds below versionCode on main + +on: + push: + branches: [main] + paths: [app/build.gradle] + workflow_dispatch: + +permissions: + actions: write + contents: read + issues: write + pull-requests: read + +concurrency: + group: pr-rebuild-on-version + cancel-in-progress: false + queue: max + +jobs: + rebuild: + runs-on: ubuntu-24.04 + timeout-minutes: 180 + steps: + - uses: actions/checkout@v4 + with: + ref: main + fetch-depth: 2 + persist-credentials: false + - name: Rebuild open PRs whose test build Android would refuse over main + env: + GH_TOKEN: ${{ github.token }} + EVENT_NAME: ${{ github.event_name }} + BEFORE: ${{ github.event.before }} + PUSHED_AT: ${{ github.event.repository.pushed_at }} + run: | + set -euo pipefail + code() { sed -n 's/^[[:space:]]*versionCode[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p'; } + now=$(code < app/build.gradle) + [[ "$now" =~ ^[0-9]+$ ]] || { echo "::error::No numeric versionCode on main"; exit 1; } + if [ "$EVENT_NAME" = push ]; then + was=$(git show "$BEFORE:app/build.gradle" 2>/dev/null | code || true) + if [[ "$was" =~ ^[0-9]+$ ]] && [ "$was" -ge "$now" ]; then + echo "versionCode stayed at $now" + exit 0 + fi + fi + # This run is created right after the push, so a PR build that started earlier may have pinned the old main. + bumped=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" --jq .created_at) + # A build can finish between the push and this run's creation; the push event carries the push time. + if [[ "${PUSHED_AT:-}" =~ ^[0-9]+$ ]]; then + pushed=$(date -u -d "@$PUSHED_AT" +%Y-%m-%dT%H:%M:%SZ) + [[ "$pushed" < "$bumped" ]] && bumped=$pushed + else + pushed=$(date -u -d "$bumped - 10 minutes" +%Y-%m-%dT%H:%M:%SZ) + fi + note() { + local number=$1 + local marker="" + gh api "repos/$GITHUB_REPOSITORY/issues/$number/comments?per_page=100" --jq '.[].body' | grep -qF "$marker" && return 0 + gh api -X POST "repos/$GITHUB_REPOSITORY/issues/$number/comments" -f body="$marker + Main is now at versionCode $now, so this PR's test build no longer installs over current DroidDeck, and its last build is too old for GitHub to re-run. Push a commit or merge main to get a new test build." >/dev/null + } + latest() { + gh api "repos/$GITHUB_REPOSITORY/actions/workflows/build.yml/runs?event=pull_request&head_sha=$1&per_page=20" \ + --jq '[.workflow_runs[] | select(.head_sha == "'"$1"'")] | sort_by(.created_at) | last // empty | [.id, .status, (.run_started_at // .created_at), .created_at, .updated_at] | @tsv' + } + consider() { + local number=$1 head=$2 built=$3 id status started created updated + IFS=$'\t' read -r id status started created updated <<<"$4" + if [[ "$started" > "$bumped" ]]; then + echo "PR #$number: build $id started after the bump" + elif ! gh api "repos/$GITHUB_REPOSITORY/pulls/$number" | + jq -e --arg head "$head" '.state == "open" and .draft == false and .base.ref == "main" and .head.sha == $head' >/dev/null; then + echo "PR #$number: moved on since the scan, its own build covers it" + elif gh run rerun "$id" -R "$GITHUB_REPOSITORY"; then + echo "PR #$number: rebuilding ${head:0:7} on main (versionCode $built -> $now)" + else + echo "::warning::PR #$number: could not rerun build $id" + # GitHub only re-runs a workflow within 30 days of its first run. + if [[ "$created" < "$(date -u -d '-30 days' +%Y-%m-%dT%H:%M:%SZ)" ]]; then + note "$number" || echo "::warning::PR #$number: could not leave a note" + fi + fi + } + pending=() + declare -A seen=() + candidates() { + gh api --paginate "repos/Droid-Deck/DroidDeck-CI/releases?per_page=100" \ + --jq '.[] | select(.tag_name | test("^pr-[0-9]+$")) | [(.tag_name | ltrimstr("pr-")), ((.body // "") | capture("(?m)^VersionCode: (?[0-9]+)").v // "0")] | @tsv' + # The latest build of every open PR: one that started before the bump and was still running at it + # may have pinned the old main. This also covers a PR's first build and fork builds. + gh api --paginate -X GET "repos/$GITHUB_REPOSITORY/pulls" -f state=open -f base=main -f per_page=100 \ + --jq '.[] | select(.draft | not) | [(.number | tostring), .head.sha] | @tsv' | + while IFS=$'\t' read -r number sha; do + run=$(latest "$sha") + [ -n "$run" ] || continue + IFS=$'\t' read -r _ status started _ updated <<<"$run" + if [[ "$started" < "$bumped" ]] && { [ "$status" != completed ] || [[ ! "$updated" < "$pushed" ]]; }; then + printf '%s\t?\n' "$number" + fi + done + } + found=$(mktemp) + candidates > "$found" + while IFS=$'\t' read -r number built; do + [ "$built" = "?" ] || [ "$built" -lt "$now" ] || continue + [ -z "${seen[$number]:-}" ] || continue + seen[$number]=1 + pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$number") || continue + jq -e '.state == "open" and .draft == false and .base.ref == "main"' <<<"$pr" >/dev/null || continue + head=$(jq -r .head.sha <<<"$pr") + run=$(latest "$head") + if [ -z "$run" ]; then + echo "PR #$number: no build of ${head:0:7} to rerun" + elif [ "$(cut -f2 <<<"$run")" = completed ]; then + consider "$number" "$head" "$built" "$run" + else + pending+=("$number $head $built") + fi + done < "$found" + # Builds still running are polled together so one slow build cannot hold up the rest. + deadline=$((SECONDS + 150 * 60)) + while [ ${#pending[@]} -gt 0 ] && [ "$SECONDS" -lt "$deadline" ]; do + sleep 60 + left=() + for item in "${pending[@]}"; do + read -r number head built <<<"$item" + run=$(latest "$head") + if [ -n "$run" ] && [ "$(cut -f2 <<<"$run")" = completed ]; then + consider "$number" "$head" "$built" "$run" + else + left+=("$item") + fi + done + pending=(${left[@]+"${left[@]}"}) + done + for item in ${pending[@]+"${pending[@]}"}; do + echo "::warning::PR #${item%% *}: its build did not finish in time" + done diff --git a/.github/workflows/pr-release-sweep.yml b/.github/workflows/pr-release-sweep.yml index 6ea1874e27..f65777ba6d 100644 --- a/.github/workflows/pr-release-sweep.yml +++ b/.github/workflows/pr-release-sweep.yml @@ -55,3 +55,9 @@ jobs: fi done exit "$failed" + + catalog: + needs: sweep + if: ${{ always() }} + uses: ./.github/workflows/update-catalog.yml + secrets: inherit diff --git a/app/build.gradle b/app/build.gradle index bb0b7132e5..7f992a5f42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -141,6 +141,7 @@ android { buildConfigField "boolean", "CI_BUILD", "${ciBuild}" buildConfigField "String", "RELEASE_SIGNER", "\"${releaseSigner}\"" buildConfigField "long", "COMMIT_TIME", "${commitTime}L * 1000L" + buildConfigField "String", "UPDATE_CATALOG_BRANCH", "\"${(System.getenv("DROIDDECK_UPDATE_CATALOG_BRANCH") ?: "main").with { it ==~ /[A-Za-z0-9._-]+/ ? it : "main" }}\"" buildConfigField "String", "VARIANT_SUFFIXES", "\"${variantSuffixes}\"" buildConfigField "String", "SGDB_API_KEY", "\"${System.getenv("SGDB_API_KEY") ?: project.findProperty("sgdbApiKey") ?: ""}\"" buildConfigField "String", "DESKTOP_KDE_TAG", "\"${desktopKde.DESKTOP_KDE_TAG}\"" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 67240f4eb3..172da8d450 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -323,6 +323,10 @@ android:theme="@style/SessionTheme" /> + (null) @@ -43,6 +44,7 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl .onFailure { error = activity.getString(R.string.upd_unknown_apps_failed); pending = null } }, onDismissPermission = { askPermission = false; pending = null }, + onSeen = { r -> UpdateWatch.seen(activity, r) }, ) val hasUpdate: Boolean get() = AppUpdates.hasUpdate(catalog, follow) @@ -77,6 +79,7 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl private fun choose(f: AppUpdates.Follow) { AppUpdates.setFollow(activity, f) + UpdateWatch.sync(activity, f, catalog?.let { AppUpdates.release(it, f) }) follow = f error = null } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index e0622acf5e..92478a6cd2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -18,6 +18,8 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -31,7 +33,9 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Bolt +import androidx.compose.material.icons.automirrored.filled.OpenInNew import androidx.compose.material.icons.outlined.CheckCircle +import androidx.compose.material.icons.outlined.ContentCopy import androidx.compose.material.icons.outlined.Code import androidx.compose.material.icons.outlined.Download import androidx.compose.material.icons.outlined.Info @@ -50,6 +54,7 @@ import androidx.compose.material3.Text 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.saveable.rememberSaveable @@ -59,7 +64,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.semantics.Role +import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -87,6 +97,7 @@ class UpdatesActions( val onInstall: (Release) -> Unit = {}, val onAllowInstalls: () -> Unit = {}, val onDismissPermission: () -> Unit = {}, + val onSeen: (Release) -> Unit = {}, ) @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @@ -112,6 +123,13 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie if (u.checking) stringResource(R.string.common_checking) else if (checked != null) stringResource(R.string.upd_checked, ago(checked).replaceFirstChar { it.lowercase() }) else stringResource(R.string.upd_not_checked), fontSize = 13.sp, color = colors.onSurfaceVariant, ) + val clipboard = LocalClipboardManager.current + val context = LocalContext.current + val details = buildDetails(me, s.buildLabel) + ToolIcon(Icons.Outlined.ContentCopy, stringResource(R.string.upd_copy_build)) { + clipboard.setText(AnnotatedString(details)) + android.widget.Toast.makeText(context, context.getString(R.string.upd_copied), android.widget.Toast.LENGTH_SHORT).show() + } ToolIcon(Icons.Outlined.Refresh, stringResource(R.string.store_check_updates), busy = u.checking, enabled = !u.checking && u.stage == null, onClick = ua.onCheck) } BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) { @@ -169,6 +187,8 @@ private fun StatusPanel(s: FrontEndState, u: UpdatesState, ua: UpdatesActions, m offered && installBlock != null -> Look(colors.onSurfaceVariant, stringResource(R.string.upd_blocked_status), newBuild(u.follow, release!!), null) offer == Offer.UPDATE -> Look(AttentionAmber, stringResource(R.string.upd_available), newBuild(u.follow, release!!), null) offer == Offer.SWITCH -> Look(pal.signal, stringResource(R.string.upd_switch), newBuild(u.follow, release!!), null) + offer == Offer.AHEAD && u.follow.channel == Channel.NIGHTLY -> Look(pal.signal, stringResource(R.string.upd_ahead_preview_status), + stringResource(R.string.upd_ahead_preview_headline), stringResource(R.string.upd_ahead_preview_detail)) offer == Offer.AHEAD -> Look(pal.signal, stringResource(R.string.upd_ahead_status), stringResource(R.string.upd_ahead_headline), stringResource(R.string.upd_ahead_detail)) offer == Offer.GONE -> Look(AttentionAmber, stringResource(R.string.upd_gone_status), stringResource(R.string.upd_gone_headline), @@ -186,6 +206,12 @@ private fun StatusPanel(s: FrontEndState, u: UpdatesState, ua: UpdatesActions, m Text(look.headline, fontSize = 22.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, modifier = Modifier.padding(top = 4.dp)) if (offered) { ReleaseNotes(changeTitle(release!!.title.ifBlank { release.tag }), release.summary, release.tag) + ReleaseFacts(release) + } + if (release != null && u.follow.channel == Channel.TEST && catalog != null) { + androidx.compose.runtime.LaunchedEffect(release.tag, release.commit, release.apk?.sha256) { ua.onSeen(release) } + if (!offered) ReleaseFacts(release) + TestFreshness(catalog, release) } if (look.detail != null) Text(look.detail, fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 10.dp)) if (installBlock != null && offered) { @@ -204,7 +230,7 @@ private fun StatusPanel(s: FrontEndState, u: UpdatesState, ua: UpdatesActions, m offered && installBlock != null -> Unit offer == Offer.UPDATE -> PrimaryButton(stringResource(R.string.upd_update_button, button), enabled = installable, main = true) { ua.onInstall(release!!) } offer == Offer.SWITCH -> PrimaryButton(stringResource(R.string.upd_install_button, button), enabled = installable, main = true) { ua.onInstall(release!!) } - offer == Offer.AHEAD && installBlock == null -> + offer == Offer.AHEAD && u.follow.channel == Channel.STABLE && installBlock == null -> SecondaryButton(stringResource(R.string.upd_install_anyway, release?.version.orEmpty()), enabled = installable) { ua.onInstall(release!!) } offer == Offer.GONE -> PrimaryButton(stringResource(R.string.upd_follow_preview), main = true) { ua.onFollow(Follow(Channel.NIGHTLY)) } } @@ -213,7 +239,7 @@ private fun StatusPanel(s: FrontEndState, u: UpdatesState, ua: UpdatesActions, m Text(stringResource(R.string.upd_stop_session), fontSize = 12.5.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 8.dp)) } if (u.follow.channel == Channel.NIGHTLY) { - PreviewHistory(catalog, me) + PreviewHistory(catalog, me, s, u, ua) } } } @@ -273,6 +299,9 @@ private fun ChannelPicker(u: UpdatesState, ua: UpdatesActions, sessionRunning: B val colors = MaterialTheme.colorScheme val catalog = u.catalog val tests = catalog?.tests.orEmpty() + val me = remember { AppUpdates.installed() } + val ready = tests.count { AppUpdates.installable(it, me) } + var showTests by rememberSaveable { mutableStateOf(false) } Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { ChannelCard( Icons.Outlined.Verified, stringResource(R.string.upd_stable), stringResource(R.string.upd_stable_hint), @@ -284,13 +313,11 @@ private fun ChannelPicker(u: UpdatesState, ua: UpdatesActions, sessionRunning: B ) { ua.onFollow(Follow(Channel.NIGHTLY)) } ChannelCard( Icons.Outlined.Science, stringResource(R.string.upd_tests), stringResource(R.string.upd_tests_hint), - if (tests.isEmpty()) stringResource(R.string.upd_tests_none) else pluralStringResource(R.plurals.upd_tests_count, tests.size, tests.size), + if (tests.isEmpty()) stringResource(R.string.upd_tests_none) else pluralStringResource(R.plurals.upd_tests_count, ready, ready), u.follow.channel == Channel.TEST, enabled = tests.isNotEmpty() || u.follow.channel == Channel.TEST, - ) { tests.firstOrNull()?.let { ua.onFollow(Follow(Channel.TEST, it.pr)) } } - AnimatedVisibility(u.follow.channel == Channel.TEST && tests.isNotEmpty(), enter = expandVertically(Motion.sp(1f)) + fadeIn(Motion.sp(1f)), exit = shrinkVertically(Motion.sp(1f)) + fadeOut(Motion.sp(1f))) { - Column(Modifier.padding(start = 18.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { - tests.forEach { t -> TestRow(t, u.follow.pr == t.pr) { ua.onFollow(Follow(Channel.TEST, t.pr)) } } - } + ) { showTests = !showTests } + AnimatedVisibility((showTests || u.follow.channel == Channel.TEST) && tests.isNotEmpty(), enter = expandVertically(Motion.sp(1f)) + fadeIn(Motion.sp(1f)), exit = shrinkVertically(Motion.sp(1f)) + fadeOut(Motion.sp(1f))) { + TestList(tests, me, u, ua) } val context = androidx.compose.ui.platform.LocalContext.current val agentReady = com.droiddeck.launcher.agent.AgentHost.installed && @@ -305,56 +332,211 @@ private fun ChannelPicker(u: UpdatesState, ua: UpdatesActions, sessionRunning: B } @Composable -private fun PreviewHistory(catalog: AppUpdates.Catalog?, me: AppUpdates.Installed) { +private fun PreviewHistory(catalog: AppUpdates.Catalog?, me: AppUpdates.Installed, s: FrontEndState, u: UpdatesState, ua: UpdatesActions) { val history = catalog?.let { AppUpdates.previewHistory(it, me) } ?: return val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val key = catalog?.recentPreviews?.firstOrNull()?.commit - var expanded by rememberSaveable(key) { mutableStateOf(false) } val heading = when (history.kind) { AppUpdates.PreviewHistoryKind.CURRENT -> stringResource(R.string.upd_preview_current) AppUpdates.PreviewHistoryKind.BEHIND -> pluralStringResource( R.plurals.upd_preview_behind, history.buildsBehind, history.buildsBehind, ) AppUpdates.PreviewHistoryKind.RECENT -> pluralStringResource( - R.plurals.upd_preview_recent, history.changes.size, history.changes.size, + R.plurals.upd_preview_recent, maxOf(history.builds.size, history.changes.size), maxOf(history.builds.size, history.changes.size), ) } Column(Modifier.fillMaxWidth().padding(top = 18.dp)) { Text(heading, fontSize = 11.5.sp, fontWeight = FontWeight.Medium, color = colors.onSurfaceVariant) - if (history.changes.isNotEmpty()) { - val visible = if (expanded) history.changes else history.changes.take(3) - Column(Modifier.padding(top = 3.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) { - visible.forEach { change -> - Column { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { - Text( - changeTitle(change.title.ifBlank { change.commit.take(7) }), - fontSize = 12.5.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, - maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), - ) - Text(ago(change.publishedAt), fontSize = 11.sp, color = colors.onSurfaceVariant) - } - if (change.summary.isNotBlank()) Text( - change.summary, fontSize = 11.5.sp, color = colors.onSurfaceVariant, - maxLines = 1, overflow = TextOverflow.Ellipsis, - ) + if (history.builds.isNotEmpty()) { + Text(stringResource(R.string.upd_preview_pick), fontSize = 11.5.sp, color = colors.onSurfaceVariant) + PreviewBuilds(history, me, s, u, ua) + } else if (history.changes.isNotEmpty()) { + LegacyChanges(history.changes) + } + } +} + +@Composable +private fun PreviewBuilds(history: AppUpdates.PreviewHistory, me: AppUpdates.Installed, s: FrontEndState, u: UpdatesState, ua: UpdatesActions) { + val builds = history.builds + var open by rememberSaveable { mutableStateOf(null) } + var shown by rememberSaveable(builds.firstOrNull()?.commit) { + mutableIntStateOf(maxOf(5, if (history.installedIndex >= 0) history.installedIndex + 2 else 0)) + } + Column(Modifier.padding(top = 6.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { + builds.take(shown).forEachIndexed { index, build -> + PreviewBuildRow( + build, index, history.installedIndex, me, s, u, ua, + expanded = open == build.commit, + ) { open = if (open == build.commit) null else build.commit } + } + } + val more = builds.size - shown + if (more > 0) MoreLink(stringResource(R.string.upd_show_more, more), "preview:history:more") { shown += 20 } + else if (shown > 5) MoreLink(stringResource(R.string.upd_less), "preview:history:less") { shown = 5 } +} + +@Composable +private fun PreviewBuildRow( + build: Release, index: Int, installedIndex: Int, me: AppUpdates.Installed, + s: FrontEndState, u: UpdatesState, ua: UpdatesActions, expanded: Boolean, onToggle: () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val installed = index == installedIndex + val block = AppUpdates.installBlock(build, me) + val tooOld = block != null && build.apk != null && build.apk.versionCode < me.versionCode + Column( + Modifier.fillMaxWidth().clip(Shape12) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else if (expanded) colors.surfaceVariant else Color.Transparent) + .alpha(if (tooOld && !expanded) 0.55f else 1f), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth().paneItem("preview:${build.commit}") + .glideBorder(hot, Shape12, pal.signal) + .hoverable(src).clickable(interactionSource = src, indication = null, role = Role.Button, onClick = onToggle) + .controllerConfirm(onClick = onToggle) + .padding(horizontal = 8.dp, vertical = 6.dp), + ) { + Column(Modifier.weight(1f)) { + Text( + changeTitle(build.title.ifBlank { build.shortCommit }), fontSize = 12.5.sp, fontWeight = FontWeight.SemiBold, + color = colors.onBackground, maxLines = if (expanded) Int.MAX_VALUE else 1, overflow = TextOverflow.Ellipsis, + ) + Text( + listOfNotNull(ago(build.committedAt.takeIf { it > 0 } ?: build.publishedAt), build.author.takeIf { it.isNotEmpty() }?.let { "@$it" }, build.shortCommit) + .joinToString(" · "), + fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } + if (installed) Chip(stringResource(R.string.upd_installed_tag), ok = true) + } + if (expanded) Column(Modifier.padding(start = 8.dp, end = 8.dp, bottom = 10.dp)) { + if (build.summary.isNotBlank()) Text(build.summary, fontSize = 12.5.sp, color = colors.onSurfaceVariant) + ReleaseFacts(build) + Box(Modifier.padding(top = 10.dp)) { + when { + installed -> Unit + block != null -> Text(block.message(LocalContext.current), fontSize = 12.5.sp, color = AttentionAmber) + me.updatable -> { + val size = build.apk?.size?.takeIf { it > 0 }?.let { " · ${megabytes(it)}" }.orEmpty() + val label = if (installedIndex in 0 until index) stringResource(R.string.upd_rollback_this, size) + else stringResource(R.string.upd_install_this, size) + SecondaryButton(label, enabled = u.stage == null && !s.sessionRunning, compact = true) { ua.onInstall(build) } } } } - if (history.changes.size > 3 || expanded) { - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - val toggle = { expanded = !expanded } + } + } +} + +@Composable +private fun LegacyChanges(changes: List) { + val colors = MaterialTheme.colorScheme + Column(Modifier.padding(top = 3.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) { + changes.take(10).forEach { change -> + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { Text( - if (expanded) stringResource(R.string.upd_less) else stringResource(R.string.upd_more), - fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, - modifier = Modifier.padding(top = 1.dp).offset(x = (-6).dp).paneItem("preview:history:more") - .clip(Shape12).glideBorder(hot, Shape12, pal.signal) - .hoverable(src).clickable(interactionSource = src, indication = null, role = Role.Button, onClick = toggle) - .controllerConfirm(onClick = toggle) - .padding(horizontal = 6.dp, vertical = 4.dp), + changeTitle(change.title.ifBlank { change.commit.take(7) }), + fontSize = 12.5.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f), ) + Text(ago(change.publishedAt), fontSize = 11.sp, color = colors.onSurfaceVariant) + } + } + } +} + +@Composable +private fun MoreLink(text: String, id: String, onClick: () -> Unit) { + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Text( + text, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, + modifier = Modifier.padding(top = 2.dp).offset(x = (-6).dp).paneItem(id) + .clip(Shape12).glideBorder(hot, Shape12, pal.signal) + .hoverable(src).clickable(interactionSource = src, indication = null, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(horizontal = 6.dp, vertical = 4.dp), + ) +} + +@OptIn(ExperimentalLayoutApi::class) +@Composable +private fun ReleaseFacts(r: Release) { + val colors = MaterialTheme.colorScheme + val facts = listOfNotNull( + r.author.takeIf { it.isNotEmpty() }?.let { "@$it" }, + stringResource(R.string.upd_version_code, r.versionCode), + ).joinToString(" · ") + Text(facts, fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 8.dp)) + FlowRow(Modifier.padding(top = 2.dp), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + if (r.linkedPr > 0) LinkPill(stringResource(R.string.upd_pr, r.linkedPr), "https://github.com/Droid-Deck/DroidDeck/pull/${r.linkedPr}") + if (r.commit.length >= 7) LinkPill(stringResource(R.string.upd_link_commit, r.shortCommit), "https://github.com/Droid-Deck/DroidDeck/commit/${r.commit}") + if (r.url.startsWith("https://github.com/Droid-Deck/")) LinkPill(stringResource(R.string.upd_link_release), r.url) + } +} + +@Composable +private fun TestFreshness(catalog: AppUpdates.Catalog, r: Release) { + val colors = MaterialTheme.colorScheme + if (r.newerCommitPushed) Text( + stringResource(R.string.upd_newer_commit, r.headCommit.take(7)), fontSize = 12.5.sp, color = AttentionAmber, modifier = Modifier.padding(top = 8.dp), + ) + val behind = AppUpdates.previewsSince(catalog, r) + if (behind > 0) Text( + stringResource(R.string.upd_main_moved, behind), fontSize = 12.5.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp), + ) +} + +@Composable +private fun LinkPill(label: String, url: String) { + val ctx = LocalContext.current + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val open = { openUrl(ctx, url) } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp), + modifier = Modifier.paneItem("link:$url").heightIn(min = 36.dp).offset(x = (-8).dp).clip(Shape12) + .background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, Shape12, pal.signal) + .hoverable(src).clickable(interactionSource = src, indication = null, role = Role.Button, onClick = open) + .controllerConfirm(onClick = open).padding(horizontal = 8.dp), + ) { + val tint = pal.signal + Text(label, fontSize = 12.sp, fontWeight = FontWeight.Medium, color = tint, maxLines = 1) + Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = null, tint = tint.copy(alpha = 0.65f), modifier = Modifier.size(11.dp)) + } +} + +@Composable +private fun TestList(tests: List, me: AppUpdates.Installed, u: UpdatesState, ua: UpdatesActions) { + val colors = MaterialTheme.colorScheme + var query by rememberSaveable { mutableStateOf("") } + val needle = query.trim().removePrefix("#").removePrefix("@") + val matches = tests.filter { + needle.isEmpty() || it.pr.toString().startsWith(needle) || it.title.contains(needle, ignoreCase = true) || + it.author.contains(needle, ignoreCase = true) || (needle.length >= 4 && it.commit.startsWith(needle, ignoreCase = true)) + } + val (ready, old) = matches.partition { it.versionCode >= me.versionCode } + val followedOld = u.follow.channel == Channel.TEST && old.any { it.pr == u.follow.pr } + var showOld by rememberSaveable { mutableStateOf(false) } + Column(Modifier.padding(start = 18.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + if (tests.size > 5 || query.isNotEmpty()) AdbTextField( + value = query, onValueChange = { query = it }, label = stringResource(R.string.upd_tests_find), + keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, compact = true, showLabel = false, + placeholder = stringResource(R.string.upd_tests_find), modifier = Modifier.fillMaxWidth(), + ) + if (matches.isEmpty()) Text(stringResource(R.string.upd_tests_no_match), fontSize = 12.5.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(4.dp)) + ready.forEach { t -> TestRow(t, u.follow.pr == t.pr && u.follow.channel == Channel.TEST) { ua.onFollow(Follow(Channel.TEST, t.pr)) } } + if (old.isNotEmpty()) { + MoreLink(stringResource(R.string.upd_tests_old, old.size, me.versionCode), "tests:old") { showOld = !showOld } + if (showOld || followedOld || needle.isNotEmpty()) old.forEach { t -> + TestRow(t, u.follow.pr == t.pr && u.follow.channel == Channel.TEST, tooOld = true) { ua.onFollow(Follow(Channel.TEST, t.pr)) } } } } @@ -404,7 +586,7 @@ private fun RadioDot(selected: Boolean, size: androidx.compose.ui.unit.Dp = 22.d } @Composable -private fun TestRow(t: Release, selected: Boolean, onClick: () -> Unit) { +private fun TestRow(t: Release, selected: Boolean, tooOld: Boolean = false, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } @@ -417,6 +599,7 @@ private fun TestRow(t: Release, selected: Boolean, onClick: () -> Unit) { .clip(Shape12) .background(colors.surface).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) .glideBorder(hot, Shape12, pal.signal, pal.line) + .alpha(if (tooOld && !selected) 0.6f else 1f) .hoverable(src) .clickable(interactionSource = src, indication = null, role = Role.RadioButton, onClick = onClick) .controllerConfirm(onClick = onClick) @@ -424,13 +607,29 @@ private fun TestRow(t: Release, selected: Boolean, onClick: () -> Unit) { ) { Text("#${t.pr}", fontSize = 13.sp, fontWeight = FontWeight.Bold, color = if (selected) pal.signal else colors.onSurfaceVariant) Column(Modifier.weight(1f)) { - Text(t.title.ifBlank { stringResource(R.string.upd_pr, t.pr) }, fontSize = 13.5.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text(if (t.apk == null) stringResource(R.string.upd_not_built) else stringResource(R.string.upd_updated, ago(t.publishedAt)), fontSize = 12.sp, color = colors.onSurfaceVariant) + Text(changeTitle(t.title.ifBlank { stringResource(R.string.upd_pr, t.pr) }), fontSize = 13.5.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + val detail = when { + t.apk == null -> stringResource(R.string.upd_not_built) + tooOld -> stringResource(R.string.upd_tests_old_row, t.versionCode) + else -> stringResource(R.string.upd_updated, ago(t.builtAt.takeIf { it > 0 } ?: t.publishedAt)) + } + Text( + listOfNotNull(detail, t.author.takeIf { it.isNotEmpty() }?.let { "@$it" }, t.shortCommit).joinToString(" · "), + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + if (t.newerCommitPushed) Text(stringResource(R.string.upd_newer_commit_short), fontSize = 12.sp, color = AttentionAmber, maxLines = 1, overflow = TextOverflow.Ellipsis) } RadioDot(selected, 20.dp) } } +private fun buildDetails(me: AppUpdates.Installed, label: String): String = buildString { + append("DroidDeck ").append(me.version).append(" (versionCode ").append(me.versionCode).append(")\n") + append(label) + if (me.pr > 0) append("\nPR #").append(me.pr).append(" https://github.com/Droid-Deck/DroidDeck/pull/").append(me.pr) + if (me.commit.length >= 7) append("\nCommit ").append(me.commit) +} + @Composable private fun channelName(f: Follow) = when (f.channel) { Channel.STABLE -> stringResource(R.string.upd_stable) diff --git a/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt b/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt index 51b5fc3d32..3540448b64 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt @@ -18,7 +18,7 @@ object AppUpdates { private const val TAG = "AppUpdates" private const val REPO = "Droid-Deck/DroidDeck" private const val CI_REPO = "Droid-Deck/DroidDeck-CI" - private const val CATALOG_URL = "https://raw.githubusercontent.com/$CI_REPO/main/catalog.json" + private val CATALOG_URL = "https://raw.githubusercontent.com/$CI_REPO/${BuildConfig.UPDATE_CATALOG_BRANCH}/catalog.json" private const val PREFS = "app_updates" private const val KEY_CATALOG = "catalog" private const val KEY_CHANNEL = "channel" @@ -49,7 +49,21 @@ object AppUpdates { val publishedAt: Long, val url: String, val apk: Apk?, - ) + val author: String = "", + val committedAt: Long = 0L, + /** The PR a Preview build merged, 0 for a direct push. Test builds use [pr]. */ + val mergedPr: Int = 0, + /** The PR's newest commit when the catalog was made; differs from [commit] while a rebuild is pending. */ + val headCommit: String = "", + /** When the APK itself was uploaded; release-note edits leave it unchanged. */ + val builtAt: Long = 0L, + ) { + val linkedPr: Int get() = if (pr > 0) pr else mergedPr + val shortCommit: String get() = commit.take(7) + val newerCommitPushed: Boolean get() = + headCommit.length >= 7 && !headCommit.startsWith(commit, ignoreCase = true) && + !commit.startsWith(headCommit, ignoreCase = true) + } class PreviewChange( val commit: String, @@ -64,7 +78,11 @@ object AppUpdates { val tests: List, val checkedAt: Long, val recentPreviews: List = emptyList(), - ) + val previews: List = emptyList(), + ) { + /** Every published Preview build, newest commit first; older catalogs only name the newest. */ + val previewBuilds: List get() = previews.ifEmpty { listOfNotNull(preview) } + } class Installed( val commit: String, @@ -88,6 +106,8 @@ object AppUpdates { val kind: PreviewHistoryKind, val buildsBehind: Int, val changes: List, + val builds: List = emptyList(), + val installedIndex: Int = -1, ) enum class Offer { @@ -149,7 +169,13 @@ object AppUpdates { compareVersions(r.version ?: "", me.version) > 0 -> Offer.UPDATE else -> Offer.AHEAD } - Channel.NIGHTLY -> if (me.pr != 0) Offer.SWITCH else Offer.UPDATE + Channel.NIGHTLY -> when { + me.pr != 0 -> Offer.SWITCH + previewIndex(catalog, me) > 0 -> Offer.UPDATE + previewIndex(catalog, me) < 0 && me.committedAt > 0 && r.committedAt > 0 && + me.committedAt > r.committedAt -> Offer.AHEAD + else -> Offer.UPDATE + } Channel.TEST -> if (me.pr == r.pr) Offer.UPDATE else Offer.SWITCH } } @@ -162,12 +188,39 @@ object AppUpdates { } fun isRunning(r: Release, me: Installed = installed()): Boolean { - if (me.commit.length < 7 || r.commit.length < 7 || r.pr != me.pr) return false + if (me.commit.length < 7 || r.commit.length < 7 || r.pr != me.pr || r.versionCode > me.versionCode) return false return me.commit.startsWith(r.commit, ignoreCase = true) || r.commit.startsWith(me.commit, ignoreCase = true) } + /** Where the installed build sits in [Catalog.previewBuilds], or -1 when it is not one of them. */ + fun previewIndex(catalog: Catalog, me: Installed = installed()): Int { + if (me.pr != 0) return -1 + val builds = catalog.previewBuilds + val matching = builds.indices.filter { matchesInstalledCommit(builds[it].commit, me.commit) } + return matching.singleOrNull() ?: -1 + } + + /** How many Preview builds landed on main after this test build was made. */ + fun previewsSince(catalog: Catalog, test: Release): Int = + catalog.previews.count { + (it.committedAt.takeIf { at -> at > 0 } ?: it.publishedAt) > (test.builtAt.takeIf { at -> at > 0 } ?: test.publishedAt) + } + + fun installable(r: Release, me: Installed = installed()): Boolean = + me.updatable && installBlock(r, me) == null && !isRunning(r, me) + fun previewHistory(catalog: Catalog, me: Installed = installed()): PreviewHistory? { + if (catalog.previews.isNotEmpty()) { + val builds = catalog.previews + val index = previewIndex(catalog, me) + val kind = when { + index == 0 -> PreviewHistoryKind.CURRENT + index > 0 -> PreviewHistoryKind.BEHIND + else -> PreviewHistoryKind.RECENT + } + return PreviewHistory(kind, maxOf(index, 0), emptyList(), builds, index) + } if (!me.ciBuild || catalog.recentPreviews.isEmpty()) return null val stable = catalog.stable if ( @@ -225,7 +278,8 @@ object AppUpdates { if (stable != null && isRunning(stable, me)) return Guess(Follow(Channel.STABLE), true) val publishedPreview = catalog != null && me.updatable && ( catalog.preview?.let { isRunning(it, me) } == true || - catalog.recentPreviews.any { matchesInstalledCommit(it.commit, me.commit) } + catalog.recentPreviews.any { matchesInstalledCommit(it.commit, me.commit) } || + catalog.previewBuilds.any { matchesInstalledCommit(it.commit, me.commit) } ) if (stable?.version?.let { compareVersions(me.version, it) < 0 } == true) return Guess(Follow(Channel.STABLE), !publishedPreview) return Guess(Follow(if (publishedPreview) Channel.NIGHTLY else Channel.STABLE), false) @@ -237,7 +291,7 @@ object AppUpdates { prefs(context).edit().putString(KEY_CHANNEL, value).apply() } - private fun stored(context: Context): Follow? { + fun stored(context: Context): Follow? { val v = prefs(context).getString(KEY_CHANNEL, null) ?: return null return when { v == "stable" -> Follow(Channel.STABLE) @@ -281,6 +335,7 @@ object AppUpdates { } val tests = root.optJSONArray("tests") ?: JSONArray() val recentPreviews = root.optJSONArray("recentPreviews") ?: JSONArray() + val previews = root.optJSONArray("previews") ?: JSONArray() return Catalog( root.optJSONObject("stable")?.let { readPublishedRelease(it, packageName) }, root.optJSONObject("preview")?.let { readPublishedRelease(it, packageName) }, @@ -294,6 +349,10 @@ object AppUpdates { .sortedByDescending { it.publishedAt } .distinctBy { it.commit.lowercase() } .take(10), + (0 until previews.length()) + .map { readPublishedRelease(previews.getJSONObject(it), packageName) } + .filter { it.pr == 0 } + .distinctBy { it.commit.lowercase() }, ) } @@ -327,6 +386,11 @@ object AppUpdates { o.optLong("publishedAt"), o.optString("url"), apk, + o.optString("author").takeIf { Regex("^[A-Za-z0-9-]{1,39}(\\[bot\\])?$").matches(it) }.orEmpty(), + o.optLong("committedAt"), + o.optInt("mergedPr").coerceAtLeast(0), + o.optString("headCommit").takeIf { Regex("^[0-9a-fA-F]{7,40}$").matches(it) }.orEmpty(), + o.optLong("builtAt"), ) } @@ -425,6 +489,11 @@ object AppUpdates { .put("publishedAt", r.publishedAt) .put("url", r.url) .put("apk", r.apk?.let(::writeApk)) + .put("author", r.author) + .put("committedAt", r.committedAt) + .put("mergedPr", r.mergedPr) + .put("headCommit", r.headCommit) + .put("builtAt", r.builtAt) private fun readCachedRelease(o: JSONObject): Release = Release( o.getString("tag"), @@ -447,6 +516,11 @@ object AppUpdates { it.getString("signerSha256"), ) }, + o.optString("author"), + o.optLong("committedAt"), + o.optInt("mergedPr"), + o.optString("headCommit"), + o.optLong("builtAt"), ) internal fun writeCatalog(c: Catalog): JSONObject = JSONObject() @@ -454,6 +528,7 @@ object AppUpdates { .put("preview", c.preview?.let(::writeRelease)) .put("tests", JSONArray().apply { c.tests.forEach { put(writeRelease(it)) } }) .put("recentPreviews", JSONArray().apply { c.recentPreviews.forEach { put(writePreviewChange(it)) } }) + .put("previews", JSONArray().apply { c.previews.forEach { put(writeRelease(it)) } }) .put("checkedAt", c.checkedAt) private fun writePreviewChange(c: PreviewChange): JSONObject = JSONObject() @@ -466,6 +541,7 @@ object AppUpdates { val tests = o.optJSONArray("tests") ?: JSONArray() val preview = o.optJSONObject("preview") ?: o.optJSONObject("nightly") val recentPreviews = o.optJSONArray("recentPreviews") ?: JSONArray() + val previews = o.optJSONArray("previews") ?: JSONArray() return Catalog( o.optJSONObject("stable")?.let(::readCachedRelease), preview?.let(::readCachedRelease), @@ -476,6 +552,7 @@ object AppUpdates { .sortedByDescending { it.publishedAt } .distinctBy { it.commit.lowercase() } .take(10), + (0 until previews.length()).map { readCachedRelease(previews.getJSONObject(it)) }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/update/UpdateWatch.kt b/app/src/main/java/com/droiddeck/launcher/update/UpdateWatch.kt new file mode 100644 index 0000000000..4c85c6a5d2 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/update/UpdateWatch.kt @@ -0,0 +1,102 @@ +package com.droiddeck.launcher.update + +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.app.job.JobInfo +import android.app.job.JobParameters +import android.app.job.JobScheduler +import android.app.job.JobService +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.download.StoreDownloadService + +/** Checks the catalog in the background while a PR test build is followed, and says when that PR has a new build. */ +class UpdateWatch : JobService() { + override fun onStartJob(params: JobParameters): Boolean { + Thread({ + runCatching { check(applicationContext) } + jobFinished(params, false) + }, "update-watch").start() + return true + } + + override fun onStopJob(params: JobParameters): Boolean = true + + companion object { + private const val JOB_ID = 41_230 + private const val NOTIFICATION_ID = 41_231 + private const val CHANNEL_ID = "test-builds" + private const val PREFS = "app_updates" + private const val KEY_SEEN = "watch_seen" + private const val INTERVAL_MS = 60 * 60 * 1000L + + fun sync(context: Context, follow: AppUpdates.Follow, current: AppUpdates.Release? = null) { + val scheduler = context.getSystemService(JobScheduler::class.java) ?: return + if (follow.channel != AppUpdates.Channel.TEST) { + scheduler.cancel(JOB_ID) + return + } + current?.let { seen(context, it) } + if (scheduler.getPendingJob(JOB_ID) != null) return + val job = JobInfo.Builder(JOB_ID, ComponentName(context, UpdateWatch::class.java)) + .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY) + .setPeriodic(INTERVAL_MS) + .build() + runCatching { scheduler.schedule(job) } + } + + fun seen(context: Context, release: AppUpdates.Release) { + prefs(context).edit().putString(KEY_SEEN, key(release)).apply() + } + + private fun key(r: AppUpdates.Release) = "${r.pr}:${r.commit}:${r.versionCode}:${r.apk?.sha256.orEmpty()}" + + + internal fun check(context: Context) { + val catalog = AppUpdates.refresh(context) + val follow = AppUpdates.follow(context, catalog) + if (follow.channel != AppUpdates.Channel.TEST) return + val release = AppUpdates.release(catalog, follow) ?: return + if (prefs(context).getString(KEY_SEEN, null) == key(release)) return + val me = AppUpdates.installed() + val offer = AppUpdates.offer(catalog, follow, me) + if (!me.updatable || AppUpdates.installBlock(release, me) != null || + (offer != AppUpdates.Offer.UPDATE && offer != AppUpdates.Offer.SWITCH) + ) return + if (post(context, release)) seen(context, release) + } + + private fun post(context: Context, release: AppUpdates.Release): Boolean { + val manager = context.getSystemService(NotificationManager::class.java) ?: return false + manager.createNotificationChannel( + NotificationChannel(CHANNEL_ID, context.getString(R.string.upd_watch_channel), NotificationManager.IMPORTANCE_DEFAULT), + ) + if (!manager.areNotificationsEnabled() || + manager.getNotificationChannel(CHANNEL_ID)?.importance == NotificationManager.IMPORTANCE_NONE + ) return false + val open = PendingIntent.getActivity( + context, NOTIFICATION_ID, + Intent(context, FrontEndActivity::class.java).putExtra(StoreDownloadService.EXTRA_NAV, "updates") + .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT, + ) + val text = context.getString(R.string.upd_watch_text, release.title.ifBlank { release.commit.take(7) }) + val notification = Notification.Builder(context, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_stat_session) + .setContentTitle(context.getString(R.string.upd_watch_title, release.pr)) + .setContentText(text) + .setStyle(Notification.BigTextStyle().bigText(text)) + .setContentIntent(open) + .setAutoCancel(true) + .build() + return runCatching { manager.notify(NOTIFICATION_ID, notification) }.isSuccess + } + + private fun prefs(context: Context) = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) + } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 7e7535eabb..f288b97098 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1080,6 +1080,29 @@ المعاينة أحدث الإصلاحات، قبل الإصدار المستقر محدَّث + نسخ تفاصيل الإصدار + تم نسخ تفاصيل الإصدار + أحدث من المعاينة + إصدارك أحدث من المعاينة + هذا الإصدار أحدث من آخر إصدار معاينة. سيحدّثه إصدار المعاينة التالي. + اختر إصدارًا لرؤية تغييراته أو تثبيته. + مثبّت + تثبيت هذا الإصدار%1$s + الرجوع إلى هذا الإصدار%1$s + versionCode %1$d + الالتزام %1$s + صفحة الإصدار + في طلب الدمج التزام أحدث (%1$s). إصدار الاختبار الخاص به ليس جاهزًا بعد، لذا لا يتضمنه هذا الإصدار. + تم دفع التزام أحدث، الإصدار قيد الانتظار + رقم PR أو العنوان أو المؤلف + لا يوجد إصدار اختبار مطابق + يحتاج إلى إعادة بناء (versionCode %1$d) + تحديثات إصدارات الاختبار + إصدار اختبار جديد لـ PR #%1$d + %1$s. افتح التحديثات لتثبيته. + عرض المزيد (%1$d) + تحتاج إلى إعادة بناء لـ versionCode %2$d (%1$d) + إصدارات المعاينة على main منذ إصدار الاختبار هذا: %1$d إصدارات الاختبار جرّب إصلاحًا قبل إصداره رسميًا لا شيء حاليًا 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 02a7a970e0..3d2a2ed8fa 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1098,6 +1098,29 @@ Vista previa Las correcciones más recientes, antes que Estable Al día + Copiar detalles de la versión + Detalles de la versión copiados + Más nueva que Vista previa + Vas por delante de Vista previa + Esta versión es más nueva que la última Vista previa. La próxima versión de Vista previa la actualizará. + Elige una versión para ver sus cambios o instalarla. + Instalada + Instalar esta versión%1$s + Volver a esta versión%1$s + versionCode %1$d + Commit %1$s + Página de la versión + El PR tiene un commit más nuevo (%1$s). Su versión de prueba aún no está lista, así que esta no lo incluye. + Hay un commit más nuevo, versión pendiente + Número de PR, título o autor + Ninguna versión de prueba coincide + Necesita recompilarse (versionCode %1$d) + Actualizaciones de versiones de prueba + Nueva versión de prueba del PR #%1$d + %1$s. Abre Actualizaciones para instalarla. + Mostrar más (%1$d) + Necesitan recompilarse para versionCode %2$d (%1$d) + Versiones de Vista previa en main desde esta versión de prueba: %1$d Versiones de prueba Prueba una corrección antes de su publicación Ninguna por ahora diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index c3b6277b4e..089077750e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1068,6 +1068,29 @@ Preview Най-новите поправки, преди Stable Актуално + Копиране на данните за версията + Данните за версията са копирани + Пред Preview + Изпреварвате Preview + Тази версия е по-нова от последната Preview. Следващата Preview версия ще я обнови. + Изберете версия, за да видите промените или да я инсталирате. + Инсталирана + Инсталиране на тази версия%1$s + Връщане към тази версия%1$s + versionCode %1$d + Къмит %1$s + Страница на версията + PR има по-нов къмит (%1$s). Тестовата му версия още не е готова, затова тази не го включва. + Има по-нов къмит, версията предстои + Номер на PR, заглавие или автор + Няма съвпадащи тестови версии + Нужно е ново изграждане (versionCode %1$d) + Обновления на тестови версии + Нова тестова версия на PR #%1$d + %1$s. Отворете Обновления, за да я инсталирате. + Още (%1$d) + Нужно е ново изграждане за versionCode %2$d (%1$d) + Preview версии в main след тази тестова версия: %1$d Тестови версии Изпробвайте поправка, преди да бъде издадена Няма в момента diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0e14f29976..241b3903e0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1074,6 +1074,29 @@ Preview Nejnovější opravy, dříve než ve Stable Aktuální + Kopírovat údaje o sestavě + Údaje o sestavě zkopírovány + Novější než Preview + Jste napřed před Preview + Tato sestava je novější než poslední Preview. Další sestava Preview ji aktualizuje. + Vyberte sestavu a zobrazte její změny nebo ji nainstalujte. + Nainstalováno + Nainstalovat tuto sestavu%1$s + Vrátit se k této sestavě%1$s + versionCode %1$d + Commit %1$s + Stránka vydání + PR má novější commit (%1$s). Jeho testovací sestava ještě není hotová, takže tato ho neobsahuje. + Nový commit odeslán, sestava čeká + Číslo PR, název nebo autor + Žádná testovací sestava neodpovídá + Nutné znovu sestavit (versionCode %1$d) + Aktualizace testovacích sestav + Nová testovací sestava PR #%1$d + %1$s. Nainstalujete ji v Aktualizacích. + Zobrazit další (%1$d) + Nutné znovu sestavit pro versionCode %2$d (%1$d) + Sestavy Preview v main od této testovací sestavy: %1$d Testovací sestavy Vyzkoušejte opravu před jejím vydáním Momentálně žádné diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 77e5d84cbe..57cbc9f72d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1068,6 +1068,29 @@ Preview Nyeste rettelser, før Stable Opdateret + Kopiér builddetaljer + Builddetaljer kopieret + Foran Preview + Du er foran Preview + Dette build er nyere end det seneste Preview. Det næste Preview-build opdaterer det. + Vælg et build for at se ændringerne eller installere det. + Installeret + Installér dette build%1$s + Gå tilbage til dette build%1$s + versionCode %1$d + Commit %1$s + Udgivelsesside + PR\'en har et nyere commit (%1$s). Dens testbuild er ikke klar endnu, så dette indeholder det ikke. + Nyere commit sendt, build afventer + PR-nummer, titel eller forfatter + Intet testbuild passer + Skal bygges igen (versionCode %1$d) + Opdateringer af testbuilds + Nyt testbuild til PR #%1$d + %1$s. Åbn Opdateringer for at installere det. + Vis flere (%1$d) + Skal bygges igen til versionCode %2$d (%1$d) + Preview-builds på main siden dette testbuild: %1$d Testbuilds Prøv en rettelse, før den udgives Ingen lige nu diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 29bfc02e8e..6d14e4b65f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1060,6 +1060,29 @@ Vorschau Neueste Fixes, vor Stabil Aktuell + Build-Details kopieren + Build-Details kopiert + Vor der Vorschau + Du bist der Vorschau voraus + Dieser Build ist neuer als die neueste Vorschau. Der nächste Vorschau-Build aktualisiert ihn. + Wähle einen Build, um seine Änderungen zu sehen oder ihn zu installieren. + Installiert + Diesen Build installieren%1$s + Zu diesem Build zurück%1$s + versionCode %1$d + Commit %1$s + Release-Seite + Der PR hat einen neueren Commit (%1$s). Sein Test-Build ist noch nicht fertig, daher fehlt er in diesem. + Neuerer Commit, Build ausstehend + PR-Nummer, Titel oder Autor + Kein Test-Build passt + Muss neu gebaut werden (versionCode %1$d) + Test-Build-Updates + Neuer Test-Build für PR #%1$d + %1$s. Öffne Updates, um ihn zu installieren. + Mehr anzeigen (%1$d) + Müssen für versionCode %2$d neu gebaut werden (%1$d) + Vorschau-Builds auf main seit diesem Test-Build: %1$d Test-Builds Einen Fix vor dem Release ausprobieren Derzeit keine diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 56c2132676..9b27f1a637 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1068,6 +1068,29 @@ Preview Νεότερες διορθώσεις, πριν το Stable Ενημερωμένο + Αντιγραφή στοιχείων build + Τα στοιχεία του build αντιγράφηκαν + Νεότερο από το Preview + Είστε μπροστά από το Preview + Αυτό το build είναι νεότερο από το τελευταίο Preview. Το επόμενο Preview build θα το ενημερώσει. + Επιλέξτε ένα build για να δείτε τις αλλαγές ή να το εγκαταστήσετε. + Εγκατεστημένο + Εγκατάσταση αυτού του build%1$s + Επιστροφή σε αυτό το build%1$s + versionCode %1$d + Commit %1$s + Σελίδα έκδοσης + Το PR έχει νεότερο commit (%1$s). Το δοκιμαστικό του build δεν είναι έτοιμο ακόμη, οπότε αυτό δεν το περιλαμβάνει. + Νεότερο commit, το build εκκρεμεί + Αριθμός PR, τίτλος ή συντάκτης + Κανένα δοκιμαστικό build δεν ταιριάζει + Χρειάζεται νέο build (versionCode %1$d) + Ενημερώσεις δοκιμαστικών builds + Νέο δοκιμαστικό build για το PR #%1$d + %1$s. Ανοίξτε τις Ενημερώσεις για εγκατάσταση. + Περισσότερα (%1$d) + Χρειάζονται νέο build για versionCode %2$d (%1$d) + Preview builds στο main μετά από αυτό το δοκιμαστικό build: %1$d Δοκιμαστικά builds Δοκιμάστε μια διόρθωση πριν κυκλοφορήσει Κανένα προς το παρόν diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 275cc3c2d1..06576af8fd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1071,6 +1071,29 @@ Vista previa Las correcciones más recientes, antes que Estable Al día + Copiar detalles de la versión + Detalles de la versión copiados + Más nueva que Vista previa + Vas por delante de Vista previa + Esta versión es más nueva que la última Vista previa. La próxima versión de Vista previa la actualizará. + Elige una versión para ver sus cambios o instalarla. + Instalada + Instalar esta versión%1$s + Volver a esta versión%1$s + versionCode %1$d + Commit %1$s + Página de la versión + El PR tiene un commit más nuevo (%1$s). Su versión de prueba aún no está lista, así que esta no lo incluye. + Hay un commit más nuevo, versión pendiente + Número de PR, título o autor + Ninguna versión de prueba coincide + Hay que recompilarla (versionCode %1$d) + Actualizaciones de versiones de prueba + Nueva versión de prueba del PR #%1$d + %1$s. Abre Actualizaciones para instalarla. + Mostrar más (%1$d) + Hay que recompilarlas para versionCode %2$d (%1$d) + Versiones de Vista previa en main desde esta versión de prueba: %1$d Versiones de prueba Prueba una corrección antes de su publicación Ninguna por ahora diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index df6a488e98..47243b27f1 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1068,6 +1068,29 @@ Preview Uusimmat korjaukset, ennen Stablea Ajan tasalla + Kopioi buildin tiedot + Buildin tiedot kopioitu + Previewtä uudempi + Olet Previewtä edellä + Tämä build on uudempi kuin viimeisin Preview. Seuraava Preview-build päivittää sen. + Valitse build nähdäksesi sen muutokset tai asentaaksesi sen. + Asennettu + Asenna tämä build%1$s + Palaa tähän buildiin%1$s + versionCode %1$d + Commit %1$s + Julkaisusivu + PR:ssä on uudempi commit (%1$s). Sen testibuild ei ole vielä valmis, joten tämä ei sisällä sitä. + Uudempi commit, build odottaa + PR-numero, otsikko tai tekijä + Mikään testibuild ei vastaa + Rakennettava uudelleen (versionCode %1$d) + Testibuildien päivitykset + Uusi testibuild PR:lle #%1$d + %1$s. Asenna se Päivitykset-sivulta. + Näytä lisää (%1$d) + Rakennettava uudelleen versionCodelle %2$d (%1$d) + Preview-buildejä mainissa tämän testibuildin jälkeen: %1$d Testibuildit Kokeile korjausta ennen sen julkaisua Ei yhtään juuri nyt diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8e422b5590..5942840c08 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1071,6 +1071,29 @@ Preview Derniers correctifs avant Stable À jour + Copier les détails de la version + Détails de la version copiés + En avance sur Preview + Vous avez une longueur d\'avance sur Preview + Cette version est plus récente que la dernière Preview. La prochaine version Preview la mettra à jour. + Choisissez une version pour voir ses changements ou l\'installer. + Installée + Installer cette version%1$s + Revenir à cette version%1$s + versionCode %1$d + Commit %1$s + Page de la version + La PR a un commit plus récent (%1$s). Sa version de test n\'est pas encore prête, donc celle-ci ne l\'inclut pas. + Commit plus récent, version en attente + Numéro de PR, titre ou auteur + Aucune version de test ne correspond + À recompiler (versionCode %1$d) + Mises à jour des versions de test + Nouvelle version de test de la PR #%1$d + %1$s. Ouvrez Mises à jour pour l\'installer. + Afficher plus (%1$d) + À recompiler pour le versionCode %2$d (%1$d) + Versions Preview sur main depuis cette version de test : %1$d Versions de test Essayer un correctif avant sa publication officielle Aucun pour le moment diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1c294fdbeb..42b60b68d3 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1068,6 +1068,29 @@ प्रीव्यू नवीनतम फ़िक्स, स्टेबल से पहले नवीनतम + बिल्ड विवरण कॉपी करें + बिल्ड विवरण कॉपी हो गया + प्रीव्यू से आगे + आप प्रीव्यू से आगे हैं + यह बिल्ड नवीनतम प्रीव्यू से नया है। अगला प्रीव्यू बिल्ड इसे अपडेट करेगा। + बदलाव देखने या इंस्टॉल करने के लिए कोई बिल्ड चुनें। + इंस्टॉल है + यह बिल्ड इंस्टॉल करें%1$s + इस बिल्ड पर वापस जाएं%1$s + versionCode %1$d + कमिट %1$s + रिलीज़ पेज + PR में नया कमिट (%1$s) है। उसका टेस्ट बिल्ड अभी तैयार नहीं है, इसलिए यह बिल्ड उसे शामिल नहीं करता। + नया कमिट आया, बिल्ड बाकी है + PR नंबर, शीर्षक या लेखक + कोई टेस्ट बिल्ड मेल नहीं खाता + फिर से बनाना होगा (versionCode %1$d) + टेस्ट बिल्ड अपडेट + PR #%1$d का नया टेस्ट बिल्ड + %1$s। इसे इंस्टॉल करने के लिए अपडेट खोलें। + और दिखाएं (%1$d) + versionCode %2$d के लिए फिर से बनाने होंगे (%1$d) + इस टेस्ट बिल्ड के बाद main पर प्रीव्यू बिल्ड: %1$d टेस्ट बिल्ड रिलीज़ होने से पहले किसी फ़िक्स को आज़माएं अभी कोई नहीं diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f8f16f0eea..1831f4ffa6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1068,6 +1068,29 @@ Preview A legújabb javítások, a Stable előtt Naprakész + Build adatainak másolása + Build adatai kimásolva + Újabb a Previewnál + Előrébb jársz a Previewnál + Ez a build újabb a legutóbbi Previewnál. A következő Preview build frissíti. + Válassz egy buildet a változásai megtekintéséhez vagy telepítéséhez. + Telepítve + Build telepítése%1$s + Visszatérés ehhez a buildhez%1$s + versionCode %1$d + Commit %1$s + Kiadási oldal + A PR-nek újabb commitja van (%1$s). A teszt buildje még nem kész, ezért ez nem tartalmazza. + Újabb commit, a build készül + PR-szám, cím vagy szerző + Nincs egyező teszt build + Újra kell építeni (versionCode %1$d) + Teszt buildek frissítései + Új teszt build: PR #%1$d + %1$s. A telepítéshez nyisd meg a Frissítéseket. + Több (%1$d) + Újra kell építeni a %2$d versionCode-hoz (%1$d) + Preview buildek a mainen e teszt build óta: %1$d Teszt buildek Próbáljon ki egy javítást a kiadása előtt Jelenleg nincs diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 5b5f5ee99d..983958bbfd 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1065,6 +1065,29 @@ Preview Perbaikan terbaru, sebelum Stable Terbaru + Salin detail build + Detail build disalin + Lebih baru dari Preview + Anda lebih baru dari Preview + Build ini lebih baru dari Preview terbaru. Build Preview berikutnya akan memperbaruinya. + Pilih build untuk melihat perubahannya atau memasangnya. + Terpasang + Pasang build ini%1$s + Kembali ke build ini%1$s + versionCode %1$d + Commit %1$s + Halaman rilis + PR ini punya commit lebih baru (%1$s). Build pengujiannya belum siap, jadi build ini belum memuatnya. + Ada commit baru, build menunggu + Nomor PR, judul, atau penulis + Tidak ada build pengujian yang cocok + Perlu dibangun ulang (versionCode %1$d) + Pembaruan build pengujian + Build pengujian baru untuk PR #%1$d + %1$s. Buka Pembaruan untuk memasangnya. + Tampilkan lagi (%1$d) + Perlu dibangun ulang untuk versionCode %2$d (%1$d) + Build Preview di main sejak build pengujian ini: %1$d Build pengujian Coba perbaikan sebelum dirilis Tidak ada saat ini diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a677a289b0..ffc9b59f63 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1063,6 +1063,29 @@ Preview Le correzioni più recenti, prima di Stable Aggiornato + Copia i dettagli della build + Dettagli della build copiati + Più recente di Preview + Sei avanti rispetto a Preview + Questa build è più recente dell\'ultima Preview. La prossima build Preview la aggiornerà. + Scegli una build per vederne le modifiche o installarla. + Installata + Installa questa build%1$s + Torna a questa build%1$s + versionCode %1$d + Commit %1$s + Pagina della release + La PR ha un commit più recente (%1$s). La sua build di test non è ancora pronta, quindi questa non lo include. + Commit più recente, build in attesa + Numero PR, titolo o autore + Nessuna build di test corrisponde + Da ricompilare (versionCode %1$d) + Aggiornamenti build di test + Nuova build di test per la PR #%1$d + %1$s. Apri Aggiornamenti per installarla. + Mostra altre (%1$d) + Da ricompilare per versionCode %2$d (%1$d) + Build Preview su main dopo questa build di test: %1$d Build di test Prova una correzione prima che venga rilasciata Nessuna al momento diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0ebe258634..7e292b3f77 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1065,6 +1065,29 @@ プレビュー版 安定版より先に最新の修正 最新です + ビルド情報をコピー + ビルド情報をコピーしました + プレビュー版より新しい + プレビュー版より先行しています + このビルドは最新のプレビュー版より新しいです。次のプレビュー版で更新されます。 + ビルドを選ぶと変更内容の確認やインストールができます。 + インストール済み + このビルドをインストール%1$s + このビルドに戻す%1$s + versionCode %1$d + コミット %1$s + リリースページ + このPRには新しいコミット (%1$s) があります。そのテストビルドはまだ準備中のため、このビルドには含まれていません。 + 新しいコミットあり、ビルド待ち + PR番号、タイトル、作成者 + 一致するテストビルドはありません + 再ビルドが必要 (versionCode %1$d) + テストビルドの更新 + PR #%1$d の新しいテストビルド + %1$s。アップデートを開いてインストールしてください。 + さらに表示 (%1$d) + versionCode %2$d 向けに再ビルドが必要 (%1$d) + このテストビルド以降の main のプレビュー版ビルド: %1$d テストビルド 正式リリース前に特定の修正を試す 現在ありません diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e0482bcee0..3ce35f034f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1065,6 +1065,29 @@ 미리보기 안정판보다 먼저 받는 최신 수정 사항 최신 버전 + 빌드 정보 복사 + 빌드 정보를 복사했습니다 + 미리보기보다 최신 + 미리보기보다 앞서 있습니다 + 이 빌드는 최신 미리보기보다 새롭습니다. 다음 미리보기 빌드가 업데이트합니다. + 빌드를 선택해 변경 사항을 보거나 설치하세요. + 설치됨 + 이 빌드 설치%1$s + 이 빌드로 되돌리기%1$s + versionCode %1$d + 커밋 %1$s + 릴리스 페이지 + 이 PR에 더 새로운 커밋(%1$s)이 있습니다. 해당 테스트 빌드가 아직 준비되지 않아 이 빌드에는 포함되지 않았습니다. + 새 커밋 있음, 빌드 대기 중 + PR 번호, 제목 또는 작성자 + 일치하는 테스트 빌드가 없습니다 + 다시 빌드 필요 (versionCode %1$d) + 테스트 빌드 업데이트 + PR #%1$d 새 테스트 빌드 + %1$s. 업데이트를 열어 설치하세요. + 더 보기 (%1$d) + versionCode %2$d용으로 다시 빌드 필요 (%1$d) + 이 테스트 빌드 이후 main의 미리보기 빌드: %1$d 테스트 빌드 정식 출시 전에 특정 수정 사항을 시험해 보기 현재 없음 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 978ab19ffc..4f0cbd5362 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1065,6 +1065,29 @@ Preview Pembetulan terbaharu, sebelum Stable Terkini + Salin butiran binaan + Butiran binaan disalin + Lebih baharu daripada Preview + Anda mendahului Preview + Binaan ini lebih baharu daripada Preview terkini. Binaan Preview seterusnya akan mengemas kininya. + Pilih binaan untuk melihat perubahannya atau memasangnya. + Dipasang + Pasang binaan ini%1$s + Kembali ke binaan ini%1$s + versionCode %1$d + Commit %1$s + Halaman keluaran + PR ini ada commit lebih baharu (%1$s). Binaan ujiannya belum siap, jadi binaan ini tidak memuatkannya. + Commit baharu ditolak, binaan menunggu + Nombor PR, tajuk atau pengarang + Tiada binaan ujian yang sepadan + Perlu dibina semula (versionCode %1$d) + Kemas kini binaan ujian + Binaan ujian baharu untuk PR #%1$d + %1$s. Buka Kemas kini untuk memasangnya. + Tunjuk lagi (%1$d) + Perlu dibina semula untuk versionCode %2$d (%1$d) + Binaan Preview di main sejak binaan ujian ini: %1$d Binaan ujian Cuba pembetulan sebelum dikeluarkan Tiada pada masa ini diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 4c9931ca33..21d08282a7 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1068,6 +1068,29 @@ Preview Nyeste fikser, før Stable Oppdatert + Kopier byggdetaljer + Byggdetaljer kopiert + Foran Preview + Du er foran Preview + Dette bygget er nyere enn siste Preview. Neste Preview-bygg oppdaterer det. + Velg et bygg for å se endringene eller installere det. + Installert + Installer dette bygget%1$s + Gå tilbake til dette bygget%1$s + versionCode %1$d + Commit %1$s + Utgivelsesside + PR-en har en nyere commit (%1$s). Testbygget for den er ikke klart ennå, så dette inneholder den ikke. + Nyere commit, bygg venter + PR-nummer, tittel eller forfatter + Ingen testbygg passer + Må bygges på nytt (versionCode %1$d) + Oppdateringer for testbygg + Nytt testbygg for PR #%1$d + %1$s. Åpne Oppdateringer for å installere det. + Vis flere (%1$d) + Må bygges på nytt for versionCode %2$d (%1$d) + Preview-bygg på main siden dette testbygget: %1$d Testbuilder Prøv en fiks før den blir utgitt Ingen akkurat nå diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 68e7983d02..4b514189f2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1068,6 +1068,29 @@ Preview Nieuwste fixes, vóór Stabiel Up-to-date + Builddetails kopiëren + Builddetails gekopieerd + Voor op Preview + Je loopt voor op Preview + Deze build is nieuwer dan de nieuwste Preview. De volgende Preview-build werkt hem bij. + Kies een build om de wijzigingen te zien of hem te installeren. + Geïnstalleerd + Deze build installeren%1$s + Terug naar deze build%1$s + versionCode %1$d + Commit %1$s + Releasepagina + De PR heeft een nieuwere commit (%1$s). De testbuild daarvan is nog niet klaar, dus deze bevat hem niet. + Nieuwere commit, build volgt + PR-nummer, titel of auteur + Geen testbuild gevonden + Moet opnieuw gebouwd (versionCode %1$d) + Updates van testbuilds + Nieuwe testbuild voor PR #%1$d + %1$s. Open Updates om hem te installeren. + Meer tonen (%1$d) + Moeten opnieuw gebouwd voor versionCode %2$d (%1$d) + Preview-builds op main sinds deze testbuild: %1$d Testbuilds Probeer een fix voordat die wordt uitgebracht Momenteel geen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 1a7f2e4f87..5c0f3ec1b0 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1074,6 +1074,29 @@ Preview Najnowsze poprawki, zanim trafią do Stable Aktualne + Kopiuj szczegóły kompilacji + Skopiowano szczegóły kompilacji + Nowsza niż Preview + Wyprzedzasz Preview + Ta kompilacja jest nowsza niż najnowsza Preview. Zaktualizuje ją następna kompilacja Preview. + Wybierz kompilację, aby zobaczyć zmiany lub ją zainstalować. + Zainstalowana + Zainstaluj tę kompilację%1$s + Wróć do tej kompilacji%1$s + versionCode %1$d + Commit %1$s + Strona wydania + PR ma nowszy commit (%1$s). Jego kompilacja testowa nie jest jeszcze gotowa, więc ta go nie zawiera. + Nowszy commit, kompilacja w toku + Numer PR, tytuł lub autor + Brak pasujących kompilacji testowych + Wymaga ponownej kompilacji (versionCode %1$d) + Aktualizacje kompilacji testowych + Nowa kompilacja testowa PR #%1$d + %1$s. Otwórz Aktualizacje, aby ją zainstalować. + Pokaż więcej (%1$d) + Wymagają ponownej kompilacji dla versionCode %2$d (%1$d) + Kompilacje Preview na main od tej kompilacji testowej: %1$d Kompilacje testowe Wypróbuj poprawkę przed jej wydaniem Obecnie żadnych diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 8ed6c78568..ef63016613 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1063,6 +1063,29 @@ Antevisão As correções mais recentes, antes do Estável Atualizado + Copiar detalhes da versão + Detalhes da versão copiados + À frente da Antevisão + Está à frente da Antevisão + Esta versão é mais recente do que a última Antevisão. A próxima versão de Antevisão vai atualizá-la. + Escolha uma versão para ver as alterações ou instalá-la. + Instalada + Instalar esta versão%1$s + Voltar a esta versão%1$s + versionCode %1$d + Commit %1$s + Página da versão + O PR tem um commit mais recente (%1$s). A versão de teste dele ainda não está pronta, por isso esta não o inclui. + Commit mais recente, versão pendente + Número do PR, título ou autor + Nenhuma versão de teste corresponde + Precisa de ser recompilada (versionCode %1$d) + Atualizações de versões de teste + Nova versão de teste do PR #%1$d + %1$s. Abra Atualizações para a instalar. + Mostrar mais (%1$d) + Precisam de ser recompiladas para o versionCode %2$d (%1$d) + Versões de Antevisão no main desde esta versão de teste: %1$d Versões de teste Experimente uma correção antes de ser lançada Nenhuma de momento diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d6623028fb..b559645180 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1063,6 +1063,29 @@ Prévia As correções mais recentes, antes da Estável Atualizado + Copiar detalhes da versão + Detalhes da versão copiados + À frente da Prévia + Você está à frente da Prévia + Esta versão é mais nova que a última Prévia. A próxima versão da Prévia vai atualizá-la. + Escolha uma versão para ver as mudanças ou instalá-la. + Instalada + Instalar esta versão%1$s + Voltar para esta versão%1$s + versionCode %1$d + Commit %1$s + Página da versão + O PR tem um commit mais novo (%1$s). A versão de teste dele ainda não está pronta, então esta não o inclui. + Commit mais novo, versão pendente + Número do PR, título ou autor + Nenhuma versão de teste corresponde + Precisa ser recompilada (versionCode %1$d) + Atualizações de versões de teste + Nova versão de teste do PR #%1$d + %1$s. Abra Atualizações para instalá-la. + Mostrar mais (%1$d) + Precisam ser recompiladas para o versionCode %2$d (%1$d) + Versões da Prévia no main desde esta versão de teste: %1$d Versões de teste Experimente uma correção antes do lançamento Nenhuma no momento diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4788d92384..fb1390fd11 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1071,6 +1071,29 @@ Preview Cele mai noi remedieri, înainte de Stabilă Actualizat + Copiază detaliile versiunii + Detaliile versiunii au fost copiate + Înaintea Preview + Ești înaintea Preview + Această versiune este mai nouă decât ultima Preview. Următoarea versiune Preview o va actualiza. + Alege o versiune pentru a-i vedea modificările sau a o instala. + Instalată + Instalează această versiune%1$s + Revino la această versiune%1$s + versionCode %1$d + Commit %1$s + Pagina versiunii + PR-ul are un commit mai nou (%1$s). Versiunea lui de test nu e gata încă, așa că aceasta nu îl include. + Commit mai nou, versiune în așteptare + Număr PR, titlu sau autor + Nicio versiune de test nu se potrivește + Trebuie recompilată (versionCode %1$d) + Actualizări pentru versiunile de test + Versiune de test nouă pentru PR #%1$d + %1$s. Deschide Actualizări pentru a o instala. + Arată mai multe (%1$d) + Trebuie recompilate pentru versionCode %2$d (%1$d) + Versiuni Preview pe main de la această versiune de test: %1$d Versiuni de test Încearcă o remediere înainte de lansare Niciuna acum diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 007c897ef5..4499bc9d88 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1074,6 +1074,29 @@ Preview Последние исправления перед Stable Актуально + Скопировать сведения о сборке + Сведения о сборке скопированы + Новее Preview + Вы опережаете Preview + Эта сборка новее последней Preview. Её обновит следующая сборка Preview. + Выберите сборку, чтобы увидеть изменения или установить её. + Установлена + Установить эту сборку%1$s + Вернуться к этой сборке%1$s + versionCode %1$d + Коммит %1$s + Страница релиза + В PR есть более новый коммит (%1$s). Его тестовая сборка ещё не готова, поэтому в этой его нет. + Есть новый коммит, сборка ожидается + Номер PR, название или автор + Подходящих тестовых сборок нет + Нужна пересборка (versionCode %1$d) + Обновления тестовых сборок + Новая тестовая сборка PR #%1$d + %1$s. Откройте Обновления, чтобы установить её. + Показать ещё (%1$d) + Нужна пересборка для versionCode %2$d (%1$d) + Сборок Preview в main после этой тестовой сборки: %1$d Тестовые сборки Попробовать исправление до официального выпуска Сейчас нет diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 4b9d2ad460..05705053ca 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1068,6 +1068,29 @@ Förhandsversion De senaste fixarna, före Stabil Senaste versionen + Kopiera bygguppgifter + Bygguppgifter kopierade + Före Förhandsversion + Du ligger före Förhandsversion + Det här bygget är nyare än den senaste förhandsversionen. Nästa förhandsbygge uppdaterar det. + Välj ett bygge för att se ändringarna eller installera det. + Installerat + Installera det här bygget%1$s + Gå tillbaka till det här bygget%1$s + versionCode %1$d + Commit %1$s + Versionssida + PR:en har en nyare commit (%1$s). Dess testbygge är inte klart än, så det här innehåller den inte. + Nyare commit, bygge väntar + PR-nummer, titel eller författare + Inget testbygge matchar + Måste byggas om (versionCode %1$d) + Uppdateringar av testbyggen + Nytt testbygge för PR #%1$d + %1$s. Öppna Uppdateringar för att installera det. + Visa fler (%1$d) + Måste byggas om för versionCode %2$d (%1$d) + Förhandsbyggen på main sedan det här testbygget: %1$d Testbyggen Prova en fix innan den släpps Inga just nu diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 5e8be9a4d8..25399225fc 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1065,6 +1065,29 @@ Preview การแก้ไขล่าสุด ก่อนถึง Stable เป็นรุ่นล่าสุดแล้ว + คัดลอกรายละเอียดบิลด์ + คัดลอกรายละเอียดบิลด์แล้ว + ใหม่กว่า Preview + คุณนำหน้า Preview + บิลด์นี้ใหม่กว่า Preview ล่าสุด บิลด์ Preview ถัดไปจะอัปเดตให้ + เลือกบิลด์เพื่อดูการเปลี่ยนแปลงหรือติดตั้ง + ติดตั้งแล้ว + ติดตั้งบิลด์นี้%1$s + ย้อนกลับไปบิลด์นี้%1$s + versionCode %1$d + คอมมิต %1$s + หน้ารีลีส + PR นี้มีคอมมิตใหม่กว่า (%1$s) บิลด์ทดสอบของคอมมิตนั้นยังไม่พร้อม บิลด์นี้จึงยังไม่มีคอมมิตนั้น + มีคอมมิตใหม่ รอบิลด์ + หมายเลข PR ชื่อ หรือผู้เขียน + ไม่มีบิลด์ทดสอบที่ตรงกัน + ต้องบิลด์ใหม่ (versionCode %1$d) + อัปเดตบิลด์ทดสอบ + บิลด์ทดสอบใหม่ของ PR #%1$d + %1$s เปิดอัปเดตเพื่อติดตั้ง + แสดงเพิ่ม (%1$d) + ต้องบิลด์ใหม่สำหรับ versionCode %2$d (%1$d) + บิลด์ Preview บน main หลังบิลด์ทดสอบนี้: %1$d บิลด์ทดสอบ ลองการแก้ไขก่อนเผยแพร่จริง ไม่มีในขณะนี้ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 93bbe73c58..4deeaafe3d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1060,6 +1060,29 @@ Önizleme En yeni düzeltmeler, Kararlı\'dan önce Güncel + Derleme ayrıntılarını kopyala + Derleme ayrıntıları kopyalandı + Önizlemeden yeni + Önizlemenin önündesiniz + Bu derleme en son Önizlemeden daha yeni. Bir sonraki Önizleme derlemesi onu güncelleyecek. + Değişiklikleri görmek veya yüklemek için bir derleme seçin. + Yüklü + Bu derlemeyi yükle%1$s + Bu derlemeye geri dön%1$s + versionCode %1$d + Commit %1$s + Sürüm sayfası + PR\'de daha yeni bir commit var (%1$s). Test derlemesi henüz hazır değil, bu yüzden bu derleme onu içermiyor. + Yeni commit var, derleme bekleniyor + PR numarası, başlık veya yazar + Eşleşen test derlemesi yok + Yeniden derlenmeli (versionCode %1$d) + Test derlemesi güncellemeleri + PR #%1$d için yeni test derlemesi + %1$s. Yüklemek için Güncellemeler\'i açın. + Daha fazla göster (%1$d) + versionCode %2$d için yeniden derlenmeli (%1$d) + Bu test derlemesinden beri main üzerindeki Önizleme derlemeleri: %1$d Test derlemeleri Yayınlanmadan önce bir düzeltmeyi deneyin Şu anda yok diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 60cef3ca95..a459dc4444 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1074,6 +1074,29 @@ Попередній Найновіші виправлення, до стабільного каналу Актуальна версія + Копіювати відомості про збірку + Відомості про збірку скопійовано + Новіша за Попередній + Ви випереджаєте Попередній канал + Ця збірка новіша за останню попередню. Її оновить наступна попередня збірка. + Виберіть збірку, щоб побачити зміни або встановити її. + Встановлено + Встановити цю збірку%1$s + Повернутися до цієї збірки%1$s + versionCode %1$d + Коміт %1$s + Сторінка релізу + У PR є новіший коміт (%1$s). Його тестова збірка ще не готова, тож у цій його немає. + Є новий коміт, збірка очікується + Номер PR, назва або автор + Немає відповідних тестових збірок + Потрібна перезбірка (versionCode %1$d) + Оновлення тестових збірок + Нова тестова збірка PR #%1$d + %1$s. Відкрийте Оновлення, щоб встановити її. + Показати ще (%1$d) + Потрібна перезбірка для versionCode %2$d (%1$d) + Попередніх збірок у main після цієї тестової збірки: %1$d Тестові збірки Спробуйте виправлення до його випуску Поки що немає diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 90588d0191..c048cfd5ac 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1065,6 +1065,29 @@ Preview Các bản sửa mới nhất, trước Stable Đã mới nhất + Sao chép chi tiết bản dựng + Đã sao chép chi tiết bản dựng + Mới hơn Preview + Bạn đang đi trước Preview + Bản dựng này mới hơn Preview mới nhất. Bản Preview tiếp theo sẽ cập nhật nó. + Chọn một bản dựng để xem thay đổi hoặc cài đặt. + Đã cài + Cài bản dựng này%1$s + Quay lại bản dựng này%1$s + versionCode %1$d + Commit %1$s + Trang phát hành + PR có commit mới hơn (%1$s). Bản thử nghiệm của nó chưa sẵn sàng nên bản này chưa có. + Có commit mới, đang chờ bản dựng + Số PR, tiêu đề hoặc tác giả + Không có bản thử nghiệm nào khớp + Cần dựng lại (versionCode %1$d) + Cập nhật bản thử nghiệm + Bản thử nghiệm mới của PR #%1$d + %1$s. Mở Cập nhật để cài đặt. + Xem thêm (%1$d) + Cần dựng lại cho versionCode %2$d (%1$d) + Bản Preview trên main kể từ bản thử nghiệm này: %1$d Bản thử nghiệm Thử một bản sửa trước khi nó được phát hành Hiện không có diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 45c3669b17..ec65c282eb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1148,6 +1148,29 @@ 预览版 最新修复,先于稳定版 已是最新 + 复制构建信息 + 已复制构建信息 + 比预览版新 + 你领先于预览版 + 此构建比最新的预览版更新。下一个预览版构建会更新它。 + 选择一个构建以查看其更改或安装。 + 已安装 + 安装此构建%1$s + 回退到此构建%1$s + versionCode %1$d + 提交 %1$s + 发布页面 + 此 PR 有更新的提交(%1$s)。它的测试构建尚未就绪,因此此构建不包含它。 + 已推送新提交,构建待生成 + PR 编号、标题或作者 + 没有匹配的测试构建 + 需要重新构建(versionCode %1$d) + 测试构建更新 + PR #%1$d 有新的测试构建 + %1$s。打开“更新”进行安装。 + 显示更多(%1$d) + 需要为 versionCode %2$d 重新构建(%1$d) + 此测试构建之后 main 上的预览版构建:%1$d 测试构建 在修复正式发布前先试用 当前没有 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index fdcb636916..3b5883d3a3 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1064,6 +1064,29 @@ 預覽版 最新修正,比穩定版更早推出 已是最新 + 複製版本資料 + 已複製版本資料 + 比預覽版新 + 你領先預覽版 + 此版本比最新的預覽版更新。下一個預覽版會更新它。 + 選擇一個版本以查看其變更或安裝。 + 已安裝 + 安裝此版本%1$s + 退回此版本%1$s + versionCode %1$d + 提交 %1$s + 發佈頁面 + 此 PR 有較新的提交(%1$s)。它的測試版本尚未準備好,因此此版本不包含它。 + 已推送新提交,版本待建立 + PR 編號、標題或作者 + 沒有相符的測試版本 + 需要重新建置(versionCode %1$d) + 測試版本更新 + PR #%1$d 有新的測試版本 + %1$s。開啟「更新」進行安裝。 + 顯示更多(%1$d) + 需要為 versionCode %2$d 重新建置(%1$d) + 此測試版本之後 main 上的預覽版:%1$d 測試版本 在正式發佈前試用修正 目前沒有 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index eca4bcbe72..7661d16baa 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1064,6 +1064,29 @@ 預覽版 比穩定版更早取得的最新修正 已是最新 + 複製組建資訊 + 已複製組建資訊 + 比預覽版新 + 你領先預覽版 + 此組建比最新的預覽版更新。下一個預覽版組建會更新它。 + 選擇一個組建以查看其變更或安裝。 + 已安裝 + 安裝此組建%1$s + 退回此組建%1$s + versionCode %1$d + 提交 %1$s + 發行頁面 + 此 PR 有較新的提交(%1$s)。它的測試組建尚未就緒,因此此組建不包含它。 + 已推送新提交,組建待產生 + PR 編號、標題或作者 + 沒有相符的測試組建 + 需要重新組建(versionCode %1$d) + 測試組建更新 + PR #%1$d 有新的測試組建 + %1$s。開啟「更新」進行安裝。 + 顯示更多(%1$d) + 需要為 versionCode %2$d 重新組建(%1$d) + 此測試組建之後 main 上的預覽版組建:%1$d 測試組建版本 在正式發布前試用修正 目前沒有 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b9c7c9c4c..2d6a82851b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1130,6 +1130,29 @@ Preview Newest fixes, before Stable Up to date + Copy build details + Build details copied + Ahead of Preview + You\'re ahead of Preview + This build is newer than the latest Preview. The next Preview build will update it. + Pick a build to see its changes or install it. + Installed + Install this build%1$s + Roll back to this build%1$s + versionCode %1$d + Commit %1$s + Release page + The PR has a newer commit (%1$s). Its test build isn\'t ready yet, so this one doesn\'t include it. + Newer commit pushed, build pending + PR number, title or author + No test build matches + Needs a rebuild (versionCode %1$d) + Test build updates + New PR #%1$d test build + Show more (%1$d) + Need a rebuild for versionCode %2$d (%1$d) + Preview builds on main since this test build: %1$d + %1$s. Open Updates to install it. Test builds Try a fix before it\'s released None right now diff --git a/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt index 1dad18e921..21fa491d30 100644 --- a/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/update/AppUpdatesTest.kt @@ -357,4 +357,80 @@ class AppUpdatesTest { assertEquals(AppUpdates.Channel.TEST, g.follow.channel) assertTrue(g.certain) } + + private fun preview(commit: String, committedAt: Long, versionCode: Int = 9) = AppUpdates.Release( + "main-${commit.take(7)}", commit, "", commit, 0, null, versionCode, committedAt, "", apk(versionCode), + committedAt = committedAt, + ) + + private val history = listOf( + preview("1".repeat(40), 300L), + preview("2".repeat(40), 200L), + preview("3".repeat(40), 100L, versionCode = 8), + ) + private val withHistory = AppUpdates.Catalog(stable, history.first(), emptyList(), 0L, previews = history) + + @Test + fun previewOffersOnlyNewerBuildsAsUpdates() { + val nightly = Follow(Channel.NIGHTLY) + assertEquals(Offer.CURRENT, AppUpdates.offer(withHistory, nightly, me("1".repeat(40)))) + assertEquals(Offer.UPDATE, AppUpdates.offer(withHistory, nightly, me("2222222"))) + val newer = Installed("4".repeat(40), 0, "0.2.0", 9, updatable = true, committedAt = 400L) + assertEquals(Offer.AHEAD, AppUpdates.offer(withHistory, nightly, newer)) + val older = Installed("5".repeat(40), 0, "0.2.0", 9, updatable = true, committedAt = 50L) + assertEquals(Offer.UPDATE, AppUpdates.offer(withHistory, nightly, older)) + } + + @Test + fun previewHistoryListsEveryBuildAndWhereTheInstalledOneSits() { + val behind = AppUpdates.previewHistory(withHistory, me("2".repeat(40), ciBuild = false))!! + assertEquals(PreviewHistoryKind.BEHIND, behind.kind) + assertEquals(1, behind.installedIndex) + assertEquals(3, behind.builds.size) + assertEquals(PreviewHistoryKind.RECENT, AppUpdates.previewHistory(withHistory, me("9".repeat(40)))!!.kind) + } + + @Test + fun anOlderVersionCodePreviewCannotBeInstalledButASameCodeRollbackCan() { + val mine = me("1".repeat(40)) + assertFalse(AppUpdates.installable(history[0], mine)) + assertTrue(AppUpdates.installable(history[1], mine)) + assertFalse(AppUpdates.installable(history[2], mine)) + } + + @Test + fun aTestBuildBehindItsPrHeadIsFlaggedAndCountsLaterPreviews() { + val test = AppUpdates.Release("pr-7", "t", "", "abcdef1", 7, null, 9, 150L, "", apk(), headCommit = "1234567890") + assertTrue(test.newerCommitPushed) + val current = AppUpdates.Release("pr-7", "t", "", "abcdef1", 7, null, 9, 150L, "", apk(), headCommit = "abcdef1234") + assertFalse(current.newerCommitPushed) + val rebuiltHigher = AppUpdates.Release("pr-7", "t", "", "abcdef1", 7, null, 10, 150L, "", apk(10)) + assertFalse(AppUpdates.isRunning(rebuiltHigher, me("abcdef1234", pr = 7))) + assertTrue(AppUpdates.isRunning(current, me("abcdef1234", pr = 7))) + assertEquals(2, AppUpdates.previewsSince(withHistory, test)) + val rebuilt = AppUpdates.Release("pr-7", "t", "", "abcdef1", 7, null, 9, 150L, "", apk(), builtAt = 250L) + assertEquals(1, AppUpdates.previewsSince(withHistory, rebuilt)) + } + + @Test + fun publishedCatalogReadsEveryPreviewWithItsAuthorAndKeepsThemInTheCache() { + val entry = JSONObject(publishedCatalog().getJSONObject("preview").toString()) + .put("author", "maxjivi05").put("committedAt", 5L).put("mergedPr", 2602) + val bad = JSONObject(entry.toString()).put("commit", "feedbee1234567").put("author", "not a login") + val raw = publishedCatalog().put("previews", JSONArray().put(entry).put(bad)) + val parsed = AppUpdates.readPublishedCatalog(raw, "com.droiddeck.launcher", 1L) + assertEquals(2, parsed.previews.size) + assertEquals("maxjivi05", parsed.previews[0].author) + assertEquals(2602, parsed.previews[0].linkedPr) + assertEquals("", parsed.previews[1].author) + val cached = AppUpdates.readCachedCatalog(AppUpdates.writeCatalog(parsed)) + assertEquals(2, cached.previews.size) + assertEquals(5L, cached.previews[0].committedAt) + } + + @Test + fun aCatalogWithoutTheFullListStillOffersItsNewestPreview() { + val parsed = AppUpdates.readPublishedCatalog(publishedCatalog(), "com.droiddeck.launcher", 1L) + assertEquals(listOf("main-deadbee"), parsed.previewBuilds.map { it.tag }) + } } diff --git a/tools/release/publish-ci.sh b/tools/release/publish-ci.sh index 987ef622dd..1b3a9ae477 100644 --- a/tools/release/publish-ci.sh +++ b/tools/release/publish-ci.sh @@ -17,8 +17,9 @@ $(cat signed/SHA256SUMS.txt) gh release delete "$tag" -R "$CI_REPO" --yes --cleanup-tag 2>/dev/null || true gh release create "$tag" -R "$CI_REPO" --target main --prerelease \ --title "main ${GITHUB_SHA::7}" --notes "$notes" signed/* -gh release list -R "$CI_REPO" -L 200 --json tagName,publishedAt \ - --jq '[.[] | select(.tagName | startswith("main-"))] | sort_by(.publishedAt) | reverse | .['"$KEEP"':][] | .tagName' | +cutoff=$(date -u -d "-${KEEP_DAYS} days" +%Y-%m-%dT%H:%M:%SZ) +gh release list -R "$CI_REPO" -L 1000 --exclude-drafts --json tagName,publishedAt \ + --jq '.[] | select((.tagName | startswith("main-")) and .publishedAt < "'"$cutoff"'") | .tagName' | while IFS= read -r old; do if [ "$old" = "$tag" ]; then continue diff --git a/tools/release/update_catalog.py b/tools/release/update_catalog.py index 94ecd1ce5c..8ceadb5fcb 100755 --- a/tools/release/update_catalog.py +++ b/tools/release/update_catalog.py @@ -17,6 +17,7 @@ API = "https://api.github.com" SHA256 = re.compile(r"^[0-9a-f]{64}$") PR_TAG = re.compile(r"^pr-([1-9][0-9]*)$") MAIN_TAG = re.compile(r"^main-([0-9a-f]{7,40})$") +MERGED_PR = re.compile(r"\[PR #([1-9][0-9]*)\]\(") class ApiError(RuntimeError): @@ -53,6 +54,20 @@ class GitHub: def get(self, path: str): return self.request("GET", path) + def get_all(self, path: str, limit: int = 1000) -> list: + items = [] + page = 1 + sep = "&" if "?" in path else "?" + while len(items) < limit: + batch = self.get(f"{path}{sep}per_page=100&page={page}") + if not batch: + break + items.extend(batch) + if len(batch) < 100: + break + page += 1 + return items + def put(self, path: str, body): return self.request("PUT", path, body) @@ -100,15 +115,20 @@ def parse_variants(text: str) -> list[tuple[str, str]]: return out -def published_millis(release: dict, prefer_updated: bool = False) -> int: - value = ( - release.get("updated_at") if prefer_updated else None - ) or release.get("published_at") or release.get("created_at") +def iso_millis(value: str | None) -> int: if not value: return 0 return int(dt.datetime.fromisoformat(value.replace("Z", "+00:00")).timestamp() * 1000) +def published_millis(release: dict, prefer_updated: bool = False) -> int: + return iso_millis( + (release.get("updated_at") if prefer_updated else None) + or release.get("published_at") + or release.get("created_at") + ) + + def paragraphs(markdown: str) -> list[str]: return [p.strip() for p in re.split(r"\n\s*\n", markdown.replace("\r", "")) if p.strip()] @@ -195,6 +215,7 @@ def release_entry( title: str, summary: str, prefer_updated: bool = False, + extra: dict | None = None, ): suffixes = [suffix for _, suffix in variants] apks = {} @@ -220,6 +241,7 @@ def release_entry( "versionCode": version_code, "publishedAt": published_millis(release, prefer_updated), "url": release.get("html_url") or "", + **(extra or {}), "apks": apks, } @@ -289,8 +311,52 @@ def stable_app_release(releases: list[dict]) -> dict | None: return max(apps, key=lambda r: r.get("published_at") or r.get("created_at") or "", default=None) -def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str) -> dict: - stable_release = stable_app_release(source.get(f"/repos/{source_repo}/releases?per_page=100")) +def merged_pr(release: dict) -> int: + ps = paragraphs(release.get("body") or "") + match = MERGED_PR.search(ps[0]) if ps else None + return int(match.group(1)) if match else 0 + + +class Cache: + """Commit facts carried over from the published catalog, so a run only asks GitHub about new builds.""" + + def __init__(self, previous: dict | None): + self.commits: dict[str, dict] = {} + for entry in (previous or {}).get("previews") or []: + commit = (entry.get("commit") or "").lower() + if commit and entry.get("committedAt"): + self.commits[commit] = {"author": entry.get("author") or "", "committedAt": entry["committedAt"]} + + def commit(self, gh: GitHub, repo: str, sha: str) -> dict: + sha = sha.lower() + if sha not in self.commits: + try: + obj = gh.get(f"/repos/{repo}/commits/{q(sha)}") + self.commits[sha] = { + "author": (obj.get("author") or {}).get("login") or "", + "committedAt": iso_millis(((obj.get("commit") or {}).get("committer") or {}).get("date")), + } + except ApiError: + self.commits[sha] = {"author": "", "committedAt": 0} + return self.commits[sha] + + +def unique_previews(previews: list[dict]) -> list[dict]: + ordered = sorted(previews, key=lambda r: (r.get("committedAt") or r["publishedAt"], r["publishedAt"]), reverse=True) + result = [] + seen = set() + for preview in ordered: + commit = preview["commit"].lower() + if commit in seen: + continue + seen.add(commit) + result.append(preview) + return result + + +def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str, previous: dict | None = None) -> dict: + cache = Cache(previous) + stable_release = stable_app_release(source.get_all(f"/repos/{source_repo}/releases", limit=300)) stable = None if stable_release: @@ -307,9 +373,11 @@ def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str) -> signer, title, summary, + extra={"committedAt": cache.commit(source, source_repo, stable_commit)["committedAt"]}, ) - releases = ci.get(f"/repos/{ci_repo}/releases?per_page=100") + main_code, _, main_variants, main_signer = source_meta(source, source_repo, "main") + releases = ci.get_all(f"/repos/{ci_repo}/releases") previews = [] preview_history = [] tests = [] @@ -322,12 +390,20 @@ def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str) -> commit = main_commit(release) if not commit: continue - try: - code, _, variants, signer = source_meta(source, source_repo, commit) - except ApiError: - continue + code_text = release_body_value(release.get("body") or "", "VersionCode") + if code_text and code_text.isdigit(): + code, variants, signer = int(code_text), main_variants, main_signer + else: + try: + code, _, variants, signer = source_meta(source, source_repo, commit) + except ApiError: + continue + facts = cache.commit(source, source_repo, commit) title, summary = ci_description(release) - preview = release_entry(release, commit, 0, None, code, variants, signer, title, summary) + preview = release_entry( + release, commit, 0, None, code, variants, signer, title, summary, + extra={"mergedPr": merged_pr(release), "author": facts["author"], "committedAt": facts["committedAt"]}, + ) previews.append(preview) history_entry = preview_history_entry(release, preview, variants) if history_entry: @@ -350,16 +426,15 @@ def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str) -> commit = release_body_value(body, "Commit") if not commit or not re.fullmatch(r"[0-9a-f]{7,40}", commit): continue - base_ref = release_body_value(body, "Base") or pull["base"]["sha"] - try: - base_code, _, variants, signer = source_meta(source, source_repo, base_ref) - except ApiError: - continue version_code_text = release_body_value(body, "VersionCode") if version_code_text and version_code_text.isdigit(): version_code = int(version_code_text) else: - version_code = base_code + base_ref = release_body_value(body, "Base") or pull["base"]["sha"] + try: + version_code = source_meta(source, source_repo, base_ref)[0] + except ApiError: + continue try: changed = source.get(f"/repos/{source_repo}/pulls/{pr}/files?per_page=100") if any(item.get("filename") == "app/build.gradle" for item in changed): @@ -375,52 +450,69 @@ def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str) -> pr, None, version_code, - variants, - signer, + main_variants, + main_signer, title, summary, prefer_updated=True, + extra={ + "author": (pull.get("user") or {}).get("login") or "", + "headCommit": (pull.get("head") or {}).get("sha") or "", + "builtAt": max( + (iso_millis(a.get("updated_at") or a.get("created_at")) + for a in release.get("assets") or [] if (a.get("name") or "").endswith(".apk")), + default=0, + ), + }, ) ) - previews.sort(key=lambda r: r["publishedAt"], reverse=True) + ordered = unique_previews(previews) tests.sort(key=lambda r: r["publishedAt"], reverse=True) return { "schema": 1, "sourceRepo": source_repo, "ciRepo": ci_repo, "generatedAt": int(time.time() * 1000), + "mainVersionCode": main_code, "stable": stable, - "preview": previews[0] if previews else None, + "preview": ordered[0] if ordered else None, "recentPreviews": recent_previews(preview_history), + "previews": ordered, "tests": tests, } -def current_file(ci: GitHub, repo: str, path: str): +def current_file(ci: GitHub, repo: str, path: str, branch: str = "main"): try: - return ci.get(f"/repos/{repo}/contents/{q(path)}?ref=main") + return ci.get(f"/repos/{repo}/contents/{q(path)}?ref={q(branch)}") except ApiError as e: if e.status == 404: return None raise -def publish_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str, path: str): +def previous_catalog(old: dict | None) -> dict | None: + try: + return json.loads(base64.b64decode(old["content"])) if old and old.get("content") else None + except Exception: + return None + + +def publish_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str, path: str, branch: str = "main"): for attempt in range(4): - catalog = build_catalog(source, ci, source_repo, ci_repo) - content = (json.dumps(catalog, indent=2, sort_keys=False) + "\n").encode() - old = current_file(ci, ci_repo, path) + old = current_file(ci, ci_repo, path, branch) + catalog = build_catalog(source, ci, source_repo, ci_repo, previous_catalog(old)) + content = (json.dumps(catalog, separators=(",", ":")) + "\n").encode() body = { "message": "ci: refresh DroidDeck update catalog", "content": base64.b64encode(content).decode(), - "branch": "main", + "branch": branch, } if old: body["sha"] = old["sha"] try: - old_bytes = base64.b64decode(old["content"]) - old_json = json.loads(old_bytes) + old_json = dict(previous_catalog(old) or {}) old_json.pop("generatedAt", None) new_json = dict(catalog) new_json.pop("generatedAt", None) @@ -431,7 +523,7 @@ def publish_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str, pass try: ci.put(f"/repos/{ci_repo}/contents/{q(path)}", body) - print(f"published https://raw.githubusercontent.com/{ci_repo}/main/{path}") + print(f"published https://raw.githubusercontent.com/{ci_repo}/{branch}/{path}") return catalog except ApiError as e: if e.status not in (409, 422) or attempt == 3: @@ -445,6 +537,7 @@ def main(): parser.add_argument("--source-repo", default="Droid-Deck/DroidDeck") parser.add_argument("--ci-repo", default="Droid-Deck/DroidDeck-CI") parser.add_argument("--path", default="catalog.json") + parser.add_argument("--branch", default="main") parser.add_argument("--dry-run", action="store_true") args = parser.parse_args() @@ -455,7 +548,7 @@ def main(): else: if not os.environ.get("CI_GITHUB_TOKEN"): raise SystemExit("CI_GITHUB_TOKEN is required to publish") - publish_catalog(source, ci, args.source_repo, args.ci_repo, args.path) + publish_catalog(source, ci, args.source_repo, args.ci_repo, args.path, args.branch) if __name__ == "__main__": diff --git a/tools/tests/test_update_catalog.py b/tools/tests/test_update_catalog.py index 3a0fc3de38..5ec076d1c6 100644 --- a/tools/tests/test_update_catalog.py +++ b/tools/tests/test_update_catalog.py @@ -1,7 +1,9 @@ import unittest from tools.release.update_catalog import ( + Cache, asset_for_suffix, + merged_pr, ci_description, parse_gradle, parse_variants, @@ -10,6 +12,7 @@ from tools.release.update_catalog import ( recent_previews, release_body_value, stable_app_release, + unique_previews, ) @@ -149,6 +152,25 @@ pubg com.tencent.ig -pubg self.assertEqual("0.2.0", stable_app_release(releases)["tag_name"]) self.assertIsNone(stable_app_release(releases[:1])) + def test_merged_pr_comes_from_the_first_paragraph(self): + body = "**Merged to main** - [PR #2602](https://github.com/Droid-Deck/DroidDeck/pull/2602): fix: x\n\nSee [PR #9](u)." + self.assertEqual(2602, merged_pr({"body": body})) + self.assertEqual(0, merged_pr({"body": "**Pushed to main** without a PR - fix: x"})) + + def test_previews_follow_commit_order_not_publish_order(self): + older = {"commit": "a" * 40, "committedAt": 100, "publishedAt": 900} + newer = {"commit": "b" * 40, "committedAt": 200, "publishedAt": 300} + again = {**newer, "publishedAt": 50} + self.assertEqual([newer, older], unique_previews([older, again, newer])) + + def test_cache_reuses_commit_facts_from_the_last_catalog(self): + class NoNetwork: + def get(self, path): + raise AssertionError(path) + + cache = Cache({"previews": [{"commit": "A" * 40, "author": "dev", "committedAt": 5}]}) + self.assertEqual({"author": "dev", "committedAt": 5}, cache.commit(NoNetwork(), "o/r", "a" * 40)) + if __name__ == "__main__": unittest.main() From a3be5f7ae2479bdd47a8997e69ad3489774247a4 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 14 Nov 2026 16:53:43 -0500 Subject: [PATCH 100/101] fix(epic): install the Epic Games Launcher from its Linux .deb (#2281) * fix(epic): install the Epic Games Launcher from its Linux .deb Epic no longer serves the Linux AppImage: the installer URL answers 404 errors.com.epicgames.launcher.app_direct_url_not_found (30003), so Install failed for everyone. Epic now ships EpicGamesLauncher-x86_64.deb (0.113.0+g2164614). - The installer downloads the .deb, checks its ar magic and the CDN ETag, and droiddeck-epic unpacks its data.tar.* member straight from the archive. - The .deb links WebKitGTK 4.1, JavaScriptCoreGTK 4.1 and GTK 3, which the Steam Runtime 4 image does not ship. 32 Debian 13 amd64 packages, pinned by SHA-256 and size (60.2 MB download, 201 MB unpacked), are unpacked into the launcher's desktop/ folder (shared libraries only) and put on its LD_LIBRARY_PATH. Debian 13 matches the runtime's own base, so only sonames the runtime lacks are added. Each package falls back to snapshot.debian.org when the deb.debian.org pool has moved on. - WebKit starts its helper processes from its built-in /usr/lib/x86_64-linux-gnu/webkit2gtk-4.1 path, so each launch links that folder in the runtime to the layer's copy. - An installed AppImage launcher keeps starting through its AppRun; the next update check moves it to the .deb. Closure checked offline: every ELF in the .deb and the layer resolves with the runtime's own ld-linux-x86-64.so.2 inside a sandbox holding only the runtime, the layer and libGLESv2 (0 missing, 0 version or undefined symbol errors with LD_BIND_NOW). Based on zooluis's research in #2268. Co-authored-by: zooluis <150430329+zooluis@users.noreply.github.com> * fix(epic): provide desktop GLib data paths * fix(epic): keep archive symlinks from redirecting the desktop layer and icon --------- Co-authored-by: zooluis <150430329+zooluis@users.noreply.github.com> --- README.md | 1 + .../stores/epic/EpicClientInstaller.kt | 89 +++++-- .../launcher/stores/epic/EpicClientTest.kt | 37 ++- .../overlay/usr/local/bin/droiddeck-epic | 230 ++++++++++++------ tools/tests/test_droiddeck_epic.py | 161 +++++++++++- 5 files changed, 417 insertions(+), 101 deletions(-) diff --git a/README.md b/README.md index e94de30150..84b6bbcd79 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. V - Epic Games and GOG build on [Phobos](https://github.com/phobos665)'s adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl). GOG install script registry entries are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher) (GPL-3.0) reads them. - Epic's official Linux launcher preview runs through FEX. That setup is outside Epic's listed Linux support. +- The launcher's .deb gets the WebKitGTK and GTK 3 libraries it needs from unmodified [Debian](https://www.debian.org) 13 packages, following [@zooluis](https://github.com/zooluis)'s research in [#2268](https://github.com/Droid-Deck/DroidDeck/pull/2268). - Battle.net is by [@kayakyakr](https://github.com/kayakyakr). It runs Blizzard's own client in Proton (downloaded from Blizzard, not included) and shows key art from the [Battle.net Shop](https://shop.battle.net). Without Steam, its games see the pad as an Xbox 360 controller via `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. - The EA store follows the EA app's protocols as documented by [ArmchairDevelopers](https://github.com/ArmchairDevelopers)' [Maxima](https://github.com/ArmchairDevelopers/Maxima) (GPL-3.0): sign-in, the GraphQL queries (included verbatim, since EA matches them by hash), build archives, online activation licences and the LSX game endpoint. The code is DroidDeck's own. - Battle.net installs drive Blizzard's Agent the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) does, with requests from [wowdev.wiki](https://wowdev.wiki/Agent). Read without taking code: [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader. diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientInstaller.kt index 12116732cf..d620388c82 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientInstaller.kt @@ -21,19 +21,61 @@ import java.security.MessageDigest import java.util.concurrent.atomic.AtomicBoolean internal object EpicClientSources { - const val LAUNCHER_URL = "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncher-x86_64.AppImage" - const val LAUNCHER_FILE = "EpicGamesLauncher-x86_64.AppImage" + const val LAUNCHER_URL = "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncher-x86_64.deb" + const val LAUNCHER_FILE = "EpicGamesLauncher-x86_64.deb" const val RUNTIME_BASE = "https://repo.steampowered.com/steamrt4/images/" const val RUNTIME_FILE = "com.valvesoftware.SteamRuntime.Platform-amd64,i386-steamrt4-runtime.tar.gz" const val GLES_URL = "https://deb.debian.org/debian/pool/main/libg/libglvnd/libgles2_1.7.0-1+b2_amd64.deb" const val GLES_FILE = "libgles2_1.7.0-1+b2_amd64.deb" const val GLES_SHA256 = "e12c18aa77939d122ee1dea520ba0440b97dc19200b7396e03dff03a3ece74c1" + const val DEBIAN = "https://deb.debian.org/debian/" + const val SNAPSHOT = "https://snapshot.debian.org/archive/debian/20261101T000000Z/" const val USER_AGENT = "DroidDeck" private val VERSION = Regex("[A-Za-z0-9._+-]{1,64}") private val SUM = Regex("^([0-9a-fA-F]{64})\\s+\\*?(.+)$") class Source(val url: String, val version: String, val sha256: String? = null) + class Package(val path: String, val sha256: String, val size: Long) { + val file: String get() = path.substringAfterLast('/') + val urls: List get() = listOf(DEBIAN + path, SNAPSHOT + path) + } + + val DESKTOP = listOf( + Package("pool/main/a/abseil/libabsl20240722_20240722.0-4_amd64.deb", "78c6d7692890990a27cb1d5bbd95b7bfe47a4183ffafec5b30f689f9b58ec6f7", 491548L), + Package("pool/main/a/aom/libaom3_3.12.1-1+deb13u1_amd64.deb", "743eec7c94ae30295bc557ebac3dfae948e7390e89a2743c585d56297e9d312e", 1871712L), + Package("pool/main/a/aspell/libaspell15_0.60.8.1-4_amd64.deb", "8be22785198a4e5de1e2c3a157e8cd99ec7d5843c8ac96a174ec701ba4ac28e2", 337684L), + Package("pool/main/a/at-spi2-core/libatk-bridge2.0-0t64_2.56.2-1+deb13u2_amd64.deb", "c0fe87ea1bdca2f938eaa8286af5ad38ecd15cf18c6cfb5961d7d46ac3192325", 68516L), + Package("pool/main/a/at-spi2-core/libatspi2.0-0t64_2.56.2-1+deb13u2_amd64.deb", "65e9c9ecbd820fba2d04104cddd0bad33d256cbdfe0d1cb5365f10e363df2315", 81056L), + Package("pool/main/liba/libavif/libavif16_1.2.1-1.2_amd64.deb", "ba6c334454d3562560ad583fbe2c998e203b0fc5a0e0e91112ddcd3cff4704bb", 133120L), + Package("pool/main/libc/libcloudproviders/libcloudproviders0_0.3.6-2_amd64.deb", "a626bb23ed9ebc4bc3ce446b552048de63d76768bf0fb492754965c5ee28a7e4", 29232L), + Package("pool/main/c/colord/libcolord2_1.4.7-3_amd64.deb", "f11fd3b492781122edf0790f1e1fe24c51a41c67d4bb76cff84a9426c5654fa7", 139204L), + Package("pool/main/e/enchant-2/libenchant-2-2_2.8.2+dfsg1-3_amd64.deb", "83f208d89db1c48e6ede8a23e8ffa2bcddd4f99427bfd1279201247bbf27ca58", 56756L), + Package("pool/main/libe/libepoxy/libepoxy0_1.5.10-2_amd64.deb", "4c4c8024f2175086de65bca9fdc3fbb967f2863ebf249d489c66d0c8103dd3a3", 192728L), + Package("pool/main/libe/libevdev/libevdev2_1.13.4+dfsg-1_amd64.deb", "02e85fb9461b85b23f775d5fcf5a31c55d37bec40b63fd98ca5d3a2763714ae7", 32372L), + Package("pool/main/f/flite/libflite1_2.2-7_amd64.deb", "5945190970be7d4a1f71fb6f7e3e340ba2675e770605df0754051d617a6c5ee6", 12811404L), + Package("pool/main/libg/libgav1/libgav1-1_0.19.0-3+b1_amd64.deb", "94010041e59c7a8d2d3d1f5e62afd523f002b7b1caa3189419160b66d71c0195", 352956L), + Package("pool/main/g/gst-plugins-base1.0/libgstreamer-gl1.0-0_1.26.2-1+deb13u1_amd64.deb", "efacc61acbd44a6a067612e4592b9fe81efdc5011ed4c6cf7afd8ed83c5f834a", 269984L), + Package("pool/main/g/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.26.2-1+deb13u1_amd64.deb", "a20aedb3f89c162b4859cec37076f4eba54b0bcc7e5cb254a26cc4a877a88a1e", 997404L), + Package("pool/main/g/gstreamer1.0/libgstreamer1.0-0_1.26.2-2_amd64.deb", "08b463307fbde5496a346b1bb300b465cd22bd326f6f4634f482bf441af28a9b", 1421116L), + Package("pool/main/g/gtk+3.0/libgtk-3-0t64_3.24.49-3_amd64.deb", "4aa8828f01365f937f3bf69f812c8107ee4c8a2b208ffdd7656e8de5de81d98f", 2768812L), + Package("pool/main/h/hidapi/libhidapi-hidraw0_0.14.0-1+b2_amd64.deb", "89c546cb55be403ce63fe668baff2515979100a30fa07e2b97de186b9c07f01e", 12664L), + Package("pool/main/h/hunspell/libhunspell-1.7-0_1.7.2+really1.7.2-10+b4_amd64.deb", "a9427e5220e71f8c04c6c0f87826c6fef98e2bab6994a87d6d82e8a120790ecf", 236980L), + Package("pool/main/h/highway/libhwy1t64_1.2.0-2+b2_amd64.deb", "540c4ff28255fbfa89468061b722dfc2b773b0c1ecf163a063202482dea5b119", 676044L), + Package("pool/main/h/hyphen/libhyphen0_2.8.8-7+b2_amd64.deb", "fa9dca7b8cf1381fd52800c44a385c5725a78a88bd705f7c39b1046a5293435e", 30664L), + Package("pool/main/w/webkit2gtk/libjavascriptcoregtk-4.1-0_2.52.6-1~deb13u1_amd64.deb", "3383ebb3e13f31225c65f41112420be58493a3de112b5993cf5c417cfedc47c8", 7511632L), + Package("pool/main/j/jpeg-xl/libjxl0.11_0.11.2-0.1~deb13u2_amd64.deb", "cd1ca3a52cb0d8fdce1d994bcbf0663de28c64add1cfe8096639ae8fa9808824", 1133312L), + Package("pool/main/l/lcms2/liblcms2-2_2.16-2+deb13u2_amd64.deb", "32e53c2002ccea8c60c02779bea0ba49ac132fef702988a30d64af79b6617806", 160264L), + Package("pool/main/libm/libmanette/libmanette-0.2-0_0.2.12-1_amd64.deb", "98841a467692c46fd1870275113235691ebbfe71a3524f6b2a0fa7e9c33c6e56", 43752L), + Package("pool/main/o/orc/liborc-0.4-0t64_0.4.41-1_amd64.deb", "5b9afe78be0dd71399c0d4d7e5f26beb6ddf207279997942d8280be1b20bd58c", 189604L), + Package("pool/main/r/rust-rav1e/librav1e0.7_0.7.1-9+b2_amd64.deb", "d5b1373a8d6905ee4523faf1db7a626dc660e03836ec91b616e57ba386f47eb6", 946396L), + Package("pool/main/libs/libsecret/libsecret-1-0_0.21.7-1_amd64.deb", "949c5428cd3427486ac6c4dfc6d9400ce786c504c02334acc903c873aa52d14f", 111224L), + Package("pool/main/s/svt-av1/libsvtav1enc2_2.3.0+dfsg-1_amd64.deb", "cdaf961c3cc4fe78a19ff18c17d83d813f78a378fdcc4c86ccbb9b54e84ae599", 2489492L), + Package("pool/main/w/webkit2gtk/libwebkit2gtk-4.1-0_2.52.6-1~deb13u1_amd64.deb", "6471d989a61a56a7801e88e420789aa6b0eaba630a9787365bba8b9576b7ba1c", 24163372L), + Package("pool/main/libx/libxslt/libxslt1.1_1.1.35-1.2+deb13u3_amd64.deb", "c8e5a745ca3afaa079b01e0c00d80a241101d1ab840407fcd4bb423de3326160", 233128L), + Package("pool/main/liby/libyuv/libyuv0_0.0.1904.20250204-1_amd64.deb", "1a6827fe94fa5572a032332df7313ed408e9c0ad78f3a1248391bddc6d920ef2", 173700L), + ) + fun launcher(): Source? { val location = redirect(LAUNCHER_URL) ?: return null val version = launcherVersion(location) ?: return null @@ -142,12 +184,13 @@ internal object EpicClientSources { private fun hex(bytes: ByteArray): String = bytes.joinToString("") { "%02x".format(it) } - fun isAppImage(file: File): Boolean = runCatching { + private val DEB_MAGIC = "!\ndebian-binary".toByteArray(Charsets.US_ASCII) + + fun isDeb(file: File): Boolean = runCatching { RandomAccessFile(file, "r").use { raf -> - val head = ByteArray(11) + val head = ByteArray(DEB_MAGIC.size) raf.readFully(head) - head[0] == 0x7f.toByte() && head[1] == 'E'.code.toByte() && head[2] == 'L'.code.toByte() && head[3] == 'F'.code.toByte() && - head[8] == 'A'.code.toByte() && head[9] == 'I'.code.toByte() && head[10] == 2.toByte() + head.contentEquals(DEB_MAGIC) } }.getOrDefault(false) } @@ -156,9 +199,10 @@ internal class EpicClientInstaller(private val app: Context) : DownloadQueue.Dow private val cancelled = AtomicBoolean(false) @Volatile private var connection: HttpURLConnection? = null - private class Part(val url: String, val file: File, val sha256: String?, val appImage: Boolean) { - var size = -1L + private class Part(val urls: List, val file: File, val sha256: String?, val launcher: Boolean, var size: Long = -1L) { + var mirror = 0 var mismatch: String? = null + val url: String get() = urls[mirror] } override fun run(handle: DownloadQueue.JobHandle): String? { @@ -173,17 +217,15 @@ internal class EpicClientInstaller(private val app: Context) : DownloadQueue.Dow val needRuntime = !(before.runtimeVersion == runtime.version && File(state, "runtime/${runtime.version}/.droiddeck-ready").isFile) val dir = EpicClient.downloadsDir(app).apply { mkdirs() } val gles = EpicClientSources.gles() - val parts = buildList { - if (needApp) add(Part(launcher.url, File(dir, "${launcher.version}-${EpicClientSources.LAUNCHER_FILE}"), null, true)) - if (needRuntime) { - add(Part(runtime.url, File(dir, "steamrt4-${runtime.version}.tar.gz"), runtime.sha256, false)) - add(Part(gles.url, File(dir, EpicClientSources.GLES_FILE), gles.sha256, false)) - } - } + val appPart = if (needApp) Part(listOf(launcher.url), File(dir, "${launcher.version}-${EpicClientSources.LAUNCHER_FILE}"), null, true) else null + val desktopParts = if (needApp) EpicClientSources.DESKTOP.map { Part(it.urls, File(dir, it.file), it.sha256, false, it.size) } else emptyList() + val runtimePart = if (needRuntime) Part(listOf(runtime.url), File(dir, "steamrt4-${runtime.version}.tar.gz"), runtime.sha256, false) else null + val glesPart = if (needRuntime) Part(listOf(gles.url), File(dir, EpicClientSources.GLES_FILE), gles.sha256, false) else null + val parts = listOfNotNull(appPart) + desktopParts + listOfNotNull(runtimePart, glesPart) val keep = parts.flatMap { listOf(it.file.name, it.file.name + PARTIAL, it.file.name + TAG) }.toSet() dir.listFiles()?.forEach { if (it.name !in keep) it.deleteRecursively() } if (parts.isNotEmpty()) { - parts.forEach { it.size = length(it.url) } + parts.forEach { if (it.size <= 0) it.size = length(it.url) } val total = parts.sumOf { it.size.coerceAtLeast(0L) } val have = parts.sumOf { p -> if (p.file.isFile) p.file.length() else File(p.file.path + PARTIAL).length() } val needed = (total - have).coerceAtLeast(0L) + (if (needApp) APP_ROOM else 0L) + (if (needRuntime) RUNTIME_ROOM else 0L) @@ -202,8 +244,9 @@ internal class EpicClientInstaller(private val app: Context) : DownloadQueue.Dow handle.stage(DownloadStage.INSTALL, app.getString(R.string.epic_client_unpacking)) val argv = mutableListOf(EpicClient.PROGRAM, "install", "--app-version", launcher.version, "--runtime-version", runtime.version) fun guest(file: File) = EpicClient.guestPath(app, file) ?: throw IllegalStateException(app.getString(R.string.epic_client_unpack_failed, file.name)) - if (needApp) argv += listOf("--app", guest(parts[0].file)) - if (needRuntime) argv += listOf("--runtime", guest(parts[parts.size - 2].file), "--gles", guest(parts[parts.size - 1].file)) + appPart?.let { argv += listOf("--app", guest(it.file)) } + desktopParts.forEach { argv += listOf("--desktop", guest(it.file)) } + if (runtimePart != null && glesPart != null) argv += listOf("--runtime", guest(runtimePart.file), "--gles", guest(glesPart.file)) var answer: JSONObject? = null val code = GuestCommand.run(app, argv, fakeRoot = true, logName = "epic-client") { line -> if (line.startsWith("{")) runCatching { JSONObject(line) }.getOrNull()?.let { answer = it } @@ -298,6 +341,10 @@ internal class EpicClientInstaller(private val app: Context) : DownloadQueue.Dow } 200 -> false 416 -> { partial.delete(); tag.delete(); throw IOException("HTTP 416") } + 404, 410 -> { + if (part.mirror + 1 < part.urls.size) { part.mirror++; tag.delete() } + throw IOException("HTTP $code") + } else -> throw IOException("HTTP $code") } val served = conn.getHeaderField("ETag")?.takeIf { it.isNotBlank() } @@ -334,8 +381,8 @@ internal class EpicClientInstaller(private val app: Context) : DownloadQueue.Dow part.sha256?.let { want -> if (EpicClientSources.sha256(file) != want) { file.delete(); throw IOException("checksum mismatch") } } - if (part.appImage) { - if (!EpicClientSources.isAppImage(file)) { file.delete(); throw IOException("not an AppImage") } + if (part.launcher) { + if (!EpicClientSources.isDeb(file)) { file.delete(); throw IOException("not a Debian package") } if (EpicClientSources.etagMatches(file, etag) == false) { val seen = EpicClientSources.sha256(file) if (part.mismatch != seen) { @@ -351,7 +398,7 @@ internal class EpicClientInstaller(private val app: Context) : DownloadQueue.Dow const val PARTIAL = ".part" const val TAG = ".etag" const val ATTEMPTS = 6 - const val APP_ROOM = 600L shl 20 + const val APP_ROOM = 700L shl 20 const val RUNTIME_ROOM = 560L shl 20 } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt index 1b92f1f1a0..6cc80dc47f 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt @@ -225,8 +225,9 @@ class EpicClientTest { } @Test fun launcherVersionComesFromTheRedirect() { - val location = "https://content-download-egs.distro.on.epicgames.com/Builds/EGLv2/0.95.2%2Bgfa9ad49/Linux/EpicGamesLauncher-x86_64.AppImage?launcherfilename=EpicGamesLauncher-x86_64.AppImage" - assertEquals("0.95.2+gfa9ad49", EpicClientSources.launcherVersion(location)) + val location = "https://content-download-egs.distro.on.epicgames.com/Builds/EGLv2/0.113.0%2Bg2164614/Linux/EpicGamesLauncher-x86_64.deb?launcherfilename=EpicGamesLauncher-x86_64.deb" + assertEquals("0.113.0+g2164614", EpicClientSources.launcherVersion(location)) + assertTrue(EpicClientSources.LAUNCHER_URL.endsWith("/" + EpicClientSources.LAUNCHER_FILE)) assertNull(EpicClientSources.launcherVersion("http://content-download-egs.distro.on.epicgames.com/Builds/EGLv2/1.0/Linux/a")) assertNull(EpicClientSources.launcherVersion("https://example.com/Builds/EGLv2/..%2F..%2Fetc/Linux/a")) assertNull(EpicClientSources.launcherVersion("https://example.com/other/path")) @@ -256,11 +257,33 @@ class EpicClientTest { assertEquals(true, EpicClientSources.etagMatches(file, hex(md5(data)))) } - @Test fun appImageMagicIsRequired() { - val good = File(tmp.root, "a").apply { writeBytes(byteArrayOf(0x7f, 'E'.code.toByte(), 'L'.code.toByte(), 'F'.code.toByte(), 2, 1, 1, 0, 'A'.code.toByte(), 'I'.code.toByte(), 2, 0)) } - val bad = File(tmp.root, "b").apply { writeBytes(ByteArray(16)) } - assertTrue(EpicClientSources.isAppImage(good)) - assertFalse(EpicClientSources.isAppImage(bad)) + @Test fun debianPackageMagicIsRequired() { + val good = File(tmp.root, "a").apply { writeBytes("!\ndebian-binary/ 0 0 0 100644 4 `\n2.0\n".toByteArray()) } + val plainAr = File(tmp.root, "b").apply { writeBytes("!\ndata.tar.gz/".toByteArray()) } + val appImage = File(tmp.root, "c").apply { writeBytes(byteArrayOf(0x7f, 'E'.code.toByte(), 'L'.code.toByte(), 'F'.code.toByte(), 2, 1, 1, 0, 'A'.code.toByte(), 'I'.code.toByte(), 2, 0)) } + val short = File(tmp.root, "d").apply { writeBytes("!".toByteArray()) } + assertTrue(EpicClientSources.isDeb(good)) + assertFalse(EpicClientSources.isDeb(plainAr)) + assertFalse(EpicClientSources.isDeb(appImage)) + assertFalse(EpicClientSources.isDeb(short)) + assertFalse(EpicClientSources.isDeb(File(tmp.root, "missing"))) + } + + @Test fun desktopPackagesArePinnedWithAFallbackMirror() { + val packages = EpicClientSources.DESKTOP + assertTrue(packages.isNotEmpty()) + assertEquals(packages.size, packages.map { it.file }.toSet().size) + assertTrue(packages.any { it.file.startsWith("libwebkit2gtk-4.1-0_") }) + assertTrue(packages.any { it.file.startsWith("libjavascriptcoregtk-4.1-0_") }) + assertTrue(packages.any { it.file.startsWith("libgtk-3-0t64_") }) + packages.forEach { p -> + assertTrue(p.path, Regex("^pool/main/[a-z0-9]+/[^/]+/[^/]+_amd64\\.deb$").matches(p.path)) + assertTrue(p.path, Regex("^[0-9a-f]{64}$").matches(p.sha256)) + assertTrue(p.path, p.size > 0) + assertEquals(listOf(EpicClientSources.DEBIAN + p.path, EpicClientSources.SNAPSHOT + p.path), p.urls) + assertTrue(p.urls.all { it.startsWith("https://") && it.endsWith("/" + p.file) }) + } + assertTrue(EpicClientSources.GLES_FILE !in packages.map { it.file }) } @Test fun signInUrlsMustRedirectToLoopback() { diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic b/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic index 6f95cabe42..34dea7de31 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic @@ -4,7 +4,6 @@ import collections import fcntl import filecmp import http.client -import io import json import os import re @@ -72,6 +71,14 @@ APP_ID = "com.epicgames.eglv2" DBUS_NAME = APP_ID + ".SingleInstance" DBUS_PATH = "/" + APP_ID.replace(".", "/") + "/SingleInstance" DBUS_METHOD = "org.SingleInstance.DBus.ExecuteCallback" +APP_BIN = "usr/bin/EpicGamesLauncher" +DEB_ICON = "usr/share/icons/hicolor/256x256@2/apps/EpicGamesLauncher.png" +ICON = "epic-games-launcher.png" +DESKTOP = "desktop" +DESKTOP_KEEP = ("usr/lib/x86_64-linux-gnu/", "usr/share/glib-2.0/schemas/") +DESKTOP_LIB = DESKTOP + "/usr/lib/x86_64-linux-gnu" +WEBKIT_DIR = "webkit2gtk-4.1" +WEBKIT_LIB = "libwebkit2gtk-4.1.so.0" SKIPPED = ("lib/i386-linux-gnu", "lib32", "libx32", "i686-pc-linux-gnu", "share/doc", "include") SETTINGS_SEED = { "minimizeToTray": False, @@ -254,6 +261,35 @@ def inside(root, path): return real == root or real.startswith(root + os.sep) +def unpack_member(archive, member, staging, root, name, link): + target = os.path.join(staging, name) + if not inside(root, os.path.dirname(target)): + return False + if member.isdir(): + os.makedirs(target, exist_ok=True) + return False + os.makedirs(os.path.dirname(target), exist_ok=True) + if not inside(root, os.path.dirname(target)): + return False + if member.issym(): + remove(target) + os.symlink(link(target, member.linkname), target) + elif member.islnk(): + source = safe_name(member.linkname) + source = os.path.join(staging, source) if source else None + if source and os.path.isfile(source) and inside(root, source): + remove(target) + shutil.copy2(source, target) + elif member.isfile(): + remove(target) + with archive.extractfile(member) as src, open(target, "wb") as out: + shutil.copyfileobj(src, out, 1 << 20) + os.chmod(target, (member.mode & 0o777) | 0o600) + else: + return False + return True + + def extract_runtime(tarball, dest): staging = dest + ".staging" remove(staging) @@ -271,32 +307,12 @@ def extract_runtime(tarball, dest): continue if top == "files" and rest and skipped(rest): continue - target = os.path.join(staging, name) - if not inside(root, os.path.dirname(target)): - continue - if member.isdir(): - os.makedirs(target, exist_ok=True) - continue - os.makedirs(os.path.dirname(target), exist_ok=True) - if not inside(root, os.path.dirname(target)): - continue - if member.issym(): - remove(target) - os.symlink(rooted_link(files_root, target, member.linkname) if top == "files" else member.linkname, target) - elif member.islnk(): - source = safe_name(member.linkname) - source = os.path.join(staging, source) if source else None - if source and os.path.isfile(source) and inside(root, source): - remove(target) - shutil.copy2(source, target) - elif member.isfile(): - remove(target) - with archive.extractfile(member) as src, open(target, "wb") as out: - shutil.copyfileobj(src, out, 1 << 20) - os.chmod(target, (member.mode & 0o777) | 0o600) + if top == "files": + link = lambda target, linkname: rooted_link(files_root, target, linkname) else: - continue - count += 1 + link = lambda target, linkname: linkname + if unpack_member(archive, member, staging, root, name, link): + count += 1 if not os.path.isfile(os.path.join(files_root, "lib", "x86_64-linux-gnu", "libc.so.6")) and \ not os.path.islink(os.path.join(files_root, "lib", "x86_64-linux-gnu", "libc.so.6")): remove(staging) @@ -306,63 +322,129 @@ def extract_runtime(tarball, dest): return staging, count -def ar_members(path): +@contextlib.contextmanager +def deb_data(path, reason): with open(path, "rb") as f: if f.read(8) != b"!\n": - raise Failure("gles-format") + raise Failure(reason) while True: header = f.read(60) if len(header) < 60: - return + raise Failure(reason) name = header[:16].decode("ascii", "replace").strip().rstrip("/") size = int(header[48:58].decode("ascii").strip()) - data = f.read(size) - if size % 2: - f.read(1) - yield name, data + if name.startswith("data.tar"): + with tarfile.open(fileobj=f, mode="r|*") as archive: + yield archive + return + f.seek(size + size % 2, os.SEEK_CUR) + + +def is_deb(path): + try: + with open(path, "rb") as f: + return f.read(21) == b"!\ndebian-binary" + except OSError: + return False def install_gles(deb, files_root): libdir = os.path.join(files_root, "lib", "x86_64-linux-gnu") os.makedirs(libdir, exist_ok=True) - for name, data in ar_members(deb): - if not name.startswith("data.tar"): - continue - with tarfile.open(fileobj=io.BytesIO(data), mode="r:*") as archive: - for member in archive: - base = os.path.basename(member.name) - if not base.startswith("libGLESv2.so"): - continue - target = os.path.join(libdir, base) - remove(target) - if member.issym(): - os.symlink(os.path.basename(member.linkname), target) - elif member.isfile(): - with archive.extractfile(member) as src, open(target, "wb") as out: - shutil.copyfileobj(src, out) - os.chmod(target, 0o644) - if os.path.exists(os.path.join(libdir, "libGLESv2.so.2")): - return - raise Failure("gles-missing") + with deb_data(deb, "gles-format") as archive: + for member in archive: + base = os.path.basename(member.name) + if not base.startswith("libGLESv2.so"): + continue + target = os.path.join(libdir, base) + remove(target) + if member.issym(): + os.symlink(os.path.basename(member.linkname), target) + elif member.isfile(): + with archive.extractfile(member) as src, open(target, "wb") as out: + shutil.copyfileobj(src, out) + os.chmod(target, 0o644) + if not os.path.exists(os.path.join(libdir, "libGLESv2.so.2")): + raise Failure("gles-missing") -def extract_app(image, dest): +def extract_deb(deb, dest, wanted=None): + root = os.path.realpath(dest) + + def link(target, linkname): + if not linkname.startswith("/"): + return linkname + return os.path.relpath(os.path.join(dest, linkname.lstrip("/")), os.path.dirname(target)) + + count = 0 + with deb_data(deb, "app-format") as archive: + for member in archive: + name = safe_name(member.name) + if name is None or (wanted is not None and not wanted(name)): + continue + if unpack_member(archive, member, dest, root, name, link): + count += 1 + return count + + +def extract_app(image, dest, desktop=()): staging = dest + ".staging" remove(staging) os.makedirs(staging) - status = subprocess.call([os.path.join(BIN_DIR, "droiddeck-fex"), "extract", os.path.abspath(image)], - cwd=staging, stdout=subprocess.DEVNULL) - root = os.path.realpath(os.path.join(staging, "squashfs-root")) - if status != 0 or not app_complete(root): + try: + if not is_deb(image): + raise Failure("app-format") + extract_deb(image, staging) + layer = os.path.join(staging, DESKTOP) + if not inside(os.path.realpath(staging), layer): + raise Failure("app-extract") + os.makedirs(layer, exist_ok=True) + for package in desktop: + if not is_deb(package): + raise Failure("desktop-format") + extract_deb(package, layer, lambda name: any(name.startswith(prefix) for prefix in DESKTOP_KEEP)) + icon = os.path.join(staging, DEB_ICON) + if os.path.isfile(icon): + remove(os.path.join(staging, ICON)) + shutil.copyfile(icon, os.path.join(staging, ICON)) + if not app_complete(staging): + raise Failure("app-extract") + except Exception: remove(staging) - raise Failure("app-extract") + raise remove(dest) - os.rename(root, dest) - remove(staging) + os.rename(staging, dest) def app_complete(root): - return os.path.isfile(os.path.join(root, "AppRun")) and os.path.isfile(os.path.join(root, "usr", "bin", "EpicGamesLauncher")) + if not os.path.isfile(os.path.join(root, APP_BIN)): + return False + return os.path.isfile(os.path.join(root, "AppRun")) or os.path.isfile(os.path.join(root, DESKTOP_LIB, WEBKIT_LIB)) + + +def app_command(app_dir): + apprun = os.path.join(app_dir, "AppRun") + return apprun if os.path.isfile(apprun) else os.path.join(app_dir, APP_BIN) + + +def desktop_libs(app_dir): + path = os.path.join(app_dir, DESKTOP_LIB) + return path if os.path.isdir(path) else None + + +def link_webkit(files, libs): + target = os.path.join(files, "lib", "x86_64-linux-gnu", WEBKIT_DIR) + if os.path.isdir(target) and not os.path.islink(target): + return + source = os.path.join(libs, WEBKIT_DIR) if libs else None + if source is None or not os.path.isdir(source): + remove(target) + return + link = os.path.relpath(source, os.path.dirname(target)) + if os.path.islink(target) and os.readlink(target) == link: + return + remove(target) + os.symlink(link, target) def ready(path): @@ -396,8 +478,11 @@ def install(options): image = options.get("app") if not image or not os.path.isfile(image): raise Failure("no-app-image") - say("unpacking the Epic Games Launcher %s" % app) - extract_app(image, app_dir) + desktop = options.get("desktop") or [] + if not all(os.path.isfile(package) for package in desktop): + raise Failure("no-desktop-package") + say("unpacking the Epic Games Launcher %s (%d desktop packages)" % (app, len(desktop))) + extract_app(image, app_dir, desktop) mark_ready(app_dir) if not ready(runtime_dir): tarball, deb = options.get("runtime"), options.get("gles") @@ -729,11 +814,16 @@ def fex_environment(fex, files, env): return result -def client_environment(base, fex, files, display, bus, broker, a11y=None, hidden=False): +def client_environment(base, fex, files, display, bus, broker, a11y=None, hidden=False, libs=None): env = {name: base[name] for name in KEPT_ENV if base.get(name)} env.setdefault("HOME", HOME) env.setdefault("LANG", "C.UTF-8") env["PATH"] = SHIMS + ":/usr/bin:/bin" + if libs: + env["LD_LIBRARY_PATH"] = libs + data = os.path.normpath(os.path.join(os.path.dirname(libs), "..", "share")) + env["XDG_DATA_DIRS"] = data + ":/usr/local/share:/usr/share" + env["GSETTINGS_SCHEMA_DIR"] = os.path.join(data, "glib-2.0", "schemas") env["DISPLAY"] = display env["DBUS_SESSION_BUS_ADDRESS"] = bus env[BROKER_ENV] = broker @@ -1238,6 +1328,8 @@ class Session: seed_settings() install_shims() install_preload(files) + libs = desktop_libs(app_dir) + link_webkit(files, libs) fex_module()["install_fonts"](files) clear_playing() sync_installations() @@ -1254,8 +1346,8 @@ class Session: path = broker_path() self.broker = Broker(path, self.mode, base) write_json(instance_file(), {"pid": os.getpid(), "mode": self.mode, "bus": bus, "broker": path}) - env = client_environment(base, fex, files, display, bus, path, self.a11y, hidden=self.mode == "hidden") - self.command = [fex["bin"], os.path.join(app_dir, "AppRun")] + env = client_environment(base, fex, files, display, bus, path, self.a11y, hidden=self.mode == "hidden", libs=libs) + self.command = [fex["bin"], app_command(app_dir)] self.env = env say("starting the Epic Games Launcher %s (%s, display %s)" % (current.get("app"), self.mode, display)) self.start_client() @@ -1471,12 +1563,14 @@ def forward(bus, url): return False -def parse_options(args, flags=()): +def parse_options(args, flags=(), lists=()): options, rest = {}, [] while args: arg = args.pop(0) if arg.startswith("--") and arg[2:] in flags: options[arg[2:]] = True + elif arg.startswith("--") and arg[2:] in lists and args: + options.setdefault(arg[2:], []).append(args.pop(0)) elif arg.startswith("--") and args: options[arg[2:]] = args.pop(0) else: @@ -1830,7 +1924,7 @@ def main(argv): if action == "xdg-open": return shim_open(args) if action == "install": - options, _ = parse_options(args) + options, _ = parse_options(args, lists=("desktop",)) try: return install(options) except (ValueError, tarfile.TarError, OSError) as error: diff --git a/tools/tests/test_droiddeck_epic.py b/tools/tests/test_droiddeck_epic.py index 297168b00e..39304d777d 100644 --- a/tools/tests/test_droiddeck_epic.py +++ b/tools/tests/test_droiddeck_epic.py @@ -175,17 +175,27 @@ class RuntimeExtractTest(EpicTestCase): old = self.state / "app/0.1" old.mkdir(parents=True) - def extract_app(image, dest): - os.makedirs(os.path.join(dest, "usr/bin")) - Path(dest, "AppRun").write_text("run") - Path(dest, "usr/bin/EpicGamesLauncher").write_text("bin") + layers = [] + def extract_app(image, dest, desktop=()): + layers.append(list(desktop)) + os.makedirs(os.path.join(dest, "usr/bin")) + os.makedirs(os.path.join(dest, "desktop/usr/lib/x86_64-linux-gnu")) + Path(dest, "usr/bin/EpicGamesLauncher").write_text("bin") + Path(dest, "desktop/usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.1.so.0").write_text("webkit") + + package = self.tmp / "libwebkit.deb" + package.write_bytes(b"x") with mock.patch.dict(G, {"extract_app": extract_app, "fex_tool": lambda request=False: {"bin": "/fex", "server": "/s"}}), \ mock.patch("sys.stdout", new_callable=io.StringIO) as out: image = self.tmp / "image" image.write_bytes(b"x") + with self.assertRaises(G["Failure"]): + G["install"]({"app": str(image), "app-version": "0.95.2+g1", "runtime": str(tarball), + "runtime-version": "4.0.1", "gles": str(deb), "desktop": [str(self.tmp / "missing.deb")]}) code = G["install"]({"app": str(image), "app-version": "0.95.2+g1", "runtime": str(tarball), - "runtime-version": "4.0.1", "gles": str(deb)}) + "runtime-version": "4.0.1", "gles": str(deb), "desktop": [str(package)]}) + self.assertEqual([[str(package)]], layers) self.assertEqual(0, code) report = json.loads(out.getvalue()) self.assertTrue(report["installed"]) @@ -197,6 +207,147 @@ class RuntimeExtractTest(EpicTestCase): self.assertTrue((self.state / "app/0.95.2+g1/.droiddeck-ready").is_file()) +def deb(path, entries, compression="gz"): + data = io.BytesIO() + with tarfile.open(fileobj=data, mode="w:" + compression) as archive: + for entry in entries: + tar_add(archive, *entry[:1], **entry[1]) + path.write_bytes(ar([("debian-binary", b"2.0\n"), ("control.tar.xz", b"c"), ("data.tar." + compression, data.getvalue())])) + return path + + +class LauncherDebTest(EpicTestCase): + def launcher(self, extra=()): + return deb(self.tmp / "EpicGamesLauncher-x86_64.deb", [ + ("./usr", {"kind": "dir"}), + ("./usr/bin/EpicGamesLauncher", {"data": b"egl", "mode": 0o755}), + ("./usr/lib/epic-games-launcher/libEOSSDK-Linux-Shipping.so", {"data": b"eos"}), + ("./usr/share/icons/hicolor/256x256@2/apps/EpicGamesLauncher.png", {"data": b"png"}), + ("./usr/share/applications/epic-games-launcher.desktop", {"data": b"[Desktop Entry]\n"}), + ("./usr/bin/egl", {"link": "/usr/bin/EpicGamesLauncher"}), + ("../escape", {"data": b"x"}), + *extra, + ]) + + def webkit(self): + return deb(self.tmp / "libwebkit2gtk-4.1-0_amd64.deb", [ + ("./usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.1.so.0.19.1", {"data": b"webkit"}), + ("./usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.1.so.0", {"link": "libwebkit2gtk-4.1.so.0.19.1"}), + ("./usr/lib/x86_64-linux-gnu/webkit2gtk-4.1/WebKitNetworkProcess", {"data": b"net", "mode": 0o755}), + ("./usr/lib/x86_64-linux-gnu/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so", {"data": b"bundle"}), + ("./usr/share/glib-2.0/schemas/org.gnome.GWeather4.gschema.xml", {"data": b"schema"}), + ("./usr/share/doc/libwebkit2gtk-4.1-0/copyright", {"data": b"c"}), + ("./usr/share/locale/fr/LC_MESSAGES/WebKitGTK-4.1.mo", {"data": b"fr"}), + ], "xz") + + def test_the_launcher_and_its_desktop_layer_come_out_of_debs(self): + dest = self.state / "app/0.113.0+g1" + G["extract_app"](str(self.launcher()), str(dest), [str(self.webkit())]) + self.assertEqual(b"egl", (dest / "usr/bin/EpicGamesLauncher").read_bytes()) + self.assertTrue(os.access(dest / "usr/bin/EpicGamesLauncher", os.X_OK)) + self.assertEqual(b"eos", (dest / "usr/lib/epic-games-launcher/libEOSSDK-Linux-Shipping.so").read_bytes()) + self.assertEqual("EpicGamesLauncher", os.readlink(dest / "usr/bin/egl")) + self.assertEqual(b"png", (dest / "epic-games-launcher.png").read_bytes()) + libs = dest / "desktop/usr/lib/x86_64-linux-gnu" + self.assertEqual(b"webkit", (libs / "libwebkit2gtk-4.1.so.0").read_bytes()) + self.assertEqual(b"net", (libs / "webkit2gtk-4.1/WebKitNetworkProcess").read_bytes()) + self.assertEqual(b"schema", (dest / "desktop/usr/share/glib-2.0/schemas/org.gnome.GWeather4.gschema.xml").read_bytes()) + self.assertFalse((dest / "desktop/usr/share/doc").exists()) + self.assertFalse((self.state / "app/escape").exists()) + self.assertFalse((self.state / "app/0.113.0+g1.staging").exists()) + self.assertTrue(G["app_complete"](str(dest))) + self.assertEqual(str(dest / "usr/bin/EpicGamesLauncher"), G["app_command"](str(dest))) + self.assertEqual(str(libs), G["desktop_libs"](str(dest))) + + def test_archive_symlinks_cannot_redirect_the_desktop_layer_or_icon(self): + outside = self.tmp / "outside" + outside.mkdir() + dest = self.state / "app/0.113.0+g1" + escape = os.path.relpath(outside, Path(str(dest) + ".staging")) + launcher = self.launcher([("./desktop", {"link": escape}), + ("./epic-games-launcher.png", {"link": escape + "/target"})]) + with self.assertRaises(G["Failure"]) as caught: + G["extract_app"](str(launcher), str(dest), [str(self.webkit())]) + self.assertEqual("app-extract", str(caught.exception)) + self.assertFalse((outside / "usr").exists()) + self.assertFalse((outside / "target").exists()) + + icon_dest = self.state / "app/0.113.0+g2" + icon_escape = os.path.relpath(outside / "target", Path(str(icon_dest) + ".staging")) + G["extract_app"](str(self.launcher([("./epic-games-launcher.png", {"link": icon_escape})])), + str(icon_dest), [str(self.webkit())]) + self.assertEqual(b"png", (icon_dest / "epic-games-launcher.png").read_bytes()) + self.assertFalse((outside / "target").exists()) + + def test_a_launcher_without_its_desktop_layer_is_refused(self): + dest = self.state / "app/0.113.0+g1" + with self.assertRaises(G["Failure"]) as caught: + G["extract_app"](str(self.launcher()), str(dest)) + self.assertEqual("app-extract", str(caught.exception)) + self.assertFalse(dest.exists()) + self.assertFalse(Path(str(dest) + ".staging").exists()) + + def test_anything_but_a_deb_is_refused_and_leaves_nothing_behind(self): + image = self.tmp / "EpicGamesLauncher-x86_64.AppImage" + image.write_bytes(b"\x7fELF\x02\x01\x01\x00AI\x02" + bytes(64)) + dest = self.state / "app/0.95.2+g1" + with self.assertRaises(G["Failure"]) as caught: + G["extract_app"](str(image), str(dest), [str(self.webkit())]) + self.assertEqual("app-format", str(caught.exception)) + plain = self.tmp / "plain.deb" + plain.write_bytes(ar([("data.tar.gz", b"x")])) + with self.assertRaises(G["Failure"]) as caught: + G["extract_app"](str(self.launcher()), str(dest), [str(plain)]) + self.assertEqual("desktop-format", str(caught.exception)) + self.assertFalse(dest.exists()) + self.assertFalse(Path(str(dest) + ".staging").exists()) + + def test_an_installed_appimage_launcher_still_runs_through_apprun(self): + app = self.state / "app/0.95.2+g1" + (app / "usr/bin").mkdir(parents=True) + (app / "AppRun").write_text("run") + (app / "usr/bin/EpicGamesLauncher").write_text("bin") + self.assertTrue(G["app_complete"](str(app))) + self.assertEqual(str(app / "AppRun"), G["app_command"](str(app))) + self.assertIsNone(G["desktop_libs"](str(app))) + (app / "usr/bin/EpicGamesLauncher").unlink() + self.assertFalse(G["app_complete"](str(app))) + + def test_the_webkit_helpers_are_linked_into_the_runtime(self): + dest = self.state / "app/0.113.0+g1" + G["extract_app"](str(self.launcher()), str(dest), [str(self.webkit())]) + files = self.state / "runtime/4.0.1/files" + (files / "lib/x86_64-linux-gnu").mkdir(parents=True) + link = files / "lib/x86_64-linux-gnu/webkit2gtk-4.1" + G["link_webkit"](str(files), G["desktop_libs"](str(dest))) + self.assertFalse(os.path.isabs(os.readlink(link))) + self.assertEqual(b"net", (link / "WebKitNetworkProcess").read_bytes()) + G["link_webkit"](str(files), G["desktop_libs"](str(dest))) + self.assertEqual(b"net", (link / "WebKitNetworkProcess").read_bytes()) + G["link_webkit"](str(files), None) + self.assertFalse(os.path.lexists(link)) + link.mkdir() + (link / "own").write_text("x") + G["link_webkit"](str(files), G["desktop_libs"](str(dest))) + self.assertTrue((link / "own").is_file()) + self.assertTrue((dest / "desktop/usr/lib/x86_64-linux-gnu/webkit2gtk-4.1/WebKitNetworkProcess").is_file()) + + def test_only_the_deb_launcher_gets_the_desktop_libraries(self): + with mock.patch.dict(G, {"fex_environment": lambda fex, files, base: {}}): + plain = G["client_environment"]({"LD_LIBRARY_PATH": "/host"}, None, None, ":0", "bus", "broker") + layered = G["client_environment"]({}, None, None, ":0", "bus", "broker", libs="/app/desktop/usr/lib/x86_64-linux-gnu") + self.assertNotIn("LD_LIBRARY_PATH", plain) + self.assertEqual("/app/desktop/usr/lib/x86_64-linux-gnu", layered["LD_LIBRARY_PATH"]) + self.assertEqual("/app/desktop/usr/share:/usr/local/share:/usr/share", layered["XDG_DATA_DIRS"]) + self.assertEqual("/app/desktop/usr/share/glib-2.0/schemas", layered["GSETTINGS_SCHEMA_DIR"]) + + def test_every_desktop_package_reaches_the_install(self): + options, rest = G["parse_options"](["--app", "a.deb", "--desktop", "one.deb", "--desktop", "two.deb", "x"], lists=("desktop",)) + self.assertEqual({"app": "a.deb", "desktop": ["one.deb", "two.deb"]}, options) + self.assertEqual(["x"], rest) + self.assertEqual({"desktop": "two.deb"}, G["parse_options"](["--desktop", "one.deb", "--desktop", "two.deb"])[0]) + + class ArgumentsTest(EpicTestCase): def test_client_arguments_win_and_paths_become_windows_paths(self): ovt = self.tmp / "ovt" From eb190f2dd7751f8f77de98940df4524e59cdf5bb Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 14 Nov 2026 17:35:54 -0500 Subject: [PATCH 101/101] feat(agent): Agent tab refinements: one-state composer, no snapping, notifications, choices, subagents, dictation, game frame, copy, History search (#2626) * fix(agent): one-state composer with model and usage on top; reading back stays detached while the agent streams - The composer no longer has a compact reading bar that a first tap expands: the editor is always the editor, and the model picker and context ring move to the top beside the menu. - The pet chat drops its DeeDee title so that top bar gets the whole width. - Scrolling back stops following new output; new entries and streamed text only scroll the list while it is at the bottom, and sending a message resumes following. - When the editor slides back in or the keyboard rises, a list at the bottom keeps its last lines above the editor, even mid-drag. * fix(agent): a revise while reading back shows the editor it focuses * feat(agent): dictate a message, and attach what the running game shows - With nothing typed, the editor's send button dictates instead, through Android's speech recognizer; what is heard follows the text already there. It asks for the microphone the first time. - While a game session is open, a camera button attaches the game's current frame. It is copied from the game's own surface, as the bottom screen's screenshots are, so the chat or drawer over it is not in the picture. * feat(agent): a notification when a turn ends unseen, and replies that end in choices offer them as buttons - A turn that ends while neither the Agent page nor the pet is in view posts a notification: finished, failed or asking, with the reply's first line. Opening the Agent page clears it. - Claude Code's question tool is not available in print mode, so the brief asks the agent to end a reply with a choices block instead. The chat shows its options as buttons, and the one picked is sent as the next message. * feat(agent): a subagent's work shows under the call that started it Claude Code tags a subagent's messages with the call that started it. Its text, thinking and streamed deltas used to show as the main agent's reply, and its tool calls mixed into the turn. Now only its tool calls are kept, stored with their parent, and shown inside the parent's card: a live line with the step count and the latest call, and every call when the card is opened. Its token counts no longer overwrite the context reading. * feat(agent): copy a reply or a tool's text, and open a turn's changes in one place - A turn's footer has a copy button for everything the agent said in it, and tool input and output boxes have one each. - The files-changed chip opens every edit the turn made, file by file. * feat(agent): search conversations in History A field above the list keeps the conversations whose title, messages or replies hold the text, ignoring case. Chat files are read off the main thread, a quarter second after the last keystroke. * fix(agent): sending while reading back jumps to the latest * feat(agent): manage Claude Code's MCP servers and skills from the Agent menu A new panel lists the MCP servers claude mcp list reports, adds one for every project from a URL (over HTTP) or a start command (over stdio), and removes it; connectors from the claude.ai account are listed but managed there. It also lists the skills in ~/.claude/skills with their descriptions, and deletes one after a confirming second tap. * fix(agent): review follow-ups for the Agent tab refinements - Choices only come from one fenced block that ends the reply. - The Agent page counts as on screen only while its activity is started, so a turn ending during a game still notifies. - Picking a choice or Go jumps to the latest like sending does. - Dictation stops when the chat is hidden or the keyboard sends; stopping it by hand keeps the recognizer until its final result. - A failed JPEG encode is not attached. - The copied reply is read from the turn each time. - MCP start commands keep their quoted arguments; the CLI is read beside its 90 s deadline; deleting a skill runs off the main thread and removes links without following them. * fix(agent): scroll the shrinking list after layout, not during measure * fix(agent): fence-aware choices parsing; dictation stops overwriting edited drafts * fix(agent): ignore choices blocks nested in a code fence * fix(agent): treat tilde fences like backtick fences when finding choices * test(agent): cover a tilde-fenced choices block --- .../com/droiddeck/launcher/SessionActivity.kt | 35 +- .../launcher/agent/AgentAttachments.kt | 20 ++ .../droiddeck/launcher/agent/AgentChats.kt | 18 +- .../droiddeck/launcher/agent/AgentHarness.kt | 11 +- .../com/droiddeck/launcher/agent/AgentHost.kt | 57 ++- .../droiddeck/launcher/agent/AgentNotice.kt | 58 +++ .../droiddeck/launcher/agent/AgentTools.kt | 143 ++++++++ .../com/droiddeck/launcher/ui/AgentEntries.kt | 103 +++++- .../com/droiddeck/launcher/ui/AgentPage.kt | 332 ++++++++++-------- .../com/droiddeck/launcher/ui/AgentPanels.kt | 239 +++++++++++-- .../droiddeck/launcher/ui/AgentPetWindows.kt | 9 +- .../com/droiddeck/launcher/ui/AgentVoice.kt | 74 ++++ 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 | 31 +- .../launcher/agent/AgentChoicesTest.kt | 68 ++++ .../droiddeck/launcher/agent/AgentHostTest.kt | 16 + .../launcher/agent/AgentToolsTest.kt | 53 +++ .../droiddeck/launcher/ui/AgentChangesTest.kt | 5 + 49 files changed, 1040 insertions(+), 296 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentNotice.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentTools.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentVoice.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentChoicesTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/agent/AgentToolsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 949bcd74e0..d3e8cf877c 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -694,6 +694,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) AgentGuest.readyListener = agentReadyListener + com.droiddeck.launcher.agent.AgentAttachments.gameFrame = gameFrame if (com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.isRemoving() || com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.isMaintaining()) { runtimeRemovalBlocked = true @@ -3764,37 +3765,46 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde runningGame = { gestureGame }, )) - private fun captureScreenshot(onDone: (Boolean) -> Unit) { + private fun captureScreenshot(onDone: (Boolean) -> Unit) = copyGameFrame { bitmap -> + if (bitmap == null) { + onDone(false) + return@copyGameFrame + } + Thread { + val saved = com.droiddeck.launcher.session.BottomScreenshots.save(applicationContext, bitmap) + bitmap.recycle() + runOnUiThread { onDone(saved) } + }.start() + } + + private val gameFrame: ((android.graphics.Bitmap?) -> Unit) -> Unit = { copyGameFrame(it) } + + /** The game's own surface, without anything DroidDeck draws over it; the caller recycles the bitmap. */ + private fun copyGameFrame(onFrame: (android.graphics.Bitmap?) -> Unit) { val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (bottomOutputActive) bottomGame?.surfaceView else if (::surfaceView.isInitialized) surfaceView else null val width = source?.width ?: 0 val height = source?.height ?: 0 if (source == null || width <= 0 || height <= 0 || source.holder.surface?.isValid != true) { - onDone(false) + onFrame(null) return } val bitmap = try { android.graphics.Bitmap.createBitmap(width, height, android.graphics.Bitmap.Config.ARGB_8888) } catch (_: OutOfMemoryError) { - onDone(false) + onFrame(null) return } try { android.view.PixelCopy.request(source, bitmap, { result -> if (result != android.view.PixelCopy.SUCCESS) { bitmap.recycle() - onDone(false) - return@request - } - Thread { - val saved = com.droiddeck.launcher.session.BottomScreenshots.save(applicationContext, bitmap) - bitmap.recycle() - runOnUiThread { onDone(saved) } - }.start() + onFrame(null) + } else onFrame(bitmap) }, uiHandler) } catch (_: IllegalArgumentException) { bitmap.recycle() - onDone(false) + onFrame(null) } } @@ -5670,6 +5680,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde frameGenRequests.incrementAndGet() } if (AgentGuest.readyListener === agentReadyListener) AgentGuest.readyListener = null + if (com.droiddeck.launcher.agent.AgentAttachments.gameFrame === gameFrame) com.droiddeck.launcher.agent.AgentAttachments.gameFrame = null com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) relativeMouseRequests.shutdownNow() backQamInput.cancel() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentAttachments.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentAttachments.kt index 6c843df797..b4f9a09dff 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentAttachments.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentAttachments.kt @@ -1,9 +1,13 @@ package com.droiddeck.launcher.agent import android.content.Context +import android.graphics.Bitmap import android.net.Uri import android.provider.OpenableColumns +import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File @@ -50,6 +54,22 @@ object AgentAttachments { if (host(context, path).renameTo(moved)) "$GUEST_DIR/$chat/${moved.name}" else path } + /** Copies the running game's frame; set while a session is open. */ + var gameFrame by mutableStateOf<(((Bitmap?) -> Unit) -> Unit)?>(null) + + /** Saves [frame] for [chat] (or a new conversation) on the calling thread; returns its guest path. */ + fun saveFrame(context: Context, chat: String?, frame: Bitmap): String? = runCatching { + val folder = chat ?: NEW + val dir = File(hostDir(context), folder).apply { mkdirs() } + val target = File(dir, "game-${System.currentTimeMillis()}.jpg") + val written = target.outputStream().use { frame.compress(Bitmap.CompressFormat.JPEG, 88, it) } + if (!written) { + target.delete() + return@runCatching null + } + "$GUEST_DIR/$folder/${target.name}" + }.getOrNull() + /** Deletes copies that will not be sent. */ fun discard(context: Context, files: List) = files.forEach { host(context, it).delete() } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt index aedd840dd0..be9be4fd0e 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentChats.kt @@ -37,6 +37,21 @@ object AgentChats { } .sortedByDescending { it.updated } + /** The chats among [chats] where the user or the agent wrote [query], ignoring case. */ + fun search(context: Context, chats: List, query: String): List { + val q = query.trim() + if (q.isEmpty()) return chats + return chats.filter { chat -> + chat.title.contains(q, ignoreCase = true) || read(file(context, chat.id)).entries.any { matches(it, q) } + } + } + + internal fun matches(entry: Entry, query: String) = when (entry) { + is Entry.Asked -> entry.text.contains(query, ignoreCase = true) + is Entry.Said -> entry.text.contains(query, ignoreCase = true) + else -> false + } + fun delete(context: Context, id: String) { file(context, id).delete() File(AgentAttachments.hostDir(context), id).deleteRecursively() @@ -72,6 +87,7 @@ object AgentChats { is Entry.Thought -> JSONObject().put("thought", entry.text) is Entry.Result -> JSONObject().put("result", entry.id).put("output", entry.output).put("failed", entry.failed) is Entry.Used -> JSONObject().put("used", entry.tool).put("detail", entry.detail).put("id", entry.id).put("input", entry.input) + .apply { if (entry.parent.isNotEmpty()) put("parent", entry.parent) } .apply { entry.output?.let { put("output", it).put("failed", entry.failed) } } is Entry.Finished -> JSONObject().put("finished", true).put("error", entry.error ?: JSONObject.NULL).put("stopped", entry.stopped).apply { if (entry.planned) put("planned", true) @@ -105,7 +121,7 @@ object AgentChats { o.has("said") -> Entry.Said(o.getString("said")) o.has("thought") -> Entry.Thought(o.getString("thought")) o.has("used") -> Entry.Used(o.optString("id"), o.getString("used"), o.optString("detail"), o.optString("input"), - if (o.has("output")) o.optString("output") else null, o.optBoolean("failed")) + if (o.has("output")) o.optString("output") else null, o.optBoolean("failed"), o.optString("parent")) o.has("result") -> Entry.Result(o.getString("result"), o.optString("output"), o.optBoolean("failed")) o.has("finished") -> Entry.Finished( if (o.isNull("error")) null else o.optString("error"), o.optBoolean("stopped"), diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index 6709399b01..d1d58e98db 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -108,8 +108,11 @@ object ClaudeCode : AgentHarness { override fun parse(line: String): AgentEvent? { val o = runCatching { JSONObject(line) }.getOrNull() ?: return null val conversation = o.optString("session_id").takeIf { it.isNotEmpty() } + // A subagent's messages carry the call that started it; only its tool calls are shown, under that call. + val parent = o.optString("parent_tool_use_id").takeIf { it.isNotEmpty() && it != "null" } return when (o.optString("type")) { "stream_event" -> { + if (parent != null) return null val delta = o.optJSONObject("event")?.takeIf { it.optString("type") == "content_block_delta" }?.optJSONObject("delta") ?: return null when (delta.optString("type")) { "text_delta" -> AgentEvent(conversation, text = delta.optString("text")) @@ -123,18 +126,18 @@ object ClaudeCode : AgentHarness { val entries = (0 until content.length()).mapNotNull { i -> val block = content.optJSONObject(i) ?: return@mapNotNull null when (block.optString("type")) { - "text" -> block.optString("text").trim().takeIf { it.isNotEmpty() }?.let { AgentHost.Entry.Said(it) } - "thinking" -> block.optString("thinking").trim().takeIf { it.isNotEmpty() }?.let { AgentHost.Entry.Thought(it) } + "text" -> if (parent != null) null else block.optString("text").trim().takeIf { it.isNotEmpty() }?.let { AgentHost.Entry.Said(it) } + "thinking" -> if (parent != null) null else block.optString("thinking").trim().takeIf { it.isNotEmpty() }?.let { AgentHost.Entry.Thought(it) } "tool_use" -> { val input = block.optJSONObject("input") - AgentHost.Entry.Used(block.optString("id"), block.optString("name"), detail(input), fullInput(block.optString("name"), input)) + AgentHost.Entry.Used(block.optString("id"), block.optString("name"), detail(input), fullInput(block.optString("name"), input), parent = parent.orEmpty()) } else -> null } } val usage = message?.optJSONObject("usage") val context = usage?.let { it.optLong("input_tokens") + it.optLong("cache_read_input_tokens") + it.optLong("cache_creation_input_tokens") + it.optLong("output_tokens") } - AgentEvent(conversation, entries, context = context?.takeIf { it > 0 }) + AgentEvent(conversation, entries, context = context?.takeIf { it > 0 && parent == null }) } "user" -> { val content = o.optJSONObject("message")?.optJSONArray("content") ?: return conversation?.let { AgentEvent(it) } diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index 63e60f3d5d..8200200516 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -29,8 +29,11 @@ object AgentHost { data class Asked(val text: String, val files: List = emptyList()) : Entry data class Said(val text: String) : Entry data class Thought(val text: String) : Entry - /** A tool call; [output] stays null until its result arrives. */ - data class Used(val id: String, val tool: String, val detail: String, val input: String = "", val output: String? = null, val failed: Boolean = false) : Entry + /** A tool call; [output] stays null until its result arrives. [parent] is the subagent call it was made under, if any. */ + data class Used( + val id: String, val tool: String, val detail: String, val input: String = "", val output: String? = null, val failed: Boolean = false, + val parent: String = "", + ) : Entry data class Result(val id: String, val output: String, val failed: Boolean) : Entry /** [planned]: the turn ran in plan mode, so it ends on a plan that nothing has carried out yet. */ data class Finished(val error: String?, val stopped: Boolean = false, val usage: Usage? = null, val planned: Boolean = false) : Entry @@ -71,7 +74,9 @@ object AgentHost { "Run it with run_in_background and keep checking its output, so the user can talk to you meanwhile. " + "The restart ends this process, and this conversation continues on the new build. " + "Files the user attaches are listed at the end of their message, under /root/.cache/droiddeck/attachments. " + - "Commits and pull requests you make are the user's own: add no co-author line, AI credit or generated-by note." + "Commits and pull requests you make are the user's own: add no co-author line, AI credit or generated-by note. " + + "To have the user pick between options, end your reply with a fenced code block whose language is choices, one short option per line, " + + "and end your turn: DroidDeck shows them as buttons and sends the one picked as the next message." val entries = mutableStateListOf() val queue = mutableStateListOf() @@ -142,6 +147,7 @@ object AgentHost { fun seen() { unseen = false + appContext?.let { AgentNotice.clear(it) } } fun refresh(context: Context) { @@ -462,7 +468,19 @@ object AgentHost { if (!stopped && queue.isNotEmpty()) { val next = queue.removeAt(0) send(app, next.text, next.files) + } else if (!stopped) notifyEnded(app, error) + } + + private fun notifyEnded(app: Context, error: String?) { + val start = entries.indexOfLast { it is Entry.Asked } + val said = entries.subList(start + 1, entries.size).lastOrNull { it is Entry.Said } as? Entry.Said + val reply = said?.let { choices(it.text) } + val kind = when { + error != null -> AgentNotice.Kind.FAILED + !reply?.options.isNullOrEmpty() -> AgentNotice.Kind.QUESTION + else -> AgentNotice.Kind.DONE } + AgentNotice.post(app, kind, error ?: reply?.text?.takeIf { it.isNotBlank() }?.let { firstLine(it) } ?: "") } /** A message typed or retried by the user replaces the automatic resend. */ @@ -501,7 +519,7 @@ object AgentHost { } /** The latest todo list the agent wrote in this conversation. */ - fun todos(): String? = entries.lastOrNull { it is Entry.Used && it.tool == "TodoWrite" }?.let { (it as Entry.Used).input } + fun todos(): String? = entries.lastOrNull { it is Entry.Used && it.tool == "TodoWrite" && it.parent.isEmpty() }?.let { (it as Entry.Used).input } private fun tick() { now = SystemClock.elapsedRealtime() @@ -645,3 +663,34 @@ object AgentHost { internal fun prefs(context: Context) = context.getSharedPreferences("agent", Context.MODE_PRIVATE) } + +/** A reply split into its text and the options of a trailing choices block. */ +internal data class Choices(val text: String, val options: List) + +private val FENCE = Regex("""[ \t]{0,3}(`{3,}|~{3,})(.*)""") + +/** Walks Markdown fences so a choices block counts only at the top level and only as the last thing in the reply. */ +internal fun choices(reply: String): Choices { + val lines = reply.split('\n') + var open = "" + var opener = -1 + var openChoices = false + var block: IntRange? = null + lines.forEachIndexed { i, line -> + val fence = FENCE.matchEntire(line) + if (open.isEmpty()) { + if (fence != null) { + open = fence.groupValues[1] + opener = i + openChoices = fence.groupValues[2].trim() == "choices" + block = null + } else if (line.isNotBlank()) block = null + } else if (fence != null && fence.groupValues[1][0] == open[0] && fence.groupValues[1].length >= open.length && fence.groupValues[2].isBlank()) { + block = if (openChoices) opener..i else null + open = "" + } + } + val found = block?.takeIf { open.isEmpty() } ?: return Choices(reply, emptyList()) + val options = lines.subList(found.first + 1, found.last).map { it.trim().removePrefix("- ").removePrefix("* ").trim() }.filter { it.isNotEmpty() } + return Choices(lines.subList(0, found.first).joinToString("\n").trimEnd(), options) +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentNotice.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentNotice.kt new file mode 100644 index 0000000000..edba77a0c8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentNotice.kt @@ -0,0 +1,58 @@ +package com.droiddeck.launcher.agent + +import android.app.ActivityManager +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.R +import com.droiddeck.launcher.ui.AgentPet + +/** Tells the user a turn has ended when nothing on screen already does. */ +internal object AgentNotice { + private const val CHANNEL_ID = "agent_done" + private const val NOTIFICATION_ID = 4108 + + enum class Kind { DONE, FAILED, QUESTION } + + fun post(context: Context, kind: Kind, text: String) { + if (onScreen(context)) return + val manager = context.getSystemService(NotificationManager::class.java) ?: return + manager.createNotificationChannel(NotificationChannel(CHANNEL_ID, context.getString(R.string.agent_done_channel), NotificationManager.IMPORTANCE_DEFAULT)) + val open = PendingIntent.getActivity(context, 2, + Intent(context, FrontEndActivity::class.java) + .setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) + .putExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV, "agent"), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) + val title = context.getString(when (kind) { + Kind.DONE -> R.string.agent_done + Kind.FAILED -> R.string.agent_done_failed + Kind.QUESTION -> R.string.agent_done_question + }) + runCatching { + manager.notify(NOTIFICATION_ID, Notification.Builder(context, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_stat_session) + .setContentTitle(title) + .setContentText(text) + .setStyle(Notification.BigTextStyle().bigText(text)) + .setContentIntent(open) + .setAutoCancel(true) + .setCategory(Notification.CATEGORY_STATUS) + .build()) + } + } + + fun clear(context: Context) { + context.getSystemService(NotificationManager::class.java)?.cancel(NOTIFICATION_ID) + } + + /** The chat in a DroidDeck window in front, or the pet, which shows the reply in its own bubble. */ + private fun onScreen(context: Context): Boolean { + if (AgentPet.floating) return true + val state = ActivityManager.RunningAppProcessInfo().also { ActivityManager.getMyMemoryState(it) } + return AgentPet.agentOnScreen > 0 && state.importance <= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTools.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTools.kt new file mode 100644 index 0000000000..9451b79c85 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTools.kt @@ -0,0 +1,143 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File +import java.nio.file.FileVisitResult +import java.nio.file.Files +import java.nio.file.LinkOption +import java.nio.file.Path +import java.nio.file.SimpleFileVisitor +import java.nio.file.attribute.BasicFileAttributes +import java.util.concurrent.TimeUnit + +/** Claude Code's MCP servers and skills in the userland, through its own CLI and skills folder. */ +internal object AgentTools { + data class Server(val name: String, val target: String, val status: String) { + /** Connectors come from the claude.ai account and are managed there, not by the CLI. */ + val account get() = name.startsWith("claude.ai ") + } + + data class Skill(val name: String, val description: String) + + class Result(val ok: Boolean, val output: String) + + private const val SKILLS = "root/.claude/skills" + private val SERVER = Regex("""^(.+?): (.+) - (.+)$""") + + fun servers(context: Context): List? { + val result = run(context, listOf(ClaudeCode.binary, "mcp", "list")) + if (!result.ok) return null + return parseServers(result.output) + } + + internal fun parseServers(output: String): List = output.lines().mapNotNull { line -> + SERVER.find(line.trim())?.destructured?.let { (name, target, status) -> Server(name, target, status) } + } + + /** A URL is added as an HTTP server; anything else is the command that starts a stdio server. */ + internal fun addCommand(name: String, target: String): List { + val t = target.trim() + val base = listOf(ClaudeCode.binary, "mcp", "add", "--scope", "user") + return if (t.startsWith("http://") || t.startsWith("https://")) base + listOf("--transport", "http", name.trim(), t) + else base + listOf(name.trim(), "--") + words(t) + } + + /** Splits a command line the way a shell would for quotes and backslashes, without expanding anything. */ + internal fun words(line: String): List { + val words = mutableListOf() + val word = StringBuilder() + var inWord = false + var quote: Char? = null + var i = 0 + while (i < line.length) { + val c = line[i] + when { + quote == '\'' -> if (c == '\'') quote = null else word.append(c) + c == '\\' && i + 1 < line.length && (quote == null || line[i + 1] == '"' || line[i + 1] == '\\') -> { + word.append(line[++i]) + inWord = true + } + quote == '"' -> if (c == '"') quote = null else word.append(c) + c == '\'' || c == '"' -> { + quote = c + inWord = true + } + c.isWhitespace() -> if (inWord) { + words += word.toString() + word.clear() + inWord = false + } + else -> { + word.append(c) + inWord = true + } + } + i++ + } + if (inWord) words += word.toString() + return words + } + + fun add(context: Context, name: String, target: String) = run(context, addCommand(name, target)) + + fun remove(context: Context, name: String) = run(context, listOf(ClaudeCode.binary, "mcp", "remove", name)) + + fun skills(context: Context): List = + File(LinuxRuntime.rootDir(context), SKILLS).listFiles { f -> f.isDirectory }.orEmpty().sortedBy { it.name.lowercase() }.map { dir -> + Skill(dir.name, description(File(dir, "SKILL.md"))) + } + + internal fun description(file: File): String = runCatching { + val lines = file.readLines() + if (lines.firstOrNull()?.trim() != "---") return@runCatching "" + lines.drop(1).takeWhile { it.trim() != "---" }.firstOrNull { it.startsWith("description:") } + ?.removePrefix("description:")?.trim()?.trim('"', '\'').orEmpty() + }.getOrDefault("") + + fun deleteSkill(context: Context, name: String): Boolean { + if (name.isEmpty() || name.contains('/') || name.startsWith(".")) return false + val root = File(LinuxRuntime.rootDir(context), SKILLS) + val dir = File(root, name) + if (dir.parentFile?.path != root.path) return false + return deleteTree(dir.toPath()) + } + + /** Deletes [path] and what is under it; a symbolic link is removed itself, never what it points to. */ + internal fun deleteTree(path: Path): Boolean = runCatching { + if (!Files.exists(path, LinkOption.NOFOLLOW_LINKS)) return@runCatching true + Files.walkFileTree(path, object : SimpleFileVisitor() { + override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult { + Files.delete(file) + return FileVisitResult.CONTINUE + } + + override fun postVisitDirectory(dir: Path, exc: java.io.IOException?): FileVisitResult { + if (exc != null) throw exc + Files.delete(dir) + return FileVisitResult.CONTINUE + } + }) + true + }.getOrDefault(false) + + private fun run(context: Context, command: List): Result { + val child = runCatching { AgentHost.guest(context.applicationContext, command, connectAdb = false).start() } + .getOrElse { return Result(false, it.message.orEmpty()) } + val output = StringBuffer() + // The CLI can hold its output open past the deadline, so it is read beside the wait rather than before it. + val reader = Thread({ runCatching { child.inputStream.bufferedReader().forEachLine { output.append(it).append('\n') } } }, "agent-tools").apply { start() } + return try { + val ended = child.waitFor(90, TimeUnit.SECONDS) + if (!ended) child.destroyForcibly() + reader.join(2_000) + Result(ended && child.exitValue() == 0, output.toString().trim()) + } catch (e: InterruptedException) { + child.destroyForcibly() + Thread.currentThread().interrupt() + Result(false, output.toString().trim()) + } finally { + runCatching { child.inputStream.close() } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt index 3300b7f8a7..1ea5094ed7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentEntries.kt @@ -6,6 +6,8 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn @@ -19,6 +21,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.CheckCircle import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Description +import androidx.compose.material.icons.outlined.ContentCopy import androidx.compose.material.icons.outlined.ErrorOutline import androidx.compose.material.icons.outlined.ExpandLess import androidx.compose.material.icons.outlined.ExpandMore @@ -39,6 +42,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource @@ -53,9 +58,13 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.agent.AgentAttachments import com.droiddeck.launcher.agent.AgentHost import com.droiddeck.launcher.agent.AgentHost.Entry +import com.droiddeck.launcher.agent.choices @Composable -internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false, changes: Changes? = null, onRevise: () -> Unit = {}) { +internal fun AgentEntry( + entry: Entry, running: Boolean, last: Boolean = false, changes: Changes? = null, answerable: Boolean = false, + children: List = emptyList(), turn: List = emptyList(), onRevise: () -> Unit = {}, onSent: () -> Unit = {}, +) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current when (entry) { @@ -66,24 +75,43 @@ internal fun AgentEntry(entry: Entry, running: Boolean, last: Boolean = false, c modifier = Modifier.widthIn(max = 560.dp).clip(Shape16).background(pal.primary).padding(horizontal = 14.dp, vertical = 10.dp)) } } - is Entry.Said -> SelectionContainer { AgentMarkdown(entry.text, Modifier.widthIn(max = 760.dp).padding(horizontal = 4.dp)) } + is Entry.Said -> { + val reply = remember(entry.text) { choices(entry.text) } + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + if (reply.text.isNotBlank()) SelectionContainer { AgentMarkdown(reply.text, Modifier.widthIn(max = 760.dp).padding(horizontal = 4.dp)) } + if (reply.options.isNotEmpty()) AgentChoices(reply.options, answerable, onSent) + } + } is Entry.Thought -> AgentThought(entry.text, live = false) - is Entry.Used -> if (entry.tool == "TodoWrite") AgentTodos(entry.input) else AgentToolCall(entry, running) + is Entry.Used -> if (entry.tool == "TodoWrite") AgentTodos(entry.input) else AgentToolCall(entry, running, children) is Entry.Result -> Unit is Entry.Finished -> when { last && AgentHost.answerless(AgentHost.entries) -> AgentNoReply() last && entry.planned -> Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - AgentTurnEnd(entry, changes) - AgentPlanActions(onRevise) + AgentTurnEnd(entry, changes, turn) + AgentPlanActions(onRevise, onSent) } - else -> AgentTurnEnd(entry, changes) + else -> AgentTurnEnd(entry, changes, turn) + } + } +} + +/** The options a reply ends with; picking one sends it, while the reply is still the latest. */ +@OptIn(ExperimentalLayoutApi::class) +@Composable +private fun AgentChoices(options: List, answerable: Boolean, onSent: () -> Unit) { + val context = LocalContext.current + FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(horizontal = 4.dp)) { + for (option in options) SecondaryButton(option, enabled = answerable, compact = true, modifier = Modifier.testTag("agent-choice")) { + AgentHost.send(context, option) + onSent() } } } /** A plan turn changed nothing; Go carries the plan out with plan mode off, Revise asks for another. */ @Composable -private fun AgentPlanActions(onRevise: () -> Unit) { +private fun AgentPlanActions(onRevise: () -> Unit, onSent: () -> Unit) { val context = LocalContext.current val pal = LocalPalette.current val go = stringResource(R.string.agent_plan_go_message) @@ -91,6 +119,7 @@ private fun AgentPlanActions(onRevise: () -> Unit) { PrimaryButton(stringResource(R.string.agent_plan_go), compact = true, modifier = Modifier.testTag("agent-plan-go")) { AgentHost.choosePlan(context, false) AgentHost.send(context, go) + onSent() } SecondaryButton(stringResource(R.string.agent_plan_revise), compact = true, modifier = Modifier.testTag("agent-plan-revise")) { AgentHost.choosePlan(context, true) @@ -106,13 +135,18 @@ internal data class Changes(val files: Int, val added: Int, val removed: Int) /** The edits of the turn that ends at [end], or null when it changed no file. */ internal fun turnChanges(entries: List, end: Int): Changes? { val start = entries.subList(0, end).indexOfLast { it is Entry.Asked } - // Plan mode saves its plan as a file of its own, which is not a change to anything. - val edits = entries.subList(start + 1, end).filterIsInstance().filter { !it.failed }.mapNotNull { diffOf(it) } - .filter { !it.path.contains("/.claude/plans/") } + val edits = turnEdits(entries.subList(start + 1, end)) if (edits.isEmpty()) return null return Changes(edits.map { it.path }.distinct().size, edits.sumOf { it.added }, edits.sumOf { it.removed }) } +/** The edits in [turn] that took, in order. Plan mode saves its plan as a file of its own, which is not a change to anything. */ +internal fun turnEdits(turn: List): List = + turn.filterIsInstance().filter { !it.failed }.mapNotNull { diffOf(it) }.filter { !it.path.contains("/.claude/plans/") } + +/** What the agent said in [turn], to copy as one text. */ +internal fun turnReply(turn: List): String = turn.filterIsInstance().joinToString("\n\n") { it.text } + internal class Diff(val path: String, val lines: List) { val added = lines.count { it.startsWith("+") } val removed = lines.count { it.startsWith("-") } @@ -129,9 +163,11 @@ internal fun diffOf(entry: Entry.Used): Diff? { } @Composable -private fun AgentTurnEnd(entry: Entry.Finished, changes: Changes?) { +private fun AgentTurnEnd(entry: Entry.Finished, changes: Changes?, turn: List) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current + var open by rememberSaveable { mutableStateOf(false) } + val reply = turnReply(turn) val text = when { entry.stopped -> stringResource(R.string.agent_stopped) entry.error != null -> stringResource(R.string.agent_failed, entry.error) @@ -143,18 +179,38 @@ private fun AgentTurnEnd(entry: Entry.Finished, changes: Changes?) { }.joinToString(" · ") } } - if (text.isNullOrEmpty() && changes == null) return + if (text.isNullOrEmpty() && changes == null && reply.isEmpty()) return Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(horizontal = 4.dp)) { if (changes != null) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = Modifier.clip(Shape12).background(pal.surfaceVariant).padding(horizontal = 9.dp, vertical = 4.dp).testTag("agent-changes"), + modifier = Modifier.clip(Shape12).background(if (open) pal.primary.copy(alpha = 0.2f) else pal.surfaceVariant).clickable { open = !open } + .padding(horizontal = 9.dp, vertical = 4.dp).testTag("agent-changes"), ) { Text(pluralStringResource(R.plurals.agent_files_changed, changes.files, changes.files), fontSize = 12.sp, color = pal.onSurfaceVariant) Text("+${changes.added}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.good) Text("−${changes.removed}", fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.error) + Icon(if (open) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) } - if (!text.isNullOrEmpty()) Text(text, fontSize = 12.sp, color = if (entry.error != null && !entry.stopped) colors.error else pal.onSurfaceVariant) + if (!text.isNullOrEmpty()) Text(text, fontSize = 12.sp, color = if (entry.error != null && !entry.stopped) colors.error else pal.onSurfaceVariant, + modifier = Modifier.weight(1f, fill = false)) + if (reply.isNotEmpty()) CopyButton(reply, stringResource(R.string.agent_copy_reply)) } + if (open && changes != null) Column(Modifier.padding(start = 4.dp, end = 4.dp, top = 8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { + for (diff in turnEdits(turn)) { + Text(diff.path, fontSize = 11.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + DiffBox(diff) + } + } +} + +@Composable +private fun CopyButton(text: String, label: String) { + val clipboard = LocalClipboardManager.current + val pal = LocalPalette.current + Icon( + Icons.Outlined.ContentCopy, label, tint = pal.onSurfaceVariant, + modifier = Modifier.size(28.dp).clip(Shape12).clickable { clipboard.setText(AnnotatedString(text)) }.padding(6.dp).testTag("agent-copy"), + ) } @Composable @@ -216,7 +272,7 @@ private fun AgentTodos(list: String) { /** A tool call: one line with its status, opening to the full input and output, or to the diff of an edit. */ @Composable -private fun AgentToolCall(entry: Entry.Used, running: Boolean) { +private fun AgentToolCall(entry: Entry.Used, running: Boolean, children: List = emptyList()) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current var open by rememberSaveable(entry.id.ifEmpty { entry.detail }) { mutableStateOf(false) } @@ -245,6 +301,17 @@ private fun AgentToolCall(entry: Entry.Used, running: Boolean) { } Icon(if (open) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) } + if (children.isNotEmpty()) { + val latest = children.last() + Text( + pluralStringResource(R.plurals.agent_subagent_steps, children.size, children.size) + " · " + latest.tool + " " + latest.detail, + fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(start = 34.dp, end = 10.dp, bottom = 8.dp), + ) + } + if (open && children.isNotEmpty()) Column(Modifier.padding(start = 10.dp, end = 4.dp, bottom = 6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + for (child in children) AgentToolCall(child, running && child.output == null) + } if (open && diff != null) Column(Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { if (diff.path.contains('/')) Text(diff.path, fontSize = 11.5.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) DiffBox(diff) @@ -289,7 +356,11 @@ private fun DiffBox(diff: Diff) { private fun CodeBox(label: String, text: String, color: Color) { val pal = LocalPalette.current Column { - Text(label, fontSize = 11.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp, color = pal.onSurfaceVariant, modifier = Modifier.padding(bottom = 3.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp, color = pal.onSurfaceVariant, + modifier = Modifier.weight(1f).padding(bottom = 3.dp)) + CopyButton(text, stringResource(R.string.agent_copy)) + } SelectionContainer { Text( text, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = color, lineHeight = 17.sp, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 34561b28ee..3bc13a5f20 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -43,6 +43,10 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.Send +import androidx.compose.material.icons.outlined.Extension +import androidx.compose.material.icons.outlined.PhotoCamera +import androidx.compose.material.icons.outlined.MicOff +import androidx.compose.material.icons.outlined.Mic import androidx.compose.material.icons.outlined.Add import androidx.compose.material.icons.outlined.ArrowDownward import androidx.compose.material.icons.outlined.AttachFile @@ -66,12 +70,12 @@ import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.Stable -import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.rememberUpdatedState import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow @@ -93,6 +97,7 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollSource import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.pointer.PointerEventPass import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalFocusManager @@ -116,34 +121,35 @@ import com.droiddeck.launcher.agent.AgentHost.Entry import com.droiddeck.launcher.agent.AgentSetup import kotlinx.coroutines.launch -internal enum class AgentPanel { NONE, MODEL, USAGE, HISTORY, PROCESSES } +internal enum class AgentPanel { NONE, MODEL, USAGE, HISTORY, PROCESSES, TOOLS } /** Slash commands the app handles itself; others go to the CLI, which has its own. */ private val LOCAL_COMMANDS = listOf("/new", "/model", "/plan", "/history", "/processes", "/stop") private val CLI_COMMANDS = listOf("/compact", "/cost", "/review", "/init") -private const val COMPOSER_SLIDE_MS = 350L /** - * The chat with the composer at the bottom. The composer is the full editor only while it is - * being typed in; reading shrinks it to one line, and scrolling back through older messages - * hides it behind a small pill. [startTyping] opens an empty conversation ready to type. + * The chat with the model, usage and menu on top and the editor at the bottom. Scrolling back + * through older messages hides the editor behind a small pill and stops following new output. + * [inputModifier] goes on the first control, where a controller lands without raising the keyboard. */ +@Suppress("UNUSED_PARAMETER") @Composable internal fun AgentPage( modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, hidesPet: Boolean = true, menuSlot: AgentMenuSlot? = null, -) = AgentPageContent(modifier, inputModifier, visible, startTyping, hidesPet, showControlsWithoutKeyboard = false, menuSlot) +) = AgentPageContent(modifier, inputModifier, visible, hidesPet, menuSlot) +// Lab overlays run against the installed APK, so these entry points keep their JVM signatures. +@Suppress("UNUSED_PARAMETER") @Composable internal fun AgentPageWithControls( modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true, startTyping: Boolean = true, showControlsWithoutKeyboard: Boolean, -) = AgentPageContent(modifier, inputModifier, visible, startTyping, hidesPet = true, showControlsWithoutKeyboard = showControlsWithoutKeyboard) +) = AgentPageContent(modifier, inputModifier, visible, hidesPet = true) @Composable private fun AgentPageContent( - modifier: Modifier, inputModifier: Modifier, visible: Boolean, startTyping: Boolean, hidesPet: Boolean, - showControlsWithoutKeyboard: Boolean, menuSlot: AgentMenuSlot? = null, + modifier: Modifier, inputModifier: Modifier, visible: Boolean, hidesPet: Boolean, menuSlot: AgentMenuSlot? = null, ) { val context = LocalContext.current val view = LocalView.current @@ -159,8 +165,16 @@ private fun AgentPageContent( } remember { AgentHost.refresh(context) } LaunchedEffect(AgentHost.unseen, visible) { if (visible) AgentHost.seen() } - DisposableEffect(visible, hidesPet) { - val counts = visible && hidesPet + // A stopped activity keeps its composition; the page is only on screen while its host is started. + val lifecycle = androidx.compose.ui.platform.LocalLifecycleOwner.current.lifecycle + var started by remember(lifecycle) { mutableStateOf(lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED)) } + DisposableEffect(lifecycle) { + val observer = androidx.lifecycle.LifecycleEventObserver { _, _ -> started = lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED) } + lifecycle.addObserver(observer) + onDispose { lifecycle.removeObserver(observer) } + } + DisposableEffect(visible, hidesPet, started) { + val counts = visible && hidesPet && started if (counts) AgentPet.agentOnScreen++ onDispose { if (counts) AgentPet.agentOnScreen-- } } @@ -172,17 +186,19 @@ private fun AgentPageContent( return } var panel by rememberSaveable { mutableStateOf(AgentPanel.NONE) } - val composer = remember { ComposerState(startTyping && AgentHost.entries.isEmpty()) } + val composer = remember { ComposerState() } val focusManager = LocalFocusManager.current val togglePanel: (AgentPanel) -> Unit = { panel = if (panel == it) AgentPanel.NONE else it } var menuOpen by rememberSaveable { mutableStateOf(false) } - val menu: @Composable () -> Unit = { - AgentMenu(menuOpen, { menuOpen = it }, onPanel = { panel = it }, onSetup = { setup = true }) + val topBar: @Composable () -> Unit = { + AgentTopBar(panel, togglePanel, inputModifier) { + AgentMenu(menuOpen, { menuOpen = it }, onPanel = { panel = it }, onSetup = { setup = true }) + } } - // A host with a title bar shows the menu there; otherwise it floats over the conversation's top corner. - val inSlot = menuSlot != null && panel != AgentPanel.HISTORY && panel != AgentPanel.PROCESSES + // A host with a title bar shows the top bar there. + val inSlot = menuSlot != null && panel != AgentPanel.HISTORY && panel != AgentPanel.PROCESSES && panel != AgentPanel.TOOLS if (menuSlot != null) DisposableEffect(menuSlot, inSlot) { - menuSlot.content = if (inSlot) menu else null + menuSlot.content = if (inSlot) topBar else null onDispose { menuSlot.content = null } } // The keyboard leaves too little height for a panel and the editor together, so typing closes the panel. @@ -191,7 +207,7 @@ private fun AgentPageContent( Column( modifier.fillMaxSize().imePadding().onPreviewKeyEvent { e -> val k = e.nativeKeyEvent - if (k.keyCode != KeyEvent.KEYCODE_BUTTON_Y || composer.typing) return@onPreviewKeyEvent false + if (k.keyCode != KeyEvent.KEYCODE_BUTTON_Y || composer.focused) return@onPreviewKeyEvent false if (k.action == KeyEvent.ACTION_UP) composer.open() true }, @@ -205,11 +221,22 @@ private fun AgentPageContent( AgentPanelBar(stringResource(R.string.agent_processes)) { panel = AgentPanel.NONE } AgentProcessList(Modifier.weight(1f)) } + AgentPanel.TOOLS -> { + AgentPanelBar(stringResource(R.string.agent_tools)) { panel = AgentPanel.NONE } + AgentToolsPanel(Modifier.weight(1f)) + } else -> { + if (menuSlot == null) Box(Modifier.padding(bottom = 6.dp)) { topBar() } + when (panel) { + AgentPanel.MODEL -> Box(Modifier.padding(bottom = 8.dp)) { AgentModelPicker() } + AgentPanel.USAGE -> Box(Modifier.padding(bottom = 8.dp)) { AgentUsage() } + else -> Unit + } val list = rememberLazyListState() val scope = rememberCoroutineScope() - // Only dragging back through older messages hides the composer; showing it again shrinks the list, which must not hide it once more. + // Only dragging back through older messages stops following the latest; reaching the bottom again resumes it. var readingBack by remember { mutableStateOf(false) } + LaunchedEffect(AgentHost.chat) { readingBack = false } LaunchedEffect(list) { snapshotFlow { list.canScrollForward }.collect { if (!it) readingBack = false } } val dragBack = remember { object : NestedScrollConnection { @@ -223,57 +250,53 @@ private fun AgentPageContent( readingBack = false scope.launch { list.scrollToItem(maxOf(0, list.layoutInfo.totalItemsCount - 1), Int.MAX_VALUE / 2) } } - val hidden = !composer.typing && readingBack && AgentHost.entries.isNotEmpty() - var wasHidden by remember { mutableStateOf(false) } - LaunchedEffect(hidden) { - if (hidden) wasHidden = true - else if (wasHidden) { - wasHidden = false - // The composer takes its height back as it slides in; the latest message stays above it. - kotlinx.coroutines.delay(COMPOSER_SLIDE_MS) - list.scrollToItem(maxOf(0, list.layoutInfo.totalItemsCount - 1), Int.MAX_VALUE / 2) - } - } - Box(Modifier.weight(1f).fillMaxWidth().clipToBounds().nestedScroll(dragBack)) { + val hidden = !composer.focused && !composer.hasUnconsumedFocusRequest() && readingBack && AgentHost.entries.isNotEmpty() + var listHeight by remember { mutableIntStateOf(0) } + Box( + Modifier.weight(1f).fillMaxWidth().clipToBounds().nestedScroll(dragBack).onGloballyPositioned { + // The editor sliding in or the keyboard rising shrinks the list from below; a list following the latest keeps it in view, even mid-drag. + // Scrolling remeasures the list, which Compose refuses during a measure pass, so this runs once positioning is done. + val height = it.size.height + val shrunk = listHeight - height + listHeight = height + if (shrunk > 0 && !readingBack) list.dispatchRawDelta(shrunk.toFloat()) + }, + ) { AgentConversation( Modifier.fillMaxSize().pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false, pass = PointerEventPass.Initial) if (panel == AgentPanel.MODEL || panel == AgentPanel.USAGE) panel = AgentPanel.NONE - if (composer.typing) focusManager.clearFocus() + if (composer.focused) focusManager.clearFocus() } }, - list, onRevise = { composer.open() }, + list, following = !readingBack, onRevise = { composer.open() }, onSent = toLatest, ) androidx.compose.animation.AnimatedVisibility( hidden, enter = fadeIn(), exit = fadeOut(), modifier = Modifier.align(Alignment.BottomCenter).padding(bottom = 8.dp), ) { AgentJumpPill(toLatest) } - if (menuSlot == null) Box(Modifier.align(Alignment.TopEnd).padding(top = 4.dp)) { menu() } } androidx.compose.animation.AnimatedVisibility(!hidden, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { - AgentComposer(composer, draft, inputModifier, panel, togglePanel, showControlsWithoutKeyboard) + AgentComposer(composer, draft, visible, onPanel = { panel = it }, onSent = toLatest) } } } } } -/** Whether the composer is the full editor; [open] also puts the cursor in it. */ +/** Whether the editor has the cursor; [open] puts it there. */ @Stable -private class ComposerState(typing: Boolean) { - var typing by mutableStateOf(typing) +private class ComposerState { + var focused by mutableStateOf(false) var focusRequests by mutableIntStateOf(0) private set private var consumedFocusRequests by mutableIntStateOf(0) - /** Opened and waiting for the text field to take focus; focus passes through nothing on the way. */ - var opening = false fun open() { - typing = true - opening = true focusRequests++ + if (focused) consumeFocusRequest() } fun hasUnconsumedFocusRequest() = focusRequests > consumedFocusRequests @@ -289,6 +312,30 @@ internal class AgentMenuSlot { var content by mutableStateOf<(@Composable () -> Unit)?>(null) } +/** The model and how full the context is, then the [menu]. */ +@Composable +private fun AgentTopBar(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, firstControl: Modifier, menu: @Composable () -> Unit) { + val context = LocalContext.current + val pal = LocalPalette.current + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) { + val model = AgentHost.models(context).firstOrNull { it.id == AgentHost.model }?.label ?: AgentHost.model ?: stringResource(R.string.agent_model_default) + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f, fill = false).height(36.dp).clip(Shape12).then(firstControl).clickable { onPanel(AgentPanel.MODEL) } + .padding(horizontal = 8.dp).testTag("agent-model"), + ) { + val parts = listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) + Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } + ContextRing("agent-usage", onClick = { onPanel(AgentPanel.USAGE) }) + } + menu() + } +} + /** History, processes, a new conversation, the pet and setup, folded behind one button. */ @Composable private fun AgentMenu(open: Boolean, onOpen: (Boolean) -> Unit, onPanel: (AgentPanel) -> Unit, onSetup: () -> Unit) { @@ -306,6 +353,9 @@ private fun AgentMenu(open: Boolean, onOpen: (Boolean) -> Unit, onPanel: (AgentP Row(verticalAlignment = Alignment.CenterVertically) { HeaderAction(Icons.Outlined.History, stringResource(R.string.agent_history), size = 36.dp, tag = "agent-history") { onOpen(false); onPanel(AgentPanel.HISTORY) } HeaderAction(Icons.Outlined.Memory, stringResource(R.string.agent_processes), size = 36.dp, tag = "agent-processes") { onOpen(false); onPanel(AgentPanel.PROCESSES) } + if (AgentHost.harness == com.droiddeck.launcher.agent.ClaudeCode) HeaderAction( + Icons.Outlined.Extension, stringResource(R.string.agent_tools), size = 36.dp, tag = "agent-tools", + ) { onOpen(false); onPanel(AgentPanel.TOOLS) } HeaderAction(Icons.Outlined.Add, stringResource(R.string.agent_new), enabled = !working && AgentHost.entries.isNotEmpty(), size = 36.dp, tag = "agent-new") { onOpen(false) AgentHost.forget(context) @@ -352,18 +402,20 @@ internal fun HeaderAction( } @Composable -private fun AgentConversation(modifier: Modifier, list: LazyListState, onRevise: () -> Unit) { +private fun AgentConversation(modifier: Modifier, list: LazyListState, following: Boolean, onRevise: () -> Unit, onSent: () -> Unit) { val pal = LocalPalette.current val working = AgentHost.state == AgentHost.State.WORKING - val atBottom by remember { derivedStateOf { !list.canScrollForward } } - val items = AgentHost.entries.size + (if (working) 1 else 0) + // A subagent's calls are shown inside the call that started it. + val shown = AgentHost.entries.indices.filter { (AgentHost.entries[it] as? Entry.Used)?.parent.isNullOrEmpty() } + val items = shown.size + (if (working) 1 else 0) + val follow by rememberUpdatedState(following) LaunchedEffect(items) { - if (items == 0) return@LaunchedEffect + if (items == 0 || !follow) return@LaunchedEffect list.animateScrollToItem(items - 1) list.scrollToItem(items - 1, Int.MAX_VALUE / 2) } LaunchedEffect(AgentHost.live.length / 80, AgentHost.liveThinking.length / 80) { - if (atBottom && items > 0) list.scrollToItem(items - 1, Int.MAX_VALUE / 2) + if (follow && items > 0) list.scrollToItem(items - 1, Int.MAX_VALUE / 2) } if (AgentHost.entries.isEmpty() && !working) { Column(modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { @@ -375,11 +427,15 @@ private fun AgentConversation(modifier: Modifier, list: LazyListState, onRevise: } val start = AgentHost.entries.indexOfLast { it is Entry.Asked } LazyColumn(modifier.fillMaxWidth(), state = list, verticalArrangement = Arrangement.spacedBy(10.dp)) { - items(AgentHost.entries.size) { i -> + items(shown.size) { n -> + val i = shown[n] val entry = AgentHost.entries[i] AgentEntry( entry, running = working && i > start && entry is Entry.Used && entry.output == null, last = !working && i == AgentHost.entries.lastIndex, - changes = if (entry is Entry.Finished) turnChanges(AgentHost.entries, i) else null, onRevise = onRevise, + children = if (entry is Entry.Used) AgentHost.entries.filter { it is Entry.Used && it.parent == entry.id && entry.id.isNotEmpty() }.map { it as Entry.Used } else emptyList(), + changes = if (entry is Entry.Finished) turnChanges(AgentHost.entries, i) else null, + turn = if (entry is Entry.Finished) AgentHost.entries.subList(AgentHost.entries.subList(0, i).indexOfLast { it is Entry.Asked } + 1, i) else emptyList(), + answerable = !working && i > start && AgentHost.queue.isEmpty(), onRevise = onRevise, onSent = onSent, ) } if (working) item { AgentLive() } @@ -564,15 +620,11 @@ internal fun usagePercent(): Int? { internal fun liveUsed(limit: AgentHost.Limit) = if (limit.resetsAt > 0 && limit.resetsAt * 1000 < System.currentTimeMillis()) 0 else limit.usedPercent @Composable -private fun AgentComposer( - composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, - showControlsWithoutKeyboard: Boolean, -) { +private fun AgentComposer(composer: ComposerState, draftState: MutableState, visible: Boolean, onPanel: (AgentPanel) -> Unit, onSent: () -> Unit) { val context = LocalContext.current var draft by draftState var labOpen by rememberSaveable { mutableStateOf(false) } if (AgentHost.lab == null) labOpen = false - var hadFocus by remember { mutableStateOf(false) } val send = send@{ val text = draft.trim() when (text.substringBefore(' ')) { @@ -586,90 +638,33 @@ private fun AgentComposer( if (text.isEmpty() && AgentAttachments.pending.isEmpty()) return@send AgentHost.send(context, text, AgentAttachments.pending.toList()) AgentAttachments.pending.clear() + onSent() } } draft = "" } val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 - // Leaving the composer for the conversation, by touch or D-pad, is reading. - Column( - Modifier.fillMaxWidth().padding(bottom = if (keyboardOpen) 4.dp else 8.dp).onFocusChanged { - if (it.hasFocus) hadFocus = true - else if (hadFocus) { - hadFocus = false - if (composer.typing && !composer.opening) composer.typing = false - } - }, - ) { + Column(Modifier.fillMaxWidth().padding(bottom = if (keyboardOpen) 4.dp else 8.dp)) { if (labOpen) AgentLabCard() - when (panel) { - AgentPanel.MODEL -> Box(Modifier.padding(top = 8.dp)) { AgentModelPicker() } - AgentPanel.USAGE -> Box(Modifier.padding(top = 8.dp)) { AgentUsage() } - else -> Unit - } - if (composer.typing) { - if (hasActivity()) Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), - ) { AgentActivity(labOpen) { labOpen = !labOpen } } - AgentEditor(composer, draftState, inputModifier, panel, onPanel, highlightControls = showControlsWithoutKeyboard, send = send) - } else AgentReadingBar( - composer, draft, inputModifier, labOpen, onLab = { labOpen = !labOpen }, onUsage = { onPanel(AgentPanel.USAGE) }, - ) { - // The session drawer is driven by a controller, so its editor opens without raising the keyboard. - if (showControlsWithoutKeyboard) { - composer.typing = true - composer.opening = true - } else composer.open() - } - } -} - -/** The composer while reading: one line holding what is going on, opened by a press or by Y. */ -@Composable -private fun AgentReadingBar( - composer: ComposerState, draft: String, inputModifier: Modifier, labOpen: Boolean, onLab: () -> Unit, onUsage: () -> Unit, onOpen: () -> Unit, -) { - val context = LocalContext.current - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val working = AgentHost.state == AgentHost.State.WORKING - var focused by remember { mutableStateOf(false) } - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth().padding(top = 8.dp).height(44.dp).clip(Shape16).background(colors.surface) - .border(if (focused) 2.dp else 1.dp, if (focused) pal.primary else pal.line, Shape16) - .then(inputModifier).onFocusChanged { focused = it.isFocused }.clickable(onClick = onOpen).testTag("agent-composer-bar") - .padding(start = 14.dp, end = 4.dp), - ) { - Text( - draft.ifBlank { stringResource(if (working) R.string.agent_hint_working else R.string.agent_message) }, fontSize = 15.sp, - color = if (draft.isBlank()) pal.onSurfaceVariant else colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.weight(1f, fill = !hasActivity()).widthIn(min = 72.dp), - ) if (hasActivity()) Row( - horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.weight(1f).padding(start = 8.dp).horizontalScroll(rememberScrollState()), - ) { AgentActivity(labOpen, onLab) } - ContextRing("agent-usage-bar", onUsage) - if (working) Box( - contentAlignment = Alignment.Center, - modifier = Modifier.padding(start = 4.dp).size(36.dp).clip(CircleShape).background(pal.error.copy(alpha = 0.22f)) - .clickable { AgentHost.stop(context) }.testTag("agent-stop"), - ) { Icon(Icons.Outlined.Stop, stringResource(R.string.agent_stop), tint = colors.error, modifier = Modifier.size(20.dp)) } + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), + ) { AgentActivity(labOpen) { labOpen = !labOpen } } + AgentEditor(composer, draftState, visible, send) } } -/** The full editor: model and usage on top, the text with attach, stop and send under them. */ +/** The text with attach, stop and send beside it. */ @Composable -private fun AgentEditor( - composer: ComposerState, draftState: MutableState, inputModifier: Modifier, panel: AgentPanel, onPanel: (AgentPanel) -> Unit, - highlightControls: Boolean = false, send: () -> Unit, -) { +private fun AgentEditor(composer: ComposerState, draftState: MutableState, visible: Boolean, send: () -> Unit) { val context = LocalContext.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current var draft by draftState + val voice = remember { AgentVoice(context.applicationContext, { draftState.value }) { draftState.value = it } } + val voiceAvailable = remember { AgentVoice.available(context) } + DisposableEffect(voice) { onDispose { voice.stop() } } + LaunchedEffect(visible) { if (!visible) voice.stop() } val working = AgentHost.state == AgentHost.State.WORKING if (draft.startsWith("/") && !draft.contains(' ')) { val matches = (LOCAL_COMMANDS + CLI_COMMANDS).filter { it.startsWith(draft) && it != draft } @@ -694,26 +689,11 @@ private fun AgentEditor( LaunchedEffect(composer.focusRequests) { if (composer.hasUnconsumedFocusRequest()) runCatching { field.requestFocus() } } Column( Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape16).background(colors.surface) - .border(if (focused || highlightControls) 2.dp else 1.dp, if (focused || highlightControls) pal.primary else pal.line, Shape16).padding(6.dp), + .border(if (focused) 2.dp else 1.dp, if (focused) pal.primary else pal.line, Shape16).padding(6.dp), ) { - Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().height(36.dp)) { - val model = AgentHost.models(context).firstOrNull { it.id == AgentHost.model }?.label ?: AgentHost.model ?: stringResource(R.string.agent_model_default) - Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.weight(1f, fill = false).height(30.dp).clip(Shape12).clickable { onPanel(AgentPanel.MODEL) } - .padding(horizontal = 8.dp).testTag("agent-model"), - ) { - val parts = listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) - Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant, - maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) - Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) - } - ContextRing("agent-usage", onClick = { onPanel(AgentPanel.USAGE) }) - } - } Row(verticalAlignment = Alignment.Bottom) { if (LocalActivityResultRegistryOwner.current != null) AttachButton() + if (AgentAttachments.gameFrame != null) GameFrameButton() Box(Modifier.weight(1f).padding(start = 8.dp, top = 10.dp, bottom = 10.dp)) { if (draft.isEmpty()) Text( stringResource(if (working) R.string.agent_hint_working else R.string.agent_hint), fontSize = 16.sp, @@ -723,15 +703,16 @@ private fun AgentEditor( draft, { draft = it }, Modifier.fillMaxWidth().focusRequester(field).onFocusChanged { focused = it.isFocused - if (it.isFocused) { - composer.consumeFocusRequest() - composer.opening = false - } - }.testTag("agent-input").then(inputModifier), + composer.focused = it.isFocused + if (it.isFocused) composer.consumeFocusRequest() + }.testTag("agent-input"), textStyle = TextStyle(fontSize = 16.sp, color = colors.onSurface), cursorBrush = SolidColor(pal.primary), keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send), - keyboardActions = KeyboardActions(onSend = { send() }), + keyboardActions = KeyboardActions(onSend = { + voice.stop() + send() + }), minLines = 1, maxLines = 8, ) @@ -740,10 +721,63 @@ private fun AgentEditor( AgentHost.stop(context) } val canSend = draft.isNotBlank() || AgentAttachments.pending.isNotEmpty() - RoundButton( + // An empty message has nothing to send, so the button there dictates one instead. + if ((!canSend || voice.listening) && voiceAvailable) VoiceButton(voice) { voice.start(draft) } + else RoundButton( Icons.AutoMirrored.Outlined.Send, stringResource(if (working) R.string.agent_queue else R.string.agent_send), if (canSend) pal.primary else pal.surfaceVariant, if (canSend) pal.onPrimary else pal.onSurfaceVariant, "agent-send", enabled = canSend, - ) { send() } + ) { + voice.stop() + send() + } + } + } +} + +@Composable +private fun VoiceButton(voice: AgentVoice, onStart: () -> Unit) { + val context = LocalContext.current + val pal = LocalPalette.current + val ask = if (LocalActivityResultRegistryOwner.current != null) rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted -> + if (granted) onStart() else android.widget.Toast.makeText(context, R.string.agent_voice_denied, android.widget.Toast.LENGTH_SHORT).show() + } else null + RoundButton( + if (voice.listening) Icons.Outlined.MicOff else Icons.Outlined.Mic, stringResource(if (voice.listening) R.string.agent_voice_stop else R.string.agent_voice), + if (voice.listening) pal.primary else pal.surfaceVariant, if (voice.listening) pal.onPrimary else pal.onBackground, "agent-voice", + ) { + when { + voice.listening -> voice.finish() + context.checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == android.content.pm.PackageManager.PERMISSION_GRANTED -> onStart() + ask != null -> ask.launch(android.Manifest.permission.RECORD_AUDIO) + else -> android.widget.Toast.makeText(context, R.string.agent_voice_denied, android.widget.Toast.LENGTH_SHORT).show() + } + } +} + +/** Attaches what the running game shows, taken from its own surface so nothing drawn over it is in the picture. */ +@Composable +private fun GameFrameButton() { + val context = LocalContext.current + val pal = LocalPalette.current + RoundButton(Icons.Outlined.PhotoCamera, stringResource(R.string.agent_attach_game), pal.surfaceVariant, pal.onBackground, "agent-game-frame") { + val grab = AgentAttachments.gameFrame ?: return@RoundButton + val chat = AgentHost.chat + grab frame@{ frame -> + if (frame == null) { + android.widget.Toast.makeText(context, R.string.agent_attach_game_failed, android.widget.Toast.LENGTH_SHORT).show() + return@frame + } + Thread({ + val path = AgentAttachments.saveFrame(context, chat, frame) + frame.recycle() + android.os.Handler(android.os.Looper.getMainLooper()).post { + when { + path == null -> android.widget.Toast.makeText(context, R.string.agent_attach_game_failed, android.widget.Toast.LENGTH_SHORT).show() + AgentHost.chat == chat -> AgentAttachments.pending.add(path) + else -> AgentAttachments.discard(context, listOf(path)) + } + } + }, "agent-game-frame").start() } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt index eed2fd6d13..ce4135a73e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -41,6 +41,18 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.Search +import androidx.compose.material3.Icon +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.text.TextStyle +import androidx.compose.runtime.rememberCoroutineScope +import kotlinx.coroutines.launch +import com.droiddeck.launcher.agent.AgentTools import com.droiddeck.launcher.R import com.droiddeck.launcher.agent.AgentChats import com.droiddeck.launcher.agent.AgentHarness @@ -100,47 +112,88 @@ internal fun AgentHistory(modifier: Modifier, onOpened: () -> Unit) { } return } + var query by rememberSaveable { mutableStateOf("") } + val found by produceState?>(null, chats, query) { + if (query.isNotBlank()) delay(250) + value = withContext(Dispatchers.IO) { AgentChats.search(context, chats, query) } + } val working = AgentHost.state == AgentHost.State.WORKING - LazyColumn(modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { - items(chats, key = { it.id }) { chat -> - var armed by remember(chat.id) { mutableStateOf(false) } - val current = chat.id == AgentHost.chat - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth().heightIn(min = 62.dp) - .clickable(enabled = !working || current) { - AgentHost.open(context, chat.id) - onOpened() - } - .background(if (current) pal.primary.copy(alpha = 0.12f) else colors.surface) - .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-chat"), - ) { - Column(Modifier.weight(1f)) { - Text(chat.title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text( - if (armed) stringResource(R.string.agent_history_delete_warning) - else AgentHarness.byId(chat.harness).name + " · " + when { - System.currentTimeMillis() - chat.updated < 60_000 -> stringResource(R.string.agent_just_now) - else -> DateUtils.getRelativeTimeSpanString(chat.updated, System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS).toString() - }, - fontSize = 12.5.sp, color = if (armed) AttentionAmber else pal.onSurfaceVariant, - ) - } - SecondaryButton( - stringResource(if (armed) R.string.agent_storage_confirm else R.string.agent_history_delete), compact = true, - enabled = !(current && working), - ) { - if (armed) { - AgentHost.delete(context, chat.id) - version++ - } else armed = true - } - } - Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + Column(modifier.fillMaxWidth()) { + AgentHistorySearch(query) { query = it } + val shown = found ?: chats + if (shown.isEmpty()) Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.agent_history_no_match), fontSize = 15.sp, color = pal.onSurfaceVariant) + } else LazyColumn(Modifier.weight(1f).fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14)) { + items(shown, key = { it.id }) { chat -> AgentHistoryRow(chat, working, onOpened) { version++ } } } } } +@Composable +private fun AgentHistorySearch(query: String, onQuery: (String) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp).height(44.dp).clip(Shape14).background(colors.surface) + .border(1.dp, pal.line, Shape14).padding(horizontal = 12.dp), + ) { + Icon(Icons.Outlined.Search, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) + Box(Modifier.weight(1f).padding(start = 8.dp)) { + if (query.isEmpty()) Text(stringResource(R.string.agent_history_search), fontSize = 15.sp, color = pal.onSurfaceVariant, maxLines = 1) + BasicTextField( + query, onQuery, singleLine = true, textStyle = TextStyle(fontSize = 15.sp, color = colors.onSurface), + cursorBrush = SolidColor(pal.primary), modifier = Modifier.fillMaxWidth().testTag("agent-history-search"), + ) + } + if (query.isNotEmpty()) Icon(Icons.Outlined.Close, stringResource(R.string.agent_close), tint = pal.onSurfaceVariant, + modifier = Modifier.size(28.dp).clip(CircleShape).clickable { onQuery("") }.padding(5.dp)) + } +} + +@Composable +private fun AgentHistoryRow(chat: AgentChats.Chat, working: Boolean, onOpened: () -> Unit, onDeleted: () -> Unit) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column { + var armed by remember(chat.id) { mutableStateOf(false) } + val current = chat.id == AgentHost.chat + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().heightIn(min = 62.dp) + .clickable(enabled = !working || current) { + AgentHost.open(context, chat.id) + onOpened() + } + .background(if (current) pal.primary.copy(alpha = 0.12f) else colors.surface) + .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-chat"), + ) { + Column(Modifier.weight(1f)) { + Text(chat.title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text( + if (armed) stringResource(R.string.agent_history_delete_warning) + else AgentHarness.byId(chat.harness).name + " · " + when { + System.currentTimeMillis() - chat.updated < 60_000 -> stringResource(R.string.agent_just_now) + else -> DateUtils.getRelativeTimeSpanString(chat.updated, System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS).toString() + }, + fontSize = 12.5.sp, color = if (armed) AttentionAmber else pal.onSurfaceVariant, + ) + } + SecondaryButton( + stringResource(if (armed) R.string.agent_storage_confirm else R.string.agent_history_delete), compact = true, + enabled = !(current && working), + ) { + if (armed) { + AgentHost.delete(context, chat.id) + onDeleted() + } else armed = true + } + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } +} + /** Processes in the Linux userland, the agent's own first, each with a way to end it. */ @Composable internal fun AgentProcessList(modifier: Modifier) { @@ -260,3 +313,117 @@ private fun resetTime(context: android.content.Context, epochSeconds: Long): Str else DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_ABBREV_WEEKDAY or DateUtils.FORMAT_SHOW_TIME return DateUtils.formatDateTime(context, ms, flags) } + +/** Claude Code's MCP servers, with a way to add and remove them, and the skills in its skills folder. */ +@Composable +internal fun AgentToolsPanel(modifier: Modifier) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val scope = rememberCoroutineScope() + var version by remember { mutableIntStateOf(0) } + var loading by remember { mutableStateOf(true) } + val servers by produceState?>(null, version) { + loading = true + value = withContext(Dispatchers.IO) { AgentTools.servers(context) } + loading = false + } + val skills by produceState(emptyList(), version) { value = withContext(Dispatchers.IO) { AgentTools.skills(context) } } + var name by rememberSaveable { mutableStateOf("") } + var target by rememberSaveable { mutableStateOf("") } + var busy by remember { mutableStateOf(false) } + var message by remember { mutableStateOf(null) } + fun act(added: Boolean = false, action: suspend () -> AgentTools.Result) { + busy = true + message = null + scope.launch { + val result = withContext(Dispatchers.IO) { action() } + busy = false + if (!result.ok) message = result.output.ifBlank { context.getString(R.string.agent_tools_failed) } + else if (added) { + name = "" + target = "" + } + version++ + } + } + LazyColumn(modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + item { ToolsHeading(stringResource(R.string.agent_tools_servers)) } + val list = servers + when { + loading && list == null -> item { Text(stringResource(R.string.agent_tools_loading), fontSize = 13.sp, color = pal.onSurfaceVariant) } + list == null -> item { Text(stringResource(R.string.agent_tools_failed), fontSize = 13.sp, color = AttentionAmber) } + list.isEmpty() -> item { Text(stringResource(R.string.agent_tools_no_servers), fontSize = 13.sp, color = pal.onSurfaceVariant) } + else -> items(list, key = { "mcp:" + it.name }) { server -> + var armed by remember(server.name) { mutableStateOf(false) } + ToolsRow(server.name, server.target + " · " + server.status) { + if (!server.account) SecondaryButton( + stringResource(if (armed) R.string.agent_storage_confirm else R.string.agent_tools_remove), compact = true, enabled = !busy, + ) { if (armed) act { AgentTools.remove(context, server.name) } else armed = true } + } + } + } + item { + Column( + Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14).padding(12.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + ToolsField(name, { name = it }, stringResource(R.string.agent_tools_name), "agent-tools-name") + ToolsField(target, { target = it }, stringResource(R.string.agent_tools_target), "agent-tools-target") + Row(verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.agent_tools_add_hint), fontSize = 12.sp, color = pal.onSurfaceVariant, modifier = Modifier.weight(1f)) + PrimaryButton(stringResource(R.string.agent_tools_add), enabled = !busy && name.isNotBlank() && target.isNotBlank(), compact = true) { + act(added = true) { AgentTools.add(context, name, target) } + } + } + message?.let { Text(it, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = AttentionAmber) } + } + } + item { ToolsHeading(stringResource(R.string.agent_tools_skills)) } + if (skills.isEmpty()) item { Text(stringResource(R.string.agent_tools_no_skills), fontSize = 13.sp, color = pal.onSurfaceVariant) } + items(skills, key = { "skill:" + it.name }) { skill -> + var armed by remember(skill.name) { mutableStateOf(false) } + ToolsRow(skill.name, skill.description) { + SecondaryButton(stringResource(if (armed) R.string.agent_storage_confirm else R.string.agent_history_delete), compact = true, enabled = !busy) { + if (armed) act { + AgentTools.Result(AgentTools.deleteSkill(context, skill.name), "") + } else armed = true + } + } + } + } +} + +@Composable +private fun ToolsHeading(text: String) { + Text(text, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = LocalPalette.current.onSurfaceVariant, modifier = Modifier.padding(top = 6.dp)) +} + +@Composable +private fun ToolsRow(title: String, detail: String, action: @Composable () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14).padding(horizontal = 14.dp, vertical = 10.dp), + ) { + Column(Modifier.weight(1f)) { + Text(title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (detail.isNotBlank()) Text(detail, fontSize = 12.5.sp, color = pal.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis) + } + action() + } +} + +@Composable +private fun ToolsField(value: String, onValue: (String) -> Unit, hint: String, tag: String) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Box(Modifier.fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(horizontal = 12.dp, vertical = 10.dp)) { + if (value.isEmpty()) Text(hint, fontSize = 14.sp, color = pal.onSurfaceVariant, maxLines = 1) + BasicTextField( + value, onValue, singleLine = true, textStyle = TextStyle(fontSize = 14.sp, fontFamily = FontFamily.Monospace, color = colors.onSurface), + cursorBrush = SolidColor(pal.primary), modifier = Modifier.fillMaxWidth().testTag(tag), + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt index b79bed3726..cea5fcaf3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt @@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -34,7 +33,6 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Close import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf @@ -62,9 +60,7 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry @@ -557,10 +553,7 @@ internal fun PetChat(open: Boolean, motion: PetMotion, onClose: () -> Unit, onCl .padding(start = 12.dp, end = 12.dp, top = 6.dp), ) { Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(bottom = 2.dp)) { - Text(stringResource(R.string.agent_pet_name), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, - modifier = Modifier.padding(start = 4.dp)) - Spacer(Modifier.weight(1f)) - menuSlot.content?.invoke() + Box(Modifier.weight(1f)) { menuSlot.content?.invoke() } HeaderAction(Icons.Outlined.Close, stringResource(R.string.agent_close), size = 34.dp, tag = "agent-pet-close", onClick = onClose) } AgentPage(Modifier.weight(1f).fillMaxWidth(), visible = open, startTyping = AgentHost.entries.isEmpty(), hidesPet = false, menuSlot = menuSlot) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentVoice.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentVoice.kt new file mode 100644 index 0000000000..a6d78e599e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentVoice.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.speech.RecognitionListener +import android.speech.RecognizerIntent +import android.speech.SpeechRecognizer +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +/** Dictation into the Agent editor: what is heard so far follows the text already typed, until the user edits the draft. */ +internal class AgentVoice(private val context: Context, private val draft: () -> String, private val onText: (String) -> Unit) { + var listening by mutableStateOf(false) + private set + private var recognizer: SpeechRecognizer? = null + private var base = "" + private var written = "" + + fun start(typed: String) { + stop() + val speech = runCatching { SpeechRecognizer.createSpeechRecognizer(context) }.getOrNull() ?: return + recognizer = speech + base = typed.trimEnd().let { if (it.isEmpty()) it else "$it " } + written = typed + speech.setRecognitionListener(object : RecognitionListener { + override fun onReadyForSpeech(params: Bundle?) { listening = true } + override fun onBeginningOfSpeech() {} + override fun onRmsChanged(rmsdB: Float) {} + override fun onBufferReceived(buffer: ByteArray?) {} + override fun onEndOfSpeech() {} + override fun onError(error: Int) { if (recognizer === speech) stop() } + override fun onResults(results: Bundle?) { + if (recognizer !== speech) return + heard(results) + stop() + } + override fun onPartialResults(partialResults: Bundle?) { if (recognizer === speech) heard(partialResults) } + override fun onEvent(eventType: Int, params: Bundle?) {} + }) + val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH) + .putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM) + .putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true) + .putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, context.packageName) + runCatching { speech.startListening(intent) }.onFailure { stop() } + } + + private fun heard(results: Bundle?) { + val spoken = results?.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)?.firstOrNull()?.takeIf { it.isNotBlank() } ?: return + if (draft() != written) return stop() + written = base + spoken + onText(written) + } + + /** Ends listening but keeps the recognizer until its final result arrives. */ + fun finish() { + val speech = recognizer ?: return + listening = false + runCatching { speech.stopListening() }.onFailure { stop() } + } + + fun stop() { + listening = false + val speech = recognizer ?: return + recognizer = null + runCatching { speech.cancel() } + runCatching { speech.destroy() } + } + + companion object { + fun available(context: Context) = SpeechRecognizer.isRecognitionAvailable(context) + } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f288b97098..191f4a79e3 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1179,7 +1179,6 @@ لم يتغير شيء بعد المضي قدماً في الخطة. إرسال الآن - رسالة المزيد إغلاق الأحدث @@ -2683,7 +2682,6 @@ فوق التطبيقات الأخرى اسمح لـ DeeDee بالظهور فوق كل التطبيقات وفتح المحادثة هناك السماح - DeeDee الدردشة مع DeeDee العرض بطاقات أكبر 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 3d2a2ed8fa..c892f88c8e 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1197,7 +1197,6 @@ Aún no hay cambios Adelante con el plan. Enviar ahora - Mensaje Más Cerrar Más reciente @@ -2615,7 +2614,6 @@ Sobre otras aplicaciones Permite que DeeDee flote sobre todas las aplicaciones y abra su chat allí Permitir - DeeDee Chatear con DeeDee Vista Tarjetas más grandes diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 089077750e..a2760406e6 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1167,7 +1167,6 @@ Още нищо не е променено Изпълни плана. Изпрати сега - Съобщение Още Затвори Най-новото @@ -2579,7 +2578,6 @@ Над други приложения Позволи на DeeDee да се показва над всяко приложение и да отваря чата си там Разреши - DeeDee Чат с DeeDee Изглед По-големи карти diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 241b3903e0..c0d54caa91 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1173,7 +1173,6 @@ Zatím se nic nezměnilo Proveď plán. Odeslat nyní - Zpráva Více Zavřít Nejnovější @@ -2631,7 +2630,6 @@ Nad ostatními aplikacemi Umožněte DeeDee zobrazovat se nad všemi aplikacemi a otevírat v nich chat. Povolit - DeeDee Chat s DeeDee Zobrazení Větší karty diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 57cbc9f72d..443b2a96cb 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1167,7 +1167,6 @@ Intet ændret endnu Gå i gang med planen. Send nu - Besked Mere Luk Seneste @@ -2579,7 +2578,6 @@ Over andre apps Lad DeeDee svæve over alle apps og åbne chatten der Tillad - DeeDee Chat med DeeDee Visning Større kort diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6d14e4b65f..41e8e685eb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1159,7 +1159,6 @@ Noch nichts geändert Führe den Plan aus. Jetzt senden - Nachricht Mehr Schließen Neueste @@ -2571,7 +2570,6 @@ Über anderen Apps DeeDee über allen Apps schweben lassen und den Chat dort öffnen Erlauben - DeeDee Mit DeeDee chatten Anzeige Größere Karten diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 9b27f1a637..70c09dfcde 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1167,7 +1167,6 @@ Δεν έχει αλλάξει τίποτα ακόμη Προχώρησε με το σχέδιο. Αποστολή τώρα - Μήνυμα Περισσότερα Κλείσιμο Πιο πρόσφατο @@ -2579,7 +2578,6 @@ Πάνω από άλλες εφαρμογές Αφήστε το DeeDee να εμφανίζεται πάνω από κάθε εφαρμογή και να ανοίγει εκεί τη συνομιλία Να επιτρέπεται - DeeDee Συνομιλία με DeeDee Προβολή Μεγαλύτερες κάρτες diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 06576af8fd..dedf2b43ff 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1170,7 +1170,6 @@ Aún no hay cambios Adelante con el plan. Enviar ahora - Mensaje Más Cerrar Más reciente @@ -2605,7 +2604,6 @@ Sobre otras aplicaciones Permite que DeeDee flote sobre todas las aplicaciones y abra su chat allí Permitir - DeeDee Chat con DeeDee Vista Tarjetas más grandes diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 47243b27f1..8d0e351def 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1167,7 +1167,6 @@ Ei muutoksia vielä Aloita suunnitelman toteutus. Lähetä nyt - Viesti Lisää Sulje Uusin @@ -2579,7 +2578,6 @@ Muiden sovellusten päällä Anna DeeDee:n leijua kaikkien sovellusten päällä ja avata keskustelunsa siellä Salli - DeeDee Keskustele DeeDee:n kanssa Näkymä Suuremmat kortit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5942840c08..b2752c83c2 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1170,7 +1170,6 @@ Rien n’a encore changé Exécute le plan. Envoyer maintenant - Message Plus Fermer Dernier @@ -2604,7 +2603,6 @@ Au-dessus des autres applications Autorise DeeDee à flotter au-dessus de toutes les applications et à y ouvrir sa discussion Autoriser - DeeDee Discuter avec DeeDee Affichage Cartes plus grandes diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 42b60b68d3..87be428351 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1167,7 +1167,6 @@ अभी तक कुछ नहीं बदला योजना के साथ आगे बढ़ें। अभी भेजें - संदेश अधिक बंद करें नवीनतम @@ -2579,7 +2578,6 @@ अन्य ऐप्स के ऊपर दिखाएँ DeeDee को हर ऐप के ऊपर दिखने दें और वहीं इसकी चैट खोलें अनुमति दें - DeeDee DeeDee के साथ चैट करें डिस्प्ले बड़े कार्ड diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1831f4ffa6..f99551869c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1167,7 +1167,6 @@ Még semmi sem változott Hajtsd végre a tervet. Küldés most - Üzenet Továbbiak Bezárás Legújabb @@ -2579,7 +2578,6 @@ Más alkalmazások felett Engedd, hogy DeeDee minden alkalmazás felett lebegjen és ott nyissa meg a csevegést Engedélyezés - DeeDee Csevegés DeeDee-vel Megjelenítés Nagyobb kártyák diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 983958bbfd..9c81a06c3f 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1164,7 +1164,6 @@ Belum ada perubahan Jalankan rencana ini. Kirim sekarang - Pesan Lainnya Tutup Terbaru @@ -2554,7 +2553,6 @@ Di atas aplikasi lain Izinkan DeeDee melayang di atas semua aplikasi dan membuka obrolannya di sana Izinkan - DeeDee Chat dengan DeeDee Tampilan Kartu lebih besar diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ffc9b59f63..cbca952ea9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1162,7 +1162,6 @@ Ancora nessuna modifica Procedi con il piano. Invia ora - Messaggio Altro Chiudi Più recente @@ -2596,7 +2595,6 @@ Sopra altre app Consenti a DeeDee di apparire sopra tutte le app e di aprire lì la sua chat Consenti - DeeDee Apri la chat con DeeDee Visualizzazione Schede più grandi diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7e292b3f77..93dda1d018 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1164,7 +1164,6 @@ まだ変更はありません 計画を進めてください。 今すぐ送信 - メッセージ その他 閉じる 最新 @@ -2554,7 +2553,6 @@ 他のアプリの上に表示 DeeDee をすべてのアプリの上に表示し、そこでチャットを開けるようにします 許可 - DeeDee DeeDee とチャット 表示 大きいカード diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3ce35f034f..048dced14f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1164,7 +1164,6 @@ 아직 변경된 내용 없음 계획대로 진행해 주세요. 지금 보내기 - 메시지 더보기 닫기 최신 @@ -2554,7 +2553,6 @@ 다른 앱 위에 표시 DeeDee가 모든 앱 위에 표시되도록 허용하고 해당 앱에서 채팅을 열 수 있게 합니다. 허용 - DeeDee DeeDee와 채팅하기 표시 카드 크게 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 4f0cbd5362..7d0a634ed9 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1164,7 +1164,6 @@ Belum ada perubahan Teruskan dengan pelan ini. Hantar sekarang - Mesej Lagi Tutup Terkini @@ -2554,7 +2553,6 @@ Di atas apl lain Benarkan DeeDee terapung di atas setiap apl dan buka sembangnya di situ Benarkan - DeeDee Sembang dengan DeeDee Paparan Kad lebih besar diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 21d08282a7..43678cb4ad 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1167,7 +1167,6 @@ Ingen endringer ennå Gå videre med planen. Send nå - Melding Mer Lukk Nyeste @@ -2579,7 +2578,6 @@ Over andre apper La DeeDee flyte over alle apper og åpne chatten sin der Tillat - DeeDee Chat med DeeDee Visning Større kort diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4b514189f2..5247d1fedd 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1167,7 +1167,6 @@ Nog niets gewijzigd Ga door met het plan. Nu verzenden - Bericht Meer Sluiten Nieuwste @@ -2579,7 +2578,6 @@ Boven andere apps Laat DeeDee boven elke app zweven en open daar de chat Toestaan - DeeDee Chatten met DeeDee Weergave Grotere kaarten diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5c0f3ec1b0..de994d5239 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1173,7 +1173,6 @@ Nic jeszcze nie zmieniono Wykonaj plan. Wyślij teraz - Wiadomość Więcej Zamknij Najnowsze @@ -2631,7 +2630,6 @@ Nad innymi aplikacjami Pozwól DeeDee wyświetlać się nad każdą aplikacją i otwierać tam jej czat Zezwól - DeeDee Czat z DeeDee Wyświetlanie Większe karty diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ef63016613..dc549260d8 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1162,7 +1162,6 @@ Ainda nada mudou Avançar com o plano. Enviar agora - Mensagem Mais Fechar Mais recente @@ -2596,7 +2595,6 @@ Sobre outras aplicações Permitir que a DeeDee flutue sobre todas as aplicações e abra aí a conversa Permitir - DeeDee Conversar com a DeeDee Apresentação Cartões maiores diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b559645180..7f8d3196b6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1162,7 +1162,6 @@ Nada mudou ainda Siga em frente com o plano. Enviar agora - Mensagem Mais Fechar Mais recente @@ -2597,7 +2596,6 @@ Sobre outros apps Permita que DeeDee flutue sobre todos os apps e abra o chat dela ali Permitir - DeeDee Conversar com DeeDee Exibição Cards maiores diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fb1390fd11..9c28d24295 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1170,7 +1170,6 @@ Nimic nu s-a schimbat încă Continuă cu planul. Trimite acum - Mesaj Mai multe Închide Cele mai recente @@ -2605,7 +2604,6 @@ Peste alte aplicații Permite ca DeeDee să plutească peste orice aplicație și să deschidă chatul acolo Permite - DeeDee Discută cu DeeDee Afișare Carduri mai mari diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4499bc9d88..8a98c2b2a2 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1173,7 +1173,6 @@ Изменений пока нет Действуйте по плану. Отправить сейчас - Сообщение Ещё Закрыть Последняя версия @@ -2631,7 +2630,6 @@ Поверх других приложений Разрешить DeeDee отображаться поверх всех приложений и открывать там чат с DeeDee Разрешить - DeeDee Чат с DeeDee Вид Крупные карточки diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 05705053ca..427d722263 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1167,7 +1167,6 @@ Inget har ändrats ännu Kör planen. Skicka nu - Meddelande Mer Stäng Senaste @@ -2579,7 +2578,6 @@ Över andra appar Låt DeeDee sväva över alla appar och öppna chatten där Tillåt - DeeDee Chatta med DeeDee Visning Större kort diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 25399225fc..fb4139f53b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1164,7 +1164,6 @@ ยังไม่มีการเปลี่ยนแปลง ดำเนินการตามแผนได้เลย ส่งตอนนี้ - ข้อความ เพิ่มเติม ปิด ล่าสุด @@ -2554,7 +2553,6 @@ เหนือแอปอื่น ให้ DeeDee ลอยเหนือทุกแอปและเปิดแชทได้จากตรงนั้น อนุญาต - DeeDee แชทกับ DeeDee การแสดงผล การ์ดใหญ่ขึ้น diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4deeaafe3d..9623e13648 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1159,7 +1159,6 @@ Henüz bir şey değişmedi Planla devam et. Şimdi gönder - Mesaj Diğer Kapat En son @@ -2571,7 +2570,6 @@ Diğer uygulamaların üzerinde DeeDee\'nin her uygulamanın üzerinde görünmesine ve sohbetini orada açmasına izin ver İzin ver - DeeDee DeeDee ile sohbet et Görünüm Daha büyük kartlar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a459dc4444..15ab8c9c4d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1173,7 +1173,6 @@ Поки нічого не змінено Виконайте план. Надіслати зараз - Повідомлення Ще Закрити Найновіше @@ -2631,7 +2630,6 @@ Поверх інших застосунків Дозволити DeeDee відображатися поверх усіх застосунків і відкривати там чат Дозволити - DeeDee Чат з DeeDee Вигляд Великі картки diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c048cfd5ac..f133ef3d94 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1164,7 +1164,6 @@ Chưa có thay đổi nào Hãy tiến hành kế hoạch. Gửi ngay - Tin nhắn Khác Đóng Mới nhất @@ -2554,7 +2553,6 @@ Trên các ứng dụng khác Cho DeeDee nổi trên mọi ứng dụng và mở khung trò chuyện của DeeDee ngay tại đó Cho phép - DeeDee Trò chuyện với DeeDee Hiển thị Thẻ lớn hơn diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ec65c282eb..0b5996252e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1247,7 +1247,6 @@ 尚未更改 按计划执行。 立即发送 - 消息 更多 关闭 最新 @@ -2631,7 +2630,6 @@ 显示在其他应用上层 让 DeeDee 悬浮在所有应用上层,并在那里打开聊天 允许 - DeeDee 与 DeeDee 聊天 显示 较大卡片 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 3b5883d3a3..709bda78c9 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1163,7 +1163,6 @@ 尚未有任何更改 按計劃執行。 立即傳送 - 訊息 更多 關閉 最新 @@ -2551,7 +2550,6 @@ 浮動於其他應用程式之上 讓 DeeDee 浮動於所有應用程式之上,並可在該處開啟對話 允許 - DeeDee 與 DeeDee 對話 顯示 較大卡片 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7661d16baa..c080ab3d47 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1163,7 +1163,6 @@ 尚未變更 按計畫執行。 立即傳送 - 訊息 更多 關閉 最新 @@ -2551,7 +2550,6 @@ 顯示在其他應用程式上層 讓 DeeDee 浮動顯示在所有應用程式上方,並在該處開啟與 DeeDee 的聊天視窗 允許 - DeeDee 與 DeeDee 聊天 顯示 較大的卡片 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2d6a82851b..5cedd4524d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1182,6 +1182,35 @@ Agent Agent Agent is working + MCP servers and skills + MCP servers + Skills in ~/.claude/skills + Asking Claude Code… + Claude Code could not do that + No MCP servers yet + No skills yet + Remove + Name + URL, or the command that starts it + Added for every project + Add + Dictate + Stop dictating + DroidDeck needs the microphone to dictate + Attach what the game shows + Could not capture the game + Agent replies + Agent finished + Agent stopped with an error + Agent has a question + + %d step + %d steps + + Copy + Copy the reply + Search conversations + No conversation mentions that Install Claude Code in the Linux userland to use the agent. Ask about a game, a crash, or a change to DroidDeck Send @@ -1229,7 +1258,6 @@ Nothing changed yet Go ahead with the plan. Send now - Message More Close Latest @@ -2725,7 +2753,6 @@ Over other apps Let DeeDee float over every app and open its chat there Allow - DeeDee Chat with DeeDee Display Larger cards diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentChoicesTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentChoicesTest.kt new file mode 100644 index 0000000000..8751b64b09 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentChoicesTest.kt @@ -0,0 +1,68 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Test + +class AgentChoicesTest { + @Test fun aTrailingChoicesBlockBecomesOptions() { + val reply = choices("Which build?\n\n```choices\n- Debug\n- Release\n```\n") + assertEquals("Which build?", reply.text) + assertEquals(listOf("Debug", "Release"), reply.options) + } + + @Test fun plainLinesAreOptionsToo() { + assertEquals(listOf("Yes", "No"), choices("Go on?\n```choices\nYes\nNo\n```").options) + } + + @Test fun aReplyWithoutTheBlockStaysWhole() { + val text = "Done.\n```kotlin\nval a = 1\n```" + assertEquals(Choices(text, emptyList()), choices(text)) + } + + @Test fun aChoicesBlockFollowedByAnotherFenceIsNotAQuestion() { + val text = "```choices\nA\nB\n```\nExplanation.\n```kotlin\nval x = 1\n```" + assertEquals(Choices(text, emptyList()), choices(text)) + } + + @Test fun aChoicesBlockFollowedByTextIsNotAQuestion() { + val text = "```choices\nA\nB\n```\nMore after it." + assertEquals(Choices(text, emptyList()), choices(text)) + } + + @Test fun backticksInsideAChoiceAreKept() { + val reply = choices("How?\n```choices\nUse ``` for code\nUse indentation\n```") + assertEquals("How?", reply.text) + assertEquals(listOf("Use ``` for code", "Use indentation"), reply.options) + } + + @Test fun aLongerOpenerNeedsAClosingFenceAsLong() { + val reply = choices("````choices\nA\n```\nB\n````") + assertEquals(listOf("A", "```", "B"), reply.options) + } + + @Test fun aChoicesExampleInsideACodeBlockStaysLiteral() { + val text = "Example:\n````markdown\n```choices\nA\nB\n````" + assertEquals(Choices(text, emptyList()), choices(text)) + } + + @Test fun anUnclosedChoicesBlockIsNotAQuestion() { + val text = "Pick:\n```choices\nA\nB" + assertEquals(Choices(text, emptyList()), choices(text)) + } + + @Test fun aChoicesExampleInsideAnUnclosedTildeFenceStaysLiteral() { + val text = "Example:\n~~~markdown\n```choices\nA\nB\n```" + assertEquals(Choices(text, emptyList()), choices(text)) + } + + @Test fun aChoicesBlockAfterAClosedTildeFenceCounts() { + val reply = choices("~~~\ncode\n~~~\nPick:\n```choices\nA\nB\n```") + assertEquals(listOf("A", "B"), reply.options) + } + + @Test fun aTildeChoicesBlockBecomesOptions() { + val reply = choices("Pick:\n~~~choices\nYes\nNo\n~~~") + assertEquals("Pick:", reply.text) + assertEquals(listOf("Yes", "No"), reply.options) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt index 11ecd7aea8..5cfc53ddee 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt @@ -32,6 +32,22 @@ class AgentHostTest { assertEquals(105L, event.context) } + @Test fun aSubagentShowsOnlyItsToolCallsUnderItsParent() { + val event = ClaudeCode.parse( + """{"type":"assistant","session_id":"abc","parent_tool_use_id":"task1","message":{"content":[ + {"type":"text","text":"I will look."}, + {"type":"tool_use","id":"t2","name":"Grep","input":{"pattern":"crash"}}],"usage":{"input_tokens":10,"output_tokens":5}}}""", + )!! + assertEquals(listOf(Entry.Used("t2", "Grep", "crash", "{\n \"pattern\": \"crash\"\n}", parent = "task1")), event.entries) + assertNull(event.context) + assertNull(ClaudeCode.parse("""{"type":"stream_event","parent_tool_use_id":"task1","event":{"type":"content_block_delta","delta":{"type":"text_delta","text":"x"}}}""")) + } + + @Test fun aParentlessMessageReadsTheNullAsNoParent() { + val event = ClaudeCode.parse("""{"type":"assistant","parent_tool_use_id":null,"message":{"content":[{"type":"text","text":"hi"}]}}""")!! + assertEquals(listOf(Entry.Said("hi")), event.entries) + } + @Test fun claudeStreamsTextAsItIsWritten() { val event = ClaudeCode.parse("""{"type":"stream_event","event":{"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"Hel"}}}""")!! assertEquals("Hel", event.text) diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentToolsTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentToolsTest.kt new file mode 100644 index 0000000000..a806832b4e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentToolsTest.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.agent + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import java.io.File +import java.nio.file.Files + +class AgentToolsTest { + @Test fun serversAreReadFromTheListOutput() { + val output = "Checking MCP server health…\n\nclaude.ai Claude Docs: https://api.anthropic.com/v1/pages/mcp - ✔ Connected\n" + + "files: npx -y @modelcontextprotocol/server-filesystem /root - ✗ Failed to connect\n" + val servers = AgentTools.parseServers(output) + assertEquals(listOf("claude.ai Claude Docs", "files"), servers.map { it.name }) + assertEquals("npx -y @modelcontextprotocol/server-filesystem /root", servers[1].target) + assertTrue(servers[0].account) + } + + @Test fun aUrlIsAddedOverHttpAndACommandOverStdio() { + assertEquals(listOf("mcp", "add", "--scope", "user", "--transport", "http", "sentry", "https://mcp.sentry.dev/mcp"), + AgentTools.addCommand("sentry", " https://mcp.sentry.dev/mcp ").drop(1)) + assertEquals(listOf("mcp", "add", "--scope", "user", "files", "--", "npx", "-y", "server", "/root"), + AgentTools.addCommand("files", "npx -y server /root").drop(1)) + } + + @Test fun aCommandKeepsItsQuotedArguments() { + assertEquals(listOf("python", "/root/My Tools/server.py", "--name", "it's", "a b"), + AgentTools.words("""python "/root/My Tools/server.py" --name "it's" a\ b""")) + assertEquals(listOf("sh", "-c", "echo \"hi\""), AgentTools.words("""sh -c 'echo "hi"'""")) + } + + @Test fun deletingASkillLeavesWhatItsLinksPointTo() { + val outside = Files.createTempDirectory("outside").toFile() + File(outside, "keep.txt").writeText("keep") + val skill = Files.createTempDirectory("skill").toFile() + File(skill, "SKILL.md").writeText("x") + Files.createSymbolicLink(File(skill, "resources").toPath(), outside.toPath()) + assertTrue(AgentTools.deleteTree(skill.toPath())) + assertTrue(!skill.exists()) + assertTrue(File(outside, "keep.txt").isFile) + outside.deleteRecursively() + } + + @Test fun aSkillsDescriptionComesFromItsFrontMatter() { + val file = Files.createTempFile("skill", ".md").toFile() + file.writeText("---\nname: deploy\ndescription: \"Ship the build\"\n---\nBody\n") + assertEquals("Ship the build", AgentTools.description(file)) + file.writeText("No front matter\ndescription: nope\n") + assertEquals("", AgentTools.description(file)) + file.delete() + assertEquals("", AgentTools.description(File(file.path))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt index 38eddd563b..2481c64c74 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/AgentChangesTest.kt @@ -38,4 +38,9 @@ class AgentChangesTest { assertEquals("1.5M", tokens(1_500_000)) assertEquals("23k", tokens(23_400)) } + + @Test fun aTurnsReplyIsEverythingItSaid() { + val turn = listOf(Entry.Said("One."), Entry.Used("e1", "Bash", "ls"), Entry.Said("Two.")) + assertEquals("One.\n\nTwo.", turnReply(turn)) + } }