From 20b63bba9bcfb15ee008c1e6ebcf639c0cd18bf4 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Mon, 28 Sep 2026 10:32:12 -0400 Subject: [PATCH] chore(release): set version 0.2.0 and remove code comments --- .github/workflows/pr-release-publish.yml | 1 - app/build.gradle | 2 +- app/src/main/java/com/droiddeck/launcher/HomeApp.kt | 3 --- .../droiddeck/launcher/runtime/LinuxRuntimeInstaller.java | 6 ------ .../java/com/droiddeck/launcher/session/SessionService.kt | 8 -------- .../com/droiddeck/launcher/wayland/WaylandCompositor.java | 3 --- tools/linuxfs/overlay/usr/local/bin/bannerlator-session | 2 -- 7 files changed, 1 insertion(+), 24 deletions(-) diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index 8104175657..1759674c1f 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -79,7 +79,6 @@ jobs: } stable=$(package_line "$RUNNER_TEMP/stable/DroidDeck-$stable_tag.apk") candidate=$(package_line "${apks[0]}") - # Same package, and a versionCode no lower than stable's, so the APK installs over it. [[ "$stable" =~ ^com\.droiddeck\.launcher\ [0-9]+$ && "$candidate" =~ ^com\.droiddeck\.launcher\ [0-9]+$ && ${candidate##* } -ge ${stable##* } ]] || { echo "::error::PR package/versionCode '$candidate' cannot install over stable '$stable'"; exit 1; diff --git a/app/build.gradle b/app/build.gradle index 09585d08f3..4195f0be8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,7 +64,7 @@ android { // proot, gamescope, the Steam client and everything it launches all live under files/. targetSdkVersion 28 versionCode 9 - versionName "0.2.1" + versionName "0.2.0" buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" ndk { diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 7def297543..cc1b2afc0a 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -97,9 +97,6 @@ object HomeApp { val intent = Intent(Intent.ACTION_MAIN) .addCategory(Intent.CATEGORY_LAUNCHER) .setComponent(ComponentName(app.packageName, app.className)) - // Keep the target app's task separate from DroidDeck. Without this, Android puts the app on - // top of the caller's task: swiping it out of Recents then removes DroidDeck's task and - // ends the session, and on another display the entire task moves there. intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) if (displayId == null) { context.startActivity(intent) 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 730ac4eff3..4643e9b406 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -245,8 +245,6 @@ public final class LinuxRuntimeInstaller { } if (!staging.renameTo(root)) { - // The user's home is inside staging by now: take it back before the old rootfs - // returns, or the next install's cleanup of staging deletes it. File keptTo = new File(staging, USER_DATA); if (keptTo.isDirectory() && old.isDirectory()) keptTo.renameTo(new File(old, USER_DATA)); if (old.isDirectory()) old.renameTo(root); @@ -262,10 +260,6 @@ public final class LinuxRuntimeInstaller { } } - /** - * Puts back what an update killed mid-swap left behind, before staging is cleared: the user's - * home may be sitting in staging and the previous rootfs in linuxfs.old. - */ private static void recoverInterruptedSwap(File root, File staging, File old) { File target = root.isDirectory() ? root : old; File stagedHome = new File(staging, USER_DATA); 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 df2529982e..87d690743b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -393,8 +393,6 @@ class SessionService : Service() { networkLink.attach(this) networkLink.publish() components.add(networkLink) - // Stopped from the loading screen while this was still setting up: the teardown has run - // and found nothing, so nothing may start behind it. if (gen != sessionGen || !SessionState.running) { Log.i(TAG, "session stopped while it was starting; not launching it") if (gen == sessionGen) components.clear() @@ -420,7 +418,6 @@ class SessionService : Service() { }, null) Log.i(TAG, "session pid $pid, log ${sessionLog.path}") if (gen != sessionGen || !SessionState.running) { - // Stopped in the moment the guest was launched: the teardown already ran without it. Log.i(TAG, "session stopped while its guest was starting; taking it down") if (gen == sessionGen) { launchWatcher?.stopWatching() @@ -900,8 +897,6 @@ class SessionService : Service() { private fun finishSessionStop(status: Int, stoppedGen: Int) { mainHandler.post { - // Play was pressed again while this teardown ran: the locks, the activity and the - // service now belong to the new session. if (stoppedGen != sessionGen || SessionState.running) { Log.i(TAG, "session $stoppedGen finished stopping after a new one started") return@post @@ -924,7 +919,6 @@ class SessionService : Service() { } private fun stopSession(status: Int) { - // Called from the main thread, the session-start thread and the guest's exit watcher. synchronized(stopLock) { if (!SessionState.running) return SessionState.running = false @@ -1158,8 +1152,6 @@ class SessionService : Service() { } fun stop(context: Context) { - // Not running yet (still downloading or setting up): the start path checks this flag - // and cancels, and a service started here would have no session to stop. if (!SessionState.running) { SessionState.stopRequested = true return diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index 0af6057a54..7b77178697 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -26,8 +26,6 @@ public final class WaylandCompositor { * listener must marshal to the UI thread itself. */ public static void setFirstFrameListener(Runnable r) { firstFrameListener = r; } - /** Clears the first-frame listener only if it is still {@code r}, so an activity going away - * never drops the one its replacement registered. */ public static synchronized void clearFirstFrameListener(Runnable r) { if (firstFrameListener == r) firstFrameListener = null; } @@ -58,7 +56,6 @@ public final class WaylandCompositor { public static void setGameListener(GameListener l) { gameListener = l; } - /** Clears the game listener only if it is still {@code l}. */ public static synchronized void clearGameListener(GameListener l) { if (gameListener == l) gameListener = null; } diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-session b/tools/linuxfs/overlay/usr/local/bin/bannerlator-session index cae72823ac..c0adc95e78 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-session +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-session @@ -591,8 +591,6 @@ BUSCONF wait "$decky_supervisor" 2>/dev/null || true echo "== Decky: session supervisor stopped" fi - # This script's own loops and daemons (the fill-screen watcher never ends) would pass to - # gamescope's reaper when it exits and hold the compositor up on a black screen. _bl_jobs=$(jobs -p) [ -n "$_bl_jobs" ] && kill $_bl_jobs 2>/dev/null reap_orphans