Dev

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -4,6 +4,12 @@ title: "[BUG]: <Short Description>"
 labels: [bug, needs-triage]
 
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ## 🌐 ENGLISH ONLY
+        **All issues MUST be written in English. Non-English reports will be closed without response.**
+
   - type: markdown
     attributes:
       value: |

.github/workflows/ci.yml

@@ -1,5 +1,4 @@
 name: Droidspaces CI
-run-name: ${{ github.event.head_commit.message || format('Release {0}', github.event.inputs.tag_name) || github.workflow }}
 
 on:
   push:
@@ -69,8 +68,10 @@ jobs:
         echo "[+] Toolchains ready."
         tree -L 3 $HOME/toolchains
 
-    - name: Build All Tarball & Sync to Android
-      run: make all-tarball
+    - name: Build All Tarball, Debian Packages & Sync to Android
+      run: |
+        make all-tarball
+        scripts/mkdeb.sh
 
     - name: Decode Keystore
       env:
@@ -103,28 +104,41 @@ jobs:
 
     - name: Stage & Rename Artifacts
       run: |
-        TAG="${{ github.event.inputs.tag_name || 'test' }}"
-        DATE=$(date +%Y-%m-%d)
-        APK_NAME="Droidspaces-universal-${TAG}-${DATE}.apk"
+        TAG="${{ github.event.inputs.tag_name || 'CI' }}"
+        COMMIT_HASH=$(git log -1 --pretty=%h)
+        APK_NAME="Droidspaces-universal-${TAG}-${COMMIT_HASH}.apk"
         TAR_NAME=$(ls droidspaces-v*-*.tar.gz)
         mkdir -p dist
         mv Android/app/build/outputs/apk/release/app-release.apk dist/${APK_NAME}
         mv ${TAR_NAME} dist/
+        mv droidspaces_*.deb dist/
         echo "APK_FILE=dist/${APK_NAME}" >> $GITHUB_ENV
         echo "TAR_FILE=dist/${TAR_NAME}" >> $GITHUB_ENV
 
     - name: Generate Telegram Message
       if: github.event_name != 'pull_request'
       run: |
-        EVENT_TYPE="${{ github.event_name == 'workflow_dispatch' && github.event.inputs.create_release == 'true' && 'Official Release' || 'Git Push' }}"
+        if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+          if [ "${{ github.event.inputs.create_release }}" = "true" ]; then
+            EVENT_TYPE="Official Release"
+          else
+            EVENT_TYPE="Manual Trigger"
+          fi
+        else
+          EVENT_TYPE="Git Push"
+        fi
         COMMIT_MSG=$(git log -1 --pretty=format:%s)
+        COMMIT_SHA=$(git log -1 --pretty=format:%h)
+        COMMIT_AUTHOR=$(git log -1 --pretty=format:%an)
         {
           echo "TELEGRAM_MESSAGE<<EOF"
           echo "**Droidspaces Build Successful**"
           echo ""
           echo "**Repository:** [${{ github.repository }}](https://github.com/${{ github.repository }})"
-          echo "**Author:** [${{ github.actor }}](https://github.com/${{ github.actor }})"
+          echo "**Branch:** ${{ github.ref_name }}"
+          echo "**Author:** $COMMIT_AUTHOR"
           echo "**Event:** $EVENT_TYPE"
+          echo "**Commit SHA:** [$COMMIT_SHA](https://github.com/${{ github.repository }}/commit/${{ github.sha }})"
           echo ""
           echo "**Commit Message:**"
           echo ""
@@ -134,7 +148,7 @@ jobs:
           echo "EOF"
         } >> "$GITHUB_ENV"
 
-    - name: Upload Final Artifacts (APK & Tarball)
+    - name: Upload Final Artifacts (APK, Tarball & Debian Packages)
       uses: actions/upload-artifact@v4
       with:
         name: droidspaces-artifacts
