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 index 6962bbb2724..80a8258d36e 100644 --- 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);