pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Removed JNIEnv-less method ToNativeString.

Browse source
This commit is contained in:
Dmitry Kunin 2013-06-10 15:25:04 +03:00 • committed by Alex Zolotarev
parent 983b2ab52d
commit 1adec84060
3 changed files with 3 additions and 6 deletions
android/jni/com/mapswithme
core
jni_helper.hpp
maps
Framework.cpp
bookmarks/data
BookmarkManager.cpp

5
android/jni/com/mapswithme/core/jni_helper.hpp
View file

@ -24,12 +24,9 @@ namespace jni
JavaVM * GetJVM();
string ToNativeString(JNIEnv * env, jstring str);
inline string ToNativeString(jstring str)
{
return ToNativeString(GetEnv(), str);
}
jstring ToJavaString(JNIEnv * env, char const * s);
inline jstring ToJavaString(JNIEnv * env, string const & s)
{
return ToJavaString(env, s.c_str());

2
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -1003,7 +1003,7 @@ extern "C"
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_Framework_nativeGetGe0Url(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name)
{
const string url = g_framework->NativeFramework()->CodeGe0url(lat, lon, zoomLevel, jni::ToNativeString(name));
const string url = g_framework->NativeFramework()->CodeGe0url(lat, lon, zoomLevel, jni::ToNativeString(env, name));
return jni::ToJavaString(env, url);
}
}

2
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -88,7 +88,7 @@ extern "C"
const m2::PointD glbPoint(MercatorBounds::LonToX(lon),
MercatorBounds::LatToY(lat));
Bookmark bmk(glbPoint, jni::ToNativeString(name), "placemark-red");
Bookmark bmk(glbPoint, jni::ToNativeString(env, name), "placemark-red");
Framework * const framework = frm();
return framework->AddBookmark(framework->LastEditedCategory(), bmk);
}