From c68fc935b2715a75459b9a63a897121cb099a0f6 Mon Sep 17 00:00:00 2001 From: Webfreak Date: Mon, 14 Mar 2022 18:34:14 +0100 Subject: [PATCH] fix: Use firstOrNull vs first to prevent NoSuchElementException (#43) * Fixed Collection contains no element matching the predicate. * first or null overlay node; no wildcard imports --- .../com/google/maps/android/compose/MapApplier.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt b/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt index cacc5c490..3144268e6 100644 --- a/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt +++ b/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt @@ -15,7 +15,6 @@ package com.google.maps.android.compose import androidx.compose.runtime.AbstractApplier -import androidx.compose.ui.platform.ComposeView import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.MapView import com.google.android.gms.maps.model.Circle @@ -139,18 +138,18 @@ internal class MapApplier( } private fun MutableList.nodeForCircle(circle: Circle): CircleNode? = - first { it is CircleNode && it.circle == circle } as? CircleNode + firstOrNull { it is CircleNode && it.circle == circle } as? CircleNode private fun MutableList.nodeForMarker(marker: Marker): MarkerNode? = - first { it is MarkerNode && it.marker == marker } as? MarkerNode + firstOrNull { it is MarkerNode && it.marker == marker } as? MarkerNode private fun MutableList.nodeForPolygon(polygon: Polygon): PolygonNode? = - first { it is PolygonNode && it.polygon == polygon } as? PolygonNode + firstOrNull { it is PolygonNode && it.polygon == polygon } as? PolygonNode private fun MutableList.nodeForPolyline(polyline: Polyline): PolylineNode? = - first { it is PolylineNode && it.polyline == polyline } as? PolylineNode + firstOrNull { it is PolylineNode && it.polyline == polyline } as? PolylineNode private fun MutableList.nodeForGroundOverlay( groundOverlay: GroundOverlay ): GroundOverlayNode? = - first { it is GroundOverlayNode && it.groundOverlay == groundOverlay } as? GroundOverlayNode + firstOrNull { it is GroundOverlayNode && it.groundOverlay == groundOverlay } as? GroundOverlayNode