summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2016-09-08 15:17:11 -0700
committerGitHub <noreply@github.com>2016-09-08 15:17:11 -0700
commit75e1ce5d00b690b1c26c92cb2f210b0dbecdaa02 (patch)
treecc61b7fe430fdbde2120fe80e42159fcd40b94c2
parent691dc6de79c115c337300d8fe952f4d51043d43f (diff)
downloadqtlocation-mapboxgl-75e1ce5d00b690b1c26c92cb2f210b0dbecdaa02.tar.gz
[android] - ensure access token is set when trying to load a style (#6280)
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java6
1 files changed, 6 insertions, 0 deletions
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 7640c9fb30..bf803de5b1 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
@@ -834,6 +834,12 @@ public class MapView extends FrameLayout {
if (mDestroyed) {
return;
}
+
+ // stopgap for https://github.com/mapbox/mapbox-gl-native/issues/6242
+ if (TextUtils.isEmpty(mNativeMapView.getAccessToken())) {
+ setAccessToken(MapboxAccountManager.getInstance().getAccessToken());
+ }
+
mStyleUrl = url;
mNativeMapView.setStyleUrl(url);
}