1 files changed, 10 insertions, 54 deletions

diff --git a/platform/android/os_android.h b/platform/android/os_android.h
index 44c5a206d4..d2198b0579 100644
--- a/platform/android/os_android.h
+++ b/platform/android/os_android.h
@@ -41,29 +41,8 @@
 #include "servers/audio_server.h"
 #include "servers/visual/rasterizer.h"
 
-typedef void (*GFXInitFunc)(void *ud, bool gl2);
-typedef int (*OpenURIFunc)(const String &);
-typedef String (*GetUserDataDirFunc)();
-typedef String (*GetLocaleFunc)();
-typedef void (*SetClipboardFunc)(const String &);
-typedef String (*GetClipboardFunc)();
-typedef String (*GetModelFunc)();
-typedef int (*GetScreenDPIFunc)();
-typedef String (*GetUniqueIDFunc)();
-typedef void (*ShowVirtualKeyboardFunc)(const String &);
-typedef void (*HideVirtualKeyboardFunc)();
-typedef void (*SetScreenOrientationFunc)(int);
-typedef String (*GetSystemDirFunc)(int);
-typedef int (*GetGLVersionCodeFunc)();
-
-typedef void (*VideoPlayFunc)(const String &);
-typedef bool (*VideoIsPlayingFunc)();
-typedef void (*VideoPauseFunc)();
-typedef void (*VideoStopFunc)();
-typedef void (*SetKeepScreenOnFunc)(bool p_enabled);
-typedef void (*AlertFunc)(const String &, const String &);
-typedef int (*VirtualKeyboardHeightFunc)();
-typedef bool (*RequestPermissionFunc)(const String &);
+class GodotJavaWrapper;
+class GodotIOJavaWrapper;
 
 class OS_Android : public OS_Unix {
 public:
@@ -91,9 +70,6 @@ public:
 private:
 	Vector<TouchPos> touch;
 
-	GFXInitFunc gfx_init_func;
-	void *gfx_init_ud;
-
 	bool use_gl2;
 	bool use_apk_expansion;
 
@@ -112,30 +88,11 @@ private:
 	VideoMode default_videomode;
 	MainLoop *main_loop;
 
-	OpenURIFunc open_uri_func;
-	GetUserDataDirFunc get_user_data_dir_func;
-	GetLocaleFunc get_locale_func;
-	SetClipboardFunc set_clipboard_func;
-	GetClipboardFunc get_clipboard_func;
-	GetModelFunc get_model_func;
-	GetScreenDPIFunc get_screen_dpi_func;
-	ShowVirtualKeyboardFunc show_virtual_keyboard_func;
-	HideVirtualKeyboardFunc hide_virtual_keyboard_func;
-	VirtualKeyboardHeightFunc get_virtual_keyboard_height_func;
-	SetScreenOrientationFunc set_screen_orientation_func;
-	GetUniqueIDFunc get_unique_id_func;
-	GetSystemDirFunc get_system_dir_func;
-	GetGLVersionCodeFunc get_gl_version_code_func;
-
-	VideoPlayFunc video_play_func;
-	VideoIsPlayingFunc video_is_playing_func;
-	VideoPauseFunc video_pause_func;
-	VideoStopFunc video_stop_func;
-	SetKeepScreenOnFunc set_keep_screen_on_func;
-	AlertFunc alert_func;
-	RequestPermissionFunc request_permission_func;
-
-	//PowerAndroid *power_manager;
+	GodotJavaWrapper *godot_java;
+	GodotIOJavaWrapper *godot_io_java;
+
+	//PowerAndroid *power_manager_func;
+
 	int video_driver_index;
 
 public:
@@ -159,6 +116,8 @@ public:
 	typedef int64_t ProcessID;
 
 	static OS *get_singleton();
+	GodotJavaWrapper *get_godot_java();
+	GodotIOJavaWrapper *get_godot_io_java();
 
 	virtual void alert(const String &p_alert, const String &p_title = "ALERT!");
 	virtual bool request_permission(const String &p_name);
@@ -185,9 +144,6 @@ public:
 
 	virtual bool can_draw() const;
 
-	virtual void set_cursor_shape(CursorShape p_shape);
-	virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot);
-
 	void main_loop_begin();
 	bool main_loop_iterate();
 	void main_loop_request_go_back();
@@ -241,7 +197,7 @@ public:
 	void joy_connection_changed(int p_device, bool p_connected, String p_name);
 
 	virtual bool _check_internal_feature_support(const String &p_feature);
-	OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURIFunc p_open_uri_func, GetUserDataDirFunc p_get_user_data_dir_func, GetLocaleFunc p_get_locale_func, GetModelFunc p_get_model_func, GetScreenDPIFunc p_get_screen_dpi_func, ShowVirtualKeyboardFunc p_show_vk, HideVirtualKeyboardFunc p_hide_vk, VirtualKeyboardHeightFunc p_vk_height_func, SetScreenOrientationFunc p_screen_orient, GetUniqueIDFunc p_get_unique_id, GetSystemDirFunc p_get_sdir_func, GetGLVersionCodeFunc p_get_gl_version_func, VideoPlayFunc p_video_play_func, VideoIsPlayingFunc p_video_is_playing_func, VideoPauseFunc p_video_pause_func, VideoStopFunc p_video_stop_func, SetKeepScreenOnFunc p_set_keep_screen_on_func, AlertFunc p_alert_func, SetClipboardFunc p_set_clipboard, GetClipboardFunc p_get_clipboard, RequestPermissionFunc p_request_permission, bool p_use_apk_expansion);
+	OS_Android(GodotJavaWrapper *p_godot_java, GodotIOJavaWrapper *p_godot_io_java, bool p_use_apk_expansion);
 	~OS_Android();
 };