MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: use correct method to get asset path

master
MoNTE48 2021-04-05 22:40:18 +02:00
parent 1a0ef21d71
commit 65545614a5
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/porting_android.cpp
View File

@ -163,22 +163,29 @@ static std::string javaStringToUTF8(jstring js)
} }
// Calls static method if obj is NULL // Calls static method if obj is NULL
static std::string getAndroidPath( static std::string getAndroidPath(jclass cls, jobject obj,
jclass cls, jobject obj, jmethodID mt_getAbsPath, const char *getter) jmethodID mt_getAbsPath, const char *getter, bool external = false)
{ {
// Get getter method
jmethodID mt_getter;
if (obj)
mt_getter = jnienv->GetMethodID(cls, getter, "()Ljava/io/File;");
else
mt_getter = jnienv->GetStaticMethodID(cls, getter, "()Ljava/io/File;");
// Call getter // Call getter
jobject ob_file; jobject ob_file;
if (obj)
ob_file = jnienv->CallObjectMethod(obj, mt_getter); if (external) {
else jclass cls_Env = jnienv->FindClass("android/app/NativeActivity");
ob_file = jnienv->CallStaticObjectMethod(cls, mt_getter); jmethodID mt_getExtPath = jnienv->GetMethodID(cls_Env, getter,
"(Ljava/lang/String;)Ljava/io/File;");
ob_file = jnienv->CallObjectMethod(obj, mt_getExtPath, nullptr);
} else {
// Get getter method
jmethodID mt_getter;
if (obj) {
mt_getter = jnienv->GetMethodID(cls, getter, "()Ljava/io/File;");
ob_file = jnienv->CallObjectMethod(obj, mt_getter);
} else {
mt_getter = jnienv->GetStaticMethodID(cls, getter,
"()Ljava/io/File;");
ob_file = jnienv->CallStaticObjectMethod(cls, mt_getter);
}
}
// Call getAbsolutePath // Call getAbsolutePath
auto js_path = (jstring) jnienv->CallObjectMethod(ob_file, mt_getAbsPath); auto js_path = (jstring) jnienv->CallObjectMethod(ob_file, mt_getAbsPath);
@ -188,23 +195,20 @@ static std::string getAndroidPath(
void initializePathsAndroid() void initializePathsAndroid()
{ {
// Get Environment class jobject obj = app_global->activity->clazz;
jclass cls_Env = jnienv->FindClass("android/os/Environment");
// Get File class // Get File class
jclass cls_File = jnienv->FindClass("java/io/File"); jclass cls_File = jnienv->FindClass("java/io/File");
// Get getAbsolutePath method // Get getAbsolutePath method
jmethodID mt_getAbsPath = jnienv->GetMethodID(cls_File, jmethodID mt_getAbsPath = jnienv->GetMethodID(cls_File,
"getAbsolutePath", "()Ljava/lang/String;"); "getAbsolutePath", "()Ljava/lang/String;");
std::string path_storage = getAndroidPath(cls_Env, nullptr,
mt_getAbsPath, "getExternalStorageDirectory");
std::string path_data = getAndroidPath(nativeActivity, app_global->activity->clazz, mt_getAbsPath,
"getFilesDir");
path_user = path_storage + DIR_DELIM + "Android/data/com.multicraft.game/files"; path_user = getAndroidPath(nullptr, obj, mt_getAbsPath,
path_share = path_data; "getExternalFilesDir", true);
path_locale = path_data + DIR_DELIM + "locale"; path_share = getAndroidPath(nativeActivity, obj, mt_getAbsPath,
path_cache = getAndroidPath(nativeActivity, "getFilesDir");
app_global->activity->clazz, mt_getAbsPath, "getCacheDir"); path_locale = path_share + DIR_DELIM + "locale";
path_cache = getAndroidPath(nativeActivity, obj, mt_getAbsPath,
"getCacheDir");
} }
void showInputDialog(const std::string &acceptButton, const std::string &hint, void showInputDialog(const std::string &acceptButton, const std::string &hint,