Skip to content

Fix/always dispose on main thread #743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkhawk merged 2 commits into from
Aug 27, 2025
Merged

Fix/always dispose on main thread #743

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18ae8c5
fix: always run the `launchSubcomposition` on the main thread (preven…
akexorcist Jul 16, 2025
7adbfe3
chore: fixes build
dkhawk Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ import com.google.maps.android.compose.meta.AttributionId
import com.google.maps.android.ktx.awaitMap
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.awaitCancellation
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

/**
* A compose container for a [MapView].
Expand Down Expand Up @@ -235,7 +237,10 @@ private fun CoroutineScope.launchSubcomposition(
content: @Composable @GoogleMapComposable () -> Unit,
): Job {
// Use [CoroutineStart.UNDISPATCHED] to kick off GoogleMap loading immediately
return launch(start = CoroutineStart.UNDISPATCHED) {
return launch(
context = Dispatchers.Main,
start = CoroutineStart.UNDISPATCHED
) {
val map = mapView.awaitMap()
val composition = Composition(
applier = MapApplier(map, mapView, mapClickListeners),
Expand Down
Loading