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/text/collator_jni.hpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'platform/android/src/text/collator_jni.hpp') diff --git a/platform/android/src/text/collator_jni.hpp b/platform/android/src/text/collator_jni.hpp index 96c381b1c1..30fb6a4369 100644 --- a/platform/android/src/text/collator_jni.hpp +++ b/platform/android/src/text/collator_jni.hpp @@ -31,10 +31,8 @@ public: static jni::Object New(jni::JNIEnv&, jni::String); static jni::Object New(jni::JNIEnv&, jni::String, jni::String); - static jni::Class javaClass; static void registerNative(jni::JNIEnv&); - }; class Collator { @@ -47,10 +45,8 @@ public: static jni::jint compare(jni::JNIEnv&, jni::Object, jni::String, jni::String); - 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 --- platform/android/src/text/collator_jni.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'platform/android/src/text/collator_jni.hpp') diff --git a/platform/android/src/text/collator_jni.hpp b/platform/android/src/text/collator_jni.hpp index 30fb6a4369..e5e82c34fd 100644 --- a/platform/android/src/text/collator_jni.hpp +++ b/platform/android/src/text/collator_jni.hpp @@ -24,12 +24,12 @@ public: static jni::Object forLanguageTag(jni::JNIEnv&, jni::String); static jni::String toLanguageTag(jni::JNIEnv&, jni::Object); */ - static jni::Object getDefault(jni::JNIEnv&); - static jni::String getLanguage(jni::JNIEnv&, jni::Object); - static jni::String getCountry(jni::JNIEnv&, jni::Object); + static jni::Local> getDefault(jni::JNIEnv&); + static jni::Local getLanguage(jni::JNIEnv&, const jni::Object&); + static jni::Local getCountry(jni::JNIEnv&, const jni::Object&); - static jni::Object New(jni::JNIEnv&, jni::String); - static jni::Object New(jni::JNIEnv&, jni::String, jni::String); + static jni::Local> New(jni::JNIEnv&, const jni::String&); + static jni::Local> New(jni::JNIEnv&, const jni::String&, const jni::String&); static void registerNative(jni::JNIEnv&); @@ -39,11 +39,11 @@ class Collator { public: static constexpr auto Name() { return "java/text/Collator"; }; - static jni::Object getInstance(jni::JNIEnv&, jni::Object); + static jni::Local> getInstance(jni::JNIEnv&, const jni::Object&); - static void setStrength(jni::JNIEnv&, jni::Object, jni::jint); + static void setStrength(jni::JNIEnv&, const jni::Object&, jni::jint); - static jni::jint compare(jni::JNIEnv&, jni::Object, jni::String, jni::String); + static jni::jint compare(jni::JNIEnv&, const jni::Object&, const jni::String&, const jni::String&); static void registerNative(jni::JNIEnv&); -- cgit v1.2.1 From 6e171a62a9cc07ddbb0765e3021e46ebd60313df Mon Sep 17 00:00:00 2001 From: tobrun Date: Fri, 27 Jul 2018 14:00:55 +0200 Subject: [android] - replace platform default implementation using nunicode for uppercasing an lowercasing with an Android specific String.java equivalent --- platform/android/src/text/collator_jni.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'platform/android/src/text/collator_jni.hpp') diff --git a/platform/android/src/text/collator_jni.hpp b/platform/android/src/text/collator_jni.hpp index e5e82c34fd..dd3f845662 100644 --- a/platform/android/src/text/collator_jni.hpp +++ b/platform/android/src/text/collator_jni.hpp @@ -49,5 +49,16 @@ public: static void registerNative(jni::JNIEnv&); }; + +class StringUtils { +public: + static constexpr auto Name() { return "com/mapbox/mapboxsdk/utils/StringUtils"; }; + + static jni::Local unaccent(jni::JNIEnv&, const jni::String&); + + + static void registerNative(jni::JNIEnv&); +}; + } // namespace android } // namespace mbgl -- cgit v1.2.1