Merge pull request #51815 from m4gr3d/refactor_android_storage_handling

godotengine · Jun 27, 2022 · ae60597 · ae60597
2 parents ff78e2d + 24e3b3b
commit ae60597
Show file tree

Hide file tree

Showing 40 changed files with 2,361 additions and 301 deletions.
diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp
@@ -184,6 +184,10 @@ Error DirAccess::make_dir_recursive(String p_dir) {
 	return OK;
 }
 
+DirAccess::AccessType DirAccess::get_access_type() const {
+	return _access_type;
+}
+
 String DirAccess::fix_path(String p_path) const {
 	switch (_access_type) {
 		case ACCESS_RESOURCES: {

diff --git a/core/os/dir_access.h b/core/os/dir_access.h
@@ -56,6 +56,7 @@ class DirAccess {
 	String _get_root_path() const;
 	String _get_root_string() const;
 
+	AccessType get_access_type() const;
 	String fix_path(String p_path) const;
 	bool next_is_dir;
 

diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
@@ -49,10 +49,6 @@
 #include <mntent.h>
 #endif
 
-DirAccess *DirAccessUnix::create_fs() {
-	return memnew(DirAccessUnix);
-}
-
 Error DirAccessUnix::list_dir_begin() {
 	list_dir_end(); //close any previous dir opening!
 

diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h
@@ -43,13 +43,11 @@
 class DirAccessUnix : public DirAccess {
 	DIR *dir_stream;
 
-	static DirAccess *create_fs();
-
-	String current_dir;
 	bool _cisdir;
 	bool _cishidden;
 
 protected:
+	String current_dir;
 	virtual String fix_unicode_name(const char *p_name) const { return String::utf8(p_name); }
 	virtual bool is_hidden(const String &p_name);
 

diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp
@@ -335,10 +335,6 @@ Error FileAccessUnix::_set_unix_permissions(const String &p_file, uint32_t p_per
 	return FAILED;
 }
 
-FileAccess *FileAccessUnix::create_libc() {
-	return memnew(FileAccessUnix);
-}
-
 CloseNotificationFunc FileAccessUnix::close_notification_func = nullptr;
 
 FileAccessUnix::FileAccessUnix() :

diff --git a/drivers/unix/file_access_unix.h b/drivers/unix/file_access_unix.h
@@ -49,8 +49,6 @@ class FileAccessUnix : public FileAccess {
 	String path;
 	String path_src;
 
-	static FileAccess *create_libc();
-
 public:
 	static CloseNotificationFunc close_notification_func;
 

diff --git a/platform/android/SCsub b/platform/android/SCsub
@@ -6,6 +6,7 @@ android_files = [
     "os_android.cpp",
     "android_input_handler.cpp",
     "file_access_android.cpp",
+    "file_access_filesystem_jandroid.cpp",
     "audio_driver_opensl.cpp",
     "dir_access_jandroid.cpp",
     "thread_jandroid.cpp",