godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

Fix Android native file picker

Browse Source
This commit is contained in:
Anish Mishra
2024-12-19 19:31:32 +05:30
parent fafc07335b
commit 9deee0097a
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/android/java/lib/src/org/godotengine/godot/io/FilePicker.kt
View File

@@ -144,14 +144,10 @@ internal class FilePicker {
} }
// ACTION_OPEN_DOCUMENT_TREE does not support intent type // ACTION_OPEN_DOCUMENT_TREE does not support intent type
if (fileMode != FILE_MODE_OPEN_DIR) { if (fileMode != FILE_MODE_OPEN_DIR) {
intent.type = "*/*" val resolvedFilters = filters.map { resolveMimeType(it) }.distinct()
if (filters.isNotEmpty()) { intent.type = resolvedFilters.firstOrNull { it != "application/octet-stream" } ?: "*/*"
val resolvedFilters = filters.map { resolveMimeType(it) }.distinct() if (resolvedFilters.size > 1) {
if (resolvedFilters.size == 1) { intent.putExtra(Intent.EXTRA_MIME_TYPES, resolvedFilters.toTypedArray())
intent.type = resolvedFilters[0]
} else {
intent.putExtra(Intent.EXTRA_MIME_TYPES, resolvedFilters.toTypedArray())
}
} }
intent.addCategory(Intent.CATEGORY_OPENABLE) intent.addCategory(Intent.CATEGORY_OPENABLE)
} }

2
platform/android/java_godot_wrapper.cpp
View File

@@ -329,7 +329,7 @@ Error GodotJavaWrapper::show_file_picker(const String &p_current_directory, cons
jint j_mode = p_mode; jint j_mode = p_mode;
jobjectArray j_filters = env->NewObjectArray(p_filters.size(), env->FindClass("java/lang/String"), nullptr); jobjectArray j_filters = env->NewObjectArray(p_filters.size(), env->FindClass("java/lang/String"), nullptr);
for (int i = 0; i < p_filters.size(); ++i) { for (int i = 0; i < p_filters.size(); ++i) {
jstring j_filter = env->NewStringUTF(p_filters[i].utf8().get_data()); jstring j_filter = env->NewStringUTF(p_filters[i].get_slice(";", 0).utf8().get_data());
env->SetObjectArrayElement(j_filters, i, j_filter); env->SetObjectArrayElement(j_filters, i, j_filter);
env->DeleteLocalRef(j_filter); env->DeleteLocalRef(j_filter);
} }