From 8935534a819f5e7ebe556fd415b04334bc1f2799 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 5 May 2024 02:41:12 +0200 Subject: [PATCH] Fix potential NPE in OSM API --- .../main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt | 1 + .../main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt index dccef91e..4f10ec80 100644 --- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt +++ b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt @@ -81,6 +81,7 @@ internal data class OsmLocation( fun fromOverpassResponse( result: OverpassResponse ): List = result.elements.mapNotNull { + it.tags ?: return@mapNotNull null OsmLocation( id = it.id, label = it.tags["name"] ?: it.tags["brand"] ?: return@mapNotNull null, diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt index 7745c667..12497b8c 100644 --- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt +++ b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt @@ -36,7 +36,7 @@ data class OverpassResponseElement( val lat: Double?, val lon: Double?, val center: OverpassResponseElementCenter?, - val tags: Map, + val tags: Map?, ) interface OverpassApi {