Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

feat: move notification permission request to after setup wizard

ExTvddfe9c5084dd
diff --git a/.gitignore b/.gitignore
index 52d16b0..3b4de42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,22 @@ skill.md
*.tmp
/captures/
app/src/main/jniLibs/
+
+# Alpine Linux rootfs directories (generated during Docker build)
+/bin/
+/etc/
+/lib/
+/sbin/
+/usr/
+/var/
+/dev/
+/home/
+/media/
+/mnt/
+/opt/
+/proc/
+/root/
+/run/
+/srv/
+/sys/
+/tmp/
diff --git a/app/src/main/java/com/excp/podroid/MainActivity.kt b/app/src/main/java/com/excp/podroid/MainActivity.kt
index a9ab5b6..e703ae9 100644
--- a/app/src/main/java/com/excp/podroid/MainActivity.kt
+++ b/app/src/main/java/com/excp/podroid/MainActivity.kt
@@ -23,7 +23,6 @@ class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- requestNotificationPermissionIfNeeded()
enableEdgeToEdge()
setContent {
val darkTheme by settingsRepository.darkTheme.collectAsState(initial = true)
@@ -32,17 +31,4 @@ class MainActivity : ComponentActivity() {
}
}
}
-
- private fun requestNotificationPermissionIfNeeded() {
- if (android.os.Build.VERSION.SDK_INT < 33) return
- if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
- != PackageManager.PERMISSION_GRANTED
- ) {
- ActivityCompat.requestPermissions(
- this,
- arrayOf(Manifest.permission.POST_NOTIFICATIONS),
- 0,
- )
- }
- }
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
index 02f5d74..567e8cb 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
@@ -1,11 +1,17 @@
package com.excp.podroid.ui.screens.setup
+import android.Manifest
+import android.content.ComponentName
import android.content.Intent
+import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import android.os.Environment
import android.provider.Settings
+import androidx.activity.ComponentActivity
import androidx.compose.animation.core.animateDpAsState
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -77,7 +83,21 @@ fun SetupScreen(
val scope = rememberCoroutineScope()
LaunchedEffect(setupComplete) {
- if (setupComplete) onSetupComplete()
+ if (setupComplete) {
+ onSetupComplete()
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ val activity = context as? ComponentActivity ?: return@LaunchedEffect
+ if (ContextCompat.checkSelfPermission(activity, Manifest.permission.POST_NOTIFICATIONS)
+ != PackageManager.PERMISSION_GRANTED
+ ) {
+ ActivityCompat.requestPermissions(
+ activity,
+ arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+ 0,
+ )
+ }
+ }
+ }
}
Scaffold { innerPadding ->
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
index 48307f1..04bfed0 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt
@@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@@ -163,7 +164,7 @@ fun TerminalScreen(
}
is VmState.Running -> {
- Box(modifier = Modifier.weight(1f).fillMaxWidth()) {
+ Box(modifier = Modifier.weight(1f).fillMaxSize()) {
val view = viewModel.getOrCreateTerminalView()
DisposableEffect(vmState) {
diff --git a/init-podroid b/init-podroid
index b1dccca..7c2d184 100644
--- a/init-podroid
+++ b/init-podroid
@@ -210,7 +210,7 @@ STORAGE_GB=$(df -BG / 2>/dev/null | awk 'NR==2 {gsub(/G/,"",$2); print $2}')
SSH_LINE=""
if [ "$SSH_ENABLED" = "1" ]; then
- SSH_LINE=" ssh root@${ANDROID_IP} -p 9922 (pass: podroid, dropbear)"
+ SSH_LINE=" ssh root@${ANDROID_IP} -p 9922 (pass: podroid)"
fi
cat > /etc/motd <<MOTD
@@ -354,4 +354,4 @@ echo "[init] WARNING: No persistent storage — changes will be lost on reboot!"
umount /dev 2>/dev/null
umount /sys 2>/dev/null
umount /proc 2>/dev/null
-exec /init --main
+exec /init --main
\ No newline at end of file