diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2019-06-11 18:07:27 +0200 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2019-06-11 18:07:27 +0200 |
| commit | c93f57d2097ab2726cee74ea8c9bd80086aebc22 (patch) | |
| tree | ab62b3a3aa4171cfe54b07af0bb7e5a1553c6bbe | |
| parent | d7fa18efa693bcb282755d86cc2f4c3d17e908b8 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-allow-null-updates.tar.gz | |
[android] - allow null updates to GeoJsonSource#setGeoJsonupstream/tvn-allow-null-updates
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java index 407ec4aa36..7a54515288 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java @@ -4,7 +4,6 @@ import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; - import com.mapbox.geojson.Feature; import com.mapbox.geojson.FeatureCollection; import com.mapbox.geojson.Geometry; @@ -287,14 +286,14 @@ public class GeoJsonSource extends Source { * * @param featureCollection the GeoJSON FeatureCollection */ - public void setGeoJson(FeatureCollection featureCollection) { + public void setGeoJson(@Nullable FeatureCollection featureCollection) { if (detached) { return; } checkThread(); - List<Feature> features = featureCollection.features(); - if (features != null) { + if (featureCollection != null && featureCollection.features() != null) { + List<Feature> features = featureCollection.features(); List<Feature> featuresCopy = new ArrayList<>(features); nativeSetFeatureCollection(FeatureCollection.fromFeatures(featuresCopy)); } else { |