Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-04 13:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android: porting_android.cpp refactoring (#9687)

Browse Source 
* Android: porting_android.cpp refactoring

* Replace assert to FATAL_ERROR_IF
This commit is contained in:
Maksim 2020-05-06 14:25:57 +02:00 committed by GitHub
parent e8e5d282da
commit 4f9a5f67ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/porting_android.cpp
View File

@ -47,8 +47,7 @@ void android_main(android_app *app)
Thread::setName("Main"); Thread::setName("Main");
try { try {
app_dummy(); char *argv[] = {strdup(PROJECT_NAME), nullptr};
char *argv[] = {strdup(PROJECT_NAME), NULL};
main(ARRLEN(argv) - 1, argv); main(ARRLEN(argv) - 1, argv);
free(argv[0]); free(argv[0]);
} catch (std::exception &e) { } catch (std::exception &e) {
@ -64,85 +63,73 @@ void android_main(android_app *app)
exit(retval); exit(retval);
} }
/* handler for finished message box input */ /**
/* Intentionally NOT in namespace porting */ * Handler for finished message box input
/* TODO this doesn't work as expected, no idea why but there's a workaround */ * Intentionally NOT in namespace porting
/* for it right now */ * ToDo: this doesn't work as expected, there's a workaround for it right now
*/
extern "C" { extern "C" {
JNIEXPORT void JNICALL Java_net_minetest_minetest_GameActivity_putMessageBoxResult( JNIEXPORT void JNICALL Java_net_minetest_minetest_GameActivity_putMessageBoxResult(
JNIEnv * env, jclass thiz, jstring text) JNIEnv *env, jclass thiz, jstring text)
{ {
errorstream << "Java_net_minetest_minetest_GameActivity_putMessageBoxResult got: " errorstream <<
<< std::string((const char*)env->GetStringChars(text,0)) "Java_net_minetest_minetest_GameActivity_putMessageBoxResult got: " <<
<< std::endl; std::string((const char*) env->GetStringChars(text, nullptr)) << std::endl;
} }
} }
namespace porting { namespace porting {
android_app *app_global;
std::string path_storage = DIR_DELIM "sdcard" DIR_DELIM; JNIEnv *jnienv;
android_app* app_global;
JNIEnv* jnienv;
jclass nativeActivity; jclass nativeActivity;
jclass findClass(std::string classname) jclass findClass(const std::string &classname)
{ {
if (jnienv == 0) { if (jnienv == nullptr)
return 0; return nullptr;
}
jclass nativeactivity = jnienv->FindClass("android/app/NativeActivity"); jclass nativeactivity = jnienv->FindClass("android/app/NativeActivity");
jmethodID getClassLoader = jmethodID getClassLoader = jnienv->GetMethodID(
jnienv->GetMethodID(nativeactivity,"getClassLoader", nativeactivity, "getClassLoader", "()Ljava/lang/ClassLoader;");
"()Ljava/lang/ClassLoader;"); jobject cls = jnienv->CallObjectMethod(
jobject cls = app_global->activity->clazz, getClassLoader);
jnienv->CallObjectMethod(app_global->activity->clazz, getClassLoader);
jclass classLoader = jnienv->FindClass("java/lang/ClassLoader"); jclass classLoader = jnienv->FindClass("java/lang/ClassLoader");
jmethodID findClass = jmethodID findClass = jnienv->GetMethodID(classLoader, "loadClass",
jnienv->GetMethodID(classLoader, "loadClass",
"(Ljava/lang/String;)Ljava/lang/Class;"); "(Ljava/lang/String;)Ljava/lang/Class;");
jstring strClassName = jstring strClassName = jnienv->NewStringUTF(classname.c_str());
jnienv->NewStringUTF(classname.c_str());
return (jclass) jnienv->CallObjectMethod(cls, findClass, strClassName); return (jclass) jnienv->CallObjectMethod(cls, findClass, strClassName);
} }
void initAndroid() void initAndroid()
{ {
porting::jnienv = NULL; porting::jnienv = nullptr;
JavaVM *jvm = app_global->activity->vm; JavaVM *jvm = app_global->activity->vm;
JavaVMAttachArgs lJavaVMAttachArgs; JavaVMAttachArgs lJavaVMAttachArgs;
lJavaVMAttachArgs.version = JNI_VERSION_1_6; lJavaVMAttachArgs.version = JNI_VERSION_1_6;
lJavaVMAttachArgs.name = PROJECT_NAME_C "NativeThread"; lJavaVMAttachArgs.name = PROJECT_NAME_C "NativeThread";
lJavaVMAttachArgs.group = NULL; lJavaVMAttachArgs.group = nullptr;
#ifdef NDEBUG
// This is a ugly hack as arm v7a non debuggable builds crash without this if (jvm->AttachCurrentThread(&porting::jnienv, &lJavaVMAttachArgs) == JNI_ERR) {
// printf ... if someone finds out why please fix it!
infostream << "Attaching native thread. " << std::endl;
#endif
if ( jvm->AttachCurrentThread(&porting::jnienv, &lJavaVMAttachArgs) == JNI_ERR) {
errorstream << "Failed to attach native thread to jvm" << std::endl; errorstream << "Failed to attach native thread to jvm" << std::endl;
exit(-1); exit(-1);
} }
nativeActivity = findClass("net/minetest/minetest/GameActivity"); nativeActivity = findClass("net/minetest/minetest/GameActivity");
if (nativeActivity == 0) { if (nativeActivity == nullptr)
errorstream << errorstream <<
"porting::initAndroid unable to find java native activity class" << "porting::initAndroid unable to find java native activity class" <<
std::endl; std::endl;
}
#ifdef GPROF #ifdef GPROF
/* in the start-up code */ // in the start-up code
__android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME_C, __android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME_C,
"Initializing GPROF profiler"); "Initializing GPROF profiler");
monstartup("libminetest.so"); monstartup("libMinetest.so");
#endif #endif
} }
void cleanupAndroid() void cleanupAndroid()
{ {
#ifdef GPROF #ifdef GPROF
errorstream << "Shutting down GPROF profiler" << std::endl; errorstream << "Shutting down GPROF profiler" << std::endl;
setenv("CPUPROFILE", (path_user + DIR_DELIM + "gmon.out").c_str(), 1); setenv("CPUPROFILE", (path_user + DIR_DELIM + "gmon.out").c_str(), 1);
@ -157,7 +144,7 @@ static std::string javaStringToUTF8(jstring js)
{ {
std::string str; std::string str;
// Get string as a UTF-8 c-string // Get string as a UTF-8 c-string
const char *c_str = jnienv->GetStringUTFChars(js, NULL); const char *c_str = jnienv->GetStringUTFChars(js, nullptr);
// Save it // Save it
str = c_str; str = c_str;
// And free the c-string // And free the c-string
@ -166,17 +153,15 @@ static std::string javaStringToUTF8(jstring js)
} }
// Calls static method if obj is NULL // Calls static method if obj is NULL
static std::string getAndroidPath(jclass cls, jobject obj, jclass cls_File, static std::string getAndroidPath(
jmethodID mt_getAbsPath, const char *getter) jclass cls, jobject obj, jmethodID mt_getAbsPath, const char *getter)
{ {
// Get getter method // Get getter method
jmethodID mt_getter; jmethodID mt_getter;
if (obj) if (obj)
mt_getter = jnienv->GetMethodID(cls, getter, mt_getter = jnienv->GetMethodID(cls, getter, "()Ljava/io/File;");
"()Ljava/io/File;");
else else
mt_getter = jnienv->GetStaticMethodID(cls, getter, mt_getter = jnienv->GetStaticMethodID(cls, getter, "()Ljava/io/File;");
"()Ljava/io/File;");
// Call getter // Call getter
jobject ob_file; jobject ob_file;
@ -186,8 +171,7 @@ static std::string getAndroidPath(jclass cls, jobject obj, jclass cls_File,
ob_file = jnienv->CallStaticObjectMethod(cls, mt_getter); ob_file = jnienv->CallStaticObjectMethod(cls, mt_getter);
// Call getAbsolutePath // Call getAbsolutePath
jstring js_path = (jstring) jnienv->CallObjectMethod(ob_file, auto js_path = (jstring) jnienv->CallObjectMethod(ob_file, mt_getAbsPath);
mt_getAbsPath);
return javaStringToUTF8(js_path); return javaStringToUTF8(js_path);
} }
@ -201,26 +185,24 @@ void initializePathsAndroid()
// 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");
path_cache = getAndroidPath(nativeActivity, app_global->activity->clazz,
cls_File, mt_getAbsPath, "getCacheDir");
path_storage = getAndroidPath(cls_Env, NULL, cls_File, mt_getAbsPath,
"getExternalStorageDirectory");
path_user = path_storage + DIR_DELIM + PROJECT_NAME_C; path_user = path_storage + DIR_DELIM + PROJECT_NAME_C;
path_share = path_storage + DIR_DELIM + PROJECT_NAME_C; path_share = path_storage + DIR_DELIM + PROJECT_NAME_C;
path_cache = getAndroidPath(nativeActivity,
app_global->activity->clazz, mt_getAbsPath, "getCacheDir");
migrateCachePath(); migrateCachePath();
} }
void showInputDialog(const std::string& acceptButton, const std::string& hint, void showInputDialog(const std::string &acceptButton, const std::string &hint,
const std::string& current, int editType) const std::string &current, int editType)
{ {
jmethodID showdialog = jnienv->GetMethodID(nativeActivity,"showDialog", jmethodID showdialog = jnienv->GetMethodID(nativeActivity, "showDialog",
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V"); "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V");
if (showdialog == 0) { FATAL_ERROR_IF(showdialog == nullptr,
assert("porting::showInputDialog unable to find java show dialog method" == 0); "porting::showInputDialog unable to find java show dialog method");
}
jstring jacceptButton = jnienv->NewStringUTF(acceptButton.c_str()); jstring jacceptButton = jnienv->NewStringUTF(acceptButton.c_str());
jstring jhint = jnienv->NewStringUTF(hint.c_str()); jstring jhint = jnienv->NewStringUTF(hint.c_str());
@ -236,9 +218,8 @@ int getInputDialogState()
jmethodID dialogstate = jnienv->GetMethodID(nativeActivity, jmethodID dialogstate = jnienv->GetMethodID(nativeActivity,
"getDialogState", "()I"); "getDialogState", "()I");
if (dialogstate == 0) { FATAL_ERROR_IF(dialogstate == nullptr,
assert("porting::getInputDialogState unable to find java dialog state method" == 0); "porting::getInputDialogState unable to find java dialog state method");
}
return jnienv->CallIntMethod(app_global->activity->clazz, dialogstate); return jnienv->CallIntMethod(app_global->activity->clazz, dialogstate);
} }
@ -248,14 +229,13 @@ std::string getInputDialogValue()
jmethodID dialogvalue = jnienv->GetMethodID(nativeActivity, jmethodID dialogvalue = jnienv->GetMethodID(nativeActivity,
"getDialogValue", "()Ljava/lang/String;"); "getDialogValue", "()Ljava/lang/String;");
if (dialogvalue == 0) { FATAL_ERROR_IF(dialogvalue == nullptr,
assert("porting::getInputDialogValue unable to find java dialog value method" == 0); "porting::getInputDialogValue unable to find java dialog value method");
}
jobject result = jnienv->CallObjectMethod(app_global->activity->clazz, jobject result = jnienv->CallObjectMethod(app_global->activity->clazz,
dialogvalue); dialogvalue);
const char* javachars = jnienv->GetStringUTFChars((jstring) result,0); const char *javachars = jnienv->GetStringUTFChars((jstring) result, nullptr);
std::string text(javachars); std::string text(javachars);
jnienv->ReleaseStringUTFChars((jstring) result, javachars); jnienv->ReleaseStringUTFChars((jstring) result, javachars);
@ -269,12 +249,11 @@ float getDisplayDensity()
static float value = 0; static float value = 0;
if (firstrun) { if (firstrun) {
jmethodID getDensity = jnienv->GetMethodID(nativeActivity, "getDensity", jmethodID getDensity = jnienv->GetMethodID(nativeActivity,
"()F"); "getDensity", "()F");
if (getDensity == 0) { FATAL_ERROR_IF(getDensity == nullptr,
assert("porting::getDisplayDensity unable to find java getDensity method" == 0); "porting::getDisplayDensity unable to find java getDensity method");
}
value = jnienv->CallFloatMethod(app_global->activity->clazz, getDensity); value = jnienv->CallFloatMethod(app_global->activity->clazz, getDensity);
firstrun = false; firstrun = false;
@ -291,9 +270,8 @@ v2u32 getDisplaySize()
jmethodID getDisplayWidth = jnienv->GetMethodID(nativeActivity, jmethodID getDisplayWidth = jnienv->GetMethodID(nativeActivity,
"getDisplayWidth", "()I"); "getDisplayWidth", "()I");
if (getDisplayWidth == 0) { FATAL_ERROR_IF(getDisplayWidth == nullptr,
assert("porting::getDisplayWidth unable to find java getDisplayWidth method" == 0); "porting::getDisplayWidth unable to find java getDisplayWidth method");
}
retval.X = jnienv->CallIntMethod(app_global->activity->clazz, retval.X = jnienv->CallIntMethod(app_global->activity->clazz,
getDisplayWidth); getDisplayWidth);
@ -301,9 +279,8 @@ v2u32 getDisplaySize()
jmethodID getDisplayHeight = jnienv->GetMethodID(nativeActivity, jmethodID getDisplayHeight = jnienv->GetMethodID(nativeActivity,
"getDisplayHeight", "()I"); "getDisplayHeight", "()I");
if (getDisplayHeight == 0) { FATAL_ERROR_IF(getDisplayHeight == nullptr,
assert("porting::getDisplayHeight unable to find java getDisplayHeight method" == 0); "porting::getDisplayHeight unable to find java getDisplayHeight method");
}
retval.Y = jnienv->CallIntMethod(app_global->activity->clazz, retval.Y = jnienv->CallIntMethod(app_global->activity->clazz,
getDisplayHeight); getDisplayHeight);

14
src/porting_android.h
View File

@ -30,16 +30,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <string> #include <string>
namespace porting { namespace porting {
/** java app **/ // java app
extern android_app *app_global; extern android_app *app_global;
/** java <-> c++ interaction interface **/ // java <-> c++ interaction interface
extern JNIEnv *jnienv; extern JNIEnv *jnienv;
/** // do initialization required on android only
* do initialization required on android only
*/
void initAndroid(); void initAndroid();
void cleanupAndroid(); void cleanupAndroid();
/** /**
@ -56,8 +55,8 @@ void initializePathsAndroid();
* @param editType type of texfield * @param editType type of texfield
* (1==multiline text input; 2==single line text input; 3=password field) * (1==multiline text input; 2==single line text input; 3=password field)
*/ */
void showInputDialog(const std::string& acceptButton, void showInputDialog(const std::string &acceptButton,
const std::string& hint, const std::string& current, int editType); const std::string &hint, const std::string &current, int editType);
/** /**
* WORKAROUND for not working callbacks from java -> c++ * WORKAROUND for not working callbacks from java -> c++
@ -75,5 +74,4 @@ std::string getInputDialogValue();
float getDisplayDensity(); float getDisplayDensity();
v2u32 getDisplaySize(); v2u32 getDisplaySize();
#endif #endif
} }