diff --git a/maps-app/src/test/java/com/google/maps/android/compose/internal/GoogleMapsInitializerTest.kt b/maps-app/src/test/java/com/google/maps/android/compose/internal/GoogleMapsInitializerTest.kt index 69aec26b..c48ea53b 100644 --- a/maps-app/src/test/java/com/google/maps/android/compose/internal/GoogleMapsInitializerTest.kt +++ b/maps-app/src/test/java/com/google/maps/android/compose/internal/GoogleMapsInitializerTest.kt @@ -23,11 +23,13 @@ import io.mockk.every import io.mockk.mockk import io.mockk.mockkStatic import io.mockk.verify +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch import kotlinx.coroutines.test.TestDispatcher import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest +import kotlinx.coroutines.test.setMain import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test @@ -51,6 +53,7 @@ class GoogleMapsInitializerTest { every { MapsApiSettings.addInternalUsageAttributionId(any(), any()) } returns Unit testDispatcher = UnconfinedTestDispatcher() + Dispatchers.setMain(testDispatcher) googleMapsInitializer = DefaultGoogleMapsInitializer(testDispatcher) } diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/internal/GoogleMapsInitializer.kt b/maps-compose/src/main/java/com/google/maps/android/compose/internal/GoogleMapsInitializer.kt index 9614cafb..277d5000 100644 --- a/maps-compose/src/main/java/com/google/maps/android/compose/internal/GoogleMapsInitializer.kt +++ b/maps-compose/src/main/java/com/google/maps/android/compose/internal/GoogleMapsInitializer.kt @@ -142,9 +142,11 @@ public class DefaultGoogleMapsInitializer( _state.value = InitializationState.INITIALIZING } - withContext(ioDispatcher) { + withContext(Dispatchers.Main) { if (MapsInitializer.initialize(context) == ConnectionResult.SUCCESS) { - MapsApiSettings.addInternalUsageAttributionId(context, attributionId) + withContext(ioDispatcher) { + MapsApiSettings.addInternalUsageAttributionId(context, attributionId) + } _state.value = InitializationState.SUCCESS } else { _state.value = InitializationState.FAILURE