Put ChatEvent handler into own function

[dragonfireclient.git] / src / porting_android.cpp

diff --git a/src/porting_android.cpp b/src/porting_android.cpp
index 96c9385a683960b49aba8203c0d2397f009530b7..c7e28cc9a1e57a686e666f64e86bfb1cd2dd8446 100644 (file)
--- a/src/porting_android.cpp
+++ b/src/porting_android.cpp
@@ -21,12 +21,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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 <stdlib.h>
 
 #ifdef GPROF
 #include "prof.h"
@@ -39,30 +44,23 @@ void android_main(android_app *app)
        int retval = 0;
        porting::app_global = app;
 
-       porting::setThreadName("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), NULL};
+               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,
-                               "Some exception occured");
+       } catch (...) {
                errorstream << "Uncaught exception in main thread!" << std::endl;
                retval = -1;
        }
 
        porting::cleanupAndroid();
-       errorstream << "Shutting down minetest." << std::endl;
+       infostream << "Shutting down." << std::endl;
        exit(retval);
 }
 
@@ -71,10 +69,10 @@ void android_main(android_app *app)
 /* TODO this doesn't work as expected, no idea why but there's a workaround   */
 /* for it right now */
 extern "C" {
-       JNIEXPORT void JNICALL Java_org_minetest_MtNativeActivity_putMessageBoxResult(
+       JNIEXPORT void JNICALL Java_net_minetest_MtNativeActivity_putMessageBoxResult(
                        JNIEnv * env, jclass thiz, jstring text)
        {
-               errorstream << "Java_org_minetest_MtNativeActivity_putMessageBoxResult got: "
+               errorstream << "Java_net_minetest_MtNativeActivity_putMessageBoxResult got: "
                                << std::string((const char*)env->GetStringChars(text,0))
                                << std::endl;
        }
@@ -126,7 +124,7 @@ void initAndroid()
        JavaVM *jvm = app_global->activity->vm;
        JavaVMAttachArgs lJavaVMAttachArgs;
        lJavaVMAttachArgs.version = JNI_VERSION_1_6;
-       lJavaVMAttachArgs.name = "MinetestNativeThread";
+       lJavaVMAttachArgs.name = PROJECT_NAME_C "NativeThread";
        lJavaVMAttachArgs.group = NULL;
 #ifdef NDEBUG
        // This is a ugly hack as arm v7a non debuggable builds crash without this
@@ -138,7 +136,7 @@ void initAndroid()
                exit(-1);
        }
 
-       nativeActivity = findClass("org/minetest/minetest/MtNativeActivity");
+       nativeActivity = findClass("net/minetest/minetest/MtNativeActivity");
        if (nativeActivity == 0) {
                errorstream <<
                        "porting::initAndroid unable to find java native activity class" <<
@@ -147,7 +145,7 @@ void initAndroid()
 
 #ifdef GPROF
        /* in the start-up code */
-       __android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME,
+       __android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME_C,
                        "Initializing GPROF profiler");
        monstartup("libminetest.so");
 #endif
@@ -187,8 +185,8 @@ void setExternalStorageDir(JNIEnv* lJNIEnv)
        lJNIEnv->ReleaseStringUTFChars(StringPath, externalPath);
 
        path_storage             = userPath;
-       path_user                = userPath + DIR_DELIM + PROJECT_NAME;
-       path_share               = userPath + DIR_DELIM + PROJECT_NAME;
+       path_user                = userPath + DIR_DELIM + PROJECT_NAME_C;
+       path_share               = userPath + DIR_DELIM + PROJECT_NAME_C;
 }
 
 void showInputDialog(const std::string& acceptButton, const  std::string& hint,
@@ -241,7 +239,7 @@ std::string getInputDialogValue()
        return text;
 }
 
-#if not defined(SERVER)
+#ifndef SERVER
 float getDisplayDensity()
 {
        static bool firstrun = true;
@@ -291,5 +289,5 @@ v2u32 getDisplaySize()
        }
        return retval;
 }
-#endif //SERVER
+#endif // ndef SERVER
 }