@@ -211,3 +225,4 @@ jobs:
         files: |
           release-assets/*.apk
           release-assets/*.tar.gz
+          release-assets/*.deb

.gitignore

@@ -1,22 +1,25 @@
 *.o
 *.tar.gz
-droidspaces-*
-output
-.cursor
-old_code_with_android-app/
-logs/
+*.deb
+output/
 *.img
-*.txt
 *.patch
 *.diff
 *.rej
 *.orig
 *.config
+.cache
+.claude
+Android/app/src/main/assets/binaries/
+Android/app/src/main/assets/supported_locales.txt
 
 # Keystores
 *.keystore
 local.properties
 
+# IDE / tooling
+compile_commands.json
+
 # Nix stuff
 /result
 *.qcow2

.gitmodules

@@ -0,0 +1,11 @@
+[submodule "external/busybox"]
+	path = external/busybox
+	url = https://github.com/Droidspaces/busybox-droidspaces.git
+[submodule "external/www"]
+	path = external/www
+	url = https://github.com/Droidspaces/webui.git
+	branch = main
+[submodule "external/socketd"]
+	path = external/socketd
+	url = https://github.com/Droidspaces/socketd.git
+	branch = main

Android/app/build.gradle.kts

@@ -18,7 +18,7 @@ if (keystorePropertiesFile.exists()) {
 
 // Helper to extract version from C header
 fun getDSVersion(): String {
-    val headerFile = file("../../src/droidspace.h")
+    val headerFile = file("../../src/include/droidspace.h")
     if (!headerFile.exists()) return "1.0.0"
 
     val pattern = Regex("#define\\s+DS_VERSION\\s+\"([^\"]+)\"")
@@ -319,6 +319,10 @@ dependencies {
     // Navigation
     implementation("androidx.navigation:navigation-compose:2.7.7")
 
+    // Drag-and-drop reordering for Compose lists (Auto boot priority screen)
+    // 2.1.x targets Compose 1.6.x, matching the BOM above.
+    implementation("sh.calvin.reorderable:reorderable:2.1.1")
+
     // ViewModel
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
 
@@ -332,8 +336,10 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
 
     // Terminal emulator (ported from LXC-Manager / termux-app)
-    implementation("com.github.termux.termux-app:terminal-view:0.118.1")
-    implementation("com.github.termux.termux-app:terminal-emulator:0.118.1")
+    // 0.118.3 consumes unsupported CSI private-parameter sequences (ESC [ = / ESC [ <)
+    // instead of leaking them to the screen — fish 4.x probes with ESC[=5u.
+    implementation("com.github.termux.termux-app:terminal-view:0.118.3")
+    implementation("com.github.termux.termux-app:terminal-emulator:0.118.3")
 
     // Debug
     debugImplementation("androidx.compose.ui:ui-tooling")

Android/app/src/main/AndroidManifest.xml

@@ -6,15 +6,16 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <application
         android:name=".DroidspacesApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
@@ -34,6 +35,11 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <!-- Long-press launcher shortcuts: Containers, Panel, Settings -->
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
 
         <service
@@ -55,19 +61,6 @@
                 android:value="Terminal sessions for Droidspaces containers" />
         </service>
 
-
-        <!-- Boot receiver: required to pair with RECEIVE_BOOT_COMPLETED permission.
-             Marked exported=false so only the system can send the boot broadcast.
-             Without this declaration, scanners flag the permission as a dropper pattern. -->
-        <receiver
-            android:name=".receiver.BootReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
     </application>
 
 </manifest>

Android/app/src/main/assets/boot-module/module.prop

@@ -1,6 +1,6 @@
 id=droidspaces
 name=Droidspaces: Daemon & Init
-version=v6.2.5
-versionCode=6250
+version=v6.4.5
+versionCode=6450
 author=ravindu644
 description=Automatically starts the Droidspaces daemon if "Daemon Mode" is enabled, and starts containers during boot if "Run-at-Boot" is active.

Android/app/src/main/assets/boot-module/sepolicy.rule

@@ -63,10 +63,14 @@ allow system_server droidspacesd fd use
 allow system_server droidspacesd fifo_file write
 
 # for Termux:X11 and DRI3 denials in daemon mode
-allow untrusted_app droidspacesd fd use
-allow untrusted_app droidspacesd fifo_file write
 allow untrusted_app_27 droidspacesd fd use
+allow untrusted_app_27 droidspacesd fifo_file write
 
 # for pulseAudio
 allow audioserver droidspacesd binder { call transfer }
+allow audioserver droidspacesd fd use
 allow mediaserver droidspacesd binder { call transfer }
+allow mediaserver droidspacesd fd use
+
+# fix permission denied when read/write mounted storage (#213)
+allow mediaprovider_app droidspacesd fd use