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

[android] Fixed network policy class initialization in JNI on nexus 5

Browse source
This commit is contained in:
Александр Зацепин 2018-03-12 18:08:45 +03:00 • committed by Vladimir Byko-Ianko
parent e062485020
commit aea9bf54ed
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/jni/com/mapswithme/core/jni_helper.cpp
View file

@ -28,6 +28,7 @@ jclass g_loggerFactoryClazz;
jclass g_keyValueClazz;
jclass g_httpUploaderClazz;
jclass g_httpUploaderResultClazz;
jclass g_networkPolicyClazz;
extern "C"
{
@ -53,6 +54,7 @@ JNI_OnLoad(JavaVM * jvm, void *)
g_keyValueClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/KeyValue");
g_httpUploaderClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpUploader");
g_httpUploaderResultClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpUploader$Result");
g_networkPolicyClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/NetworkPolicy");
return JNI_VERSION_1_6;
}
@ -76,6 +78,7 @@ JNI_OnUnload(JavaVM *, void *)
env->DeleteGlobalRef(g_keyValueClazz);
env->DeleteGlobalRef(g_httpUploaderClazz);
env->DeleteGlobalRef(g_httpUploaderResultClazz);
env->DeleteGlobalRef(g_networkPolicyClazz);
}
} // extern "C"

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

@ -26,6 +26,7 @@ extern jclass g_loggerFactoryClazz;
extern jclass g_keyValueClazz;
extern jclass g_httpUploaderClazz;
extern jclass g_httpUploaderResultClazz;
extern jclass g_networkPolicyClazz;
namespace jni
{

5
android/jni/com/mapswithme/util/NetworkPolicy.cpp
View file

@ -11,9 +11,8 @@ bool GetNetworkPolicyStatus(JNIEnv * env, jobject obj)
bool GetCurrentNetworkUsageStatus(JNIEnv * env)
{
static jclass const clazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/NetworkPolicy");
static jmethodID const method =
jni::GetStaticMethodID(env, clazz, "getCurrentNetworkUsageStatus", "()Z");
return env->CallStaticBooleanMethod(clazz, method);
jni::GetStaticMethodID(env, g_networkPolicyClazz, "getCurrentNetworkUsageStatus", "()Z");
return env->CallStaticBooleanMethod(g_networkPolicyClazz, method);
}
} // namespace network_policy

1
android/multidex-config.txt
View file

@ -11,5 +11,6 @@ com/mapswithme/util/HttpClient$HttpHeader.class
com/mapswithme/util/HttpUploader.class
com/mapswithme/util/HttpUploader$Result.class
com/mapswithme/util/KeyValue.class
com/mapswithme/util/NetworkPolicy.class
com/mapswithme/util/Utils.class
com/my/tracker/MyTracker.class