diff options
author | Brad Leege <bleege@gmail.com> | 2015-07-24 13:40:41 -0500 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2015-07-24 13:40:41 -0500 |
commit | 791c59d899c1c509b62838d4f1709497d9c009fc (patch) | |
tree | 55a6a13d7c82ce75dbfd680c46b2d34681a29b6f | |
parent | 3512da96093916b09d925d9a64957011de6af8dc (diff) | |
download | qtlocation-mapboxgl-791c59d899c1c509b62838d4f1709497d9c009fc.tar.gz |
#1915 - Adding NonNull annotations to accessToken for development warnings and isEmpty() checks for more accurate runtime errors
-rw-r--r-- | android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java | 11 |
1 files changed, 4 insertions, 7 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 2357c557ed..8a9f987122 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 @@ -16,6 +16,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.view.GestureDetectorCompat; import android.support.v4.view.ScaleGestureDetectorCompat; +import android.text.TextUtils; import android.view.GestureDetector; import android.view.ScaleGestureDetector; import android.util.AttributeSet; @@ -27,7 +28,6 @@ import android.view.SurfaceView; import android.view.View; import android.view.ViewConfiguration; import android.widget.ZoomButtonsController; - import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector; import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector; import com.mapbox.mapboxgl.annotations.Annotation; @@ -39,10 +39,7 @@ import com.mapbox.mapboxgl.annotations.Polyline; import com.mapbox.mapboxgl.annotations.PolylineOptions; import com.mapbox.mapboxgl.geometry.LatLng; import com.mapbox.mapboxgl.geometry.LatLngZoom; - import org.apache.commons.validator.routines.UrlValidator; - -import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; @@ -422,14 +419,14 @@ public class MapView extends SurfaceView { return mStyleUrl; } - private void validateAccessToken(String accessToken) { + private void validateAccessToken(@NonNull String accessToken) { - if (!accessToken.startsWith("pk.") && !accessToken.startsWith("sk.")) { + if (TextUtils.isEmpty(accessToken) || (!accessToken.startsWith("pk.") && !accessToken.startsWith("sk."))) { throw new RuntimeException("Using MapView requires setting a valid access token. See the README.md"); } } - public void setAccessToken(String accessToken) { + public void setAccessToken(@NonNull String accessToken) { validateAccessToken(accessToken); mNativeMapView.setAccessToken(accessToken); } |