diff options
| author | Arsentiy Milchakov <milcars@mapswithme.com> | 2018-09-20 14:40:45 +0300 |
|---|---|---|
| committer | Aleksey Belousov <beloal@users.noreply.github.com> | 2018-09-25 11:56:55 +0300 |
| commit | 0a254cf68ae046596dc19b41e377fa29f9b265af (patch) | |
| tree | c1c04ba1067a5af85d550e35f6cf2e6189ed4eae /android | |
| parent | dbf2f9868cbd9b3fdee8948309410a56a66b1187 (diff) | |
[types_strings][bookmarks] bookmarks localization logic is moved to platforms
Diffstat (limited to 'android')
| -rw-r--r-- | android/jni/com/mapswithme/maps/editor/Editor.cpp | 13 | ||||
| -rw-r--r-- | android/jni/com/mapswithme/platform/Localization.cpp | 5 |
2 files changed, 11 insertions, 7 deletions
diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp index c99dabb7e3..bd67a239fb 100644 --- a/android/jni/com/mapswithme/maps/editor/Editor.cpp +++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp @@ -421,7 +421,8 @@ Java_com_mapswithme_maps_editor_Editor_nativeStartEdit(JNIEnv *, jclass) } JNIEXPORT void JNICALL -Java_com_mapswithme_maps_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass, jstring featureType) +Java_com_mapswithme_maps_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass, + jstring featureType) { ::Framework * frm = g_framework->NativeFramework(); auto const type = classif().GetTypeByReadableObjectName(jni::ToNativeString(env, featureType)); @@ -453,7 +454,8 @@ Java_com_mapswithme_maps_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jcl } JNIEXPORT jobjectArray JNICALL -Java_com_mapswithme_maps_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env, jclass clazz, jstring jLang) +Java_com_mapswithme_maps_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env, jclass clazz, + jstring jLang) { std::string const & lang = jni::ToNativeString(env, jLang); GetFeatureCategories().AddLanguage(lang); @@ -461,11 +463,14 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv } JNIEXPORT jobjectArray JNICALL -Java_com_mapswithme_maps_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * env, jclass clazz, jstring query, jstring jLang) +Java_com_mapswithme_maps_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * env, jclass clazz, + jstring query, + jstring jLang) { std::string const & lang = jni::ToNativeString(env, jLang); GetFeatureCategories().AddLanguage(lang); - return jni::ToJavaStringArray(env, GetFeatureCategories().Search(jni::ToNativeString(env, query))); + return jni::ToJavaStringArray(env, + GetFeatureCategories().Search(jni::ToNativeString(env, query))); } JNIEXPORT jobjectArray JNICALL diff --git a/android/jni/com/mapswithme/platform/Localization.cpp b/android/jni/com/mapswithme/platform/Localization.cpp index 0d6030520d..0cdbb4a60e 100644 --- a/android/jni/com/mapswithme/platform/Localization.cpp +++ b/android/jni/com/mapswithme/platform/Localization.cpp @@ -12,9 +12,8 @@ namespace platform std::string GetLocalizedTypeName(std::string const & type) { JNIEnv * env = jni::GetEnv(); - static auto const getLocalizedFeatureType = - jni::GetStaticMethodID(env, g_utilsClazz, - "getLocalizedFeatureType", "(Ljava/lang/String;)Ljava/lang/String;"); + static auto const getLocalizedFeatureType = jni::GetStaticMethodID( + env, g_utilsClazz, "getLocalizedFeatureType", "(Ljava/lang/String;)Ljava/lang/String;"); jni::TScopedLocalRef typeRef(env, jni::ToJavaString(env, type)); auto localizedFeatureType = |