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

[android] load settings dir in Platform constructor

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-04-24 10:21:10 +03:00 • committed by Aleksandr Zatsepin
parent 2fde0194fe
commit 0b71876515
7 changed files with 19 additions and 9 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

@ -29,6 +29,7 @@ jclass g_keyValueClazz;
jclass g_httpUploaderClazz;
jclass g_httpUploaderResultClazz;
jclass g_networkPolicyClazz;
jclass g_storageUtilsClazz;
extern "C"
{
@ -55,6 +56,7 @@ JNI_OnLoad(JavaVM * jvm, void *)
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");
g_storageUtilsClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/StorageUtils");
return JNI_VERSION_1_6;
}
@ -79,6 +81,7 @@ JNI_OnUnload(JavaVM *, void *)
env->DeleteGlobalRef(g_httpUploaderClazz);
env->DeleteGlobalRef(g_httpUploaderResultClazz);
env->DeleteGlobalRef(g_networkPolicyClazz);
env->DeleteGlobalRef(g_storageUtilsClazz);
}
} // extern "C"

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

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

7
android/jni/com/mapswithme/maps/MwmApplication.cpp
View file

@ -11,13 +11,6 @@ crashlytics_context_t * g_crashlytics;
extern "C"
{
// static void nativePreparePlatform(String settingsPath);
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_MwmApplication_nativePreparePlatform(JNIEnv * env, jclass clazz, jstring settingsPath)
{
android::Platform::Instance().SetSettingsDir(jni::ToNativeString(env, settingsPath));
}
// void nativeInitPlatform(String apkPath, String storagePath, String privatePath, String tmpPath,
// String obbGooglePath, String flavorName, String buildType, boolean isTablet);
JNIEXPORT void JNICALL

12
android/jni/com/mapswithme/platform/Platform.cpp
View file

@ -119,6 +119,18 @@ platform::NetworkPolicy GetCurrentNetworkPolicy()
namespace android
{
Platform::Platform()
{
auto env = jni::GetEnv();
static auto const getSettingsPathId =
jni::GetStaticMethodID(env, g_storageUtilsClazz, "getSettingsPath", "()Ljava/lang/String;");
auto const settingsDir =
static_cast<jstring>(env->CallStaticObjectMethod(g_storageUtilsClazz, getSettingsPathId));
SetSettingsDir(jni::ToNativeString(env, settingsDir));
}
void Platform::Initialize(JNIEnv * env, jobject functorProcessObject, jstring apkPath,
jstring storagePath, jstring privatePath, jstring tmpPath,
jstring obbGooglePath, jstring flavorName, jstring buildType,

2
android/jni/com/mapswithme/platform/Platform.hpp
View file

@ -17,6 +17,8 @@ namespace android
class Platform : public ::Platform
{
public:
Platform();
void Initialize(JNIEnv * env, jobject functorProcessObject, jstring apkPath, jstring storagePath,
jstring privatePath, jstring tmpPath, jstring obbGooglePath, jstring flavorName,
jstring buildType, bool isTablet);

1
android/multidex-config.txt
View file

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

2
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -211,7 +211,6 @@ public class MwmApplication extends Application
return;
// First we need initialize paths and platform to have access to settings and other components.
nativePreparePlatform(settingsPath);
nativeInitPlatform(StorageUtils.getApkPath(), StorageUtils.getStoragePath(settingsPath),
filesPath, tempPath, StorageUtils.getObbGooglePath(), BuildConfig.FLAVOR,
BuildConfig.BUILD_TYPE, UiUtils.isTablet());
@ -410,7 +409,6 @@ public class MwmApplication extends Application
mMainLoopHandler.sendMessage(m);
}
private static native void nativePreparePlatform(String settingsPath);
private native void nativeInitPlatform(String apkPath, String storagePath, String privatePath,
String tmpPath, String obbGooglePath, String flavorName,
String buildType, boolean isTablet);