diff options
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/core-files.json | 4 | ||||
| -rw-r--r-- | platform/android/src/text/collator.cpp | 12 | ||||
| -rw-r--r-- | platform/android/src/unaccent.cpp | 18 |
3 files changed, 5 insertions, 29 deletions
diff --git a/platform/android/core-files.json b/platform/android/core-files.json index 362098dd9b..9d502bf33e 100644 --- a/platform/android/core-files.json +++ b/platform/android/core-files.json @@ -86,7 +86,6 @@ "platform/android/src/gl_functions.cpp", "platform/android/src/thread.cpp", "platform/android/src/timer.cpp", - "platform/android/src/unaccent.cpp", "platform/default/src/mbgl/gfx/headless_backend.cpp", "platform/default/src/mbgl/gfx/headless_frontend.cpp", "platform/default/src/mbgl/gl/headless_backend.cpp", @@ -103,8 +102,7 @@ "mbgl/gfx/headless_backend.hpp": "platform/default/include/mbgl/gfx/headless_backend.hpp", "mbgl/gfx/headless_frontend.hpp": "platform/default/include/mbgl/gfx/headless_frontend.hpp", "mbgl/gl/headless_backend.hpp": "platform/default/include/mbgl/gl/headless_backend.hpp", - "mbgl/map/map_snapshotter.hpp": "platform/default/include/mbgl/map/map_snapshotter.hpp", - "mbgl/text/unaccent.hpp": "platform/default/include/mbgl/text/unaccent.hpp" + "mbgl/map/map_snapshotter.hpp": "platform/default/include/mbgl/map/map_snapshotter.hpp" }, "private_headers": { "android_renderer_backend.hpp": "platform/android/src/android_renderer_backend.hpp", diff --git a/platform/android/src/text/collator.cpp b/platform/android/src/text/collator.cpp index acb4f36ee1..1cd6f3cab0 100644 --- a/platform/android/src/text/collator.cpp +++ b/platform/android/src/text/collator.cpp @@ -2,8 +2,6 @@ #include <mbgl/text/language_tag.hpp> #include <mbgl/util/platform.hpp> -#include <mbgl/text/unaccent.hpp> - #include <jni/jni.hpp> #include "../attach_env.hpp" @@ -144,12 +142,10 @@ public: // Because of the difference in locale-awareness, this means turning on case-sensitivity // can _potentially_ change compare results for strings that don't actually have any case // differences. - jni::Local<jni::String> jlhs = jni::Make<jni::String>(*env, useUnaccent ? - platform::unaccent(lhs) : - lhs); - jni::Local<jni::String> jrhs = jni::Make<jni::String>(*env, useUnaccent ? - platform::unaccent(rhs) : - rhs); + jni::Local<jni::String> jlhs = useUnaccent ? android::StringUtils::unaccent(*env, jni::Make<jni::String>(*env, lhs)) + : jni::Make<jni::String>(*env, lhs); + jni::Local<jni::String> jrhs = useUnaccent ? android::StringUtils::unaccent(*env, jni::Make<jni::String>(*env, rhs)) + : jni::Make<jni::String>(*env, rhs); jni::jint result = android::Collator::compare(*env, collator, jlhs, jrhs); diff --git a/platform/android/src/unaccent.cpp b/platform/android/src/unaccent.cpp deleted file mode 100644 index 8da0ce4931..0000000000 --- a/platform/android/src/unaccent.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include <mbgl/text/unaccent.hpp> -#include <string> -#include "attach_env.hpp" -#include "text/collator_jni.hpp" -#include <jni/jni.hpp> - -namespace mbgl { -namespace platform { - -std::string unaccent(const std::string& str) { - android::UniqueEnv env = android::AttachEnv(); - jni::Local<jni::String> input = jni::Make<jni::String>(*env, str); - jni::Local<jni::String> unaccented = android::StringUtils::unaccent(*env, input); - return jni::Make<std::string>(*env, unaccented); -} - -} // namespace platform -} // namespace mbgl |