From 8e51c550b2a379011ef75d81518f33b0945cb12e Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Tue, 18 Aug 2015 11:29:21 +1000 Subject: [PATCH] Adds getAnnotations to Android Also adds Collections.unmodifiableList to returned lists from public methods Fixes #1998 --- .../src/main/java/com/mapbox/mapboxgl/views/MapView.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java index a967bc40c..308095e97 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java @@ -60,6 +60,7 @@ import com.squareup.okhttp.HttpUrl; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -397,7 +398,7 @@ public class MapView extends FrameLayout implements LocationListener { mAnnotations.add(polygons.get(i)); } - return polygons; + return Collections.unmodifiableList(polygons); } private void removeAnnotationsWithId(long annotationId){ @@ -430,6 +431,10 @@ public class MapView extends FrameLayout implements LocationListener { mAnnotations.clear(); } + public List getAnnotations() { + return Collections.unmodifiableList(mAnnotations); + } + // // Property methods // @@ -590,7 +595,7 @@ public class MapView extends FrameLayout implements LocationListener { } public List getStyleClasses() { - return mNativeMapView.getClasses(); + return Collections.unmodifiableList(mNativeMapView.getClasses()); } public void setStyleClasses(List styleClasses) {