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

[android]: Revert "load settings dir in Platform constructor"

Browse source 
This reverts commit 0b71876515.

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2021-03-20 21:14:07 +03:00
parent 9b5a03ab1c
commit 090b7042d4
7 changed files with 9 additions and 19 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,7 +29,6 @@ jclass g_httpPayloadClazz;
jclass g_httpBackgroundUploaderClazz;
jclass g_httpUploaderResultClazz;
jclass g_networkPolicyClazz;
jclass g_storageUtilsClazz;
jclass g_elevationInfoClazz;
jclass g_parsingResultClazz;
@ -59,7 +58,6 @@ JNI_OnLoad(JavaVM * jvm, void *)
jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpBackgroundUploader");
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");
g_elevationInfoClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/ElevationInfo");
g_parsingResultClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/api/ParsingResult");
@ -86,7 +84,6 @@ JNI_OnUnload(JavaVM *, void *)
env->DeleteGlobalRef(g_httpBackgroundUploaderClazz);
env->DeleteGlobalRef(g_httpUploaderResultClazz);
env->DeleteGlobalRef(g_networkPolicyClazz);
env->DeleteGlobalRef(g_storageUtilsClazz);
env->DeleteGlobalRef(g_elevationInfoClazz);
env->DeleteGlobalRef(g_parsingResultClazz);
}

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

@ -30,7 +30,6 @@ extern jclass g_httpPayloadClazz;
extern jclass g_httpBackgroundUploaderClazz;
extern jclass g_httpUploaderResultClazz;
extern jclass g_networkPolicyClazz;
extern jclass g_storageUtilsClazz;
extern jclass g_elevationInfoClazz;
extern jclass g_parsingResultClazz;

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

@ -7,6 +7,13 @@
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

@ -136,18 +136,6 @@ 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 flavorName, jstring buildType, bool isTablet)

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

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

1
android/multidex-config.txt
View file

@ -26,5 +26,4 @@ com/mapswithme/util/log/LoggerFactory.class
com/mapswithme/util/log/ZipLogsTask.class
com/mapswithme/util/NetworkPolicy.class
com/mapswithme/util/sharing/ShareableInfoProvider.class
com/mapswithme/util/StorageUtils.class
com/mapswithme/util/Utils.class

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

@ -195,6 +195,7 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
return;
// First we need initialize paths and platform to have access to settings and other components.
nativePreparePlatform(settingsPath);
nativeInitPlatform(StorageUtils.getApkPath(this),
StorageUtils.getStoragePath(settingsPath),
filesPath, tempPath,
@ -312,6 +313,7 @@ public class MwmApplication extends Application implements AppBackgroundTracker.
return mPlayer;
}
private static native void nativePreparePlatform(String settingsPath);
private native void nativeInitPlatform(String apkPath, String storagePath, String privatePath,
String tmpPath, String flavorName, String buildType,
boolean isTablet);