Skip to content

Commit

Permalink
Catch NPE in OSM library
Browse files Browse the repository at this point in the history
Fixes openhab#1443

Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>
  • Loading branch information
mueller-ma committed Jul 10, 2019
1 parent a0b658e commit 8a7d257
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions mobile/src/foss/java/org/openhab/habdroid/ui/MapViewHelper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import org.osmdroid.views.MapView
import org.osmdroid.views.overlay.CopyrightOverlay
import org.osmdroid.views.overlay.MapEventsOverlay
import org.osmdroid.views.overlay.Marker
import java.lang.NullPointerException
import java.util.*
import kotlin.math.max
import kotlin.math.min
Expand Down Expand Up @@ -242,14 +243,19 @@ fun MapView.setMarker(
canDrag: Boolean,
onMarkerDragListener: Marker.OnMarkerDragListener
) {
val marker = Marker(this).apply {
setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
isDraggable = canDrag
position = pos
title = label?.toString()
id = item.name
setOnMarkerDragListener(onMarkerDragListener)
icon = ContextCompat.getDrawable(context, R.drawable.ic_location_on_red_24dp)
val marker: Marker
try {
marker = Marker(this).apply {
setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
isDraggable = canDrag
position = pos
title = label?.toString()
id = item.name
setOnMarkerDragListener(onMarkerDragListener)
icon = ContextCompat.getDrawable(context, R.drawable.ic_location_on_red_24dp)
}
} catch (e: NullPointerException) {
return
}
overlays.add(marker)
}
Expand Down

0 comments on commit 8a7d257

Please sign in to comment.