Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109267 from syntaxerror247/misc

Browse Source 
Android: Misc changes
This commit is contained in:
Thaddeus Crews
2025-08-03 10:51:15 -05:00
parent 3dd70c4cef ae678b4085
commit 4b23f09e2f
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/file_system/editor_file_system.cpp
View File

@@ -1069,12 +1069,13 @@ void EditorFileSystem::scan() {
if (first_scan) {
_first_scan_filesystem();
#ifdef ANDROID_ENABLED
// Create a .nomedia file to hide assets from media apps on Android.
// Android 11 has some issues with nomedia files, so it's disabled there. See GH-106479 and GH-105399 for details.
// NOTE: Nomedia file is also handled in project manager. See project_dialog.cpp -> ProjectDialog::ok_pressed().
String sdk_version = OS::get_singleton()->get_version().get_slicec('.', 0);
if (sdk_version != "30") {
const String nomedia_file_path = ProjectSettings::get_singleton()->get_resource_path().path_join(".nomedia");
if (!FileAccess::exists(nomedia_file_path)) {
// Create a .nomedia file to hide assets from media apps on Android.
Ref<FileAccess> f = FileAccess::open(nomedia_file_path, FileAccess::WRITE);
if (f.is_null()) {
// .nomedia isn't so critical.

3
editor/project_manager/project_dialog.cpp
View File

@@ -739,10 +739,11 @@ void ProjectDialog::ok_pressed() {
hide();
if (mode == MODE_NEW || mode == MODE_IMPORT || mode == MODE_INSTALL) {
#ifdef ANDROID_ENABLED
// Create a .nomedia file to hide assets from media apps on Android.
// Android 11 has some issues with nomedia files, so it's disabled there. See GH-106479, GH-105399 for details.
// NOTE: Nomedia file is also handled during the first filesystem scan. See editor_file_system.cpp -> EditorFileSystem::scan().
String sdk_version = OS::get_singleton()->get_version().get_slicec('.', 0);
if (sdk_version != "30") {
// Create a .nomedia file to hide assets from media apps on Android.
const String nomedia_file_path = path.path_join(".nomedia");
Ref<FileAccess> f2 = FileAccess::open(nomedia_file_path, FileAccess::WRITE);
if (f2.is_null()) {