From 494e6849c2a9a0b1191fe95e3252c5418c73509d Mon Sep 17 00:00:00 2001
From: Tobrun Van Nuland <tobrun.van.nuland@gmail.com>
Date: Fri, 22 Jul 2016 15:56:51 +0200
Subject: [PATCH] [android] #5756 - correctly load style from xml attributes

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 34e0fadb0..05d01f677 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
@@ -156,6 +156,7 @@ public class MapView extends FrameLayout {
     private PointF mFocalPoint;
 
     private String mStyleUrl;
+    private String mInitalStyle;
 
     private List<OnMapReadyCallback> mOnMapReadyCallbackList;
 
@@ -270,7 +271,7 @@ public class MapView extends FrameLayout {
         // style url
         String style = options.getStyle();
         if (!TextUtils.isEmpty(style)) {
-            mMapboxMap.setStyleUrl(style);
+            mInitalStyle = style;
         }
 
         // MyLocationView
@@ -567,8 +568,9 @@ public class MapView extends FrameLayout {
         mMyLocationView.onResume();
 
         if (mStyleUrl == null) {
+            // user supplied style through xml
             // user has failed to supply a style url
-            setStyleUrl(Style.MAPBOX_STREETS);
+            setStyleUrl(mInitalStyle == null ? Style.MAPBOX_STREETS : mInitalStyle);
         }
     }