diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-03-10 13:14:18 -0500 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2016-03-10 15:01:19 -0500 |
commit | d04d6d8f9394ebef856e1822acdd57b33954c26b (patch) | |
tree | 1d8efcc98ac2916d2fe41b1f40c8a9f1ca82761d /platform | |
parent | 4cb75a5c36e5e82053c9dd5fae626596aee6136b (diff) | |
download | qtlocation-mapboxgl-d04d6d8f9394ebef856e1822acdd57b33954c26b.tar.gz |
[androd] #4269 - polyline activity crash fix
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java index ebea58550a..46f926c619 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java @@ -13,10 +13,10 @@ import android.view.View; import com.mapbox.mapboxsdk.annotations.Polyline; import com.mapbox.mapboxsdk.annotations.PolylineOptions; import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; -import com.mapbox.mapboxsdk.maps.MapView; import java.util.ArrayList; import java.util.Collections; @@ -71,18 +71,20 @@ public class PolylineActivity extends AppCompatActivity { findViewById(R.id.fab).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (mMapboxMap != null && mPolylines != null && mPolylines.size() > 0) { - if (mPolylines.size() == 1) { - // test for removing annotation - mMapboxMap.removeAnnotation(mPolylines.get(0)); - } else { - // test for removing annotations - mMapboxMap.removeAnnotations(mPolylines); + if (mMapboxMap != null) { + if (mPolylines != null && mPolylines.size() > 0) { + if (mPolylines.size() == 1) { + // test for removing annotation + mMapboxMap.removeAnnotation(mPolylines.get(0)); + } else { + // test for removing annotations + mMapboxMap.removeAnnotations(mPolylines); + } } + mPolylineOptions.clear(); + mPolylineOptions.addAll(getRandomLine()); + mPolylines = mMapboxMap.addPolylines(mPolylineOptions); } - mPolylineOptions.clear(); - mPolylineOptions.addAll(getRandomLine()); - mPolylines = mMapboxMap.addPolylines(mPolylineOptions); } }); } |