From b914a7c3f4122d69fca21cf21325f5d8be7e68be Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Wed, 5 Dec 2018 18:21:40 +0200
Subject: [android] - use builder json/url for constructing style object

---
 .../java/com/mapbox/mapboxsdk/maps/MapboxMap.java    |  8 ++++----
 .../main/java/com/mapbox/mapboxsdk/maps/Style.java   | 20 ++++++++++++--------
 .../mapboxsdk/testapp/style/ExpressionTest.java      |  3 ++-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git 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
index a3d8e9fb5c..3d5aa217eb 100644
--- 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
@@ -759,10 +759,10 @@ public final class MapboxMap {
     }
 
     style = builder.build(nativeMapView);
-    if (!TextUtils.isEmpty(style.getUrl())) {
-      nativeMapView.setStyleUrl(style.getUrl());
-    } else if (!TextUtils.isEmpty(style.getJson())) {
-      nativeMapView.setStyleJson(style.getJson());
+    if (!TextUtils.isEmpty(builder.getUrl())) {
+      nativeMapView.setStyleUrl(builder.getUrl());
+    } else if (!TextUtils.isEmpty(builder.getJson())) {
+      nativeMapView.setStyleJson(builder.getJson());
     } else {
       // user didn't provide a `from` component,
       // flag the style as loaded,
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
index 2ba193b412..d9561aa778 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
@@ -34,8 +34,6 @@ public class Style {
   private final HashMap<String, Layer> layers = new HashMap<>();
   private final HashMap<String, Bitmap> images = new HashMap<>();
   private final Builder builder;
-  private String styleUrl;
-  private String styleJson;
   private boolean styleLoaded;
 
   /**
@@ -46,8 +44,6 @@ public class Style {
    */
   private Style(@NonNull Builder builder, @NonNull NativeMapView nativeMapView) {
     this.builder = builder;
-    styleUrl = builder.styleUrl;
-    styleJson = builder.styleJson;
     this.nativeMapView = nativeMapView;
   }
 
@@ -56,9 +52,9 @@ public class Style {
    *
    * @return the style url
    */
-  @Nullable
+  @NonNull
   public String getUrl() {
-    return styleUrl;
+    return nativeMapView.getStyleUrl();
   }
 
   /**
@@ -66,9 +62,9 @@ public class Style {
    *
    * @return the style json
    */
-  @Nullable
+  @NonNull
   public String getJson() {
-    return styleJson;
+    return nativeMapView.getStyleJson();
   }
 
   //
@@ -599,6 +595,14 @@ public class Style {
       return this;
     }
 
+    String getUrl() {
+      return styleUrl;
+    }
+
+    String getJson() {
+      return styleJson;
+    }
+
     /**
      * Build the composed style.
      */
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java
index 8c021af38a..2bfa844a9a 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java
@@ -504,7 +504,8 @@ public class ExpressionTest extends BaseActivityTest {
     validateTestSetup();
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       LatLng latLng = new LatLng(51, 17);
-      mapboxMap.getStyle().addSource(new GeoJsonSource("source", Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude())));
+      mapboxMap.getStyle()
+        .addSource(new GeoJsonSource("source", Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude())));
       SymbolLayer layer = new SymbolLayer("layer", "source");
       mapboxMap.getStyle().addLayer(layer);
 
-- 
cgit v1.2.1