diff options
| author | Maksim <MoNTE48@mail.ua> | 2020-04-15 16:27:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 16:27:40 +0200 |
| commit | 62ae7adab2bebde04864c12543caefbffab24963 (patch) | |
| tree | 1cad2b08c94c2de26a39124f3b3dd0d513cbcc99 /src/porting_android.cpp | |
| parent | 8ae8c1600a66c724565ce7a70e0e5f542f12e38e (diff) | |
| download | minetest-62ae7adab2bebde04864c12543caefbffab24963.tar.gz minetest-62ae7adab2bebde04864c12543caefbffab24963.tar.bz2 minetest-62ae7adab2bebde04864c12543caefbffab24963.zip | |
Android: add Android Studio support, completely redone java part (#9066)
Diffstat (limited to 'src/porting_android.cpp')
| -rw-r--r-- | src/porting_android.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/porting_android.cpp b/src/porting_android.cpp index 7c74f7b5b..4130bdb6d 100644 --- a/src/porting_android.cpp +++ b/src/porting_android.cpp @@ -69,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_net_minetest_MtNativeActivity_putMessageBoxResult( + JNIEXPORT void JNICALL Java_net_minetest_minetest_GameActivity_putMessageBoxResult( JNIEnv * env, jclass thiz, jstring text) { - errorstream << "Java_net_minetest_MtNativeActivity_putMessageBoxResult got: " + errorstream << "Java_net_minetest_minetest_GameActivity_putMessageBoxResult got: " << std::string((const char*)env->GetStringChars(text,0)) << std::endl; } @@ -107,17 +107,6 @@ jclass findClass(std::string classname) 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; @@ -136,7 +125,7 @@ void initAndroid() exit(-1); } - nativeActivity = findClass("net/minetest/minetest/MtNativeActivity"); + nativeActivity = findClass("net/minetest/minetest/GameActivity"); if (nativeActivity == 0) { errorstream << "porting::initAndroid unable to find java native activity class" << |