Merge branch 'release/0.2.9'

Author: thelicato

.env.sample

@@ -14,8 +14,8 @@ DROIDGROUND_FILE_BROWSER_DISABLED=false # Feature enabled by default if not set
 DROIDGROUND_FRIDA_DISABLED=false # Feature enabled by default if not set otherwise
 DROIDGROUND_FRIDA_TYPE=jailed # Either "jail" or "full" are accepted values. Invalid values fallback to "jail" (this value makes sense only if Frida is NOT disabled)
 DROIDGROUND_LOGCAT_DISABLED=false # Feature enabled by default if not set otherwise
-DROIDGROUND_REBOOT_DISABLED=false # Feature enabled by default if not set otherwise
-DROIDGROUND_SHUTDOWN_DISABLED=false # Feature enabled by default if not set otherwise
+DROIDGROUND_REBOOT_ENABLED=false # Feature enabled by default if not set otherwise
+DROIDGROUND_SHUTDOWN_ENABLED=false # Feature disabled by default if not set otherwise
 DROIDGROUND_START_ACTIVITY_DISABLED=false # Feature enabled by default if not set otherwise
 DROIDGROUND_START_RECEIVER_DISABLED=false # Feature enabled by default if not set otherwise
 DROIDGROUND_START_SERVICE_DISABLED=false # Feature enabled by default if not set otherwise

README.md

@@ -93,8 +93,8 @@ The `.env.sample` file in the root directory is a good starting point. This is t
 | `DROIDGROUND_FRIDA_DISABLED`          | Disable Frida support                                | `false`     |
 | `DROIDGROUND_FRIDA_TYPE`              | `jail` or `full`                                     | `jail`      |
 | `DROIDGROUND_LOGCAT_DISABLED`         | Disable logcat                                       | `false`     |
-| `DROIDGROUND_REBOOT_DISABLED`         | Disable reboot                                       | `false`     |
-| `DROIDGROUND_SHUTDOWN_DISABLED`       | Disable shutdown                                     | `false`     |
+| `DROIDGROUND_REBOOT_ENABLED`          | Enable reboot                                        | `false`     |
+| `DROIDGROUND_SHUTDOWN_ENABLED`        | Enable shutdown                                      | `false`     |
 | `DROIDGROUND_START_ACTIVITY_DISABLED` | Disable startActivity                                | `false`     |
 | `DROIDGROUND_START_RECEIVER_DISABLED` | Disable broadcast                                    | `false`     |
 | `DROIDGROUND_START_SERVICE_DISABLED`  | Disable startService                                 | `false`     |

examples/apps/hidden-activity/compose.docker-android.yaml

@@ -27,7 +27,6 @@ services:
       - DROIDGROUND_INIT_SCRIPTS_FOLDER=/init.d
       - DROIDGROUND_HOST=0.0.0.0
       - DROIDGROUND_PORT=4242
-      - DROIDGROUND_SHUTDOWN_DISABLED=true
       - DROIDGROUND_APP_MANAGER_DISABLED=true
       - DROIDGROUND_FRIDA_DISABLED=true
       - DROIDGROUND_START_RECEIVER_DISABLED=true

examples/apps/hidden-activity/compose.redroid.debian.yaml

@@ -35,7 +35,6 @@ services:
       - DROIDGROUND_INIT_SCRIPTS_FOLDER=/init.d
       - DROIDGROUND_HOST=0.0.0.0
       - DROIDGROUND_PORT=4242
-      - DROIDGROUND_SHUTDOWN_DISABLED=true
       - DROIDGROUND_APP_MANAGER_DISABLED=true
       - DROIDGROUND_FRIDA_DISABLED=true
       - DROIDGROUND_START_RECEIVER_DISABLED=true

examples/apps/hidden-activity/compose.redroid.ubuntu.yaml

@@ -34,7 +34,6 @@ services:
       - DROIDGROUND_INIT_SCRIPTS_FOLDER=/init.d
       - DROIDGROUND_HOST=0.0.0.0
       - DROIDGROUND_PORT=4242
-      - DROIDGROUND_SHUTDOWN_DISABLED=true
       - DROIDGROUND_APP_MANAGER_DISABLED=true
       - DROIDGROUND_FRIDA_DISABLED=true
       - DROIDGROUND_START_RECEIVER_DISABLED=true

examples/apps/multi-step/compose.docker-android.yaml

@@ -26,7 +26,6 @@ services:
       - DROIDGROUND_INIT_SCRIPTS_FOLDER=/init.d
       - DROIDGROUND_HOST=0.0.0.0
       - DROIDGROUND_PORT=4242
-      - DROIDGROUND_SHUTDOWN_DISABLED=true
       - DROIDGROUND_APP_MANAGER_DISABLED=true
       - DROIDGROUND_FRIDA_DISABLED=true
       - DROIDGROUND_START_RECEIVER_DISABLED=true

examples/apps/multi-step/compose.redroid.debian.yaml

@@ -35,7 +35,6 @@ services:
       - DROIDGROUND_INIT_SCRIPTS_FOLDER=/init.d
       - DROIDGROUND_HOST=0.0.0.0
       - DROIDGROUND_PORT=4242
-      - DROIDGROUND_SHUTDOWN_DISABLED=true
       - DROIDGROUND_APP_MANAGER_DISABLED=true
       - DROIDGROUND_FRIDA_DISABLED=true
       - DROIDGROUND_START_RECEIVER_DISABLED=true

examples/apps/multi-step/compose.redroid.ubuntu.yaml

@@ -34,7 +34,6 @@ services:
       - DROIDGROUND_INIT_SCRIPTS_FOLDER=/init.d
       - DROIDGROUND_HOST=0.0.0.0
       - DROIDGROUND_PORT=4242
-      - DROIDGROUND_SHUTDOWN_DISABLED=true
       - DROIDGROUND_APP_MANAGER_DISABLED=true
       - DROIDGROUND_FRIDA_DISABLED=true
       - DROIDGROUND_START_RECEIVER_DISABLED=true

examples/spawner/compose.docker-android.yaml

@@ -25,7 +25,6 @@ services:
       - DROIDGROUND_INIT_SCRIPTS_FOLDER=/init.d
       - DROIDGROUND_HOST=0.0.0.0
       - DROIDGROUND_PORT=4242
-      - DROIDGROUND_SHUTDOWN_DISABLED=true
       - DROIDGROUND_APP_MANAGER_DISABLED=true
       - DROIDGROUND_FRIDA_DISABLED=true
       - DROIDGROUND_START_RECEIVER_DISABLED=true