From 59275f66386bf4dcf3d5d371690a69e9825ee8c5 Mon Sep 17 00:00:00 2001 From: davotoula Date: Sat, 2 May 2026 08:40:34 +0200 Subject: [PATCH] fix: use LocalActivity to resolve NestActivity (lint ContextCastToActivity) Casting LocalContext.current to NestActivity tripped the Jetpack Activity Compose lint rule ContextCastToActivity, failing :amethyst:lintPlayBenchmark in CI. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../loggedIn/nests/room/activity/NestActivityContent.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/activity/NestActivityContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/activity/NestActivityContent.kt index 065e38e25..d5d9aa8dd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/activity/NestActivityContent.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/activity/NestActivityContent.kt @@ -21,6 +21,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.nests.room.activity import androidx.activity.compose.BackHandler +import androidx.activity.compose.LocalActivity import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -40,7 +41,6 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.R @@ -283,7 +283,7 @@ private fun NestActivityBody( // system mic indicator) and the listener close run on // cleanupScope/GlobalScope before the activity destruction // queue eats viewModelScope. - val activity = LocalContext.current as? NestActivity + val activity = LocalActivity.current as? NestActivity DisposableEffect(activity, viewModel) { activity?.setPipCleanupAction { viewModel.leave() } onDispose { activity?.setPipCleanupAction(null) }