[android] remove source and layer detach workaroundupstream/tvn-style-detach

4 files changed, 1 insertions, 41 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 b21186050b..89bee135b4 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
@@ -520,17 +520,6 @@ public class Style {
    */
   void clear() {
     fullyLoaded = false;
-    for (Layer layer : layers.values()) {
-      if (layer != null) {
-        layer.setDetached();
-      }
-    }
-
-    for (Source source : sources.values()) {
-      if (source != null) {
-        source.setDetached();
-      }
-    }
 
     for (Map.Entry<String, Bitmap> bitmapEntry : images.entrySet()) {
       nativeMap.removeImage(bitmapEntry.getKey());
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
index fffa471bad..67cb7ae38c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
@@ -18,9 +18,9 @@ public abstract class Layer {
 
   @Keep
   private long nativePtr;
+
   @Keep
   private boolean invalidated;
-  private boolean detached;
 
   static {
     LibraryLoader.load();
@@ -44,10 +44,6 @@ public abstract class Layer {
   }
 
   public void setProperties(@NonNull PropertyValue<?>... properties) {
-    if (detached) {
-      return;
-    }
-
     checkThread();
     if (properties.length == 0) {
       return;
@@ -157,12 +153,4 @@ public abstract class Layer {
       return value;
     }
   }
-
-  public void setDetached() {
-    detached = true;
-  }
-
-  public boolean isDetached() {
-    return detached;
-  }
 }
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
index 7a54515288..e9880eb029 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -259,9 +259,6 @@ public class GeoJsonSource extends Source {
    * @param feature the GeoJSON {@link Feature} to set
    */
   public void setGeoJson(Feature feature) {
-    if (detached) {
-      return;
-    }
     checkThread();
     nativeSetFeature(feature);
   }
@@ -273,9 +270,6 @@ public class GeoJsonSource extends Source {
    * @param geometry the GeoJSON {@link Geometry} to set
    */
   public void setGeoJson(Geometry geometry) {
-    if (detached) {
-      return;
-    }
     checkThread();
     nativeSetGeometry(geometry);
   }
@@ -287,9 +281,6 @@ public class GeoJsonSource extends Source {
    * @param featureCollection the GeoJSON FeatureCollection
    */
   public void setGeoJson(@Nullable FeatureCollection featureCollection) {
-    if (detached) {
-      return;
-    }
     checkThread();
 
     if (featureCollection != null && featureCollection.features() != null) {
@@ -308,9 +299,6 @@ public class GeoJsonSource extends Source {
    * @param json the raw GeoJson FeatureCollection string
    */
   public void setGeoJson(String json) {
-    if (detached) {
-      return;
-    }
     checkThread();
     nativeSetGeoJsonString(json);
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
index 7d5838541b..3153f35446 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
@@ -15,8 +15,6 @@ public abstract class Source {
   @Keep
   private long nativePtr;
 
-  protected boolean detached;
-
   static {
     LibraryLoader.load();
   }
@@ -85,7 +83,4 @@ public abstract class Source {
   @Keep
   protected native String nativeGetAttribution();
 
-  public void setDetached() {
-    detached = true;
-  }
 }