Skip to content

fix: Use firstOrNull vs first to prevent NoSuchElementException #43

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
arriolac merged 3 commits into from
Mar 14, 2022
Merged

fix: Use firstOrNull vs first to prevent NoSuchElementException #43

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e325f6
Fixed Collection contains no element matching the predicate.
webfrea-k Feb 20, 2022
db0c0d7
first or null overlay node; no wildcard imports
webfrea-k Mar 11, 2022
7bad9f0
Merge branch 'main' into fix/no_element_matching_the_predicate
webfrea-k Mar 11, 2022
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
11 changes: 5 additions & 6 deletions maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -139,18 +138,18 @@ internal class MapApplier(
}

private fun MutableList<MapNode>.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<MapNode>.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<MapNode>.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<MapNode>.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<MapNode>.nodeForGroundOverlay(
Comment thread
webfrea-k marked this conversation as resolved.
groundOverlay: GroundOverlay
): GroundOverlayNode? =
first { it is GroundOverlayNode && it.groundOverlay == groundOverlay } as? GroundOverlayNode
firstOrNull { it is GroundOverlayNode && it.groundOverlay == groundOverlay } as? GroundOverlayNode