[WIP] use simple statement instead of statement (abstract class), not compiling!upstream/pg-7978-add-layer-filter-accessor

2 files changed, 6 insertions, 3 deletions

diff --git a/platform/android/src/style/filter.cpp b/platform/android/src/style/filter.cpp
index 30a2add903..b9e558337e 100644
--- a/platform/android/src/style/filter.cpp
+++ b/platform/android/src/style/filter.cpp
@@ -4,10 +4,13 @@ namespace mbgl {
 namespace android {
 
 jni::Object<Filter::Statement> Filter::fromFilter(jni::JNIEnv& env, const mbgl::style::Filter&) {
-    static auto constructor = Filter::Statement::javaClass.template GetConstructor<jni::String>(env);
+    static auto constructor = Filter::Statement::javaClass.template GetConstructor<jni::String, jni::String, jni::Array<jni::Object<>>>(env);
     const char *const equals = "==";
     auto joper = jni::Make<jni::String>(env, equals);
-    return Filter::Statement::javaClass.New(env, constructor, joper);
+    const char *const key = "type";
+    auto jkey = jni::Make<jni::String>(env, key);
+    auto jvalues = jni::Array<jni::Object<>>::New(env, 1);
+    return Filter::Statement::javaClass.New(env, constructor, joper, jkey, jvalues);
 }
 
 jni::Class<Filter> Filter::javaClass;
diff --git a/platform/android/src/style/filter.hpp b/platform/android/src/style/filter.hpp
index 6c58501a61..bfd16ac715 100644
--- a/platform/android/src/style/filter.hpp
+++ b/platform/android/src/style/filter.hpp
@@ -15,7 +15,7 @@ public:
 
     class Statement : private mbgl::util::noncopyable {
     public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/Filter$Statement"; };
+        static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/Filter$SimpleStatement"; };
 
         static jni::Class<Filter::Statement> javaClass;
     };