From 1ba1ead3eab5eb27c24163b93b04b49ffbdf2a3b Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Tue, 6 Nov 2018 11:45:51 +0200
Subject: [android] Remove UnknownLayer

---
 .../mapboxsdk/style/layers/UnknownLayer.java       | 27 ------------
 platform/android/core-files.txt                    |  2 -
 .../android/src/style/layers/unknown_layer.cpp     | 48 ----------------------
 .../android/src/style/layers/unknown_layer.hpp     | 28 -------------
 4 files changed, 105 deletions(-)
 delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/UnknownLayer.java
 delete mode 100644 platform/android/src/style/layers/unknown_layer.cpp
 delete mode 100644 platform/android/src/style/layers/unknown_layer.hpp

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/UnknownLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/UnknownLayer.java
deleted file mode 100644
index b9898e72da..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/UnknownLayer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mapbox.mapboxsdk.style.layers;
-
-import android.support.annotation.Keep;
-import android.support.annotation.UiThread;
-
-/**
- * An unknown type of layer
- */
-@UiThread
-@Keep
-public class UnknownLayer extends Layer {
-
-  /**
-   * Creates a UnknownLayer.
-   *
-   * @param nativePtr pointer used by core
-   */
-  UnknownLayer(long nativePtr) {
-    super(nativePtr);
-  }
-
-  protected native void initialize();
-
-  @Override
-  protected native void finalize() throws Throwable;
-
-}
diff --git a/platform/android/core-files.txt b/platform/android/core-files.txt
index 4005aba1e5..03735198a2 100644
--- a/platform/android/core-files.txt
+++ b/platform/android/core-files.txt
@@ -103,8 +103,6 @@ platform/android/src/style/layers/raster_layer.cpp
 platform/android/src/style/layers/raster_layer.hpp
 platform/android/src/style/layers/symbol_layer.cpp
 platform/android/src/style/layers/symbol_layer.hpp
-platform/android/src/style/layers/unknown_layer.cpp
-platform/android/src/style/layers/unknown_layer.hpp
 platform/android/src/style/sources/geojson_source.cpp
 platform/android/src/style/sources/geojson_source.hpp
 platform/android/src/style/sources/custom_geometry_source.cpp
diff --git a/platform/android/src/style/layers/unknown_layer.cpp b/platform/android/src/style/layers/unknown_layer.cpp
deleted file mode 100644
index bf311aff37..0000000000
--- a/platform/android/src/style/layers/unknown_layer.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "unknown_layer.hpp"
-
-#include <string>
-
-namespace {
-
-    // Dummy initializer (We don't support initializing this from the JVM)
-    std::unique_ptr<mbgl::android::UnknownLayer> init(jni::JNIEnv&) {
-        throw std::runtime_error("UnknownLayer should not be initialized from the JVM");
-    }
-
-} // namespace
-
-namespace mbgl {
-namespace android {
-
-    UnknownLayer::UnknownLayer(mbgl::Map& map, mbgl::style::Layer& coreLayer)
-        : Layer(map, coreLayer) {
-    }
-
-    UnknownLayer::UnknownLayer(mbgl::Map& map, std::unique_ptr<mbgl::style::Layer> coreLayer)
-        : Layer(map, std::move(coreLayer)) {
-    }
-
-    jni::Local<jni::Object<Layer>> UnknownLayer::createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-        static auto& javaClass = jni::Class<UnknownLayer>::Singleton(env);
-        static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-        return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-    }
-
-    void UnknownLayer::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<UnknownLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        std::function<std::unique_ptr<UnknownLayer>(JNIEnv&)> initializer = nullptr;
-
-        // Register the peer
-        jni::RegisterNativePeer<UnknownLayer>(
-            env, javaClass, "nativePtr",
-            init,
-            "initialize",
-            "finalize");
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/unknown_layer.hpp b/platform/android/src/style/layers/unknown_layer.hpp
deleted file mode 100644
index 1b64ba1b3d..0000000000
--- a/platform/android/src/style/layers/unknown_layer.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "layer.hpp"
-#include <mbgl/style/layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class UnknownLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/UnknownLayer"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    UnknownLayer(mbgl::Map&, mbgl::style::Layer&);
-
-    UnknownLayer(mbgl::Map&, std::unique_ptr<mbgl::style::Layer>);
-
-    ~UnknownLayer() = default;
-
-    static jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv&, Layer*);
-
-}; // class UnknownLayer
-
-} // namespace android
-} // namespace mbgl
-- 
cgit v1.2.1