From 53c3c327f0ebea276d977f58a59cdb9449165518 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 17 Aug 2018 13:43:07 -0700 Subject: [android] Upgrade to latest jni.hpp --- platform/android/src/offline/offline_region_definition.hpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'platform/android/src/offline/offline_region_definition.hpp') diff --git a/platform/android/src/offline/offline_region_definition.hpp b/platform/android/src/offline/offline_region_definition.hpp index a9dfb54634..853cc833bf 100644 --- a/platform/android/src/offline/offline_region_definition.hpp +++ b/platform/android/src/offline/offline_region_definition.hpp @@ -10,8 +10,6 @@ class OfflineRegionDefinition { public: static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegionDefinition"; }; - static jni::Class javaClass; - static void registerNative(jni::JNIEnv&); static mbgl::OfflineRegionDefinition getDefinition(JNIEnv& env, jni::Object jDefinition); @@ -25,10 +23,7 @@ public: static mbgl::OfflineTilePyramidRegionDefinition getDefinition(jni::JNIEnv&, jni::Object); - static jni::Class javaClass; - static void registerNative(jni::JNIEnv&); - }; class OfflineGeometryRegionDefinition: public OfflineRegionDefinition { @@ -39,10 +34,7 @@ public: static mbgl::OfflineGeometryRegionDefinition getDefinition(jni::JNIEnv&, jni::Object); - static jni::Class javaClass; - static void registerNative(jni::JNIEnv&); - }; } // namespace android -- cgit v1.2.1 From 79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 22 Aug 2018 12:27:43 -0700 Subject: [android] jni.hpp 4.0.0 --- .../android/src/offline/offline_region_definition.hpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'platform/android/src/offline/offline_region_definition.hpp') diff --git a/platform/android/src/offline/offline_region_definition.hpp b/platform/android/src/offline/offline_region_definition.hpp index 853cc833bf..827fac0a80 100644 --- a/platform/android/src/offline/offline_region_definition.hpp +++ b/platform/android/src/offline/offline_region_definition.hpp @@ -12,27 +12,29 @@ public: static void registerNative(jni::JNIEnv&); - static mbgl::OfflineRegionDefinition getDefinition(JNIEnv& env, jni::Object jDefinition); + static mbgl::OfflineRegionDefinition getDefinition(JNIEnv& env, const jni::Object& jDefinition); }; -class OfflineTilePyramidRegionDefinition: public OfflineRegionDefinition { +class OfflineTilePyramidRegionDefinition { public: + using SuperTag = OfflineRegionDefinition; static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition"; }; - static jni::Object New(jni::JNIEnv&, const mbgl::OfflineTilePyramidRegionDefinition&); + static jni::Local> New(jni::JNIEnv&, const mbgl::OfflineTilePyramidRegionDefinition&); - static mbgl::OfflineTilePyramidRegionDefinition getDefinition(jni::JNIEnv&, jni::Object); + static mbgl::OfflineTilePyramidRegionDefinition getDefinition(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; -class OfflineGeometryRegionDefinition: public OfflineRegionDefinition { +class OfflineGeometryRegionDefinition { public: + using SuperTag = OfflineRegionDefinition; static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition"; }; - static jni::Object New(jni::JNIEnv&, const mbgl::OfflineGeometryRegionDefinition&); + static jni::Local> New(jni::JNIEnv&, const mbgl::OfflineGeometryRegionDefinition&); - static mbgl::OfflineGeometryRegionDefinition getDefinition(jni::JNIEnv&, jni::Object); + static mbgl::OfflineGeometryRegionDefinition getDefinition(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; -- cgit v1.2.1