[android] Fix bug with native nested Java object creation (simply avoid this).

1 files changed, 6 insertions, 10 deletions

diff --git a/android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp b/android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp
index e9001646da..e9accdcc1c 100644
--- a/android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp
+++ b/android/jni/com/mapswithme/maps/DownloadResourcesActivity.cpp
@@ -165,21 +165,14 @@ extern "C"
 
     JNIEnv * env = jni::GetEnv();
 
-    jmethodID onFinishMethod = env->GetMethodID(env->GetObjectClass(*obj.get()), "onDownloadFinished", "(I)V");
-    ASSERT(onFinishMethod, ("Not existing method: void onDownloadFinished(int)"));
-
-    env->CallVoidMethod(*obj.get(), onFinishMethod, errorCode);
+    jmethodID methodID = jni::GetJavaMethodID(env, *obj.get(), "onDownloadFinished", "(I)V");
+    env->CallVoidMethod(*obj.get(), methodID, errorCode);
   }
 
   void DownloadFileProgress(shared_ptr<jobject> obj, downloader::HttpRequest & req)
   {
     LOG(LDEBUG, (req.Progress().first, "bytes for", g_filesToDownload.back().m_fileName, "was downloaded"));
 
-    JNIEnv * env = jni::GetEnv();
-
-    jmethodID onProgressMethod = env->GetMethodID(env->GetObjectClass(*obj.get()), "onDownloadProgress", "(IIII)V");
-    ASSERT(onProgressMethod, ("Not existing method: void onDownloadProgress(int, int, int, int)"));
-
     FileToDownload & curFile = g_filesToDownload.back();
 
     jint curTotal = req.Progress().second;
@@ -187,7 +180,10 @@ extern "C"
     jint glbTotal = g_totalBytesToDownload;
     jint glbProgress = g_totalDownloadedBytes + req.Progress().first;
 
-    env->CallVoidMethod(*obj.get(), onProgressMethod,
+    JNIEnv * env = jni::GetEnv();
+
+    jmethodID methodID = jni::GetJavaMethodID(env, *obj.get(), "onDownloadProgress", "(IIII)V");
+    env->CallVoidMethod(*obj.get(), methodID,
                          curTotal, curProgress,
                          glbTotal, glbProgress);
   }