A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix(lint): gate AvfEngine on API 34 and use LocalActivity in X11Screen
ExTvd8dc01e6346e
diff --git a/app/src/main/java/com/excp/podroid/engine/avf/AvfEngine.kt b/app/src/main/java/com/excp/podroid/engine/avf/AvfEngine.ktindex 6cae1ba..a1aa126 100644--- a/app/src/main/java/com/excp/podroid/engine/avf/AvfEngine.kt+++ b/app/src/main/java/com/excp/podroid/engine/avf/AvfEngine.kt@@ -16,8 +16,10 @@package com.excp.podroid.engine.avfimport android.content.Context+import android.os.Buildimport android.system.Osimport android.util.Log+import androidx.annotation.RequiresApiimport com.excp.podroid.data.repository.PortForwardRuleimport com.excp.podroid.data.repository.SettingsRepositoryimport com.excp.podroid.engine.BootStageDetector@@ -41,6 +43,11 @@ import java.util.concurrent.atomic.AtomicBooleanimport javax.inject.Injectimport javax.inject.Singleton+// AVF requires API 34 (UpsideDownCake). EngineHolder only resolves the+// Provider<AvfEngine> when getCapabilities() reports AVF support, which implies+// API 34+, but lint can't see that runtime gate - declaring the class here lets+// the in-class calls to the @RequiresApi(34) avf/* helpers type-check cleanly.+@RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)@Singletonclass AvfEngine @Inject constructor(@ApplicationContext private val context: Context,diff --git a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.ktindex d2f73b4..1edc8f8 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/x11/X11Screen.kt@@ -4,7 +4,6 @@*/package com.excp.podroid.ui.screens.x11-import android.app.Activityimport android.content.pm.ActivityInfoimport android.graphics.Bitmapimport android.graphics.Rect@@ -13,6 +12,7 @@ import android.view.SurfaceViewimport android.view.Viewimport android.view.WindowManagerimport androidx.activity.compose.BackHandler+import androidx.activity.compose.LocalActivityimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.focusable@@ -78,7 +78,6 @@ import androidx.compose.ui.input.pointer.isPrimaryPressedimport androidx.compose.ui.input.pointer.isSecondaryPressedimport androidx.compose.ui.input.pointer.isTertiaryPressedimport androidx.compose.ui.input.pointer.pointerInput-import androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.platform.LocalSoftwareKeyboardControllerimport androidx.compose.ui.platform.LocalViewimport androidx.core.view.WindowCompat@@ -165,7 +164,7 @@ fun X11Screen(val s by viewModel.x11Settings.collectAsStateWithLifecycle()LaunchedEffect(Unit) { viewModel.connect() }- val activity = LocalContext.current as? Activity+ val activity = LocalActivity.current// Restore orientation when leaving; without this the lock persists onto// terminal/home until process restart.DisposableEffect(Unit) {