Skip to content

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.kt
index 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.avf
import android.content.Context
+import android.os.Build
import android.system.Os
import android.util.Log
+import androidx.annotation.RequiresApi
import com.excp.podroid.data.repository.PortForwardRule
import com.excp.podroid.data.repository.SettingsRepository
import com.excp.podroid.engine.BootStageDetector
@@ -41,6 +43,11 @@ import java.util.concurrent.atomic.AtomicBoolean
import javax.inject.Inject
import 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)
@Singleton
class 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.kt
index 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.Activity
import android.content.pm.ActivityInfo
import android.graphics.Bitmap
import android.graphics.Rect
@@ -13,6 +12,7 @@ import android.view.SurfaceView
import android.view.View
import android.view.WindowManager
import androidx.activity.compose.BackHandler
+import androidx.activity.compose.LocalActivity
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
@@ -78,7 +78,6 @@ import androidx.compose.ui.input.pointer.isPrimaryPressed
import androidx.compose.ui.input.pointer.isSecondaryPressed
import androidx.compose.ui.input.pointer.isTertiaryPressed
import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.platform.LocalView
import 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) {