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"
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/.github/trusted-test-builds.txt b/.github/trusted-test-builds.txt
index 8f7b0148c5..fa4cff1104 100644
--- a/.github/trusted-test-builds.txt
+++ b/.github/trusted-test-builds.txt
@@ -1,5 +1,7 @@
ASEbrahim
FX192
K11MCH1
+KeegantheVeganat0r
kingokksa
ovurrsl
+KeegantheVeganat0r
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e66bb49a0e..93b7bf0e45 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
@@ -313,6 +314,11 @@ jobs:
- name: Build the DiRT 3 / DiRT Showdown ws2_32 stand-in
run: python3 tools/components/prepare.py dirt-ws2
+ - name: Cache graphics driver inputs
+ uses: actions/cache@v4
+ with:
+ path: app/build/quest-inputs
+ key: quest-inputs-${{ hashFiles('tools/quest/build-driver.py') }}
- name: Prepare graphics driver variants
run: python3 tools/quest/build-driver.py "$ANDROID_HOME/ndk/$NDK_VERSION"
- name: Record and pack prepared components
@@ -550,6 +556,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
@@ -558,9 +570,11 @@ jobs:
- name: Cache checksum-pinned pack inputs
uses: actions/cache@v4
with:
- path: ~/.cache/droiddeck-pack-inputs
- key: pack-inputs-v1-${{ hashFiles('tools/packs/build.sh', 'tools/packs/fetch-verified.sh', 'tools/packs/tracking/release.env') }}
- restore-keys: pack-inputs-v1-
+ path: |
+ ~/.cache/droiddeck-pack-inputs
+ ~/.cache/droiddeck-build
+ key: pack-inputs-v2-${{ hashFiles('tools/packs/build.sh', 'tools/packs/fetch-verified.sh', 'tools/packs/tracking/release.env', 'tools/powervr/release.json') }}
+ restore-keys: pack-inputs-v2-
- name: Build the add-on packs
run: |
python3 tools/powervr/fetch.py
@@ -784,6 +798,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-runner:
needs: source
@@ -883,6 +900,17 @@ jobs:
variants: ${{ needs.build.outputs.variants }}
secrets: inherit
+ scan:
+ needs: sign
+ if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+ permissions:
+ contents: read
+ uses: ./.github/workflows/scan.yml
+ with:
+ artifact: droiddeck-signed
+ variant: standard
+ secrets: inherit
+
packs:
needs: [build, checks]
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
diff --git a/.github/workflows/pick-runner.yml b/.github/workflows/pick-runner.yml
index 5eee6bc57c..cb2a0b0ffd 100644
--- a/.github/workflows/pick-runner.yml
+++ b/.github/workflows/pick-runner.yml
@@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-24.04
timeout-minutes: 2
outputs:
- labels: ${{ steps.runner.outputs.labels || '"ubuntu-24.04"' }}
+ labels: ${{ steps.runner.outputs.labels || steps.fork.outputs.labels || '"ubuntu-24.04"' }}
steps:
- name: Pick the compile runner
id: runner
@@ -36,3 +36,25 @@ jobs:
fi
echo "labels=$labels" >> "$GITHUB_OUTPUT"
echo "Compile runner: \`$labels\`" >> "$GITHUB_STEP_SUMMARY"
+ - name: Pick the fork runner
+ id: fork
+ if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+ continue-on-error: true
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ set -euo pipefail
+ labels='"ubuntu-24.04"'
+ gist=https://api.github.com/gists/0c7ed7ad6d6493de84f5123689c64ae6
+ body=$(curl -fsS --max-time 15 -H "Authorization: Bearer $GH_TOKEN" "$gist" 2>/dev/null || curl -fsS --max-time 15 "$gist" 2>/dev/null || echo '{}')
+ IDLE_AT=$(jq -r 'select(.owner.login == "maxjivi05") | .files["idle-at"].content // "0"' <<< "$body" 2>/dev/null || echo 0)
+ echo "Heartbeat: ${IDLE_AT:-none}"
+ age=-1
+ if [[ "${IDLE_AT:-0}" =~ ^[0-9]+$ ]] && [ "${IDLE_AT:-0}" -gt 0 ]; then
+ age=$(( $(date +%s) - IDLE_AT ))
+ fi
+ if [ "$age" -ge 0 ] && [ "$age" -lt 180 ]; then
+ labels='"droiddeck-fork"'
+ fi
+ echo "labels=$labels" >> "$GITHUB_OUTPUT"
+ echo "Compile runner: \`$labels\`" >> "$GITHUB_STEP_SUMMARY"
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/release.yml b/.github/workflows/release.yml
index a151592681..eabc77a358 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,6 +63,15 @@ jobs:
artifact: droiddeck-release
secrets: inherit
+ scan:
+ needs: sign
+ permissions:
+ contents: read
+ uses: ./.github/workflows/scan.yml
+ with:
+ artifact: droiddeck-release
+ secrets: inherit
+
packs:
needs: find
permissions:
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
new file mode 100644
index 0000000000..9790f40c7b
--- /dev/null
+++ b/.github/workflows/scan.yml
@@ -0,0 +1,49 @@
+name: Scan APKs
+
+on:
+ workflow_call:
+ inputs:
+ artifact:
+ 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
+
+permissions:
+ contents: read
+
+jobs:
+ virustotal:
+ name: VirusTotal
+ runs-on: ubuntu-24.04
+ timeout-minutes: 90
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ persist-credentials: false
+ sparse-checkout: tools/release
+
+ - uses: actions/download-artifact@v4
+ with:
+ pattern: ${{ inputs.artifact }}-${{ inputs.variant }}
+ merge-multiple: true
+ path: scan
+
+ - name: Scan
+ continue-on-error: ${{ !inputs.fail_on_detection }}
+ env:
+ VT_API_KEY: ${{ secrets.VIRUSTOTAL_API_KEY }}
+ FAIL_ON_DETECTION: ${{ inputs.fail_on_detection && '1' || '0' }}
+ run: |
+ set -euo pipefail
+ if [ -z "$VT_API_KEY" ]; then
+ echo "::warning title=VirusTotal::no VIRUSTOTAL_API_KEY secret; skipping the scan"
+ exit 0
+ fi
+ bash tools/release/virustotal-scan.sh scan/*.apk
diff --git a/README.md b/README.md
index 606b7a6707..73c18762b1 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@
DroidDeck brings the SteamOS experience to Android: Steam Gaming Mode, full Linux desktop, integration with GOG, Epic Games, Xbox, and other storefronts, Steam VR, and more!
-
100% open source. No ads. No telemetry. No source withheld.
+100% open source. No ads. No telemetry. No proprietary components. No source withheld.
-
+
@@ -36,9 +36,9 @@ DroidDeck brings the SteamOS experience to Android: Steam Gaming Mode, full Linu
## Install
-1. Android 9 or newer on Adreno 730 or newer, or any 8xx. Adreno 6xx is experimental. Mali, Xclipse, PowerVR and Adreno 710 are unsupported. No root needed.
+1. Android 9 or newer on Adreno 730 or newer, or any 8xx. Adreno 6xx, Mali, Xclipse and PowerVR are experimental. Adreno 710 is currently unsupported. No root needed.
2. About 3 GB free for the runtime, plus 1.1 GB for the desktop and emulators.
-3. Install the [APK](https://github.com/Droid-Deck/DroidDeck/releases/download/0.6.9/DroidDeck-0.6.9.apk), install the Linux runtime, press **Play** and sign in to Steam.
+3. Install the [APK](https://github.com/Droid-Deck/DroidDeck/releases/download/0.7.1/DroidDeck-0.7.1.apk), install the Linux runtime, press **Play** and sign in to Steam.
4. On Android 14 and newer, turn on **Disable child process restrictions** in Developer options. On Android 12 and 13, Steam's first launch shows a **Fix it for me** button that walks you through it.
Smart glasses setup is in the [support matrix](docs/smart-glasses-support.md). Release notes are in [docs/releases](docs/releases).
@@ -79,7 +79,8 @@ DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. V
- droiddeck-ntsync follows the [Linux](https://github.com/torvalds/linux) ntsync semantics in `Documentation/userspace-api/ntsync.rst` (GPL-2.0).
- The proot fast path orders bindings like [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later).
- DiRT 3 and DiRT Showdown keep their telemetry socket the way RoccoC's DiRTTelemetryErrorFix (MIT) does, based on the fix by Carsten Gottschling.
-- Games use [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's per render pass memory choice. The Steam client keeps `TU_DEBUG=sysmem`.
+- Zink on PowerVR keeps colour textures in colour with Icenowy Zheng's upstream [Mesa](https://gitlab.freedesktop.org/mesa/mesa) fix d55418dae7 (MIT), carried as a runtime patch.
+- Games and AppImage, Flatpak and Snap programs such as emulators use [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's per render pass memory choice. The Steam client and Chromium-based apps keep `TU_DEBUG=sysmem`.
- Black Ops III and Dark Souls Remastered start without [umu-protonfixes](https://github.com/Open-Wine-Components/umu-protonfixes) (BSD-2-Clause), whose `311210.py` and `570940.py` fail under ARM64 Proton.
- [ReSkate](https://github.com/Dingo-Shenanigans/ReSkate) (GPL-3.0) by Dingo Shenanigans uses the launch option from its README and D3D12 feature level 12_1.
- The arm64 client's sign in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest).
@@ -92,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/build.gradle b/app/build.gradle
index 743ad2a847..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")
@@ -131,8 +131,8 @@ android {
applicationId "com.droiddeck.launcher"
minSdkVersion 26
targetSdkVersion 28
- versionCode 17
- versionName "0.6.9"
+ versionCode 19
+ versionName "0.7.1"
buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\""
buildConfigField "String", "SOURCE_COMMIT", "\"${sourceCommit}\""
buildConfigField "int", "PR_NUMBER", "${prNumber}"
@@ -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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5f010b48d3..514b4d9146 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -91,14 +91,6 @@
-
-
-
-
-
@@ -266,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" />
@@ -352,6 +345,14 @@
+
+
+
+
+
#include
#include
+#include
#include
#include
#include
@@ -208,23 +209,33 @@ struct FakeConfig {
bool uinput_enabled;
};
+// The first allocation here can start the host program's own allocator, which may call a hooked
+// function (mimalloc probes NUMA nodes with access()) and land back in config(). A guarded static
+// would throw a recursive-init error there, so the fields are filled without allocating, and a
+// reentry on the initializing thread gets them while other threads wait for the fork handlers.
static FakeConfig &config() {
- static FakeConfig *cfg = [] {
- auto *c = new FakeConfig();
- const char *dir = getenv("FAKE_EVDEV_DIR");
- c->hook_dir = dir ? dir : "/data/data/com.termux/files/home/fake-input";
- c->udev_data_dir = getenv("FAKE_UDEV_DATA_DIR");
- c->vibration_enabled =
- getenv("FAKE_EVDEV_VIBRATION") && atoi(getenv("FAKE_EVDEV_VIBRATION"));
- const char *identity = getenv("FAKE_EVDEV_IDENTITY");
- c->xbox360_identity = identity && !strcmp(identity, "xbox360");
- c->uinput_enabled = getenv("FAKE_EVDEV_UINPUT") && atoi(getenv("FAKE_EVDEV_UINPUT"));
- pthread_atfork(controller_fork_prepare, controller_fork_parent,
- controller_fork_child);
- Logger::init();
- return c;
- }();
- return *cfg;
+ static FakeConfig cfg;
+ static std::atomic state{0};
+ static __thread bool initializing __attribute__((tls_model("initial-exec")));
+ if (state.load(std::memory_order_acquire) == 2 || initializing) return cfg;
+ int expected = 0;
+ if (!state.compare_exchange_strong(expected, 1, std::memory_order_acq_rel)) {
+ while (state.load(std::memory_order_acquire) != 2) sched_yield();
+ return cfg;
+ }
+ initializing = true;
+ const char *dir = getenv("FAKE_EVDEV_DIR");
+ cfg.hook_dir = dir ? dir : "/data/data/com.termux/files/home/fake-input";
+ cfg.udev_data_dir = getenv("FAKE_UDEV_DATA_DIR");
+ cfg.vibration_enabled = getenv("FAKE_EVDEV_VIBRATION") && atoi(getenv("FAKE_EVDEV_VIBRATION"));
+ const char *identity = getenv("FAKE_EVDEV_IDENTITY");
+ cfg.xbox360_identity = identity && !strcmp(identity, "xbox360");
+ cfg.uinput_enabled = getenv("FAKE_EVDEV_UINPUT") && atoi(getenv("FAKE_EVDEV_UINPUT"));
+ pthread_atfork(controller_fork_prepare, controller_fork_parent, controller_fork_child);
+ Logger::init();
+ state.store(2, std::memory_order_release);
+ initializing = false;
+ return cfg;
}
static std::recursive_mutex &controller_mutex() {
@@ -2311,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/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c
index 8d0267cc13..44fea0c768 100644
--- a/app/src/main/cpp/waylandcomp/src/vk_present.c
+++ b/app/src/main/cpp/waylandcomp/src/vk_present.c
@@ -213,7 +213,7 @@ static struct {
} g_map;
static pthread_mutex_t g_game_picture_lock = PTHREAD_MUTEX_INITIALIZER;
static float g_game_picture_rect[4];
-static int g_game_picture_top;
+static int g_game_picture_placed;
static int64_t g_swap_retry_at_ns;
static int g_swap_fail_logged;
@@ -362,7 +362,7 @@ int vkp_completion_unknown(void) { return g_dev_state == -3; }
void vk_present_set_scale_mode(int mode, int alignment) {
if (mode < VKP_MODE_OFF || mode > VKP_MODE_INTEGER) mode = VKP_MODE_FIT;
- if (alignment < VKP_ALIGN_CENTER || alignment > VKP_ALIGN_PICTURE_BOTTOM) alignment = VKP_ALIGN_CENTER;
+ if (alignment < VKP_ALIGN_CENTER || alignment > VKP_ALIGN_PICTURE_RIGHT) alignment = VKP_ALIGN_CENTER;
g_mode = mode;
g_align = alignment;
}
@@ -383,6 +383,8 @@ static const char *align_name(int a) {
case VKP_ALIGN_BOTTOM: return "bottom";
case VKP_ALIGN_PICTURE_TOP: return "picture top";
case VKP_ALIGN_PICTURE_BOTTOM: return "picture bottom";
+ case VKP_ALIGN_PICTURE_LEFT: return "picture left";
+ case VKP_ALIGN_PICTURE_RIGHT: return "picture right";
default: return "center";
}
}
@@ -420,9 +422,11 @@ static void update_map(int scene_w, int scene_h) {
}
if (align == VKP_ALIGN_PICTURE_TOP) g_map.off_y = 0;
else if (align == VKP_ALIGN_PICTURE_BOTTOM) g_map.off_y = H - scene_h * g_map.ky;
+ else if (align == VKP_ALIGN_PICTURE_LEFT) g_map.off_x = 0;
+ else if (align == VKP_ALIGN_PICTURE_RIGHT) g_map.off_x = W - scene_w * g_map.kx;
g_map.valid = 1;
pthread_mutex_lock(&g_game_picture_lock);
- g_game_picture_top = align == VKP_ALIGN_PICTURE_TOP || align == VKP_ALIGN_PICTURE_BOTTOM;
+ g_game_picture_placed = align == VKP_ALIGN_PICTURE_TOP || align == VKP_ALIGN_PICTURE_BOTTOM || align == VKP_ALIGN_PICTURE_LEFT || align == VKP_ALIGN_PICTURE_RIGHT;
g_game_picture_rect[0] = g_map.off_x;
g_game_picture_rect[1] = g_map.off_y;
g_game_picture_rect[2] = g_map.off_x + scene_w * g_map.kx;
@@ -436,7 +440,7 @@ static void update_map(int scene_w, int scene_h) {
int vkp_game_picture_rect(float rect[4]) {
pthread_mutex_lock(&g_game_picture_lock);
- int active = g_game_picture_top;
+ int active = g_game_picture_placed;
if (active) memcpy(rect, g_game_picture_rect, sizeof(g_game_picture_rect));
pthread_mutex_unlock(&g_game_picture_lock);
return active;
diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.h b/app/src/main/cpp/waylandcomp/src/vk_present.h
index 3a76b4c0b6..2a363979e6 100644
--- a/app/src/main/cpp/waylandcomp/src/vk_present.h
+++ b/app/src/main/cpp/waylandcomp/src/vk_present.h
@@ -15,7 +15,9 @@ int vkp_quest_layer_presentation(void);
enum vkp_scale_mode { VKP_MODE_OFF = 0, VKP_MODE_FIT = 1, VKP_MODE_STRETCH = 2, VKP_MODE_FILL = 3,
VKP_MODE_INTEGER = 4 };
-enum vkp_align { VKP_ALIGN_CENTER = 0, VKP_ALIGN_TOP = 1, VKP_ALIGN_BOTTOM = 2, VKP_ALIGN_PICTURE_TOP = 3, VKP_ALIGN_PICTURE_BOTTOM = 4 };
+enum vkp_align { VKP_ALIGN_CENTER = 0, VKP_ALIGN_TOP = 1, VKP_ALIGN_BOTTOM = 2,
+ VKP_ALIGN_PICTURE_TOP = 3, VKP_ALIGN_PICTURE_BOTTOM = 4,
+ VKP_ALIGN_PICTURE_LEFT = 5, VKP_ALIGN_PICTURE_RIGHT = 6 };
void vk_present_set_scale_mode(int mode, int alignment);
int vkp_game_picture_rect(float rect[4]);
int vkp_output_to_scene(double ox, double oy, double *sx, double *sy);
diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt
index 5ef39f6b6e..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)
@@ -61,6 +65,9 @@ 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)
}
private fun prefetchAddonPacks() {
@@ -74,6 +81,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/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt
index 669aad4e67..be0af56a06 100644
--- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt
+++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt
@@ -603,11 +603,19 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl
}
fun selectDriver(id: String, linux: Boolean) {
+ if (!linux && id == TurnipDriver.AUTO) {
+ DriverBundle.selectDisplay(activity, id)
+ pairModeOpen = false
+ lastAutoCheck = 0L
+ setMode(auto = true)
+ refreshDrivers()
+ return
+ }
val bundle = DriverBundle.containing(activity, id, linux)
when {
bundle != null -> useBundle(bundle)
linux -> SessionPrefs.setLinuxDriver(activity, id)
- else -> SessionPrefs.setAndroidDriver(activity, id)
+ else -> DriverBundle.selectDisplay(activity, id)
}
pairModeOpen = false
setMode(auto = false, mix = true)
diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
index cbd9ba859b..f429efcbf7 100644
--- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
@@ -23,6 +23,7 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
@@ -184,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)
@@ -873,6 +875,7 @@ class FrontEndActivity : ComponentActivity() {
android.widget.Toast.makeText(this, R.string.game_link_failed, android.widget.Toast.LENGTH_LONG).show()
return false
}
+ Library.recordPlayed(this, game)
startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME)
.putExtra(SessionActivity.EXTRA_STEAMVR, steamVr)
.returnTo(returnHome)
@@ -888,7 +891,15 @@ class FrontEndActivity : ComponentActivity() {
putExtra(SessionService.EXTRA_STEAM_URL,
com.droiddeck.launcher.frontend.GameLaunchLink.steamUrl(game.gameIdString))
}
- }, steamSession = true)
+ }
+ .playing(game), steamSession = true)
+ }
+
+ private fun Intent.playing(game: Library.SteamGame): Intent =
+ apply { if (game.library == Library.ADDED) putExtra(SessionActivity.EXTRA_PLAYED_GAME, game.gameIdString) }
+
+ private fun recordPlayed(intent: Intent) {
+ intent.getStringExtra(SessionActivity.EXTRA_PLAYED_GAME)?.let { Library.recordPlayed(this, it) }
}
private fun Intent.returnTo(returnHome: Boolean): Intent {
@@ -915,14 +926,17 @@ class FrontEndActivity : ComponentActivity() {
.putExtra(SessionService.EXTRA_PROGRAM, command.program)
.putExtra(SessionService.EXTRA_PROGRAM_ARGS, command.args.toTypedArray())
.putExtra(SessionService.EXTRA_GAME_ID, com.droiddeck.launcher.session.NoSteamLaunch.scope(game))
+ .playing(game)
when {
!SessionState.running -> startSessionOrWait(next)
SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show()
- command.program == com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET && handToBattleNet(command.args, returnHome) { pendingSwitch = next } -> {}
- SessionState.mode == SessionService.MODE_RUN && SessionState.program == command.program && SessionState.programArgs == command.args ->
+ command.program == com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET && handToBattleNet(command.args, next, returnHome) -> {}
+ SessionState.mode == SessionService.MODE_RUN && SessionState.program == command.program && SessionState.programArgs == command.args -> {
+ recordPlayed(next)
startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME)
.returnTo(returnHome)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP))
+ }
else -> pendingSwitch = next
}
}
@@ -1123,6 +1137,10 @@ class FrontEndActivity : ComponentActivity() {
applyLauncherFullscreen()
updates.start()
setContent {
+ val prootPack by com.droiddeck.launcher.core.AddonPack.PROOT.state.collectAsState()
+ androidx.compose.runtime.LaunchedEffect(prootPack) {
+ if (prootPack == com.droiddeck.launcher.core.AddonPack.State.Ready && installed == null) refresh()
+ }
DroidDeckTheme(theme, appScale = appScale) {
com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize().exposeTestTags()) {
if (decky.deckyPendingZip != null) com.droiddeck.launcher.ui.DeckyZipWarningDialog(
@@ -2276,14 +2294,14 @@ class FrontEndActivity : ComponentActivity() {
when {
!SessionState.running -> startSessionOrWait(next)
SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show()
- handToBattleNet(full) { pendingSwitch = next } -> {}
+ handToBattleNet(full, next) -> {}
else -> pendingSwitch = next
}
}
}, "battlenet-open").start()
}
- private fun handToBattleNet(args: List, returnHome: Boolean = false, otherwise: () -> Unit): Boolean {
+ private fun handToBattleNet(args: List, next: Intent, returnHome: Boolean = false): Boolean {
if (SessionState.mode != SessionService.MODE_RUN || SessionState.program != com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET) return false
val library = args.takeIf { it.firstOrNull() == "--library" }?.getOrNull(1)
val sessionLibrary = SessionState.programArgs.takeIf { it.firstOrNull() == "--library" }?.getOrNull(1)
@@ -2294,10 +2312,13 @@ class FrontEndActivity : ComponentActivity() {
val handed = request.isEmpty() || com.droiddeck.launcher.stores.battlenet.BattleNetClient.request(LinuxRuntime.sessionRoot(app), request)
ui.post {
if (isDestroyed) return@post
- if (!handed) otherwise()
- else startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME)
- .returnTo(returnHome)
- .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP))
+ if (!handed) pendingSwitch = next
+ else {
+ recordPlayed(next)
+ startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME)
+ .returnTo(returnHome)
+ .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP))
+ }
}
}, "battlenet-request").start()
return true
@@ -2537,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 },
@@ -2555,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 ->
@@ -2777,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/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
index ed322ef176..5f39d03c6c 100644
--- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
@@ -121,6 +121,7 @@ import com.droiddeck.launcher.session.SessionArtifacts
import com.droiddeck.launcher.session.SessionLogShare
import com.droiddeck.launcher.session.SessionPhase
import com.droiddeck.launcher.session.SessionPaths
+import com.droiddeck.launcher.session.SessionLoadingDecision
import com.droiddeck.launcher.wayland.HdrSupport
import com.droiddeck.launcher.session.SessionService
import com.droiddeck.launcher.session.SessionState
@@ -172,12 +173,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val alignment = if (!active) ALIGN_CENTER else when (picturePosition) {
"top" -> ALIGN_PICTURE_TOP
"bottom" -> ALIGN_PICTURE_BOTTOM
+ "left" -> ALIGN_PICTURE_LEFT
+ "right" -> ALIGN_PICTURE_RIGHT
else -> ALIGN_CENTER
}
WaylandCompositor.nativeSetScaleMode(SCALE_FIT, alignment)
}
private var unfoldedPanel by mutableStateOf(null)
private var unfoldedColumn: android.widget.LinearLayout? = null
+ private var unfoldedDeckSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null
+ private var unfoldedDeckPanel by mutableStateOf(null)
+ private var deckPanelLayouts: Map = emptyMap()
private lateinit var sessionRoot: FrameLayout
private var inputRouter: InputRouter? = null
private var physicalInputBindings: com.droiddeck.launcher.input.PhysicalInputBindings? = null
@@ -283,6 +289,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private var directHoldBehavior by mutableStateOf(com.droiddeck.launcher.input.TouchGestureConfig.MOUSE_BEHAVIOR_CLICK)
private var relativeMouseMode by mutableIntStateOf(0)
@Volatile private var appliedRelativeMouseMode: Int? = null
+ private val agentReadyListener: () -> Unit = { relativeMouseRetries = 0; requestRelativeMouse() }
private val appTextFocus get() = wowChat.request != null
private val wowChat by lazy { com.droiddeck.launcher.ui.WowChat(this, ::sendWowChat, ::cancelWowChat, ::readGameField) }
private var wowChatBottom: SecondScreenPresentation? = null
@@ -384,8 +391,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
)
private val mouseBackInput = com.droiddeck.launcher.input.MouseBackInput(
sendRight = { down -> heldButtons.set(32, PointerGestures.BTN_RIGHT, down) },
- mouseAttached = ::mouseAttached,
+ mouseAttached = ::externalMouseAttached,
)
+ private var lastExternalMouse: InputDevice? = null
private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN
private var drawerDirectionDownTime = 0L
private var drawerDirectionDeviceId = -1
@@ -565,6 +573,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private var sessionActivityDisplayId = Display.DEFAULT_DISPLAY
private lateinit var displayManager: DisplayManager
private var secondScreenPresentation: SecondScreenPresentation? = null
+ private val inputWindowDisplays = mutableListOf()
private val bottomScreenListener: () -> Unit = {
if (secondScreenPresentation?.display?.displayId?.let(com.droiddeck.launcher.input.DualScreen::taken) == true) closeSecondScreen(reset = false)
updateBottomGame()
@@ -632,6 +641,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
padBridge?.syncConnectedControllers()
refreshControls()
updatePointerCapture()
+ requestRelativeMouse()
updateHandCamera()
refreshSecondScreenDisplays()
}
@@ -647,12 +657,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (::padMouse.isInitialized) padMouse.reset()
refreshControls()
updatePointerCapture()
+ requestRelativeMouse()
updateHandCamera()
refreshSecondScreenDisplays()
}
override fun onInputDeviceChanged(deviceId: Int) {
joyConVr?.refresh()
refreshControls()
+ requestRelativeMouse()
refreshSecondScreenDisplays()
}
}
@@ -661,6 +673,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ AgentGuest.readyListener = agentReadyListener
if (com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.isRemoving() ||
com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.isMaintaining()) {
runtimeRemovalBlocked = true
@@ -977,7 +990,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
} else {
com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) {
- CursorOverlay({ cursorPos }, cursorVisible && !uiPointer && !bottomOutputActive,
+ CursorOverlay({ cursorPos }, cursorVisible && (!uiPointer || onlyPcKeyboardOpen()) && !bottomOutputActive,
resources.displayMetrics.density,
cursorImage, cursorHotX, cursorHotY, cursorImageScale)
if (memoryHud.text.isNotEmpty()) HudText(memoryHud.text, hudColor, hudOpacity)
@@ -1222,7 +1235,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias,
frameGen = frameGen,
lossless = lossless,
- oscMode = oscMode, onScreenButtonsVisible = onScreenButtonsVisible, suspendPolicy = suspendPolicy,
+ oscMode = oscMode, suspendPolicy = suspendPolicy,
steamDownloadsInBackground = steamDownloadsInBackground, touchMode = touchMode,
micAvailable = SessionState.micAvailable && !SessionState.suspended,
micEnabled = SessionState.micEnabled,
@@ -1443,6 +1456,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
},
onClose = { drawerOpen = false },
+ onDismissScreen = if (docked) ({ selectSecondScreenMode(SecondScreenMode.NONE) }) else null,
components = drawerComponents,
onComponentsRefresh = {
refreshDrawerComponents()
@@ -1955,6 +1969,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val nextRoutedTouchMode = effectiveTouchMode()
if (routedTouchMode != nextRoutedTouchMode) gestureTouchStreamGate.reset()
routedTouchMode = nextRoutedTouchMode
+ requestRelativeMouse()
frameGen = FrameGen.mode(this)
fexPreset = SessionPrefs.fexPreset(this)
suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode)
@@ -2225,6 +2240,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
intent.getStringExtra(SessionService.EXTRA_GAME_ID),
sessionActivityDisplayId,
)
+ intent.getStringExtra(EXTRA_PLAYED_GAME)?.let { com.droiddeck.launcher.frontend.Library.recordPlayed(this, it) }
}
applyFrameGen()
applyGameAlignment()
@@ -2315,9 +2331,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel()
if (::touchpad.isInitialized) touchpad.cancel()
if (::directTouchHold.isInitialized) directTouchHold.cancel()
+ if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel()
if (::scrollTouch.isInitialized) scrollTouch.cancel()
scrollTouchGesture = false
gesturePointerReady = false
+ if (sessionTouchDown) dismissTouch = true
}
private fun panelBounds(): android.graphics.Rect = if (Build.VERSION.SDK_INT >= 30) {
@@ -2421,6 +2439,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private fun watchSession() {
val handler = Handler(Looper.getMainLooper())
var ticks = 0
+ val loadingStartedAt = SystemClock.elapsedRealtime()
val poll = object : Runnable {
override fun run() {
if (!watching) return
@@ -2433,6 +2452,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
finish()
return
}
+ if (loading.visible && !loading.ended && !SessionState.running && !installingRuntime &&
+ SessionLoadingDecision.shouldReturnToLauncher(
+ loadingStartedAt, SystemClock.elapsedRealtime(), SessionState.running, SessionState.phase)) {
+ finish()
+ return
+ }
if (loading.visible && !loading.ended) {
if (!installingRuntime) loading.update(this@SessionActivity, SessionState.logFile)
if (ticks++ % 2 == 0) loading.tick()
@@ -2457,8 +2482,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val hint = sessionExitHint(status)
runOnUiThread {
if (isFinishing || isDestroyed) return@runOnUiThread
- if (status == 0) SessionState.relaunch?.let { next ->
- SessionState.relaunch = null
+ if (status == 0) SessionState.takeRelaunch()?.let { next ->
next.putExtra(EXTRA_RETURN_HOME, intent.getBooleanExtra(EXTRA_RETURN_HOME, false))
next.putExtra(EXTRA_LINK_TASK, intent.getIntExtra(EXTRA_LINK_TASK, -1))
setIntent(next)
@@ -2660,7 +2684,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
val mouseToGuest = !pipUi && !appTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && !inputSettingsOpen &&
!SessionState.suspended && !(::loading.isInitialized && (loading.visible || loading.ended))
- if (mouseBackInput.onKeyEvent(event, mouseToGuest)) return true
+ if (event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0 &&
+ com.droiddeck.launcher.input.MouseBackInput.isInjectedBack(event)) lastExternalMouse = null
+ val mouseBackHandled = mouseBackInput.onKeyEvent(event, mouseToGuest)
+ if (event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0 &&
+ com.droiddeck.launcher.input.MouseBackInput.isInjectedBack(event) && mouseToGuest) {
+ val device = lastExternalMouse
+ if (mouseBackHandled && device != null) {
+ Log.i(TAG, String.format(java.util.Locale.ROOT,
+ "injected Back right-click mouse=\"%s\" (%04x:%04x, id %d, sources 0x%x, external=%s, virtual=%s)",
+ device.name, device.vendorId, device.productId, device.id, device.sources,
+ Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || device.isExternal, device.isVirtual))
+ } else if (!mouseBackHandled) {
+ Log.i(TAG, "injected Back no external mouse found")
+ }
+ }
+ if (mouseBackHandled) return true
val backToQam = !pipUi && !appTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen &&
!inputSettingsOpen && !gestureSettingsOpen &&
SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen &&
@@ -2826,6 +2865,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
return onScreenControls?.let { takes(it, it::takesTouchAt) } == true ||
steamTouchControls?.let { takes(it, it::takesTouchAt) } == true ||
unfoldedPanel?.let { takes(it, it::takesTouchAt) } == true ||
+ unfoldedDeckSurface?.let { takes(it, it::takesTouchAt) } == true ||
unfoldedColumn?.getChildAt(0)?.let { takes(it) { _, _ -> true } } == true
}
@@ -2972,7 +3012,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
private fun applyRelativeMouse() {
- val mode = desiredRelativeMouseMode
+ val wanted = desiredRelativeMouseMode
+ val touchpadRoute = com.droiddeck.launcher.input.TouchRouter.decide(com.droiddeck.launcher.input.TouchRouter.Snapshot(
+ uiBlocking = false,
+ mode = routedTouchMode,
+ scrollLayer = false,
+ steamSession = SessionState.mode == SessionService.MODE_STEAM,
+ steamDesktopUi = SessionState.steamUi == "desktop",
+ )) == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD
+ val mode = com.droiddeck.launcher.input.TouchGestureConfig.gamescopeRelativeMouse(wanted, mouseAttached(), touchpadRoute)
if (appliedRelativeMouseMode == mode) return
val request = org.json.JSONObject()
.put("kind", "exec")
@@ -2988,7 +3036,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
Log.w(TAG, "gamescope did not take relative mouse $mode: ${result.exceptionOrNull() ?: answer}")
if (relativeMouseRetries++ < RELATIVE_MOUSE_MAX_RETRIES) uiHandler.postDelayed({ requestRelativeMouse() }, 2_000)
}
- if (desiredRelativeMouseMode != mode) requestRelativeMouse()
+ if (desiredRelativeMouseMode != wanted) requestRelativeMouse()
}
private fun refreshGestureConfig() {
@@ -3183,12 +3231,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
cursorVisible = false
return
}
- val rect = drawnRect() ?: return
+ val rect = if (glassesOutputActive) pointerSurfaceRect() else drawnRect()
+ val pointerRect = rect ?: return
val position = cursorPos
- val x = if (position.x >= 0f) position.x.coerceIn(rect.left, rect.right) else rect.centerX()
- val y = if (position.y >= 0f) position.y.coerceIn(rect.top, rect.bottom) else rect.centerY()
+ val x = if (position.x >= 0f) position.x.coerceIn(pointerRect.left, pointerRect.right) else pointerRect.centerX()
+ val y = if (position.y >= 0f) position.y.coerceIn(pointerRect.top, pointerRect.bottom) else pointerRect.centerY()
val out = SessionState.outputSize
- movePointer(x + dx * rect.width() / out.first, y + dy * rect.height() / out.second)
+ val nextX = (x + dx * pointerRect.width() / out.first)
+ .coerceIn(pointerRect.left, pointerRect.right)
+ val nextY = (y + dy * pointerRect.height() / out.second)
+ .coerceIn(pointerRect.top, pointerRect.bottom)
+ movePointer(nextX, nextY)
// Make frame-callback updates visible to drawing before this frame's traversal.
androidx.compose.runtime.snapshots.Snapshot.sendApplyNotifications()
}
@@ -3378,6 +3431,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
var presentation = secondScreenPresentation
if (presentation?.display?.displayId != target.displayId) {
+ if (target.displayId in inputWindowDisplays) {
+ panelMode(mode)
+ return
+ }
dropDockedDrawer()
presentation?.closeControls()
presentation = secondScreenPresentation(target)
@@ -3432,50 +3489,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private fun bottomPages(): List = sessionBottomPages(BottomPageActions(
takeScreenshot = ::captureScreenshot,
fps = { if (::hud.isInitialized) hud.liveFps else null },
- openSettings = ::openSettingsBelow,
runningGame = { gestureGame },
))
- private fun openSettingsBelow(intent: android.content.Intent, done: () -> Boolean) {
- val presentation = secondScreenPresentation
- if (presentation == null) {
- if (!bottomOutputActive) return
- listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any {
- runCatching { startActivity(android.content.Intent(it)) }
- .onFailure { e -> Log.w(TAG, "could not open ${it.action}", e) }
- .isSuccess
- }
- return
- }
- val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(presentation.display.displayId)
- val opened = listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any {
- runCatching { startActivity(android.content.Intent(it).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK), options.toBundle()) }
- .onFailure { e -> Log.w(TAG, "could not open ${it.action} on display ${presentation.display.displayId}", e) }
- .isSuccess
- }
- if (!opened) return
- presentation.hide()
- var checks = 0
- fun showAgain() {
- try {
- presentation.show()
- } catch (e: Exception) {
- Log.w(TAG, "could not show the dashboard again", e)
- if (secondScreenPresentation === presentation) closeSecondScreen(reset = true)
- }
- }
- uiHandler.postDelayed(object : Runnable {
- override fun run() {
- if (secondScreenPresentation !== presentation || presentation.isShowing) return
- if (done()) {
- showAgain()
- return
- }
- if (++checks < SETTINGS_WATCH_CHECKS) uiHandler.postDelayed(this, SETTINGS_WATCH_MS) else showAgain()
- }
- }, SETTINGS_WATCH_MS)
- }
-
private fun captureScreenshot(onDone: (Boolean) -> Unit) {
val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (bottomOutputActive) bottomGame?.surfaceView
else if (::surfaceView.isInitialized) surfaceView else null
@@ -3518,8 +3534,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val main = window.decorView.display
if (role == InputRole.PRIMARY) return bottomGame?.display ?: main
if (bottomGame != null) return main
- return displayManager.getDisplay(selectedSecondScreenDisplay)
- ?: secondScreenDisplays.firstOrNull()?.let { displayManager.getDisplay(it.id) }
+ return com.droiddeck.launcher.input.SecondScreenDisplays.editorCandidates(selectedSecondScreenDisplay,
+ secondScreenDisplays.map { it.id }, com.droiddeck.launcher.input.DualScreen::taken).firstNotNullOfOrNull(displayManager::getDisplay)
+ }
+
+ fun inputWindowShown(displayId: Int) { inputWindowDisplays += displayId }
+
+ fun inputWindowClosed(displayId: Int) {
+ inputWindowDisplays -= displayId
+ if (started && displayId !in inputWindowDisplays && secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode)
}
private fun refreshInputProfile() {
@@ -3530,6 +3553,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
adaptiveSticks = primaryInputLayout?.adaptiveSticks
quickButtons = primaryInputLayout?.takeIf { it.editable }?.let { l -> l.quickButtons.associateWith { it !in l.style.hidden } }.orEmpty()
secondaryInputLayout = library.panelLayout(desktop, secondScreenMode.panel(this))
+ deckPanelLayouts = com.droiddeck.launcher.input.DeckPanel.entries.associateWith { library.panelLayout(desktop, it.bindings) }
inputUsesLocalActions = InputControl.padControls.any { inputProfile.action(InputRole.PHYSICAL, it) !is InputAction.Native }
inputUsesPointer = inputProfile.bindings.values.any { bindings ->
bindings.values.any { it is InputAction.Pointer || it is InputAction.MouseButton || it is InputAction.Scroll }
@@ -3543,6 +3567,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
onScreenControls?.updateLayout(primaryInputLayout)
bottomInputControls?.updateLayout(primaryInputLayout)
unfoldedPanel?.updateLayout(primaryInputLayout)
+ if (unfoldedPanel != null) applyUnfoldedControls()
+ showUnfoldedDeckPanel()
updateOnScreenPad()
secondScreenPresentation?.refreshControls()
}
@@ -3586,7 +3612,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val width = sessionRoot.width
val height = sessionRoot.height
val wanted = controlsBelowWanted()
- val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height)
+ val tabRow = unfoldedColumn?.getChildAt(0)?.height?.let {
+ it - (com.droiddeck.launcher.ui.BAR_HEIGHT.value * resources.displayMetrics.density + 0.5f).toInt()
+ } ?: 0
+ val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height, tabRow)
else FrameLayout.LayoutParams.MATCH_PARENT
val params = surfaceView.layoutParams as FrameLayout.LayoutParams
if (params.height != gameHeight) {
@@ -3594,11 +3623,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
Log.i(TAG, if (wanted) "unfolded controls: game ${width}x$gameHeight, controls ${width}x${height - gameHeight}"
else "unfolded controls: game full screen")
}
- val dock = com.droiddeck.launcher.input.OnScreenLayout.Dock(!com.droiddeck.launcher.session.SessionDisplay.foldable(this), SessionState.deckPad)
+ val portrait = !com.droiddeck.launcher.session.SessionDisplay.foldable(this)
+ val dock = if (SessionState.deckPad) com.droiddeck.launcher.input.OnScreenLayout.Dock.deck(portrait, deckPanelLayouts[com.droiddeck.launcher.input.DeckPanel.GAMEPAD])
+ else com.droiddeck.launcher.input.OnScreenLayout.Dock(portrait, false)
var panel = unfoldedPanel
if (panel != null && (!wanted || panel.dock != dock)) {
sessionRoot.removeView(unfoldedColumn)
unfoldedColumn = null
+ unfoldedDeckSurface = null
+ unfoldedDeckPanel = null
unfoldedPanel = null
panel = null
if (!wanted) updateOnScreenControls()
@@ -3608,21 +3641,47 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
panel = OnScreenControls(this, padBridge, dock).also { it.updateLayout(primaryInputLayout) }
val column = android.widget.LinearLayout(this).apply {
orientation = android.widget.LinearLayout.VERTICAL
- addView(unfoldedBar(), android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT,
- (com.droiddeck.launcher.ui.BAR_HEIGHT.value * resources.displayMetrics.density + 0.5f).toInt()))
+ addView(unfoldedBar().apply {
+ addOnLayoutChangeListener { _, _, top, _, bottom, _, oldTop, _, oldBottom ->
+ if (bottom - top != oldBottom - oldTop) post { applyUnfoldedControls() }
+ }
+ }, android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT,
+ android.widget.LinearLayout.LayoutParams.WRAP_CONTENT))
addView(panel, android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f))
}
sessionRoot.addView(column, sessionRoot.indexOfChild(surfaceView) + 1)
unfoldedColumn = column
unfoldedPanel = panel
+ showUnfoldedDeckPanel()
updateOnScreenControls()
}
unfoldedColumn?.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, height - gameHeight, Gravity.BOTTOM)
}
private fun unfoldedBar(): View = com.droiddeck.launcher.ui.bottomScreenBarView(this) {
- com.droiddeck.launcher.ui.sessionBarModel(getString(R.string.deck_tab_gamepad), { chooseUnfoldedControls(false) },
- { drawerOpen = true }, ::tapSteamButton, ::tapQam)
+ val deck = unfoldedDeckPanel
+ com.droiddeck.launcher.ui.sessionBarModel(getString(if (deck != null) R.string.second_mode_deck_controls else R.string.deck_tab_gamepad),
+ { chooseUnfoldedControls(false) }, { drawerOpen = true }, ::tapSteamButton, ::tapQam,
+ tabs = deck?.let { com.droiddeck.launcher.ui.deckPanelTabs(this, it, ::selectDeckPanel) })
+ }
+
+ private fun showUnfoldedDeckPanel() {
+ val column = unfoldedColumn
+ val panel = unfoldedPanel
+ val selected = SessionPrefs.deckPanel(this).takeIf { column != null && panel?.dock?.grips == true }
+ unfoldedDeckPanel = selected
+ val layout = selected?.takeIf { it != com.droiddeck.launcher.input.DeckPanel.GAMEPAD }?.let { deckPanelLayouts[it] }
+ if (layout != null && unfoldedDeckSurface?.tag == layout) return
+ unfoldedDeckSurface?.let { it.releaseInputs(); column?.removeView(it) }
+ unfoldedDeckSurface = null
+ if (column == null || panel == null) return
+ if (layout == null) { panel.visibility = View.VISIBLE; return }
+ panel.releaseAll()
+ panel.visibility = View.GONE
+ unfoldedDeckSurface = com.droiddeck.launcher.ui.InputSurfaceView(this, padBridge, layout.elements, InputRole.PRIMARY, layout.style, haptics = true).also {
+ it.tag = layout
+ column.addView(it, android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f))
+ }
}
private fun bottomKeyboardPresentation(): SecondScreenPresentation? {
@@ -3798,6 +3857,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (next == SessionPrefs.TOUCH_OFF) cursorVisible = false
gestureTouchStreamGate.reset()
routedTouchMode = next
+ requestRelativeMouse()
if (directTouchCursorHidden()) cursorVisible = false
}
@@ -3890,8 +3950,29 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val width = outputView().width.takeIf { it > 0 } ?: return null
val height = outputView().height.takeIf { it > 0 } ?: return null
topPictureMapped = CompositorHost.isStarted && WaylandCompositor.nativeGamePictureRect(gamePictureBounds)
- if (topPictureMapped) return android.graphics.RectF(
- gamePictureBounds[0], gamePictureBounds[1], gamePictureBounds[2], gamePictureBounds[3])
+ if (topPictureMapped) {
+ val rect = android.graphics.RectF(
+ gamePictureBounds[0], gamePictureBounds[1],
+ gamePictureBounds[2], gamePictureBounds[3]
+ )
+
+ if (glassesOutputActive) {
+ val mode = glassesScreen?.display?.mode ?: return null
+ val outputWidth = mode.physicalWidth.takeIf { it > 0 } ?: return null
+ val outputHeight = mode.physicalHeight.takeIf { it > 0 } ?: return null
+ val scaleX = width.toFloat() / outputWidth
+ val scaleY = height.toFloat() / outputHeight
+
+ return android.graphics.RectF(
+ rect.left * scaleX,
+ rect.top * scaleY,
+ rect.right * scaleX,
+ rect.bottom * scaleY
+ )
+ }
+
+ return rect
+ }
val out = SessionState.outputSize
val scale = minOf(width / out.first.toFloat(), height / out.second.toFloat())
val drawnW = out.first * scale
@@ -3918,9 +3999,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private var lockedSwipeX = 0f
private var lockedSwipeY = 0f
private var dismissTouch = false
+ private var sessionTouchDown = false
override fun onTouchEvent(event: MotionEvent): Boolean {
if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE)) return onMouse(event)
+ when (event.actionMasked) {
+ MotionEvent.ACTION_DOWN -> {
+ sessionTouchDown = true
+ dismissTouch = false
+ }
+ MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> sessionTouchDown = false
+ }
if (drawerOpen && drawerDocked && event.actionMasked == MotionEvent.ACTION_DOWN) {
drawerLayerOpen = false
drawerOpenState = false
@@ -3932,7 +4021,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) dismissTouch = false
return true
}
- val uiBlocking = drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || inputSettingsOpen || pipUi || SessionState.suspended
+ val uiBlocking = drawerOpen || achievementsOpen || gestureSettingsOpen || inputSettingsOpen || pipUi || SessionState.suspended
if (event.actionMasked == MotionEvent.ACTION_DOWN && !uiBlocking && routedTouchMode != SessionPrefs.TOUCH_GESTURES) {
scrollTouchGesture = scrollTouchMode()
scrollRestX = 0f
@@ -3960,7 +4049,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
com.droiddeck.launcher.input.TouchRouter.Route.SCROLL -> scrollTouch.onTouch(event)
else -> {
if (com.droiddeck.launcher.input.TouchRouter.steamKeyboardZone(snapshot)) {
- val wasActive = threeFingerTap.active
+ val wasActive = threeFingerTap.active && event.actionMasked != MotionEvent.ACTION_DOWN
if (threeFingerTap.onTouch(event)) padBridge?.triggerSteamKeyboard()
if (threeFingerTap.active && !wasActive) {
if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD) touchpad.cancel()
@@ -4036,9 +4125,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
return true
}
if (event.actionMasked == MotionEvent.ACTION_DOWN) lockedSwipeUsed = false
+ if (lockedSwipeUsed && (event.actionMasked != MotionEvent.ACTION_MOVE || !programLocksPointer())) return true
if (programLocksPointer() && event.actionMasked == MotionEvent.ACTION_MOVE) {
+ if (lockedSwipeUsed) directTouchHold.cancelPendingHold() else directTouchHold.cancelTouch()
lockedSwipeUsed = true
- directTouchHold.cancelPendingHold()
val scale = sceneScale(rect)
sendSceneDelta((event.x - swipeX) * scale, (event.y - swipeY) * scale)
return true
@@ -4089,6 +4179,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
isHardwareMouse(d) && d?.supportsSource(InputDevice.SOURCE_TOUCHPAD) != true
}
+ private fun externalMouseAttached(): Boolean {
+ lastExternalMouse = InputDevice.getDeviceIds().map { InputDevice.getDevice(it) }
+ .firstOrNull { device -> device != null && com.droiddeck.launcher.input.MouseBackInput.isExternalMouse(device) }
+ return lastExternalMouse != null
+ }
+
private fun relativeMouseAttached(): Boolean = !isInMultiWindowMode && !glassesOutputActive && InputDevice.getDeviceIds().any { id ->
val d = InputDevice.getDevice(id)
isHardwareMouse(d) && d?.supportsSource(InputDevice.SOURCE_TOUCHPAD) != true
@@ -4155,6 +4251,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
applyPlatformPointer(appUiOwnsPointer())
}
+ private fun onlyPcKeyboardOpen(): Boolean =
+ pcKeyboardOpen && !drawerOpen && !achievementsOpen && !inputSettingsOpen && !pipUi && !glassesOutputActive && !touchEditorOpen && !wowChatOnTop
+
private fun appUiOwnsPointer(): Boolean =
drawerOpen || pcKeyboardOpen || achievementsOpen || inputSettingsOpen || pipUi || glassesOutputActive || bottomOutputActive || touchEditorOpen || wowChatOnTop
@@ -4245,7 +4344,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
updateOnScreenPad()
val c = onScreenControls
glassesSlot = when {
- c == null || c.visibility != View.VISIBLE -> 0
+ c == null || c.visibility != View.VISIBLE || c.isPinnedOnly -> 0
c.isButtonsOnly -> -1
primaryInputLayout?.let { l -> l.elements.any { it.quickButton == InputCommand.KEYBOARD && !l.style.hides(it) } }
?: (controllerSettings?.keyboardButton != false) -> 2
@@ -4260,12 +4359,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
?.let { FileUtils.readString(it)?.trim()?.lowercase() }
?: SessionPrefs.oscMode(this)
val controls = onScreenControls ?: return
+ fun showPinned() {
+ controls.setPinnedOnly(true)
+ val pinned = controls.hasPinned && !pipUi && !inputSettingsOpen
+ if (!pinned) controls.releaseAll()
+ controls.visibility = if (pinned) View.VISIBLE else View.GONE
+ }
if (pipUi || unfoldedPanel != null || pcKeyboardOpen || inputSettingsOpen ||
(SessionState.mode == SessionService.MODE_STEAM && !SessionPrefs.builtinPad(this))) {
onScreenButtonsVisible = false
hideBottomControls()
- controls.releaseAll()
- controls.visibility = View.GONE
+ showPinned()
steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE }
com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false
applyTouchRouting()
@@ -4298,7 +4402,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
val drawn = show && !keyboardCoversPad()
if (steam != null) {
hideBottomControls()
- if (controls.visibility == View.VISIBLE) { controls.releaseAll(); controls.visibility = View.GONE }
+ showPinned()
if (!drawn) { steam.cancelEditing(); steam.releaseAll() }
steam.visibility = if (drawn) View.VISIBLE else View.GONE
com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = show
@@ -4307,7 +4411,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
return
}
val bottomRoot = bottomGame?.surfaceView?.parent as? android.view.ViewGroup
- if (drawn && bottomRoot != null) {
+ if (bottomRoot != null && (drawn || controls.hasPinned)) {
controls.releaseAll(); controls.visibility = View.GONE
var bottom = bottomInputControls
if (bottom?.parent !== bottomRoot) {
@@ -4320,13 +4424,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
bottom.updateLayout(primaryInputLayout)
bottom.setButtonsOnly(buttonsOnly)
+ bottom.setPinnedOnly(!drawn)
bottom.visibility = View.VISIBLE
return
}
hideBottomControls()
- if (drawn == (controls.visibility == View.VISIBLE)) return
- if (!drawn) controls.releaseAll()
- controls.visibility = if (drawn) View.VISIBLE else View.GONE
+ val wasDrawn = controls.visibility == View.VISIBLE && !controls.isPinnedOnly
+ if (!drawn) showPinned() else { controls.setPinnedOnly(false); controls.visibility = View.VISIBLE }
+ if (drawn == wasDrawn) return
Log.i(TAG, "on-screen controls " + when {
!drawn -> "hidden"
buttonsOnly -> "Steam + QAM"
@@ -5069,7 +5174,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
com.droiddeck.launcher.ui.BottomScreenBar(bar(getString(SecondScreenMode.KEYBOARD_TRACKPAD.label), listOf(keyboardExtra)))
SecondScreenMode.DECK_CONTROLS -> com.droiddeck.launcher.ui.BottomScreenBar(bar(getString(SecondScreenMode.DECK_CONTROLS.label),
tabs = com.droiddeck.launcher.ui.deckPanelTabs(this@SessionActivity, SessionPrefs.deckPanel(this@SessionActivity), ::selectDeckPanel)))
- else -> Unit
+ else -> com.droiddeck.launcher.ui.BottomScreenBar(bar(getString(secondScreenMode.label)))
}
androidx.compose.runtime.key(profileLayout) {
androidx.compose.ui.viewinterop.AndroidView(
@@ -5286,6 +5391,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
override fun onDestroy() {
+ if (AgentGuest.readyListener === agentReadyListener) AgentGuest.readyListener = null
com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this)
relativeMouseRequests.shutdownNow()
backQamInput.cancel()
@@ -5390,13 +5496,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
const val EXTRA_RETURN_HOME = "returnHome"
const val EXTRA_LINK_TASK = "linkTask"
const val EXTRA_STEAMVR = "steamVr"
+ const val EXTRA_PLAYED_GAME = "com.droiddeck.launcher.PLAYED_GAME"
const val EXTRA_REPAIR_RUNTIME = "repairRuntime"
private const val LEAVE_TIMEOUT_MS = 1_500L
private const val TEXT_FIELD_TAP_MS = 1_000L
private const val PAUSED_FRAME_MAX_EDGE = 1920f
private const val PAUSED_FRAME_REDRAW_MS = 150L
- private const val SETTINGS_WATCH_MS = 1_000L
- private const val SETTINGS_WATCH_CHECKS = 600
private const val BOTTOM_RECOVERY_MS = 1_000L
private const val BOTTOM_RECOVERY_TRIES = 3
private const val TAG = "SessionActivity"
@@ -5438,6 +5543,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private const val ALIGN_CENTER = 0
private const val ALIGN_PICTURE_TOP = 3
private const val ALIGN_PICTURE_BOTTOM = 4
+ private const val ALIGN_PICTURE_LEFT = 5
+ private const val ALIGN_PICTURE_RIGHT = 6
private val RUNTIME_LINES = PackageLines(
R.string.session_runtime_downloading, R.string.session_runtime_downloading_mb,
R.string.session_runtime_checking, R.string.session_runtime_unpacking,
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..93922c8050 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))
@@ -284,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/agent/AgentCallReceiver.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentCallReceiver.kt
new file mode 100644
index 0000000000..6ef8b2d4ba
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentCallReceiver.kt
@@ -0,0 +1,41 @@
+package com.droiddeck.launcher.agent
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import java.io.File
+
+/**
+ * The agent bridge for devices whose shell has no `content` command: the same calls as
+ * [AgentBridgeProvider], answered in a file under the app's external files folder.
+ */
+class AgentCallReceiver : BroadcastReceiver() {
+
+ override fun onReceive(context: Context, intent: Intent) {
+ val method = intent.getStringExtra("method") ?: return
+ 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 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"}}"""
+ } catch (e: Exception) {
+ org.json.JSONObject().put("ok", false)
+ .put("error", org.json.JSONObject().put("code", "COMMAND_FAILED").put("message", e.message ?: e.javaClass.simpleName)).toString()
+ }
+ 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/main/java/com/droiddeck/launcher/agent/AgentGuest.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt
index eaa2bbc0f7..e04dda2580 100644
--- a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt
+++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt
@@ -33,6 +33,7 @@ object AgentGuest {
var keyboardDismissals by mutableIntStateOf(0)
private set
@Volatile private var keyboardRoute = false
+ @Volatile var readyListener: (() -> Unit)? = null
@Volatile private var routeDir: File? = null
private const val TAG = "AgentGuest"
private const val POLL_MS = 50L
@@ -59,6 +60,7 @@ object AgentGuest {
when (path) {
"hello.json" -> readJson(File(dir, path))?.let {
SessionEvents.record("agent.ready", mapOf("pid" to it.optInt("pid"), "focus" to it.optBoolean("focus")))
+ readyListener?.invoke()
}
"focus.json" -> readJson(File(dir, path))?.let(::recordFocus)
"keyboard.json" -> readJson(File(dir, path))?.let { recordKeyboard(this, it) }
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/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/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/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/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
index ef7ec06a10..b303ecc71e 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt
@@ -18,9 +18,10 @@ object Library {
val source: String = SOURCE_STEAM,
val storeId: String? = null,
val logo: File? = null,
+ val installedAt: Long = 0L,
) {
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)
+ SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo, installedAt)
val gameIdString: String get() = java.lang.Long.toUnsignedString(gameId)
val launchKey: String get() = if (storeId != null) "$source:$storeId" else gameIdString
@@ -31,6 +32,7 @@ object Library {
}
}
const val ADDED = "added"
+ private const val PLAYED = "added_games_played"
const val EPIC_LAUNCHER = "epic-launcher"
const val EPIC_LAUNCHER_NAME = "Epic Games Launcher"
const val BATTLENET_LAUNCHER = "battlenet-launcher"
@@ -221,6 +223,18 @@ object Library {
return (steam + own.map { g -> addedGame(context, g, roots, played[g.appId] ?: 0L) }).distinctBy { it.gameId }
}
+ fun recordPlayed(context: Context, game: SteamGame) {
+ if (game.library == ADDED) recordPlayed(context, game.gameIdString)
+ }
+
+ fun recordPlayed(context: Context, gameId: String) {
+ context.getSharedPreferences(PLAYED, Context.MODE_PRIVATE).edit()
+ .putLong(gameId, System.currentTimeMillis() / 1000).apply()
+ }
+
+ internal fun recordedPlay(context: Context, gameId: Long): Long =
+ context.getSharedPreferences(PLAYED, Context.MODE_PRIVATE).getLong(java.lang.Long.toUnsignedString(gameId), 0L)
+
internal fun shortcutsLastPlayed(root: File): Map = runCatching {
val config = AddedGames.accountConfig(root) ?: return emptyMap()
val bytes = File(config, "shortcuts.vdf").takeIf { it.isFile }?.readBytes() ?: return emptyMap()
@@ -249,12 +263,13 @@ object Library {
AddedGameArt.resolve(context, g).let { art ->
SteamGame(
g.steamAppId ?: g.appId.toInt(), g.name, art.portrait ?: art.header, ADDED, g.gameId,
- hero = art.hero ?: art.header, lastPlayed = lastPlayed, gameFiles = g.folder,
+ hero = art.hero ?: art.header, lastPlayed = maxOf(lastPlayed, recordedPlay(context, g.gameId)), gameFiles = g.folder,
protonPrefix = if (g.source == com.droiddeck.launcher.stores.Store.BATTLENET.id) File(com.droiddeck.launcher.runtime.BattleNet.prefix(context), "pfx").takeIf { it.isDirectory }
else protonPrefix(context, g.steamAppId?.toLong() ?: g.appId, libraries = roots),
icon = art.icon?.takeIf { it.extension.lowercase() != "ico" },
source = g.source, storeId = g.storeId,
logo = art.logo,
+ installedAt = g.folder.lastModified(),
)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt b/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt
index 6fa35c753a..81434ce2ca 100644
--- a/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt
+++ b/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt
@@ -27,6 +27,7 @@ object LibraryCache {
source = o.optString("source").ifEmpty { if (o.getString("library") == Library.ADDED) Library.ADDED else Library.SOURCE_STEAM },
storeId = o.optString("storeId").ifEmpty { null },
logo = o.file("logo"),
+ installedAt = o.optLong("installedAt"),
)
} to x64
}.getOrElse { e -> Log.w(TAG, "unreadable, ignored: ${e.message}"); Pair(emptyList(), false) }
@@ -44,7 +45,7 @@ object LibraryCache {
JSONObject().put("appId", g.appId).put("name", g.name).put("library", g.library).put("gameId", g.gameId)
.put("lastPlayed", g.lastPlayed).putFile("art", g.art).putFile("hero", g.hero)
.putFile("gameFiles", g.gameFiles).putFile("protonPrefix", g.protonPrefix).putFile("icon", g.icon).putFile("logo", g.logo)
- .put("source", g.source).apply { g.storeId?.let { put("storeId", it) } },
+ .put("source", g.source).put("installedAt", g.installedAt).apply { g.storeId?.let { put("storeId", it) } },
)
val f = file(context)
val tmp = File(f.path + ".tmp")
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/gpu/DriverBundle.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt
index 594dbebb27..319a123811 100644
--- a/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt
+++ b/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt
@@ -159,6 +159,12 @@ object DriverBundle {
SessionPrefs.setLinuxDriver(context, bundle.linuxId)
}
+ fun selectDisplay(context: Context, id: String) {
+ val left = active(context)
+ SessionPrefs.setAndroidDriver(context, id)
+ if (left != null && left.androidId != id) SessionPrefs.setLinuxDriver(context, "")
+ }
+
fun remove(context: Context, bundle: Bundle) {
TurnipDriver(context).remove(bundle.androidId)
LinuxVulkanDriverManager(context).removeDriver(bundle.linuxId)
diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SystemVulkanDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/SystemVulkanDriver.java
index 25a6e363c6..1106ac9602 100644
--- a/app/src/main/java/com/droiddeck/launcher/gpu/SystemVulkanDriver.java
+++ b/app/src/main/java/com/droiddeck/launcher/gpu/SystemVulkanDriver.java
@@ -191,6 +191,7 @@ public final class SystemVulkanDriver {
/** Collect abandoned stages, and obsolete versions once older guests can no longer load them. */
public static synchronized void pruneUnused(Context context, boolean guestsStopped) throws IOException {
+ if (!AddonPack.POWERVR.installed(context)) return;
pruneUnused(runtimeDirectory(context), guestsStopped);
}
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 98dc35074f..2aba209ded 100644
--- a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt
+++ b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt
@@ -6,6 +6,7 @@ import kotlin.math.roundToInt
internal class FrameStats {
private val graph = FloatArray(GRAPH_FRAMES)
private var graphHead = 0
+ private var graphFrames = 0L
private var lastPresentNs = 0L
private var lastFpsUpdateNs = 0L
private var framesSinceUpdate = 0
@@ -38,6 +39,7 @@ internal class FrameStats {
if (lastPresentNs != 0L) {
graph[graphHead] = frametimeNs / 1e6f
graphHead = (graphHead + 1) % GRAPH_FRAMES
+ graphFrames++
}
val elapsed = timeNs - lastFpsUpdateNs
if (elapsed >= FPS_PERIOD_NS) {
@@ -68,6 +70,7 @@ internal class FrameStats {
fun reset() {
graph.fill(0f)
graphHead = 0
+ graphFrames = 0L
lastPresentNs = 0L
lastFpsUpdateNs = 0L
framesSinceUpdate = 0
@@ -86,8 +89,9 @@ internal class FrameStats {
fun frametimeMs(): Float = 1000f / maxOf(fps, 1f)
@Synchronized
- fun graph(out: FloatArray) {
+ fun graph(out: FloatArray): Long {
for (i in 0 until GRAPH_FRAMES) out[i] = graph[(graphHead + i) % GRAPH_FRAMES]
+ return graphFrames
}
@Synchronized
diff --git a/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt
index ae44dc0e6c..574536e18a 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt
@@ -9,6 +9,7 @@ import android.hardware.display.DisplayManager
import android.os.Build
import android.os.Handler
import android.os.HandlerThread
+import android.os.SystemClock
import android.util.Log
import android.view.Display
import android.view.accessibility.AccessibilityEvent
@@ -33,6 +34,8 @@ object BottomScreenGuests {
else -> null
}
+ internal fun current(arrivedAt: Long, ownShownAt: Long?): Boolean = ownShownAt == null || arrivedAt >= ownShownAt
+
internal fun ignorable(type: Int): Boolean = type == AccessibilityWindowInfo.TYPE_INPUT_METHOD ||
type == AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY ||
type == AccessibilityWindowInfo.TYPE_SPLIT_SCREEN_DIVIDER ||
@@ -43,7 +46,7 @@ object BottomScreenGuests {
}
class BottomScreenWatch(private val service: AccessibilityService) {
- private class Arrival(val pkg: String)
+ private class Arrival(val pkg: String, val at: Long)
private val thread = HandlerThread("bottom-screen").apply { start() }
private val handler = Handler(thread.looper)
@@ -52,6 +55,8 @@ class BottomScreenWatch(private val service: AccessibilityService) {
private var homes: Set = emptySet()
private var keyboards: Set = emptySet()
private var holders: Map = emptyMap()
+ private var ownWindows: Map> = emptyMap()
+ private val ownShownAt = mutableMapOf()
private val check = Runnable { evaluate() }
fun start() {
@@ -72,7 +77,7 @@ class BottomScreenWatch(private val service: AccessibilityService) {
AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED -> {
val pkg = event.packageName?.toString() ?: return
if (event.displayId == Display.DEFAULT_DISPLAY || pkg == own || pkg == SYSTEM_UI) return
- arrivals[event.displayId] = Arrival(pkg)
+ arrivals[event.displayId] = Arrival(pkg, event.eventTime)
}
AccessibilityEvent.TYPE_WINDOWS_CHANGED -> Unit
else -> return
@@ -97,19 +102,25 @@ class BottomScreenWatch(private val service: AccessibilityService) {
val all = runCatching { service.windowsOnAllDisplays }.getOrNull() ?: return
val displays = service.getSystemService(DisplayManager::class.java) ?: return
val taken = mutableMapOf()
+ val shown = mutableMapOf>()
+ val now = SystemClock.uptimeMillis()
for (i in 0 until all.size()) {
val id = all.keyAt(i)
if (id == Display.DEFAULT_DISPLAY) continue
val display = displays.getDisplay(id)?.takeIf(DualScreen::builtIn) ?: continue
val windows = all.valueAt(i)
- val topPkg = windows.asSequence()
.filter { !BottomScreenGuests.ignorable(it.type) && cover(it, display) >= BottomScreenGuests.MIN_COVER }
.sortedByDescending { it.layer }
- .firstNotNullOfOrNull { packageOf(it)?.takeUnless { pkg -> pkg == own } }
- val arrival = seen[id]
- if (topPkg != null && arrival != null) arrivals.remove(id, arrival)
+ .map { it to packageOf(it) }
+ val ours = windows.filter { it.second == own }.map { it.first.id }.toSet()
+ if (!ownWindows[id].orEmpty().containsAll(ours)) ownShownAt[id] = now
+ shown[id] = ours
+ val topPkg = windows.firstNotNullOfOrNull { it.second?.takeUnless { pkg -> pkg == own } }
+ val arrival = seen[id]?.takeIf { BottomScreenGuests.current(it.at, ownShownAt[id]) }
+ seen[id]?.takeIf { topPkg != null || arrival == null }?.let { arrivals.remove(id, it) }
BottomScreenGuests.holder(topPkg, arrival?.pkg?.takeUnless { it in keyboards }, homes)?.let { taken[id] = it }
}
+ ownWindows = shown
if (current !== this) return
if (taken != holders) Log.i(TAG, "bottom screen holders: $taken")
holders = taken
diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt
index 1edc2395ce..5231a753ac 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt
@@ -73,7 +73,7 @@ object ControllerPrefs {
keyboardButton = p.getBoolean("keyboardButton", true),
selectSteam = p.getBoolean("selectSteam", false),
joyConVr = joyConVr(context),
- snap = p.getBoolean("snap", true),
+ snap = snap(context),
customLayout = p.all.keys.any { it.startsWith("layout.") },
mapping = mappable.associate { (id, _) -> id to target(context, id) },
deadZone = deadZone(context),
@@ -87,11 +87,6 @@ object ControllerPrefs {
prefs(context).edit().putString("map.$id", target).apply()
}
- fun resetMapping(context: Context) {
- val p = prefs(context)
- p.edit().apply { p.all.keys.filter { it.startsWith("map.") }.forEach { remove(it) } }.apply()
- }
-
fun setTint(context: Context, tint: Int) {
prefs(context).edit().putInt("tint", tint).apply()
}
@@ -129,10 +124,6 @@ object ControllerPrefs {
prefs(context).edit().putBoolean("steamButton", on).apply()
}
- fun setQamButton(context: Context, on: Boolean) {
- prefs(context).edit().putBoolean("qamButton", on).apply()
- }
-
fun setKeyboardButton(context: Context, on: Boolean) {
prefs(context).edit().putBoolean("keyboardButton", on).apply()
}
@@ -147,6 +138,8 @@ object ControllerPrefs {
prefs(context).edit().putBoolean("joyConVr", on).apply()
}
+ fun snap(context: Context): Boolean = prefs(context).getBoolean("snap", true)
+
fun setSnap(context: Context, on: Boolean) {
prefs(context).edit().putBoolean("snap", on).apply()
}
@@ -172,9 +165,4 @@ object ControllerPrefs {
fun resetAll(context: Context) {
prefs(context).edit().clear().putBoolean("rumble", true).apply()
}
-
- fun resetAllLayouts(context: Context) {
- val p = prefs(context)
- p.edit().apply { p.all.keys.filter { it.startsWith("layout.") }.forEach { remove(it) } }.apply()
- }
}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt
index ee8d68ef05..7a64caaac6 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt
@@ -70,6 +70,14 @@ class DirectTouchHold(
handler.removeCallbacks(hold)
}
+ fun cancelTouch() {
+ handler.removeCallbacks(hold)
+ handler.removeCallbacks(lift)
+ liftPending = false
+ if (forwarded) touch.cancel()
+ forwarded = false
+ }
+
fun onTouch(event: MotionEvent): Boolean {
if (event.actionMasked == MotionEvent.ACTION_DOWN) {
if (liftPending) {
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt
index 074fd834a8..bcc641ebaa 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt
@@ -4,12 +4,13 @@ import android.content.Context
import android.hardware.display.DisplayManager
import android.util.DisplayMetrics
import android.view.Display
+import com.droiddeck.launcher.session.SessionPrefs
import org.json.JSONArray
import org.json.JSONObject
import java.util.UUID
object InputLibraries {
- private const val VERSION = 12
+ private const val VERSION = 14
private const val KEY = "library"
private const val RECOVERY = "library-recovery."
const val OVERLAY = "builtin.overlay"
@@ -30,6 +31,8 @@ object InputLibraries {
if (version < 11) library = neutralStockLayouts(library)
if (version < 10) library = restyleGamepads(context, library)
if (version < 12) library = barStockLayouts(library)
+ if (version < 13) library = LegacyScreenKeyMigration.pin(library)
+ if (version < 14) library = deckGamepadSurfaces(context, library)
if (version < 6 || !p.contains(LegacyScreenKeyMigration.BACKUP)) {
val legacy = LegacyScreenKeyMigration.snapshot(context)
if (legacy != null) {
@@ -263,6 +266,15 @@ object InputLibraries {
return addStockLayouts(result)
}
+ private fun deckGamepadSurfaces(context: Context, library: InputLibrary): InputLibrary {
+ val leftPad = SessionPrefs.gamepadSurface(context, right = false) == SessionPrefs.SURFACE_TRACKPAD
+ val rightStick = SessionPrefs.gamepadSurface(context, right = true) == SessionPrefs.SURFACE_STICK
+ if (!leftPad && !rightStick) return library
+ val saved = library.layouts.firstOrNull { it.id == DeckPanel.GAMEPAD.layout } ?: return library
+ if (saved.elements != InputStockLayouts.gamepad(leftPad = false, rightStick = false)) return library
+ return library.withLayout(saved.copy(elements = InputStockLayouts.gamepad(leftPad, rightStick))).validate()
+ }
+
private fun migrationBindingId(library: InputLibrary, binding: String, layout: String): String {
val seed = JSONArray(listOf(binding, layout)).toString().toByteArray(Charsets.UTF_8)
val base = "migrated.bindings." + UUID.nameUUIDFromBytes(seed)
@@ -292,7 +304,7 @@ object InputLibraries {
for (e in layout.elements) elements.put(JSONObject().put("id", e.id).put("kind", e.kind.name)
.put("control", e.control.id).put("name", e.name).put("x", e.x.toDouble()).put("y", e.y.toDouble())
.put("width", e.width.toDouble()).put("height", e.height.toDouble()).put("floating", e.floating).put("hideWhenIdle", e.hideWhenIdle).put("mouseGestures", e.mouseGestures).put("toggle", e.toggle).put("icon", e.icon).put("image", e.image)
- .put("elementOpacity", e.opacity.toDouble()).put("buttonShape", e.buttonShape.name).put("showLabel", e.showLabel))
+ .put("elementOpacity", e.opacity.toDouble()).put("buttonShape", e.buttonShape.name).put("showLabel", e.showLabel).put("alwaysShown", e.alwaysShown))
layouts.put(JSONObject().put("id", layout.id).put("name", layout.name).put("template", layout.template.name).put("elements", elements)
.put("tint", layout.style.tint ?: JSONObject.NULL).put("opacity", layout.style.opacity).put("screen", layout.screen.name).put("aspect", layout.aspect.toDouble()).put("scale", layout.scale.toDouble())
.put("hidden", JSONArray(layout.style.hidden.map { it.name }.sorted())).put("origin", layout.origin ?: JSONObject.NULL))
@@ -333,7 +345,7 @@ object InputLibraries {
e.getDouble("y").toFloat(), e.getDouble("width").toFloat(), e.getDouble("height").toFloat(),
e.getString("id"), InputElementKind.valueOf(e.getString("kind")), e.getString("name"),
e.optBoolean("floating", true), e.optBoolean("hideWhenIdle", false), e.optBoolean("mouseGestures", false), e.optBoolean("toggle", false), e.optInt("icon", 0), e.optString("image", ""),
- e.optDouble("elementOpacity", 1.0).toFloat(), InputButtonShape.valueOf(e.optString("buttonShape", InputButtonShape.ROUNDED.name)), e.optBoolean("showLabel", true))
+ e.optDouble("elementOpacity", 1.0).toFloat(), InputButtonShape.valueOf(e.optString("buttonShape", InputButtonShape.ROUNDED.name)), e.optBoolean("showLabel", true), e.optBoolean("alwaysShown", false))
}
SavedInputLayout(layout.getString("id"), layout.getString("name"), elements, InputLayoutTemplate.valueOf(layout.getString("template")),
InputSurfaceStyle(if (!layout.has("tint")) ControllerPrefs.STEAM_BLUE else if (layout.isNull("tint")) null else layout.getInt("tint"), layout.optInt("opacity", 100),
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt b/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt
index 059fbb1dda..f3c451d6f7 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt
@@ -45,6 +45,14 @@ internal object InputStockLayouts {
InputSurfaceElement(InputControl.SELECT, .42f, .3f, .07f, .1f, buttonShape = InputButtonShape.PILL),
InputSurfaceElement(InputControl.START, .51f, .3f, .07f, .1f, buttonShape = InputButtonShape.PILL))
}
+ fun gamepad(leftPad: Boolean, rightStick: Boolean) = gamepad().map {
+ when {
+ leftPad && it.control == InputControl.LS -> InputSurfaceElement(InputControl.LEFT_PAD, it.x, it.y, it.width, it.height)
+ rightStick && it.control == InputControl.RIGHT_PAD -> InputSurfaceElement(InputControl.RS, it.x, it.y, it.width, it.height)
+ else -> it
+ }
+ }
+
fun layouts() = listOf(
SavedInputLayout(InputLibraries.DECK, "Deck grips + trackpads", pads() + grips(), style = NEUTRAL, screen = InputLayoutScreen.SECONDARY),
SavedInputLayout(InputLibraries.TRACKPAD, "Trackpad + keyboard", listOf(
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt
index de16d485f4..e7e1c58a36 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt
@@ -34,6 +34,7 @@ data class InputSurfaceElement(
val opacity: Float = 1f,
val buttonShape: InputButtonShape = InputButtonShape.ROUNDED,
val showLabel: Boolean = true,
+ val alwaysShown: Boolean = false,
) {
val hasClick get() = kind == InputElementKind.STICK || kind == InputElementKind.TRACKPAD
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt
index 555f99b3e0..7012731ae0 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt
@@ -11,6 +11,7 @@ class InputSurfaceSource(private val pad: PadBridge, private val role: InputRole
private val gestureRight = if (element.mouseGestures) router?.channel(role, InputControl.A, fixedAction = InputAction.MouseButton(273)) else null
private val gestureMiddle = if (element.mouseGestures) router?.channel(role, InputControl.A, fixedAction = InputAction.MouseButton(274)) else null
val mouseGestures get() = element.mouseGestures && route?.action is InputAction.Pointer
+ val directions get() = route?.action as? InputAction.Directions
fun gestureContact(touching: Boolean) { if (!closed) route?.update(0f, 0f, touching) }
fun pointerDelta(dx: Float, dy: Float) {
diff --git a/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt
index f2857900af..e281a2b741 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt
@@ -225,7 +225,8 @@ internal class LegacyGamepadLayout(private val context: Context, private val wid
)
}
- fun dock(stored: List, portrait: Boolean, grips: Boolean): List {
+ fun dock(stored: List, portrait: Boolean, grips: Boolean, left: InputControl = InputControl.LS,
+ right: InputControl = InputControl.RS): List {
val boxes = GamepadGeometry.layout(width.toFloat(), height.toFloat(), resources.displayMetrics.density, portrait)
val placed = mutableListOf()
fun box(control: InputControl, slot: GamepadGeometry.Slot, shape: InputButtonShape) {
@@ -243,9 +244,9 @@ internal class LegacyGamepadLayout(private val context: Context, private val wid
b.cx + direction.first * spread, b.cy + direction.second * spread, radius)
}
}
- box(InputControl.LS, GamepadGeometry.Slot.LEFT_MAIN, InputButtonShape.CIRCLE)
+ box(left, GamepadGeometry.Slot.LEFT_MAIN, InputButtonShape.CIRCLE)
cross(DPAD_ORDER, GamepadGeometry.Slot.LEFT_SECOND)
- box(InputControl.RS, GamepadGeometry.Slot.RIGHT_MAIN, InputButtonShape.CIRCLE)
+ box(right, GamepadGeometry.Slot.RIGHT_MAIN, InputButtonShape.CIRCLE)
cross(FACE_ORDER, GamepadGeometry.Slot.RIGHT_SECOND)
box(InputControl.LT, GamepadGeometry.Slot.LEFT_OUTER_SHOULDER, InputButtonShape.PILL)
box(InputControl.LB, GamepadGeometry.Slot.LEFT_INNER_SHOULDER, InputButtonShape.PILL)
@@ -254,7 +255,8 @@ internal class LegacyGamepadLayout(private val context: Context, private val wid
box(InputControl.SELECT, GamepadGeometry.Slot.VIEW, InputButtonShape.PILL)
box(InputControl.START, GamepadGeometry.Slot.MENU, InputButtonShape.PILL)
if (grips) GRIPS.forEach { (control, slot) -> box(control, slot, InputButtonShape.ROUNDED) }
- return withGeometry(stored, placed) + placed.filter { p -> GRIPS.any { it.first == p.control } && stored.none { it.id == p.id } }
+ val surfaces = listOf(left, right).filter { it.isTrackpad }
+ return withGeometry(stored, placed) + placed.filter { p -> (GRIPS.any { it.first == p.control } || p.control in surfaces) && stored.none { it.id == p.id } }
}
private fun circle(e: InputSurfaceElement, cx: Float, cy: Float, radius: Float) =
diff --git a/app/src/main/java/com/droiddeck/launcher/input/LegacyScreenKeyMigration.kt b/app/src/main/java/com/droiddeck/launcher/input/LegacyScreenKeyMigration.kt
index 58329fc88e..9921fdf960 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/LegacyScreenKeyMigration.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/LegacyScreenKeyMigration.kt
@@ -40,7 +40,7 @@ internal object LegacyScreenKeyMigration {
if (result.profiles.any { it.id == id }) continue
val converted = convert(context, set.second, metrics.widthPixels, metrics.heightPixels, metrics.density)
if (converted.isEmpty()) continue
- val layout = SavedInputLayout("$id.layout", set.first, converted.map { it.first }, style = style, screen = InputLayoutScreen.MAIN,
+ val layout = SavedInputLayout("$id.layout", set.first, converted.map { it.first.copy(alwaysShown = true) }, style = style, screen = InputLayoutScreen.MAIN,
aspect = (metrics.widthPixels.coerceAtLeast(1).toFloat() / metrics.heightPixels.coerceAtLeast(1)).coerceIn(.05f, 20f))
val bindings = SavedInputBindings("$id.bindings", set.first, false, layout.id, elements = converted.associate { it.first.id to it.second })
val base = library.profile(library.steam)
@@ -68,6 +68,17 @@ internal object LegacyScreenKeyMigration {
return result.validate()
}
+ fun pin(library: InputLibrary): InputLibrary {
+ val keys = library.layouts.firstOrNull { it.id == "$SHOWN.layout" }?.elements.orEmpty()
+ return library.copy(layouts = library.layouts.map { layout ->
+ val imported = layout.id.startsWith("migrated.screenkeys.")
+ layout.copy(elements = layout.elements.map { e ->
+ val key = e.id.startsWith("imported:") && (imported || keys.any { it.id == e.id && it.kind == e.kind && it.name == e.name })
+ if (key) e.copy(alwaysShown = true) else e
+ })
+ })
+ }
+
internal fun convert(context: Context, raw: String, width: Int, height: Int, density: Float): List> =
convert(context, parse(raw), width, height, density)
diff --git a/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt b/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt
index 261c88a74b..9f8240640f 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt
@@ -1,5 +1,6 @@
package com.droiddeck.launcher.input
+import android.os.Build
import android.view.InputDevice
import android.view.KeyCharacterMap
import android.view.KeyEvent
@@ -7,7 +8,7 @@ import android.view.KeyEvent
/**
* Some firmware turns a mouse's right button into Back. Most report it from the mouse itself; REDMAGIC's
* cast mode injects it from no device and without the virtual-hard-key flag that the navigation bar and
- * back gesture set, so that form only counts while a mouse is connected.
+ * back gesture set, so that form only counts while an external mouse is connected.
*/
class MouseBackInput(private val sendRight: (Boolean) -> Unit, private val mouseAttached: () -> Boolean) {
private val held = mutableSetOf()
@@ -45,6 +46,21 @@ class MouseBackInput(private val sendRight: (Boolean) -> Unit, private val mouse
}
companion object {
+ fun isExternalMouse(device: InputDevice?): Boolean {
+ if (device == null || device.isVirtual || PadBridge.isSystemVirtualInputName(device.name) ||
+ declaresVirtual(device.name) ||
+ PadBridge.isFromController(device) ||
+ (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && !device.isExternal)) return false
+ return (device.supportsSource(InputDevice.SOURCE_MOUSE) ||
+ device.supportsSource(InputDevice.SOURCE_MOUSE_RELATIVE)) &&
+ !device.supportsSource(InputDevice.SOURCE_TOUCHPAD) &&
+ !device.supportsSource(InputDevice.SOURCE_TOUCHSCREEN)
+ }
+
+ private val VIRTUAL_NAME = Regex("\\bvirtual\\b", RegexOption.IGNORE_CASE)
+
+ fun declaresVirtual(name: String?): Boolean = name != null && VIRTUAL_NAME.containsMatchIn(name)
+
fun isFromMouse(event: KeyEvent): Boolean =
event.isFromSource(InputDevice.SOURCE_MOUSE) || event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE)
diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt
index e285337124..4923221fa0 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt
@@ -29,6 +29,9 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo
private set
var isQuickHidden = false
private set
+ var isPinnedOnly = false
+ private set
+ val hasPinned get() = layout?.elements?.any { it.alwaysShown } == true
var onTouchMiss: ((MotionEvent) -> Unit)?
get() = surface.onTouchMiss
set(value) { surface.onTouchMiss = value }
@@ -61,6 +64,13 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo
render()
}
+ fun setPinnedOnly(enabled: Boolean) {
+ if (isPinnedOnly == enabled) return
+ releaseAll()
+ isPinnedOnly = enabled
+ render()
+ }
+
private data class Placement(val layout: SavedInputLayout?, val width: Int, val height: Int, val safe: Rect, val buttonsOnly: Boolean)
private fun placed(): List {
@@ -72,12 +82,16 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo
private fun render() {
val elements = placed()
- surface.updateCustomLayout(if (isQuickHidden) elements.filter { it.id == "builtin:keyboard" } else elements)
+ surface.updateCustomLayout(when {
+ isPinnedOnly -> elements.filter { it.alwaysShown }
+ isQuickHidden -> elements.filter { it.id == "builtin:keyboard" || it.alwaysShown }
+ else -> elements
+ })
val style = layout?.style ?: InputSurfaceStyle()
surface.updateStyle(style)
quickToggle.tint = style.tint
quickToggle.alpha = style.opacity / 100f
- quickToggle.visibility = if (isButtonsOnly || layout == null || dock != null) GONE else VISIBLE
+ quickToggle.visibility = if (isButtonsOnly || isPinnedOnly || layout == null || dock != null) GONE else VISIBLE
quickToggle.invalidate()
}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt
index b7c1bafea6..3935c1a565 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt
@@ -7,7 +7,18 @@ import kotlin.math.max
import kotlin.math.min
object OnScreenLayout {
- data class Dock(val portrait: Boolean, val grips: Boolean)
+ data class Dock(val portrait: Boolean, val grips: Boolean, val left: InputControl = InputControl.LS, val right: InputControl = InputControl.RS) {
+ companion object {
+ fun deck(portrait: Boolean, gamepad: SavedInputLayout?): Dock {
+ fun side(right: Boolean) = gamepad?.elements?.firstOrNull {
+ (it.kind == InputElementKind.STICK || it.kind == InputElementKind.TRACKPAD) && (it.x + it.width / 2f >= .5f) == right
+ }?.kind
+ val left = if (side(false) == InputElementKind.TRACKPAD) InputControl.LEFT_PAD else InputControl.LS
+ val right = if (side(true) == InputElementKind.STICK) InputControl.RS else InputControl.RIGHT_PAD
+ return Dock(portrait, true, left, right)
+ }
+ }
+ }
private const val TOLERANCE = .01f
private const val KEYBOARD_ID = "builtin:keyboard"
@@ -17,13 +28,13 @@ object OnScreenLayout {
val stored = layout?.elements ?: return emptyList()
if (width <= 0 || height <= 0) return stored
val generator = LegacyGamepadLayout(context, width, height, safe, layout.scale)
- if (buttonsOnly && dock == null) return generator.buttonsOnly(stored)
val (reference, generated) = reference(context, layout, width, height)
+ if (buttonsOnly && dock == null) return generator.buttonsOnly(stored) + fit(stored.filter { it.alwaysShown }, reference.first, reference.second, width, height, safe)
val gamepad = if (generated) stored.filter(::isGamepad) else emptyList()
- val others = fit(stored.filterNot { generated && isGamepad(it) }, reference.first, reference.second, width, height, safe)
+ val others = fit(stored.filterNot { generated && isGamepad(it) || dock != null && it.alwaysShown }, reference.first, reference.second, width, height, safe)
val placed = when {
gamepad.isEmpty() -> emptyList()
- dock != null -> generator.dock(gamepad, dock.portrait, dock.grips)
+ dock != null -> generator.dock(gamepad, dock.portrait, dock.grips, dock.left, dock.right)
else -> generator.regenerate(gamepad)
}
val byId = (placed + others).associateBy { it.id }
diff --git a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt
index 316ac08243..2d0006925f 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt
@@ -52,4 +52,7 @@ object SecondScreenDisplays {
)
}
.toList()
+
+ fun editorCandidates(selected: Int, available: List, taken: (Int) -> Boolean): List =
+ (listOf(selected) + available).distinct().filterNot(taken)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt
index d3be470568..035060585f 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt
@@ -213,6 +213,9 @@ data class TouchGestureConfig(
return if (value == MOUSE_BEHAVIOR_CLICK) MOUSE_BEHAVIOR_CLICK else MOUSE_BEHAVIOR_HOLD
}
+ fun gamescopeRelativeMouse(mode: Int, mouseAttached: Boolean, touchpad: Boolean): Int =
+ if (mode == RELATIVE_MOUSE_AUTO && !mouseAttached && !touchpad) RELATIVE_MOUSE_OFF else mode
+
private fun normalizeRelativeMouseMode(mode: Int): Int {
return if (mode in RELATIVE_MOUSE_AUTO..RELATIVE_MOUSE_OFF) mode else RELATIVE_MOUSE_AUTO
}
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/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/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt
index 2b976796fc..835c85894d 100644
--- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt
@@ -15,6 +15,7 @@ object DesktopCatalog {
const val CATALOG_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/desktop.json"
const val STEAM_SEED_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/steam-seed.json"
const val PROTON_SEED_ID = "proton-arm64"
+ const val APPIMAGE_EXEC = "/usr/local/bin/droiddeck-appimage-exec"
class Entry(
val id: String, val name: String, val tier: Int, val version: String, val kind: String,
@@ -216,7 +217,7 @@ object DesktopCatalog {
target.setExecutable(true, false)
FileUtils.writeString(File(root, "usr/share/applications/droiddeck-${entry.id}.desktop"),
"[Desktop Entry]\nType=Application\nName=${entry.name}\n" +
- "Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/${entry.id}.AppImage\n" +
+ "Exec=$APPIMAGE_EXEC /opt/appimages/${entry.id}.AppImage\n" +
"Icon=${entry.icon}\nTerminal=false\nCategories=${entry.category};\n")
}
else -> {
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/LegacyNames.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt
index eb01d3dc53..3febbfd1fa 100644
--- a/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt
+++ b/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt
@@ -21,9 +21,11 @@ object LegacyNames {
"etc/bannerlator-network.json" to "etc/droiddeck-network.json",
"etc/bannerlator-wifi-scan-request" to "etc/droiddeck-wifi-scan-request",
)
- private const val MENU_DIR = "usr/local/share/applications"
- private const val OLD_BIN = "/usr/local/bin/bannerlator-"
- private const val NEW_BIN = "/usr/local/bin/droiddeck-"
+ private val MENU_REWRITES = listOf(
+ Triple("usr/local/share/applications", "/usr/local/bin/bannerlator-", "/usr/local/bin/droiddeck-"),
+ Triple("usr/share/applications", "Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/",
+ "Exec=${DesktopCatalog.APPIMAGE_EXEC} /opt/appimages/"),
+ )
@JvmStatic
@Synchronized
@@ -95,14 +97,16 @@ object LegacyNames {
}
private fun rewriteMenuEntries(root: File) {
- val entries = File(root, MENU_DIR).listFiles { f -> f.isFile && f.name.startsWith("droiddeck-") && f.name.endsWith(".desktop") } ?: return
- for (entry in entries) {
- val text = FileUtils.readString(entry) ?: continue
- if (!text.contains(OLD_BIN)) continue
- val staged = File(entry.parentFile, entry.name + ".staged")
- if (!FileUtils.writeString(staged, text.replace(OLD_BIN, NEW_BIN)) || !staged.renameTo(entry)) {
- staged.delete()
- Log.w(TAG, "could not rewrite $entry")
+ for ((dir, old, new) in MENU_REWRITES) {
+ val entries = File(root, dir).listFiles { f -> f.isFile && f.name.startsWith("droiddeck-") && f.name.endsWith(".desktop") } ?: continue
+ for (entry in entries) {
+ val text = FileUtils.readString(entry) ?: continue
+ if (!text.contains(old)) continue
+ val staged = File(entry.parentFile, entry.name + ".staged")
+ if (!FileUtils.writeString(staged, text.replace(old, new)) || !staged.renameTo(entry)) {
+ staged.delete()
+ Log.w(TAG, "could not rewrite $entry")
+ }
}
}
}
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/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java
index 21a40a92ae..cf613008bb 100644
--- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java
+++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java
@@ -82,8 +82,12 @@ public final class LinuxRuntimeInstaller {
private LinuxRuntimeInstaller() {}
public static String installedVersion(Context context) {
+ return LinuxRuntime.isInstalled(context) ? rootfsVersion(context) : null;
+ }
+
+ private static String rootfsVersion(Context context) {
File marker = new File(LinuxRuntime.rootDir(context), VERSION_FILE);
- if (!marker.isFile() || !LinuxRuntime.isInstalled(context)) return null;
+ if (!marker.isFile()) return null;
String v = FileUtils.readString(marker);
return v == null ? null : v.trim();
}
@@ -144,6 +148,10 @@ public final class LinuxRuntimeInstaller {
}
};
boolean desktop = DesktopCatalog.INSTANCE.desktopInstalled(app);
+ if (packsOnly(app, release, progress)) {
+ job.ok = true;
+ return true;
+ }
job.ok = installOnce(app, release, progress);
if (job.ok && desktop) keepDesktop(app, progress);
return job.ok;
@@ -283,6 +291,31 @@ public final class LinuxRuntimeInstaller {
for (File file : files) file.delete();
}
+ private static kotlin.jvm.functions.Function1 packProgress(ProgressListener listener, String stage) {
+ return state -> {
+ if (listener != null && state instanceof AddonPack.State.Downloading) {
+ listener.onProgress(Step.DOWNLOADING, stage, Math.round(((AddonPack.State.Downloading) state).getProgress() * 100f));
+ }
+ return kotlin.Unit.INSTANCE;
+ };
+ }
+
+ private static boolean packsOnly(Context context, Release release, ProgressListener listener) {
+ if (!LinuxRuntime.hasRootfs(context) || LinuxRuntime.isInstalled(context) || !release.version.equals(rootfsVersion(context))) return false;
+ File root = LinuxRuntime.rootDir(context);
+ try {
+ recoverInterruptedSwap(root, new File(root.getParentFile(), LinuxRuntime.DIR + ".new"), new File(root.getParentFile(), LinuxRuntime.DIR + ".old"));
+ } catch (IOException e) {
+ Log.w(TAG, "packs only: " + e);
+ return false;
+ }
+ String downloading = context.getString(R.string.rtinst_downloading);
+ if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0);
+ return AddonPack.PROOT.await(context, () -> true, packProgress(listener, downloading))
+ && AddonPack.DIRECTAUDIO.await(context, () -> true, packProgress(listener, downloading))
+ && LinuxRuntime.isInstalled(context);
+ }
+
private static boolean installOnce(Context context, Release release, ProgressListener listener) {
File archive = new File(context.getCacheDir(), archiveName(release));
boolean keepPartial = false;
@@ -294,10 +327,10 @@ public final class LinuxRuntimeInstaller {
emptyTrash(LinuxRuntime.rootDir(context).getParentFile());
String downloading = context.getString(R.string.rtinst_downloading);
if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0);
- if (!LinuxRuntime.patchedProot(context) && !AddonPack.PROOT.await(context)
+ 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)) throw new IOException("Cannot download DirectAudio");
+ if (!AddonPack.DIRECTAUDIO.await(context, () -> true, packProgress(listener, downloading))) throw new IOException("Cannot download DirectAudio");
boolean ok = Downloader.downloadFile(release.url, archive, true, release.sha256, (fraction) -> {
if (listener != null) {
listener.onProgress(Step.DOWNLOADING, downloading,
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/runtime/UserApps.kt b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt
index f40443e028..cd16d03b42 100644
--- a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt
+++ b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt
@@ -35,6 +35,7 @@ object UserApps {
private const val GITHUB_REPO = "github-repo"
private const val GITHUB_TAG = "github-tag"
private const val GITHUB_PUBLISHED = "github-published"
+ private const val GITHUB_ASSET = "github-asset"
enum class Kind { SCRIPT, APPIMAGE, FLATPAK }
@@ -56,7 +57,7 @@ object UserApps {
sealed class Source {
class Script(val file: File) : Source()
class AppImage(val file: File) : Source()
- class GitHub(val repo: String) : Source()
+ class GitHub(val repo: String, val asset: String? = null) : Source()
class Flatpak(val id: String) : Source()
class FlatpakBundle(val file: File) : Source()
}
@@ -113,7 +114,7 @@ object UserApps {
when (val s = request.source) {
is Source.Script -> addScript(context, s.file, name, icon, request.meta, onProgress)
is Source.AppImage -> AppImageManager.import(context, s.file, name, icon, request.meta) { onProgress(it, -1) }
- is Source.GitHub -> addFromGitHub(context, s.repo, name, icon, onProgress)
+ is Source.GitHub -> addFromGitHub(context, s.repo, s.asset, name, icon, onProgress)
is Source.Flatpak -> addFlatpak(context, s.id, name, icon, onProgress)
is Source.FlatpakBundle -> addFlatpakBundle(context, s.file, name, icon, onProgress)
}
@@ -305,14 +306,26 @@ object UserApps {
return if (repo.isEmpty() || repo == "." || repo == "..") null else "${m.groupValues[1]}/$repo"
}
- internal fun pickAsset(names: List): String? {
+ fun githubAsset(input: String): String? =
+ Regex("github\\.com/[\\w.-]+/[\\w.-]+/releases/(?:download/[^/]+|latest/download)/([^/?#]+\\.appimage)(?:[?#].*)?$", RegexOption.IGNORE_CASE)
+ .find(input.trim())?.groupValues?.get(1)?.let { runCatching { java.net.URLDecoder.decode(it, "UTF-8") }.getOrNull() }
+
+ private fun assetVariant(name: String): Set =
+ name.lowercase().replace(Regex("x86[_-]64|amd64"), "x64").replace(Regex("x86[_-]32|i[36]86"), "x32")
+ .split(Regex("[^a-z0-9]+")).filter { it.isNotEmpty() && !Regex("[0-9a-f]{7,}|v?[0-9]+").matches(it) }.toSet()
+
+ internal fun pickAsset(names: List, wanted: String? = null): String? {
val images = names.filter { it.endsWith(".appimage", ignoreCase = true) }
+ if (wanted != null) {
+ images.firstOrNull { it == wanted }?.let { return it }
+ images.firstOrNull { assetVariant(it) == assetVariant(wanted) }?.let { return it }
+ }
return images.firstOrNull { Regex("aarch64|arm64", RegexOption.IGNORE_CASE).containsMatchIn(it) }
?: images.firstOrNull { !Regex("x86_64|x86-64|amd64|x64|i[36]86|armhf|armv7", RegexOption.IGNORE_CASE).containsMatchIn(it) }
?: images.firstOrNull { Regex("x86_64|x86-64|amd64|x64", RegexOption.IGNORE_CASE).containsMatchIn(it) }
}
- private fun latestRelease(context: Context, repo: String): Pair {
+ private fun latestRelease(context: Context, repo: String, wanted: String? = null): Pair {
val body = Downloader.downloadString("https://api.github.com/repos/$repo/releases?per_page=15")
val releases = body?.let { runCatching { JSONArray(it) }.getOrNull() }
?: return null to context.getString(R.string.user_apps_github_unreachable, repo)
@@ -321,7 +334,7 @@ object UserApps {
if (r.optBoolean("draft")) return@mapNotNull null
val assets = r.optJSONArray("assets") ?: return@mapNotNull null
val byName = (0 until assets.length()).associate { j -> assets.getJSONObject(j).let { it.getString("name") to it } }
- pickAsset(byName.keys.toList())?.let { asset ->
+ pickAsset(byName.keys.toList(), wanted)?.let { asset ->
r.optBoolean("prerelease") to byName.getValue(asset).let { a ->
Release(r.optString("tag_name", asset), r.optString("published_at"), asset, a.getString("browser_download_url"),
Hashes.githubSha256(a.optString("digest")))
@@ -344,11 +357,11 @@ object UserApps {
}
private fun githubMeta(repo: String, release: Release) =
- mapOf(GITHUB_REPO to repo, GITHUB_TAG to release.tag, GITHUB_PUBLISHED to release.published)
+ mapOf(GITHUB_REPO to repo, GITHUB_TAG to release.tag, GITHUB_PUBLISHED to release.published, GITHUB_ASSET to release.asset)
- private fun addFromGitHub(context: Context, repo: String, name: String?, icon: File?, onProgress: (String, Int) -> Unit): String? {
+ private fun addFromGitHub(context: Context, repo: String, asset: String?, name: String?, icon: File?, onProgress: (String, Int) -> Unit): String? {
onProgress(context.getString(R.string.user_apps_github_checking, repo), -1)
- val (release, problem) = latestRelease(context, repo)
+ val (release, problem) = latestRelease(context, repo, asset)
if (release == null) return problem
return withDownload(context, release, onProgress) { file ->
AppImageManager.import(context, file, name ?: repo.substringAfter('/'), icon, githubMeta(repo, release)) { onProgress(it, -1) }
@@ -381,9 +394,10 @@ object UserApps {
fun checkUpdate(context: Context, app: App): UpdateCheck {
val repo = app.repo ?: return UpdateCheck.Failed(context.getString(R.string.user_apps_update_failed))
- val (release, problem) = latestRelease(context, repo)
+ val dir = AppImageManager.dir(context, app.key.substringAfter(':'))
+ val (release, problem) = latestRelease(context, repo, FileUtils.readString(File(dir, GITHUB_ASSET))?.trim()?.takeIf { it.isNotEmpty() })
if (release == null) return UpdateCheck.Failed(problem ?: context.getString(R.string.user_apps_update_failed))
- val published = FileUtils.readString(File(AppImageManager.dir(context, app.key.substringAfter(':')), GITHUB_PUBLISHED))?.trim().orEmpty()
+ val published = FileUtils.readString(File(dir, GITHUB_PUBLISHED))?.trim().orEmpty()
val newer = if (published.isNotEmpty() && release.published.isNotEmpty()) release.published > published else release.tag != app.version
return if (newer) UpdateCheck.Available(release) else UpdateCheck.Current(app.version ?: release.tag)
}
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/BottomNotifications.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt
deleted file mode 100644
index 45e0890c52..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.droiddeck.launcher.session
-
-import android.app.Notification
-import android.content.Context
-import android.service.notification.NotificationListenerService
-import android.service.notification.StatusBarNotification
-import androidx.compose.runtime.mutableStateListOf
-import androidx.core.app.NotificationManagerCompat
-
-data class BottomNotification(val key: String, val app: String, val title: String, val text: String, val postedAt: Long)
-
-object BottomNotifications {
- val items = mutableStateListOf()
-
- fun granted(context: Context): Boolean =
- context.packageName in NotificationManagerCompat.getEnabledListenerPackages(context)
-
- internal fun keep(own: String, pkg: String, ongoing: Boolean, groupSummary: Boolean, title: String, text: String): Boolean =
- pkg != own && !ongoing && !groupSummary && (title.isNotBlank() || text.isNotBlank())
-
- internal fun add(list: MutableList, item: BottomNotification) {
- list.removeAll { it.key == item.key }
- list.add(0, item)
- while (list.size > MAX_ITEMS) list.removeAt(list.lastIndex)
- }
-
- fun clear() = items.clear()
-
- internal fun post(context: Context, sbn: StatusBarNotification) {
- val n = sbn.notification ?: return
- val extras = n.extras
- val title = extras?.getCharSequence(Notification.EXTRA_TITLE)?.toString().orEmpty()
- val text = (extras?.getCharSequence(Notification.EXTRA_BIG_TEXT) ?: extras?.getCharSequence(Notification.EXTRA_TEXT))?.toString().orEmpty()
- if (!keep(context.packageName, sbn.packageName, sbn.isOngoing, (n.flags and Notification.FLAG_GROUP_SUMMARY) != 0, title, text)) return
- val app = runCatching {
- val pm = context.packageManager
- pm.getApplicationLabel(pm.getApplicationInfo(sbn.packageName, 0)).toString()
- }.getOrDefault(sbn.packageName)
- add(items, BottomNotification(sbn.key, app, title, text, sbn.postTime))
- }
-
- internal fun remove(key: String) {
- items.removeAll { it.key == key }
- }
-
- private const val MAX_ITEMS = 30
-}
-
-class BottomNotificationListener : NotificationListenerService() {
- override fun onListenerConnected() {
- BottomNotifications.clear()
- runCatching { activeNotifications }.getOrNull()?.sortedBy { it.postTime }?.forEach { BottomNotifications.post(this, it) }
- }
-
- override fun onNotificationPosted(sbn: StatusBarNotification) = BottomNotifications.post(this, sbn)
-
- override fun onNotificationRemoved(sbn: StatusBarNotification) = BottomNotifications.remove(sbn.key)
-
- override fun onListenerDisconnected() = BottomNotifications.clear()
-}
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 26fe486c80..5bf25103b0 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt
@@ -68,8 +68,9 @@ object GameStorage {
externalStoragePath: Boolean = isExternalStoragePath(path),
): Boolean = when {
state == Environment.MEDIA_MOUNTED || state == Environment.MEDIA_MOUNTED_READ_ONLY -> true
+ path.isDirectory -> true
externalStoragePath -> false
- state == Environment.MEDIA_UNKNOWN || state == null -> path.isDirectory || path.parentFile?.isDirectory == true
+ state == Environment.MEDIA_UNKNOWN || state == null -> path.parentFile?.isDirectory == true
else -> false
}
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 962291d2c7..94334f4dc9 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt
@@ -48,11 +48,19 @@ object ProtonExtras {
internal fun installedIn(dir: File, tool: Tool): List =
dir.listFiles()
- ?.filter { it.isDirectory && it.name.startsWith(tool.prefix) && File(it, "toolmanifest.vdf").isFile }
+ ?.filter { it.isDirectory && it.name.startsWith(tool.prefix) && usable(it) }
?.map { it.name }
?.sortedWith { a, b -> compareVersions(a, b) }
?: emptyList()
+ private fun usable(dir: File): Boolean {
+ val manifest = runCatching { File(dir, "toolmanifest.vdf").readText() }.getOrNull() ?: return false
+ val command = Regex("\\\"commandline\\\"\\s+\\\"/?([^\\\" ]+)").find(manifest)?.groupValues?.getOrNull(1) ?: return false
+ val compat = runCatching { File(dir, "compatibilitytool.vdf").readText() }.getOrNull() ?: return false
+ return Regex("\\\"from_oslist\\\"\\s+\\\"[^\\\"]*windows", RegexOption.IGNORE_CASE).containsMatchIn(compat) &&
+ File(dir, command).isFile && File(dir, command).canExecute()
+ }
+
private val ARCH = Regex("(?i)aarch64|arm64|x86_64|x86-64|amd64")
private val NUMBER = Regex("\\d+")
@@ -275,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/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt
index 1cb526c90d..9b253d88a7 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt
@@ -69,8 +69,8 @@ object SessionDisplay {
const val UNFOLDED_MIN_DP = 600
- fun unfoldedGameHeight(width: Int, height: Int): Int =
- minOf(width * 9 / 16, (height * UNFOLDED_MAX_GAME_SHARE).toInt()) and 1.inv()
+ fun unfoldedGameHeight(width: Int, height: Int, tabRow: Int = 0): Int =
+ (minOf(width * 9 / 16, (height * UNFOLDED_MAX_GAME_SHARE).toInt()) - tabRow.coerceAtLeast(0)).coerceAtLeast(0) and 1.inv()
fun unfoldedControlsWanted(
enabled: Boolean,
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionEvents.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionEvents.kt
index 26b63fd5cf..6c0a076456 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionEvents.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionEvents.kt
@@ -14,6 +14,7 @@ object SessionEvents {
SessionPaths.take()
val dir = SessionPaths.beginOrCurrent(context, label ?: SessionPaths.label(mode, null))
synchronized(SessionState) {
+ SessionState.clearRelaunch()
SessionState.phase = SessionPhase.PREPARING
SessionState.mode = mode
SessionState.sessionId = dir.name
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 cb9b5391fc..8c5e7431b1 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) }
@@ -40,8 +71,10 @@ object SessionFiles {
WinComponents.publish(context)
val files = arrayOf(
"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",
"usr/local/bin/droiddeck-wincomponents" to "usr/local/bin/droiddeck-wincomponents",
+ "usr/local/bin/droiddeck-wine-pe" to "usr/local/bin/droiddeck-wine-pe",
"usr/local/bin/droiddeck-msi-install" to "usr/local/bin/droiddeck-msi-install",
"usr/local/bin/droiddeck-esync" to "usr/local/bin/droiddeck-esync",
"usr/local/bin/droiddeck-steam-compat" to "usr/local/bin/droiddeck-steam-compat",
@@ -50,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",
@@ -112,6 +146,7 @@ object SessionFiles {
"usr/local/bin/droiddeck-flatpak-setup" to "usr/local/bin/droiddeck-flatpak-setup",
"usr/local/bin/droiddeck-flatpak-run" to "usr/local/bin/droiddeck-flatpak-run",
"usr/local/bin/droiddeck-appimage-run" to "usr/local/bin/droiddeck-appimage-run",
+ "usr/local/bin/droiddeck-appimage-exec" to "usr/local/bin/droiddeck-appimage-exec",
"usr/local/bin/droiddeck-script-run" to "usr/local/bin/droiddeck-script-run",
"usr/local/bin/droiddeck-open" to "usr/local/bin/droiddeck-open",
"usr/local/bin/droiddeck-proton-run" to "usr/local/bin/droiddeck-proton-run",
@@ -248,18 +283,23 @@ 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")
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/SessionLoadingDecision.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionLoadingDecision.kt
new file mode 100644
index 0000000000..1c5d034dff
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionLoadingDecision.kt
@@ -0,0 +1,8 @@
+package com.droiddeck.launcher.session
+
+internal object SessionLoadingDecision {
+ const val TIMEOUT_MS = 10_000L
+
+ fun shouldReturnToLauncher(startedAt: Long, now: Long, running: Boolean, phase: SessionPhase): Boolean =
+ !running && phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED) && now - startedAt >= TIMEOUT_MS
+}
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 91ac74b20c..4b0a94f7b6 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt
@@ -558,11 +558,11 @@ object SessionPrefs {
fun picturePosition(context: Context): String =
prefs(context).getString("picturePosition", "center")
- ?.takeIf { it in listOf("top", "bottom", "center") } ?: "center"
+ ?.takeIf { it in listOf("top", "bottom", "left", "right", "center") } ?: "center"
fun setPicturePosition(context: Context, position: String) {
prefs(context).edit().putString("picturePosition",
- position.takeIf { it in listOf("top", "bottom", "center") } ?: "center").apply()
+ position.takeIf { it in listOf("top", "bottom", "left", "right", "center") } ?: "center").apply()
}
fun returnAfterGame(context: Context): Boolean = prefs(context).getBoolean("returnAfterGame", true)
@@ -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) {
@@ -1555,10 +1561,6 @@ object SessionPrefs {
prefs(context).getString(if (right) "gamepadRight" else "gamepadLeft", null)
?: if (right) SURFACE_TRACKPAD else SURFACE_STICK
- fun setGamepadSurface(context: Context, right: Boolean, surface: String) {
- prefs(context).edit().putString(if (right) "gamepadRight" else "gamepadLeft", surface).apply()
- }
-
fun deckPanel(context: Context): com.droiddeck.launcher.input.DeckPanel =
com.droiddeck.launcher.input.DeckPanel.from(prefs(context).getString("deckPanel", null))
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 cc67bc800d..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 }
}
@@ -1697,8 +1716,8 @@ class SessionService : Service() {
.putExtra(EXTRA_STEAM_UI, ui)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
if (url.isNotEmpty()) next.putExtra(EXTRA_STEAM_URL, url)
- SessionState.relaunch = next
- android.os.Handler(android.os.Looper.getMainLooper()).post { stopSession(0) }
+ SessionState.queueRelaunch(next)
+ android.os.Handler(android.os.Looper.getMainLooper()).post { stopSession(0, relaunch = true) }
}
}
watcher.startWatching()
@@ -2013,7 +2032,7 @@ class SessionService : Service() {
}
}
- private fun stopSession(status: Int, gen: Int? = null) {
+ private fun stopSession(status: Int, gen: Int? = null, relaunch: Boolean = false) {
if (gen != null && gen != sessionGen) {
Log.i(TAG, "ignoring a stop from session $gen; session $sessionGen is current")
return
@@ -2023,7 +2042,10 @@ 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))
SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status))
SessionState.running = false
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt
index fa6eb38c90..5f17212e52 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt
@@ -73,7 +73,44 @@ object SessionState {
@Volatile
var steamClientArch: String? = null
var steamVr by mutableStateOf(false)
+ @Volatile
var relaunch: android.content.Intent? = null
+ @Volatile
+ private var relaunchSessionId: String? = null
+ @Volatile
+ private var relaunchStopRequested = false
+
+ fun queueRelaunch(intent: android.content.Intent) {
+ synchronized(this) {
+ relaunch = intent
+ relaunchSessionId = sessionId
+ relaunchStopRequested = false
+ }
+ }
+
+ fun confirmRelaunchStop() {
+ synchronized(this) {
+ relaunchStopRequested = relaunch != null && relaunchSessionId == sessionId
+ }
+ }
+
+ fun takeRelaunch(): android.content.Intent? = synchronized(this) {
+ val next = relaunch
+ val valid = relaunchStopRequested && relaunchSessionId == sessionId
+ relaunch = null
+ relaunchSessionId = null
+ relaunchStopRequested = false
+ next.takeIf { valid }
+ }
+
+ fun clearRelaunch() {
+ synchronized(this) {
+ relaunch = null
+ relaunchSessionId = null
+ relaunchStopRequested = false
+ }
+ }
+
@JvmStatic var hdr = false
@Volatile private var deckPadValue = false
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/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt
index 48244c4895..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.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 -> 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 -> 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 4e53c5ea08..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,11 +13,15 @@ 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 }
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..b8a6e8931e 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,9 @@ 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"),
+ 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/StoreCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt
index ad59e511a0..cb46d23601 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt
@@ -65,6 +65,8 @@ private fun releaseDateValue(raw: String): Long =
runCatching { java.time.LocalDate.parse(day).toEpochDay() }.getOrDefault(0L)
} ?: 0L
+internal fun entryTime(first: Long?, fallback: Long?): Long = first?.takeIf { it > 0 } ?: fallback?.takeIf { it > 0 } ?: 0L
+
fun sortGames(
items: List,
sort: String,
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 378d7fa74b..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,9 +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
+ 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))
@@ -49,6 +54,21 @@ 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\""
+ 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
}
@@ -73,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 b4b9f7669a..18f5a161e3 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" -> {
@@ -69,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 545c981e50..5e8ce7c6d7 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt
@@ -55,7 +55,8 @@ 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.GOG, Store.XBOX, Store.BATTLENET -> {}
+ 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 -> {}
}
}
}, pool).exceptionally { error ->
@@ -111,7 +112,8 @@ object StoreSizes {
val bytes = AmazonApiClient.getBytes(AmazonApiClient.appendPath(spec.downloadUrl, "manifest.proto"), token) ?: return 0L
AmazonManifest.parse(bytes).totalInstallSize
}
- Store.GOG, Store.XBOX, Store.BATTLENET -> 0L
+ Store.EA -> com.droiddeck.launcher.stores.ea.EaSizes.size(context, item)
+ 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/battlenet/BattleNetStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt
index 737ba3b4ff..403b867538 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
@@ -204,7 +204,8 @@ object BattleNetBackend : StoreBackend {
fun installedGames(context: Context): List = installed(context).map { game ->
val art = BattleNet.art(context, game.title)
val cover = art.cover?.let { Uri.fromFile(it).toString() }
- InstalledStoreGame(StoreGameSidecar(store, game.title.uid, game.name, "", cover = cover, hero = art.header?.let { Uri.fromFile(it).toString() } ?: cover), game.folder)
+ InstalledStoreGame(StoreGameSidecar(store, game.title.uid, game.name, "", installedAt = game.folder.lastModified(),
+ cover = cover, hero = art.header?.let { Uri.fromFile(it).toString() } ?: cover), game.folder)
}
private fun shelves(context: Context): StoreShelves {
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