1 files changed, 8 insertions, 11 deletions
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 d6bb0a9f01..c58bab19f5 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
@@ -7,6 +7,7 @@ import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringDef;
+import android.support.annotation.VisibleForTesting;
 import android.util.DisplayMetrics;
 import android.util.Pair;
 
@@ -51,7 +52,8 @@ public class Style {
    * @param builder   the builder used for creating this style
    * @param nativeMap the map object used to load this style
    */
-  private Style(@NonNull Builder builder, @NonNull NativeMap nativeMap) {
+  @VisibleForTesting
+  Style(@NonNull Builder builder, @NonNull NativeMap nativeMap) {
     this.builder = builder;
     this.nativeMap = nativeMap;
   }
@@ -442,18 +444,13 @@ public class Style {
    */
   void onWillStartLoadingMap() {
     fullyLoaded = false;
-    for (Source source : sources.values()) {
-      if (source != null) {
-        source.setDetached();
-        nativeMap.removeSource(source);
-      }
+
+    for (Source source : nativeMap.getSources()) {
+      source.nativeSetDetached();
     }
 
-    for (Layer layer : layers.values()) {
-      if (layer != null) {
-        layer.setDetached();
-        nativeMap.removeLayer(layer);
-      }
+    for (Layer layer : nativeMap.getLayers()) {
+      layer.nativeSetDetached();
     }
 
     for (Map.Entry<String, Bitmap> bitmapEntry : images.entrySet()) {