[android] #5004 - Rewiring MapView to look for Access Token from Mapb…

…oxAccountManager fist and options second
mapbox · May 13, 2016 · d67687d · d67687d
1 parent 05ab48d
commit d67687d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -60,6 +60,7 @@
 import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector;
 import com.almeros.android.multitouch.gesturedetectors.ShoveGestureDetector;
 import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector;
+import com.mapbox.mapboxsdk.MapboxAccountManager;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.Icon;
@@ -257,7 +258,13 @@ private void setInitialState(MapboxMapOptions options) {
             mMapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(position));
         }
 
-        String accessToken = options.getAccessToken();
+        String accessToken = null;
+        if (MapboxAccountManager.getInstance() != null) {
+            accessToken = MapboxAccountManager.getInstance().getAccessToken();
+        } else {
+            accessToken = options.getAccessToken();
+        }
+
         String style = options.getStyle();
         if (!TextUtils.isEmpty(accessToken)) {
             mMapboxMap.setAccessToken(accessToken);