Setup Godot to support the Oculus Mobile SDK.

3 files changed, 36 insertions, 9 deletions

diff --git a/modules/gdnative/android/android_gdn.cpp b/modules/gdnative/android/android_gdn.cpp
index 8657935602..624ef19dec 100644
--- a/modules/gdnative/android/android_gdn.cpp
+++ b/modules/gdnative/android/android_gdn.cpp
@@ -34,6 +34,8 @@
 // These entry points are only for the android platform and are simple stubs in all others.
 
 #ifdef __ANDROID__
+#include "platform/android/java_godot_wrapper.h"
+#include "platform/android/os_android.h"
 #include "platform/android/thread_jandroid.h"
 #else
 #define JNIEnv void
@@ -54,20 +56,31 @@ JNIEnv *GDAPI godot_android_get_env() {
 
 jobject GDAPI godot_android_get_activity() {
 #ifdef __ANDROID__
-	JNIEnv *env = ThreadAndroid::get_env();
-
-	jclass activityThread = env->FindClass("android/app/ActivityThread");
-	jmethodID currentActivityThread = env->GetStaticMethodID(activityThread, "currentActivityThread", "()Landroid/app/ActivityThread;");
-	jobject at = env->CallStaticObjectMethod(activityThread, currentActivityThread);
-	jmethodID getApplication = env->GetMethodID(activityThread, "getApplication", "()Landroid/app/Application;");
-	jobject context = env->CallObjectMethod(at, getApplication);
+	OS_Android *os_android = (OS_Android *)OS::get_singleton();
+	return os_android->get_godot_java()->get_activity();
+#else
+	return NULL;
+#endif
+}
 
-	return env->NewGlobalRef(context);
+jobject GDAPI godot_android_get_surface() {
+#ifdef __ANDROID__
+	OS_Android *os_android = (OS_Android *)OS::get_singleton();
+	return os_android->get_godot_java()->get_surface();
 #else
 	return NULL;
 #endif
 }
 
+bool GDAPI godot_android_is_activity_resumed() {
+#ifdef __ANDROID__
+	OS_Android *os_android = (OS_Android *)OS::get_singleton();
+	return os_android->get_godot_java()->is_activity_resumed();
+#else
+	return false;
+#endif
+}
+
 #ifdef __cplusplus
 }
 #endif
\ No newline at end of file
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
index 8afe988102..9f3c5752fd 100644
--- a/modules/gdnative/gdnative_api.json
+++ b/modules/gdnative/gdnative_api.json
@@ -6286,7 +6286,7 @@
       "type": "ANDROID",
       "version": {
         "major": 1,
-        "minor": 0
+        "minor": 1
       },
       "next": null,
       "api": [
@@ -6301,6 +6301,18 @@
           "return_type": "jobject",
           "arguments": [
           ]
+        },
+        {
+          "name": "godot_android_get_surface",
+          "return_type": "jobject",
+          "arguments": [
+          ]
+        },
+        {
+          "name": "godot_android_is_activity_resumed",
+          "return_type": "bool",
+          "arguments": [
+          ]
         }
       ]
     },
diff --git a/modules/gdnative/include/android/godot_android.h b/modules/gdnative/include/android/godot_android.h
index 32e86838be..7063e1d2c5 100644
--- a/modules/gdnative/include/android/godot_android.h
+++ b/modules/gdnative/include/android/godot_android.h
@@ -46,6 +46,8 @@ extern "C" {
 
 JNIEnv *GDAPI godot_android_get_env();
 jobject GDAPI godot_android_get_activity();
+jobject GDAPI godot_android_get_surface();
+bool GDAPI godot_android_is_activity_resumed();
 
 #ifdef __cplusplus
 }