From 8fa52f306ded41406fca2a7664a99f959ed9d5ca Mon Sep 17 00:00:00 2001 From: vng Date: Mon, 9 Jul 2012 17:40:05 -0700 Subject: [PATCH] [android] Return 0 instead of empty string if no country under current position. --- android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp b/android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp index f0880389db..8294a906ef 100644 --- a/android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp +++ b/android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp @@ -265,6 +265,8 @@ extern "C" { string const name = g_framework->GetCountryName(MercatorBounds::LonToX(lon), MercatorBounds::LatToY(lat)); - return env->NewStringUTF(name.c_str()); + + // Important thing. Return 0 if no any country. + return (name.empty() ? 0 : jni::ToJavaString(env, name)); } }