A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix(net): LAN IP via ConnectivityManager transport priority, not interface enumeration
ExTv4dc01c165123
diff --git a/app/src/main/java/com/excp/podroid/service/PodroidService.kt b/app/src/main/java/com/excp/podroid/service/PodroidService.ktindex 3ba004d..e528481 100644--- a/app/src/main/java/com/excp/podroid/service/PodroidService.kt+++ b/app/src/main/java/com/excp/podroid/service/PodroidService.kt@@ -195,7 +195,7 @@ class PodroidService : Service() {ramMb = settingsRepository.getVmRamMbSnapshot(),cpus = settingsRepository.getVmCpusSnapshot(),sshEnabled = sshEnabled,- androidIp = NetworkUtils.localIpv4(),+ androidIp = NetworkUtils.localIpv4(this@PodroidService),storageSizeGb = settingsRepository.getStorageSizeGbSnapshot(),storageAccessEnabled = settingsRepository.getStorageAccessEnabledSnapshot(),qemuExtraArgs = settingsRepository.getQemuExtraArgsSnapshot(),diff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.ktindex a958654..000ab53 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt@@ -97,7 +97,7 @@ class HomeViewModel @Inject constructor(}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 0L)/** Phone IPv4 — cheap, lazily recomputed when the screen reads it. */- fun phoneIp(): String = NetworkUtils.localIpv4()+ fun phoneIp(): String = NetworkUtils.localIpv4(context)private val _updateInfo = MutableStateFlow<UpdateInfo?>(null)val updateInfo: StateFlow<UpdateInfo?> = _updateInfo.asStateFlow()diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.ktindex f4bac55..01f93d5 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt@@ -198,11 +198,25 @@ class SettingsViewModel @Inject constructor(}/** Current LAN IP of the Android device — shown next to port forward rules. Cached for the VM lifetime. */- val phoneIp: String by lazy { NetworkUtils.localIpv4() }+ val phoneIp: String by lazy { NetworkUtils.localIpv4(context) }/** Returns the ID string of the currently active VM backend (e.g. "qemu" or "avf"). */fun activeBackendId(): String = engine.backendId+ /**+ * True if Downloads sharing actually works on the currently-active backend.+ * QEMU's virtio-9p path always works (it runs as part of our process and+ * doesn't cross SELinux domains). AVF requires the 10-param `SharedPath`+ * ctor with `appDomain=false` so crosvm can spin up in virtmgr's system+ * domain and read /storage/emulated/... — without it the VM crashes at+ * start. Shipping Pixel mustang beta has the 9-param ctor only, so AVF+ * Downloads sharing is effectively unavailable to third-party apps there.+ */+ fun isDownloadsShareAvailable(): Boolean = when (engine.backendId) {+ "avf" -> com.excp.podroid.engine.avf.AvfDiagnostics.externalStorageShareSupported()+ else -> true+ }+fun removePortForward(rule: PortForwardRule) {viewModelScope.launch { portForwardRepository.removeRule(rule) }}diff --git a/app/src/main/java/com/excp/podroid/util/NetworkUtils.kt b/app/src/main/java/com/excp/podroid/util/NetworkUtils.ktindex b7cf06b..8dd1881 100644--- a/app/src/main/java/com/excp/podroid/util/NetworkUtils.kt+++ b/app/src/main/java/com/excp/podroid/util/NetworkUtils.kt@@ -8,16 +8,48 @@*/package com.excp.podroid.util+import android.content.Context+import android.net.ConnectivityManager+import android.net.NetworkCapabilitiesimport java.net.Inet4Address-import java.net.NetworkInterfaceobject NetworkUtils {- /** First non-loopback IPv4 address, or "unknown" if none / on error. */- fun localIpv4(): String = try {- NetworkInterface.getNetworkInterfaces()- ?.asSequence()- ?.flatMap { it.inetAddresses.asSequence() }- ?.firstOrNull { !it.isLoopbackAddress && it is Inet4Address }- ?.hostAddress ?: "unknown"+ /**+ * The address users would `ssh root@<this> -p 9922` to, from another+ * device on the same LAN.+ *+ * Picks by transport preference rather than by address-pattern matching:+ * WiFi first (LAN), then Ethernet (USB-C dongles), then Cellular (hotspot+ * or LTE), skipping VPN tunnels. No address-range literals — selection is+ * a policy on transports, so it stays correct whatever network the user+ * is on.+ */+ fun localIpv4(context: Context): String = try {+ val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager+ cm?.let(::firstIpv4ByTransportPreference) ?: "unknown"} catch (_: Exception) { "unknown" }++ private val TRANSPORT_PREFERENCE = intArrayOf(+ NetworkCapabilities.TRANSPORT_WIFI,+ NetworkCapabilities.TRANSPORT_ETHERNET,+ NetworkCapabilities.TRANSPORT_CELLULAR,+ )++ private fun firstIpv4ByTransportPreference(cm: ConnectivityManager): String? {+ for (preferred in TRANSPORT_PREFERENCE) {+ for (net in cm.allNetworks) {+ val caps = cm.getNetworkCapabilities(net) ?: continue+ if (!caps.hasTransport(preferred)) continue+ if (caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) continue+ val link = cm.getLinkProperties(net) ?: continue+ for (la in link.linkAddresses) {+ val addr = la.address+ if (addr is Inet4Address && !addr.isLoopbackAddress) {+ return addr.hostAddress+ }+ }+ }+ }+ return null+ }}