From 7e0cc3b545a5b47a8770e55e5476e9646809a618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 17 Jan 2017 13:25:27 +0100 Subject: [android] introduce generic Peer object for JNI wrapping --- platform/android/config.cmake | 1 - platform/android/src/jni.cpp | 8 +-- platform/android/src/jni/peer.hpp | 40 +++++++++++ platform/android/src/native_map_view.cpp | 9 +-- platform/android/src/native_map_view.hpp | 9 ++- .../src/storage/default_file_source_peer.cpp | 84 ++++++++++++---------- .../src/storage/default_file_source_peer.hpp | 40 ----------- 7 files changed, 97 insertions(+), 94 deletions(-) create mode 100644 platform/android/src/jni/peer.hpp delete mode 100644 platform/android/src/storage/default_file_source_peer.hpp diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 61669d48a7..8a8b5cb768 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -91,7 +91,6 @@ macro(mbgl_platform_core) # Storage PRIVATE platform/android/src/storage/default_file_source_peer.cpp - PRIVATE platform/android/src/storage/default_file_source_peer.hpp # Conversion C++ -> Java platform/android/src/conversion/constant.hpp diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index d136766455..a4631997ad 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -9,12 +9,12 @@ #include #include "jni.hpp" +#include "jni/peer.hpp" #include "java_types.hpp" #include "native_map_view.hpp" #include "connectivity_listener.hpp" #include "style/layers/layers.hpp" #include "style/sources/sources.hpp" -#include "storage/default_file_source_peer.hpp" #include "conversion/conversion.hpp" #include "conversion/collection.hpp" @@ -298,7 +298,7 @@ namespace { using namespace mbgl::android; using DebugOptions = mbgl::MapDebugOptions; -jlong nativeCreate(JNIEnv *env, jni::jobject* obj, jni::Object fileSource, jfloat pixelRatio, jint availableProcessors, jlong totalMemory) { +jlong nativeCreate(JNIEnv *env, jni::jobject* obj, jni::Object> fileSource, jfloat pixelRatio, jint availableProcessors, jlong totalMemory) { mbgl::Log::Debug(mbgl::Event::JNI, "nativeCreate"); return reinterpret_cast(new NativeMapView(env, jni::Unwrap(obj), fileSource, pixelRatio, availableProcessors, totalMemory)); } @@ -1705,9 +1705,7 @@ void registerNatives(JavaVM *vm) { registerNativeLayers(env); registerNativeSources(env); ConnectivityListener::registerNative(env); - - mbgl::Log::Error(mbgl::Event::JNI, "registering DefaultFileSource peer"); - DefaultFileSourcePeer::registerNative(env); + Peer::RegisterNative(env); latLngClass = &jni::FindClass(env, "com/mapbox/mapboxsdk/geometry/LatLng"); latLngClass = jni::NewGlobalRef(env, latLngClass).release(); diff --git a/platform/android/src/jni/peer.hpp b/platform/android/src/jni/peer.hpp new file mode 100644 index 0000000000..2c16cce710 --- /dev/null +++ b/platform/android/src/jni/peer.hpp @@ -0,0 +1,40 @@ +#pragma once + +#include + +#include + +namespace mbgl { +namespace android { + +template +class Peer { +public: + static constexpr auto Name(); + static void RegisterNative(jni::JNIEnv&); + + static T& Get(jni::JNIEnv& env, const jni::Object>& obj) { + jni::Field field{ env, javaClass, peer }; + return *reinterpret_cast(obj.Get(env, field))->native; + } + +protected: + template + Peer(Args&&... args) : native(std::make_unique(std::forward(args)...)) { + } + + const std::unique_ptr native; + +private: + static const char* peer; + static jni::Class> javaClass; +}; + +template +jni::Class> Peer::javaClass; + +template +const char* Peer::peer = "peer"; + +} // namespace android +} // namespace mbgl diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 3e2013c0d3..df47c6588b 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -1,5 +1,6 @@ #include "native_map_view.hpp" #include "jni.hpp" +#include "jni/peer.hpp" #include #include @@ -40,7 +41,7 @@ void log_egl_string(EGLDisplay display, EGLint name, const char *label) { NativeMapView::NativeMapView(JNIEnv* env_, jobject obj_, - jni::Object fileSource_, + jni::Object> fileSource_, float pixelRatio, int availableProcessors_, size_t totalMemory_) @@ -65,13 +66,9 @@ NativeMapView::NativeMapView(JNIEnv* env_, return; } - jni::Field peerField{ *env, DefaultFileSourcePeer::javaClass, - "peer" }; - auto fileSourcePtr = reinterpret_cast(fileSource->Get(*env, peerField)); - map = std::make_unique( *this, mbgl::Size{ static_cast(width), static_cast(height) }, - pixelRatio, fileSourcePtr->getFileSource(), threadPool, MapMode::Continuous); + pixelRatio, Peer::Get(*env, *fileSource), threadPool, MapMode::Continuous); float zoomFactor = map->getMaxZoom() - map->getMinZoom() + 1; float cpuFactor = availableProcessors; diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index ea75ef7702..bc1306405f 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -6,7 +6,7 @@ #include #include -#include "storage/default_file_source_peer.hpp" +#include "jni/peer.hpp" #include #include @@ -14,13 +14,16 @@ #include namespace mbgl { + +class DefaultFileSource; + namespace android { class NativeMapView : public mbgl::View, public mbgl::Backend { public: NativeMapView(JNIEnv* env, jobject obj, - jni::Object fileSourcePeer, + jni::Object> fileSourcePeer, float pixelRatio, int availableProcessors, size_t totalMemory); @@ -101,7 +104,7 @@ private: size_t totalMemory = 0; // Ensure these are initialised last - jni::UniqueObject fileSource; + jni::UniqueObject> fileSource; mbgl::ThreadPool threadPool; std::unique_ptr map; mbgl::EdgeInsets insets; diff --git a/platform/android/src/storage/default_file_source_peer.cpp b/platform/android/src/storage/default_file_source_peer.cpp index 6f8a36b78a..968ec1c652 100644 --- a/platform/android/src/storage/default_file_source_peer.cpp +++ b/platform/android/src/storage/default_file_source_peer.cpp @@ -1,53 +1,59 @@ -#include "default_file_source_peer.hpp" - +#include #include +#include "../jni/peer.hpp" + namespace mbgl { namespace android { -jni::Class DefaultFileSourcePeer::javaClass; +template <> +constexpr auto Peer::Name() { + return "com/mapbox/mapboxsdk/storage/DefaultFileSource"; +} + +class Impl : public Peer { +public: + Impl(jni::JNIEnv& env, + jni::String cachePath, + jni::String assetRoot, + jni::jlong maximumCacheSize) + : Peer(jni::Make(env, cachePath), + jni::Make(env, assetRoot), + maximumCacheSize) { + } + + void setAPIBaseURL(jni::JNIEnv& env, jni::String baseURL) { + native->setAPIBaseURL(jni::Make(env, baseURL)); + } + + jni::String getAPIBaseURL(jni::JNIEnv& env) { + return jni::Make(env, native->getAPIBaseURL()); + } + + void setAccessToken(jni::JNIEnv& env, jni::String accessToken) { + native->setAccessToken(jni::Make(env, accessToken)); + } + + jni::String getAccessToken(jni::JNIEnv& env) { + return jni::Make(env, native->getAccessToken()); + } +}; #define NATIVE_METHOD(MethodPtr, name) \ jni::MakeNativePeerMethod(name) -void DefaultFileSourcePeer::registerNative(jni::JNIEnv& env) { - javaClass = *jni::Class::Find(env).NewGlobalRef(env).release(); +template <> +void Peer::RegisterNative(jni::JNIEnv& env) { + javaClass = *jni::Class>::Find(env).NewGlobalRef(env).release(); - jni::RegisterNativePeer( - env, javaClass, "peer", - std::make_unique, + jni::RegisterNativePeer( + env, javaClass, peer, + std::make_unique, "initialize", "finalize", - NATIVE_METHOD(&DefaultFileSourcePeer::setAPIBaseURL, "setAPIBaseURL"), - NATIVE_METHOD(&DefaultFileSourcePeer::getAPIBaseURL, "getAPIBaseURL"), - NATIVE_METHOD(&DefaultFileSourcePeer::setAccessToken, "setAccessToken"), - NATIVE_METHOD(&DefaultFileSourcePeer::getAccessToken, "getAccessToken")); -} - -DefaultFileSourcePeer::DefaultFileSourcePeer(jni::JNIEnv& env, - jni::String cachePath, - jni::String assetRoot, - jni::jlong maximumCacheSize) - : native(std::make_unique(jni::Make(env, cachePath), - jni::Make(env, assetRoot), - maximumCacheSize)) { -} - -DefaultFileSourcePeer::~DefaultFileSourcePeer() = default; - -void DefaultFileSourcePeer::setAPIBaseURL(jni::JNIEnv& env, jni::String baseURL) { - native->setAPIBaseURL(jni::Make(env, baseURL)); -} - -jni::String DefaultFileSourcePeer::getAPIBaseURL(jni::JNIEnv& env) { - return jni::Make(env, native->getAPIBaseURL()); -} - -void DefaultFileSourcePeer::setAccessToken(jni::JNIEnv& env, jni::String accessToken) { - native->setAccessToken(jni::Make(env, accessToken)); -} - -jni::String DefaultFileSourcePeer::getAccessToken(jni::JNIEnv& env) { - return jni::Make(env, native->getAccessToken()); + NATIVE_METHOD(&Impl::setAPIBaseURL, "setAPIBaseURL"), + NATIVE_METHOD(&Impl::getAPIBaseURL, "getAPIBaseURL"), + NATIVE_METHOD(&Impl::setAccessToken, "setAccessToken"), + NATIVE_METHOD(&Impl::getAccessToken, "getAccessToken")); } } // namespace android diff --git a/platform/android/src/storage/default_file_source_peer.hpp b/platform/android/src/storage/default_file_source_peer.hpp deleted file mode 100644 index c0f60447b3..0000000000 --- a/platform/android/src/storage/default_file_source_peer.hpp +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -#include - -#include - -namespace mbgl { - -class DefaultFileSource; - -namespace android { - -class DefaultFileSourcePeer { -public: - static constexpr auto Name() { return "com/mapbox/mapboxsdk/storage/DefaultFileSource"; } - static jni::Class javaClass; - static void registerNative(jni::JNIEnv&); - - DefaultFileSourcePeer(jni::JNIEnv&, - jni::String cachePath, - jni::String assetRoot, - jni::jlong maximumCacheSize); - ~DefaultFileSourcePeer(); - - void setAPIBaseURL(jni::JNIEnv&, jni::String); - jni::String getAPIBaseURL(jni::JNIEnv&); - - void setAccessToken(jni::JNIEnv&, jni::String); - jni::String getAccessToken(jni::JNIEnv&); - - DefaultFileSource& getFileSource() { - return *native; - } - -private: - const std::unique_ptr native; -}; - -} // namespace android -} // namespace mbgl -- cgit v1.2.1