godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #107207 from syntaxerror247/filePicker-save

Browse Source 
Android: Fix save issue when using native file dialog
This commit is contained in:
Rémi Verschelde
2025-06-10 12:30:21 +02:00
parent 823f4f8b58 a28697f2fe
commit 6e5bcd2f41
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,7 @@ import org.godotengine.godot.io.file.MediaStoreData
internal class FilePicker { internal class FilePicker {
companion object { companion object {
private const val FILE_PICKER_REQUEST = 1000 private const val FILE_PICKER_REQUEST = 1000
private const val FILE_SAVE_REQUEST = 1001
private val TAG = FilePicker::class.java.simpleName private val TAG = FilePicker::class.java.simpleName
// Constants for fileMode values // Constants for fileMode values
@@ -70,7 +71,7 @@ internal class FilePicker {
*/ */
@RequiresApi(Build.VERSION_CODES.Q) @RequiresApi(Build.VERSION_CODES.Q)
fun handleActivityResult(context: Context, requestCode: Int, resultCode: Int, data: Intent?) { fun handleActivityResult(context: Context, requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == FILE_PICKER_REQUEST) { if (requestCode == FILE_PICKER_REQUEST || requestCode == FILE_SAVE_REQUEST) {
if (resultCode == Activity.RESULT_CANCELED) { if (resultCode == Activity.RESULT_CANCELED) {
Log.d(TAG, "File picker canceled") Log.d(TAG, "File picker canceled")
GodotLib.filePickerCallback(false, emptyArray()) GodotLib.filePickerCallback(false, emptyArray())
@@ -101,6 +102,10 @@ internal class FilePicker {
} else { } else {
Log.d(TAG, "null filepath URI: $it") Log.d(TAG, "null filepath URI: $it")
} }
if (requestCode == FILE_SAVE_REQUEST) {
DocumentsContract.deleteDocument(context.contentResolver, it)
}
} }
} }
@@ -152,7 +157,11 @@ internal class FilePicker {
intent.addCategory(Intent.CATEGORY_OPENABLE) intent.addCategory(Intent.CATEGORY_OPENABLE)
} }
intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true) intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true)
activity?.startActivityForResult(intent, FILE_PICKER_REQUEST) if (fileMode == FILE_MODE_SAVE_FILE) {
activity?.startActivityForResult(intent, FILE_SAVE_REQUEST)
} else {
activity?.startActivityForResult(intent, FILE_PICKER_REQUEST)
}
} }
/** /**