[android] For now, lets ignore the issue in GeoJsonSource's async methods.

2 files changed, 13 insertions, 1 deletions

diff --git a/platform/android/src/style/sources/geojson_source.cpp b/platform/android/src/style/sources/geojson_source.cpp
index aa05f9c912..6bfdaca1fc 100644
--- a/platform/android/src/style/sources/geojson_source.cpp
+++ b/platform/android/src/style/sources/geojson_source.cpp
@@ -183,7 +183,11 @@ namespace android {
                             android::UniqueEnv _env = android::AttachEnv();
 
                             // Update the core source
-                            source(*_env)->as<mbgl::style::GeoJSONSource>()->GeoJSONSource::setGeoJSON(geoJSON);
+                            auto coreSource = source();
+                            if (!coreSource) {
+                                return;
+                            }
+                            coreSource->as<mbgl::style::GeoJSONSource>()->GeoJSONSource::setGeoJSON(geoJSON);
 
                             // if there is an awaiting update, execute it, otherwise, release resources
                             if (awaitingUpdate) {
diff --git a/platform/android/src/style/sources/source.hpp b/platform/android/src/style/sources/source.hpp
index 3da8840630..e7fd64c656 100644
--- a/platform/android/src/style/sources/source.hpp
+++ b/platform/android/src/style/sources/source.hpp
@@ -64,6 +64,14 @@ protected:
         return nonOwnedSource_.get();
     }
 
+    inline mbgl::style::Source* source() {
+        if (ownedSource_) return ownedSource_.get();
+        if (!nonOwnedSource_) {
+            return nullptr;
+        }
+        return nonOwnedSource_.get();
+    }
+
     // Set when the source is added to a map.
     jni::Global<jni::Object<Source>> javaPeer;