1 files changed, 47 insertions, 38 deletions

diff --git a/platform/android/java_godot_wrapper.cpp b/platform/android/java_godot_wrapper.cpp
index 2a540bb4a9..cff591d903 100644
--- a/platform/android/java_godot_wrapper.cpp
+++ b/platform/android/java_godot_wrapper.cpp
@@ -37,36 +37,47 @@
 
 // TODO we could probably create a base class for this...
 
-GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_godot_instance) {
+GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_activity, jobject p_godot_instance) {
 	godot_instance = p_env->NewGlobalRef(p_godot_instance);
+	activity = p_env->NewGlobalRef(p_activity);
 
 	// get info about our Godot class so we can get pointers and stuff...
-	cls = p_env->FindClass("org/godotengine/godot/Godot");
-	if (cls) {
-		cls = (jclass)p_env->NewGlobalRef(cls);
+	godot_class = p_env->FindClass("org/godotengine/godot/Godot");
+	if (godot_class) {
+		godot_class = (jclass)p_env->NewGlobalRef(godot_class);
+	} else {
+		// this is a pretty serious fail.. bail... pointers will stay 0
+		return;
+	}
+	activity_class = p_env->FindClass("android/app/Activity");
+	if (activity_class) {
+		activity_class = (jclass)p_env->NewGlobalRef(activity_class);
 	} else {
 		// this is a pretty serious fail.. bail... pointers will stay 0
 		return;
 	}
 
-	// get some method pointers...
-	_on_video_init = p_env->GetMethodID(cls, "onVideoInit", "()V");
-	_restart = p_env->GetMethodID(cls, "restart", "()V");
-	_finish = p_env->GetMethodID(cls, "forceQuit", "()V");
-	_set_keep_screen_on = p_env->GetMethodID(cls, "setKeepScreenOn", "(Z)V");
-	_alert = p_env->GetMethodID(cls, "alert", "(Ljava/lang/String;Ljava/lang/String;)V");
-	_get_GLES_version_code = p_env->GetMethodID(cls, "getGLESVersionCode", "()I");
-	_get_clipboard = p_env->GetMethodID(cls, "getClipboard", "()Ljava/lang/String;");
-	_set_clipboard = p_env->GetMethodID(cls, "setClipboard", "(Ljava/lang/String;)V");
-	_request_permission = p_env->GetMethodID(cls, "requestPermission", "(Ljava/lang/String;)Z");
-	_request_permissions = p_env->GetMethodID(cls, "requestPermissions", "()Z");
-	_get_granted_permissions = p_env->GetMethodID(cls, "getGrantedPermissions", "()[Ljava/lang/String;");
-	_init_input_devices = p_env->GetMethodID(cls, "initInputDevices", "()V");
-	_get_surface = p_env->GetMethodID(cls, "getSurface", "()Landroid/view/Surface;");
-	_is_activity_resumed = p_env->GetMethodID(cls, "isActivityResumed", "()Z");
-	_vibrate = p_env->GetMethodID(cls, "vibrate", "(I)V");
-	_get_input_fallback_mapping = p_env->GetMethodID(cls, "getInputFallbackMapping", "()Ljava/lang/String;");
-	_on_godot_main_loop_started = p_env->GetMethodID(cls, "onGodotMainLoopStarted", "()V");
+	// get some Godot method pointers...
+	_on_video_init = p_env->GetMethodID(godot_class, "onVideoInit", "()V");
+	_restart = p_env->GetMethodID(godot_class, "restart", "()V");
+	_finish = p_env->GetMethodID(godot_class, "forceQuit", "()V");
+	_set_keep_screen_on = p_env->GetMethodID(godot_class, "setKeepScreenOn", "(Z)V");
+	_alert = p_env->GetMethodID(godot_class, "alert", "(Ljava/lang/String;Ljava/lang/String;)V");
+	_get_GLES_version_code = p_env->GetMethodID(godot_class, "getGLESVersionCode", "()I");
+	_get_clipboard = p_env->GetMethodID(godot_class, "getClipboard", "()Ljava/lang/String;");
+	_set_clipboard = p_env->GetMethodID(godot_class, "setClipboard", "(Ljava/lang/String;)V");
+	_request_permission = p_env->GetMethodID(godot_class, "requestPermission", "(Ljava/lang/String;)Z");
+	_request_permissions = p_env->GetMethodID(godot_class, "requestPermissions", "()Z");
+	_get_granted_permissions = p_env->GetMethodID(godot_class, "getGrantedPermissions", "()[Ljava/lang/String;");
+	_init_input_devices = p_env->GetMethodID(godot_class, "initInputDevices", "()V");
+	_get_surface = p_env->GetMethodID(godot_class, "getSurface", "()Landroid/view/Surface;");
+	_is_activity_resumed = p_env->GetMethodID(godot_class, "isActivityResumed", "()Z");
+	_vibrate = p_env->GetMethodID(godot_class, "vibrate", "(I)V");
+	_get_input_fallback_mapping = p_env->GetMethodID(godot_class, "getInputFallbackMapping", "()Ljava/lang/String;");
+	_on_godot_main_loop_started = p_env->GetMethodID(godot_class, "onGodotMainLoopStarted", "()V");
+
+	// get some Activity method pointers...
+	_get_class_loader = p_env->GetMethodID(activity_class, "getClassLoader", "()Ljava/lang/ClassLoader;");
 }
 
 GodotJavaWrapper::~GodotJavaWrapper() {
@@ -74,35 +85,33 @@ GodotJavaWrapper::~GodotJavaWrapper() {
 }
 
 jobject GodotJavaWrapper::get_activity() {
-	// our godot instance is our activity
-	return godot_instance;
+	return activity;
 }
 
 jobject GodotJavaWrapper::get_member_object(const char *p_name, const char *p_class, JNIEnv *p_env) {
-	if (cls) {
-		if (p_env == NULL)
+	if (godot_class) {
+		if (p_env == nullptr)
 			p_env = ThreadAndroid::get_env();
 
-		jfieldID fid = p_env->GetStaticFieldID(cls, p_name, p_class);
-		return p_env->GetStaticObjectField(cls, fid);
+		jfieldID fid = p_env->GetStaticFieldID(godot_class, p_name, p_class);
+		return p_env->GetStaticObjectField(godot_class, fid);
 	} else {
-		return NULL;
+		return nullptr;
 	}
 }
 
 jobject GodotJavaWrapper::get_class_loader() {
-	if (cls) {
+	if (_get_class_loader) {
 		JNIEnv *env = ThreadAndroid::get_env();
-		jmethodID getClassLoader = env->GetMethodID(cls, "getClassLoader", "()Ljava/lang/ClassLoader;");
-		return env->CallObjectMethod(godot_instance, getClassLoader);
+		return env->CallObjectMethod(godot_instance, _get_class_loader);
 	} else {
-		return NULL;
+		return nullptr;
 	}
 }
 
 void GodotJavaWrapper::on_video_init(JNIEnv *p_env) {
 	if (_on_video_init)
-		if (p_env == NULL)
+		if (p_env == nullptr)
 			p_env = ThreadAndroid::get_env();
 
 	p_env->CallVoidMethod(godot_instance, _on_video_init);
@@ -110,7 +119,7 @@ void GodotJavaWrapper::on_video_init(JNIEnv *p_env) {
 
 void GodotJavaWrapper::on_godot_main_loop_started(JNIEnv *p_env) {
 	if (_on_godot_main_loop_started) {
-		if (p_env == NULL) {
+		if (p_env == nullptr) {
 			p_env = ThreadAndroid::get_env();
 		}
 	}
@@ -119,7 +128,7 @@ void GodotJavaWrapper::on_godot_main_loop_started(JNIEnv *p_env) {
 
 void GodotJavaWrapper::restart(JNIEnv *p_env) {
 	if (_restart)
-		if (p_env == NULL)
+		if (p_env == nullptr)
 			p_env = ThreadAndroid::get_env();
 
 	p_env->CallVoidMethod(godot_instance, _restart);
@@ -127,7 +136,7 @@ void GodotJavaWrapper::restart(JNIEnv *p_env) {
 
 void GodotJavaWrapper::force_quit(JNIEnv *p_env) {
 	if (_finish)
-		if (p_env == NULL)
+		if (p_env == nullptr)
 			p_env = ThreadAndroid::get_env();
 
 	p_env->CallVoidMethod(godot_instance, _finish);
@@ -244,7 +253,7 @@ jobject GodotJavaWrapper::get_surface() {
 		JNIEnv *env = ThreadAndroid::get_env();
 		return env->CallObjectMethod(godot_instance, _get_surface);
 	} else {
-		return NULL;
+		return nullptr;
 	}
 }