[android] - don't load default style if style json string was set (#11520)

2018-03-26 09:40:22 -04:00
parent c44fe25200
commit ce3c42a1c2
2 changed files with 78 additions and 1 deletions
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -103,7 +103,7 @@ public final class MapboxMap {
   */
  void onStart() {
    nativeMapView.update();
-    if (TextUtils.isEmpty(nativeMapView.getStyleUrl())) {
+    if (TextUtils.isEmpty(nativeMapView.getStyleUrl()) && TextUtils.isEmpty(nativeMapView.getStyleJson())) {
      // if user hasn't loaded a Style yet
      nativeMapView.setStyleUrl(Style.MAPBOX_STREETS);
    }