[android] Remove forgotten JNI bindgings from android platform. (#16374)

Cleanup after PR #16356.

2 files changed, 0 insertions, 302 deletions

diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp
deleted file mode 100644
index b33e7da723..0000000000
--- a/platform/android/src/style/sources/source.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-#include "source.hpp"
-#include "../android_conversion.hpp"
-#include "../../attach_env.hpp"
-
-#include <jni/jni.hpp>
-
-#include <mbgl/style/style.hpp>
-#include <mbgl/util/logging.hpp>
-
-// Java -> C++ conversion
-#include <mbgl/style/conversion/source.hpp>
-#include <mbgl/style/conversion_impl.hpp>
-
-// C++ -> Java conversion
-#include "../conversion/property_value.hpp"
-
-#include <string>
-
-// Core Sources
-#include <mbgl/style/sources/geojson_source.hpp>
-#include <mbgl/style/sources/image_source.hpp>
-#include <mbgl/style/sources/raster_source.hpp>
-#include <mbgl/style/sources/vector_source.hpp>
-
-// Android Source peers
-#include "geojson_source.hpp"
-#include "image_source.hpp"
-#include "raster_source.hpp"
-#include "unknown_source.hpp"
-#include "vector_source.hpp"
-#include "custom_geometry_source.hpp"
-#include "raster_dem_source.hpp"
-
-namespace mbgl {
-namespace android {
-
-static std::unique_ptr<Source> createSourcePeer(jni::JNIEnv& env,
-                                                mbgl::style::Source& coreSource,
-                                                AndroidRendererFrontend* frontend) {
-    if (coreSource.is<mbgl::style::VectorSource>()) {
-        return std::make_unique<VectorSource>(env, *coreSource.as<mbgl::style::VectorSource>(), frontend);
-    } else if (coreSource.is<mbgl::style::RasterSource>()) {
-        return std::make_unique<RasterSource>(env, *coreSource.as<mbgl::style::RasterSource>(), frontend);
-    } else if (coreSource.is<mbgl::style::GeoJSONSource>()) {
-        return std::make_unique<GeoJSONSource>(env, *coreSource.as<mbgl::style::GeoJSONSource>(), frontend);
-    } else if (coreSource.is<mbgl::style::ImageSource>()) {
-        return std::make_unique<ImageSource>(env, *coreSource.as<mbgl::style::ImageSource>(), frontend);
-    } else {
-        return std::make_unique<UnknownSource>(env, coreSource, frontend);
-    }
-}
-
-    const jni::Object<Source>& Source::peerForCoreSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend& frontend) {
-        if (!coreSource.peer.has_value()) {
-            coreSource.peer = createSourcePeer(env, coreSource, &frontend);
-        }
-        return coreSource.peer.get<std::unique_ptr<Source>>()->javaPeer;
-    }
-
-    const jni::Object<Source>& Source::peerForCoreSource(jni::JNIEnv& env, mbgl::style::Source& coreSource) {
-        if (!coreSource.peer.has_value()) {
-            coreSource.peer = createSourcePeer(env, coreSource, nullptr);
-        }
-        return coreSource.peer.get<std::unique_ptr<Source>>()->javaPeer;
-    }
-
-    Source::Source(jni::JNIEnv& env,
-                   mbgl::style::Source& coreSource,
-                   const jni::Object<Source>& obj,
-                   AndroidRendererFrontend* frontend)
-        : source(coreSource), javaPeer(jni::NewGlobal(env, obj)), rendererFrontend(frontend) {}
-
-    Source::Source(jni::JNIEnv&, std::unique_ptr<mbgl::style::Source> coreSource)
-        : ownedSource(std::move(coreSource))
-        , source(*ownedSource) {
-    }
-
-    Source::~Source() {
-        // Before being added to a map, the Java peer owns this C++ peer and cleans
-        //  up after itself correctly through the jni native peer bindings.
-        // After being added to the map, the ownership is flipped and the C++ peer has a strong reference
-        //  to it's Java peer, preventing the Java peer from being GC'ed.
-        //  In this case, the core source initiates the destruction, which requires releasing the Java peer,
-        //  while also resetting it's nativePtr to 0 to prevent the subsequent GC of the Java peer from
-        //  re-entering this dtor.
-        if (ownedSource.get() == nullptr && javaPeer.get() != nullptr) {
-            // Manually clear the java peer
-            android::UniqueEnv env = android::AttachEnv();
-            static auto& javaClass = jni::Class<Source>::Singleton(*env);
-            static auto nativePtrField = javaClass.GetField<jlong>(*env, "nativePtr");
-            javaPeer.Set(*env, nativePtrField, (jlong) 0);
-            javaPeer.reset();
-        }
-    }
-
-    jni::Local<jni::String> Source::getId(jni::JNIEnv& env) {
-        return jni::Make<jni::String>(env, source.getID());
-    }
-
-    jni::Local<jni::String> Source::getAttribution(jni::JNIEnv& env) {
-        auto attribution = source.getAttribution();
-        return attribution ? jni::Make<jni::String>(env, attribution.value()) : jni::Make<jni::String>(env,"");
-    }
-
-    void Source::setPrefetchZoomDelta(jni::JNIEnv& env, jni::Integer& delta) {
-        if (!delta) {
-            source.setPrefetchZoomDelta(nullopt);
-        } else {
-            source.setPrefetchZoomDelta(jni::Unbox(env, delta));
-        }
-    }
-
-    jni::Local<jni::Integer> Source::getPrefetchZoomDelta(jni::JNIEnv& env) {
-        auto delta = source.getPrefetchZoomDelta();
-        if (delta.has_value()) {
-            return jni::Box(env, jni::jint(delta.value()));
-        }
-        return jni::Local<jni::Integer>(env, nullptr);
-    }
-
-    void Source::setMaxOverscaleFactorForParentTiles(jni::JNIEnv& env, jni::Integer& maxOverscaleFactor) {
-        if (!maxOverscaleFactor) {
-            source.setMaxOverscaleFactorForParentTiles(nullopt);
-        } else {
-            source.setMaxOverscaleFactorForParentTiles(jni::Unbox(env, maxOverscaleFactor));
-        }
-    }
-
-    jni::Local<jni::Integer> Source::getMaxOverscaleFactorForParentTiles(jni::JNIEnv& env) {
-        auto maxOverscaleFactor = source.getMaxOverscaleFactorForParentTiles();
-        if (maxOverscaleFactor) {
-            return jni::Box(env, jni::jint(*maxOverscaleFactor));
-        }
-        return jni::Local<jni::Integer>(env, nullptr);
-    }
-
-    void Source::addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mbgl::style::Style& style) {
-        if (!ownedSource) {
-            throw std::runtime_error("Cannot add source twice");
-        }
-
-        // Add source to style and release ownership
-        style.addSource(std::move(ownedSource));
-
-        // Add peer to core source
-        source.peer = std::unique_ptr<Source>(this);
-
-        // Add strong reference to java source
-        javaPeer = jni::NewGlobal(env, obj);
-    }
-
-    void Source::addToMap(JNIEnv& env, const jni::Object<Source>& obj, mbgl::Map& map, AndroidRendererFrontend& frontend) {
-        // Check to see if we own the source first
-        if (!ownedSource) {
-            throw std::runtime_error("Cannot add source twice");
-        }
-
-        // Add source to map and release ownership
-        map.getStyle().addSource(std::move(ownedSource));
-
-        // Add peer to core source
-        source.peer = std::unique_ptr<Source>(this);
-
-        // Add strong reference to java source
-        javaPeer = jni::NewGlobal(env, obj);
-
-        rendererFrontend = &frontend;
-    }
-
-    bool Source::removeFromMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map& map) {
-        // Cannot remove if not attached yet
-        if (ownedSource) {
-            throw std::runtime_error("Cannot remove detached source");
-        }
-
-        // Remove the source from the map and take ownership
-        ownedSource = map.getStyle().removeSource(source.getID());
-
-        // The source may not be removed if any layers still reference it
-        return ownedSource != nullptr;
-    }
-
-    void Source::releaseJavaPeer() {
-        // We can't release the peer if the source was not removed from the map
-        if (!ownedSource) {
-            return;
-        }
-
-        // Release the peer relationships. These will be re-established when the source is added to a map
-        assert(ownedSource->peer.has_value());
-        ownedSource->peer.get<std::unique_ptr<Source>>().release();
-        ownedSource->peer = mapbox::base::TypeWrapper();
-
-        // Release the strong reference to the java peer
-        assert(javaPeer);
-        javaPeer.release();
-
-        rendererFrontend = nullptr;
-    }
-
-    void Source::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<Source>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<Source>(
-            env,
-            javaClass,
-            "nativePtr",
-            METHOD(&Source::getId, "nativeGetId"),
-            METHOD(&Source::getAttribution, "nativeGetAttribution"),
-            METHOD(&Source::setPrefetchZoomDelta, "nativeSetPrefetchZoomDelta"),
-            METHOD(&Source::getPrefetchZoomDelta, "nativeGetPrefetchZoomDelta"),
-            METHOD(&Source::setMaxOverscaleFactorForParentTiles, "nativeSetMaxOverscaleFactorForParentTiles"),
-            METHOD(&Source::getMaxOverscaleFactorForParentTiles, "nativeGetMaxOverscaleFactorForParentTiles"));
-
-        // Register subclasses
-        GeoJSONSource::registerNative(env);
-        ImageSource::registerNative(env);
-        RasterSource::registerNative(env);
-        UnknownSource::registerNative(env);
-        VectorSource::registerNative(env);
-        CustomGeometrySource::registerNative(env);
-        RasterDEMSource::registerNative(env);
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/source.hpp b/platform/android/src/style/sources/source.hpp
deleted file mode 100644
index fbeb201c7d..0000000000
--- a/platform/android/src/style/sources/source.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/map/map.hpp>
-#include <mbgl/style/source.hpp>
-
-#include "../value.hpp"
-#include "../../android_renderer_frontend.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class Source : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/Source"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    static const jni::Object<Source>& peerForCoreSource(jni::JNIEnv&, mbgl::style::Source&);
-    static const jni::Object<Source>& peerForCoreSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend&);
-
-    /*
-     * Called when a Java object is created for a core source that belongs to a map.
-     */
-    Source(jni::JNIEnv&, mbgl::style::Source&, const jni::Object<Source>&, AndroidRendererFrontend*);
-
-    /*
-     * Called when a Java object is created for a new core source that does not belong to a map.
-     */
-    Source(jni::JNIEnv&, std::unique_ptr<mbgl::style::Source>);
-
-    virtual ~Source();
-
-    virtual void addToMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&, AndroidRendererFrontend&);
-
-    virtual bool removeFromMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&);
-
-    void releaseJavaPeer();
-
-    jni::Local<jni::String> getId(jni::JNIEnv&);
-
-    jni::Local<jni::String> getAttribution(jni::JNIEnv&);
-
-    void setPrefetchZoomDelta(jni::JNIEnv& env, jni::Integer& delta);
-
-    jni::Local<jni::Integer> getPrefetchZoomDelta(jni::JNIEnv&);
-
-    void setMaxOverscaleFactorForParentTiles(jni::JNIEnv& env, jni::Integer& delta);
-
-    jni::Local<jni::Integer> getMaxOverscaleFactorForParentTiles(jni::JNIEnv&);
-
-    void addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mbgl::style::Style& style);
-
-protected:
-    // Set on newly created sources until added to the map.
-    std::unique_ptr<mbgl::style::Source> ownedSource;
-
-    // Raw pointer that is valid at all times.
-    mbgl::style::Source& source;
-
-    // Set when the source is added to a map.
-    jni::Global<jni::Object<Source>> javaPeer;
-
-    // RendererFrontend pointer is valid only when added to the map.
-    AndroidRendererFrontend* rendererFrontend { nullptr };
-};
-
-} // namespace android
-} // namespace mbgl