Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add full support for Android scoped storage #62459

Merged
merged 1 commit into from
Jul 5, 2022
Merged

Add full support for Android scoped storage #62459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/io/dir_access.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,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: {
Expand Down
1 change: 1 addition & 0 deletions core/io/dir_access.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class DirAccess : public RefCounted {
String _get_root_path() const;
String _get_root_string() const;

AccessType get_access_type() const;
String fix_path(String p_path) const;

template <class T>
Expand Down
4 changes: 0 additions & 4 deletions drivers/unix/dir_access_unix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
#include <mntent.h>
#endif

Ref<DirAccess> DirAccessUnix::create_fs() {
return memnew(DirAccessUnix);
}

Error DirAccessUnix::list_dir_begin() {
list_dir_end(); //close any previous dir opening!

Expand Down
4 changes: 1 addition & 3 deletions drivers/unix/dir_access_unix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,11 @@
class DirAccessUnix : public DirAccess {
DIR *dir_stream = nullptr;

static Ref<DirAccess> create_fs();

String current_dir;
bool _cisdir = false;
bool _cishidden = false;

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);

Expand Down
4 changes: 0 additions & 4 deletions drivers/unix/file_access_unix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,6 @@ Error FileAccessUnix::_set_unix_permissions(const String &p_file, uint32_t p_per
return FAILED;
}

Ref<FileAccess> FileAccessUnix::create_libc() {
return memnew(FileAccessUnix);
}

CloseNotificationFunc FileAccessUnix::close_notification_func = nullptr;

FileAccessUnix::~FileAccessUnix() {
Expand Down
1 change: 0 additions & 1 deletion drivers/unix/file_access_unix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class FileAccessUnix : public FileAccess {
String path;
String path_src;

static Ref<FileAccess> create_libc();
void _close();

public:
Expand Down
1 change: 1 addition & 0 deletions platform/android/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"tts_android.cpp",
Expand Down
Loading