#error This file may only be compiled for android!
#endif
+#include "util/numeric.h"
#include "porting.h"
#include "porting_android.h"
#include "threading/thread.h"
#include "config.h"
#include "filesys.h"
#include "log.h"
+
#include <sstream>
+#include <exception>
+#include <cstdlib>
#ifdef GPROF
#include "prof.h"
int retval = 0;
porting::app_global = app;
- Thread::setName("MainThread");
+ Thread::setName("Main");
try {
- app_dummy();
- char *argv[] = {(char*) "minetest"};
- main(sizeof(argv) / sizeof(argv[0]), argv);
- } catch (BaseException &e) {
- std::stringstream msg;
- msg << "Exception handled by main: " << e.what();
- const char *message = msg.str().c_str();
- __android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME, "%s", message);
- errorstream << msg << std::endl;
+ char *argv[] = {strdup(PROJECT_NAME), nullptr};
+ main(ARRLEN(argv) - 1, argv);
+ free(argv[0]);
+ } catch (std::exception &e) {
+ errorstream << "Uncaught exception in main thread: " << e.what() << std::endl;
retval = -1;
} catch (...) {
- __android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME,
- "An unknown exception occured!");
errorstream << "Uncaught exception in main thread!" << std::endl;
retval = -1;
}
porting::cleanupAndroid();
- errorstream << "Shutting down." << std::endl;
+ infostream << "Shutting down." << std::endl;
exit(retval);
}
-/* handler for finished message box input */
-/* Intentionally NOT in namespace porting */
-/* TODO this doesn't work as expected, no idea why but there's a workaround */
-/* for it right now */
+/**
+ * Handler for finished message box input
+ * Intentionally NOT in namespace porting
+ * ToDo: this doesn't work as expected, there's a workaround for it right now
+ */
extern "C" {
- JNIEXPORT void JNICALL Java_net_minetest_MtNativeActivity_putMessageBoxResult(
- JNIEnv * env, jclass thiz, jstring text)
+ JNIEXPORT void JNICALL Java_net_minetest_minetest_GameActivity_putMessageBoxResult(
+ JNIEnv *env, jclass thiz, jstring text)
{
- errorstream << "Java_net_minetest_MtNativeActivity_putMessageBoxResult got: "
- << std::string((const char*)env->GetStringChars(text,0))
- << std::endl;
+ errorstream <<
+ "Java_net_minetest_minetest_GameActivity_putMessageBoxResult got: " <<
+ std::string((const char*) env->GetStringChars(text, nullptr)) << std::endl;
}
}
namespace porting {
-
-std::string path_storage = DIR_DELIM "sdcard" DIR_DELIM;
-
-android_app* app_global;
-JNIEnv* jnienv;
+android_app *app_global;
+JNIEnv *jnienv;
jclass nativeActivity;
-jclass findClass(std::string classname)
+jclass findClass(const std::string &classname)
{
- if (jnienv == 0) {
- return 0;
- }
+ if (jnienv == nullptr)
+ return nullptr;
jclass nativeactivity = jnienv->FindClass("android/app/NativeActivity");
- jmethodID getClassLoader =
- jnienv->GetMethodID(nativeactivity,"getClassLoader",
- "()Ljava/lang/ClassLoader;");
- jobject cls =
- jnienv->CallObjectMethod(app_global->activity->clazz, getClassLoader);
+ jmethodID getClassLoader = jnienv->GetMethodID(
+ nativeactivity, "getClassLoader", "()Ljava/lang/ClassLoader;");
+ jobject cls = jnienv->CallObjectMethod(
+ app_global->activity->clazz, getClassLoader);
jclass classLoader = jnienv->FindClass("java/lang/ClassLoader");
- jmethodID findClass =
- jnienv->GetMethodID(classLoader, "loadClass",
+ jmethodID findClass = jnienv->GetMethodID(classLoader, "loadClass",
"(Ljava/lang/String;)Ljava/lang/Class;");
- jstring strClassName =
- jnienv->NewStringUTF(classname.c_str());
+ jstring strClassName = jnienv->NewStringUTF(classname.c_str());
return (jclass) jnienv->CallObjectMethod(cls, findClass, strClassName);
}
-void copyAssets()
-{
- jmethodID assetcopy = jnienv->GetMethodID(nativeActivity,"copyAssets","()V");
-
- if (assetcopy == 0) {
- assert("porting::copyAssets unable to find copy assets method" == 0);
- }
-
- jnienv->CallVoidMethod(app_global->activity->clazz, assetcopy);
-}
-
void initAndroid()
{
- porting::jnienv = NULL;
+ porting::jnienv = nullptr;
JavaVM *jvm = app_global->activity->vm;
JavaVMAttachArgs lJavaVMAttachArgs;
lJavaVMAttachArgs.version = JNI_VERSION_1_6;
- lJavaVMAttachArgs.name = "MinetestNativeThread";
- lJavaVMAttachArgs.group = NULL;
-#ifdef NDEBUG
- // This is a ugly hack as arm v7a non debuggable builds crash without this
- // printf ... if someone finds out why please fix it!
- infostream << "Attaching native thread. " << std::endl;
-#endif
- if ( jvm->AttachCurrentThread(&porting::jnienv, &lJavaVMAttachArgs) == JNI_ERR) {
+ lJavaVMAttachArgs.name = PROJECT_NAME_C "NativeThread";
+ lJavaVMAttachArgs.group = nullptr;
+
+ if (jvm->AttachCurrentThread(&porting::jnienv, &lJavaVMAttachArgs) == JNI_ERR) {
errorstream << "Failed to attach native thread to jvm" << std::endl;
exit(-1);
}
- nativeActivity = findClass("net/minetest/minetest/MtNativeActivity");
- if (nativeActivity == 0) {
+ nativeActivity = findClass("net/minetest/minetest/GameActivity");
+ if (nativeActivity == nullptr)
errorstream <<
"porting::initAndroid unable to find java native activity class" <<
std::endl;
- }
#ifdef GPROF
- /* in the start-up code */
- __android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME,
+ // in the start-up code
+ __android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME_C,
"Initializing GPROF profiler");
- monstartup("libminetest.so");
+ monstartup("libMinetest.so");
#endif
}
void cleanupAndroid()
{
-
#ifdef GPROF
errorstream << "Shutting down GPROF profiler" << std::endl;
setenv("CPUPROFILE", (path_user + DIR_DELIM + "gmon.out").c_str(), 1);
jvm->DetachCurrentThread();
}
-void setExternalStorageDir(JNIEnv* lJNIEnv)
+static std::string javaStringToUTF8(jstring js)
{
- // Android: Retrieve ablsolute path to external storage device (sdcard)
- jclass ClassEnv = lJNIEnv->FindClass("android/os/Environment");
- jmethodID MethodDir =
- lJNIEnv->GetStaticMethodID(ClassEnv,
- "getExternalStorageDirectory","()Ljava/io/File;");
- jobject ObjectFile = lJNIEnv->CallStaticObjectMethod(ClassEnv, MethodDir);
- jclass ClassFile = lJNIEnv->FindClass("java/io/File");
-
- jmethodID MethodPath =
- lJNIEnv->GetMethodID(ClassFile, "getAbsolutePath",
- "()Ljava/lang/String;");
- jstring StringPath =
- (jstring) lJNIEnv->CallObjectMethod(ObjectFile, MethodPath);
-
- const char *externalPath = lJNIEnv->GetStringUTFChars(StringPath, NULL);
- std::string userPath(externalPath);
- lJNIEnv->ReleaseStringUTFChars(StringPath, externalPath);
-
- path_storage = userPath;
- path_user = userPath + DIR_DELIM + PROJECT_NAME;
- path_share = userPath + DIR_DELIM + PROJECT_NAME;
+ std::string str;
+ // Get string as a UTF-8 c-string
+ const char *c_str = jnienv->GetStringUTFChars(js, nullptr);
+ // Save it
+ str = c_str;
+ // And free the c-string
+ jnienv->ReleaseStringUTFChars(js, c_str);
+ return str;
}
-void showInputDialog(const std::string& acceptButton, const std::string& hint,
- const std::string& current, int editType)
+// Calls static method if obj is NULL
+static std::string getAndroidPath(
+ jclass cls, jobject obj, jmethodID mt_getAbsPath, const char *getter)
{
- jmethodID showdialog = jnienv->GetMethodID(nativeActivity,"showDialog",
+ // 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
+ jobject ob_file;
+ if (obj)
+ ob_file = jnienv->CallObjectMethod(obj, mt_getter);
+ else
+ ob_file = jnienv->CallStaticObjectMethod(cls, mt_getter);
+
+ // Call getAbsolutePath
+ auto js_path = (jstring) jnienv->CallObjectMethod(ob_file, mt_getAbsPath);
+
+ return javaStringToUTF8(js_path);
+}
+
+void initializePathsAndroid()
+{
+ // Get Environment class
+ jclass cls_Env = jnienv->FindClass("android/os/Environment");
+ // Get File class
+ jclass cls_File = jnienv->FindClass("java/io/File");
+ // Get getAbsolutePath method
+ jmethodID mt_getAbsPath = jnienv->GetMethodID(cls_File,
+ "getAbsolutePath", "()Ljava/lang/String;");
+ std::string path_storage = getAndroidPath(cls_Env, nullptr,
+ mt_getAbsPath, "getExternalStorageDirectory");
+
+ path_user = 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();
+}
+
+void showInputDialog(const std::string &acceptButton, const std::string &hint,
+ const std::string ¤t, int editType)
+{
+ jmethodID showdialog = jnienv->GetMethodID(nativeActivity, "showDialog",
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V");
- if (showdialog == 0) {
- assert("porting::showInputDialog unable to find java show dialog method" == 0);
- }
+ FATAL_ERROR_IF(showdialog == nullptr,
+ "porting::showInputDialog unable to find java show dialog method");
jstring jacceptButton = jnienv->NewStringUTF(acceptButton.c_str());
jstring jhint = jnienv->NewStringUTF(hint.c_str());
jacceptButton, jhint, jcurrent, jeditType);
}
+void openURLAndroid(const std::string &url)
+{
+ jmethodID url_open = jnienv->GetMethodID(nativeActivity, "openURL",
+ "(Ljava/lang/String;)V");
+
+ FATAL_ERROR_IF(url_open == nullptr,
+ "porting::openURLAndroid unable to find java openURL method");
+
+ jstring jurl = jnienv->NewStringUTF(url.c_str());
+ jnienv->CallVoidMethod(app_global->activity->clazz, url_open, jurl);
+}
+
int getInputDialogState()
{
jmethodID dialogstate = jnienv->GetMethodID(nativeActivity,
"getDialogState", "()I");
- if (dialogstate == 0) {
- assert("porting::getInputDialogState unable to find java dialog state method" == 0);
- }
+ FATAL_ERROR_IF(dialogstate == nullptr,
+ "porting::getInputDialogState unable to find java dialog state method");
return jnienv->CallIntMethod(app_global->activity->clazz, dialogstate);
}
jmethodID dialogvalue = jnienv->GetMethodID(nativeActivity,
"getDialogValue", "()Ljava/lang/String;");
- if (dialogvalue == 0) {
- assert("porting::getInputDialogValue unable to find java dialog value method" == 0);
- }
+ FATAL_ERROR_IF(dialogvalue == nullptr,
+ "porting::getInputDialogValue unable to find java dialog value method");
jobject result = jnienv->CallObjectMethod(app_global->activity->clazz,
dialogvalue);
- const char* javachars = jnienv->GetStringUTFChars((jstring) result,0);
+ const char *javachars = jnienv->GetStringUTFChars((jstring) result, nullptr);
std::string text(javachars);
jnienv->ReleaseStringUTFChars((jstring) result, javachars);
return text;
}
-#if not defined(SERVER)
+#ifndef SERVER
float getDisplayDensity()
{
static bool firstrun = true;
static float value = 0;
if (firstrun) {
- jmethodID getDensity = jnienv->GetMethodID(nativeActivity, "getDensity",
- "()F");
+ jmethodID getDensity = jnienv->GetMethodID(nativeActivity,
+ "getDensity", "()F");
- if (getDensity == 0) {
- assert("porting::getDisplayDensity unable to find java getDensity method" == 0);
- }
+ FATAL_ERROR_IF(getDensity == nullptr,
+ "porting::getDisplayDensity unable to find java getDensity method");
value = jnienv->CallFloatMethod(app_global->activity->clazz, getDensity);
firstrun = false;
jmethodID getDisplayWidth = jnienv->GetMethodID(nativeActivity,
"getDisplayWidth", "()I");
- if (getDisplayWidth == 0) {
- assert("porting::getDisplayWidth unable to find java getDisplayWidth method" == 0);
- }
+ FATAL_ERROR_IF(getDisplayWidth == nullptr,
+ "porting::getDisplayWidth unable to find java getDisplayWidth method");
retval.X = jnienv->CallIntMethod(app_global->activity->clazz,
getDisplayWidth);
jmethodID getDisplayHeight = jnienv->GetMethodID(nativeActivity,
"getDisplayHeight", "()I");
- if (getDisplayHeight == 0) {
- assert("porting::getDisplayHeight unable to find java getDisplayHeight method" == 0);
- }
+ FATAL_ERROR_IF(getDisplayHeight == nullptr,
+ "porting::getDisplayHeight unable to find java getDisplayHeight method");
retval.Y = jnienv->CallIntMethod(app_global->activity->clazz,
getDisplayHeight);
}
return retval;
}
-#endif //SERVER
+#endif // ndef SERVER
}
projects / oweals / minetest.git / blobdiff