diff options
author | Igor Tarasov <igor.tarasov@mapbox.com> | 2019-09-17 15:26:18 +0300 |
---|---|---|
committer | Igor Tarasov <igor.tarasov@mapbox.com> | 2019-09-17 15:26:18 +0300 |
commit | 67c3176fc19b63d4585ef0616c9027c25d288c9a (patch) | |
tree | dba7c0f2b945849f3bf62f01d26cc6d5b5c3ab4b | |
parent | 751b394a0e5081e5af0c78dcaf4ba49643dbf89e (diff) | |
download | qtlocation-mapboxgl-67c3176fc19b63d4585ef0616c9027c25d288c9a.tar.gz |
[android] Remove detach workaround from java layer of style sources.
2 files changed, 0 insertions, 18 deletions
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..47a4eec00f 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(); } @@ -84,8 +82,4 @@ public abstract class Source { @NonNull @Keep protected native String nativeGetAttribution(); - - public void setDetached() { - detached = true; - } } |