godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 19:31:35 +00:00
Code Releases Wiki Activity

Merge pull request #113878 from m4gr3d/fix_obb_dir_access

Browse Source 
Fix storage scope for the obb directory
This commit is contained in:
Thaddeus Crews
2025-12-15 08:01:14 -06:00
parent 4adf88033f 280120b1f8
commit 5311b5e4d0
9 changed files with 126 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/android/java/lib/src/main/java/org/godotengine/godot/io/StorageScope.kt
View File

@@ -77,6 +77,7 @@ internal enum class StorageScope {
private val internalAppDir: String? = context.filesDir.canonicalPath
private val internalCacheDir: String? = context.cacheDir.canonicalPath
private val externalAppDir: String? = context.getExternalFilesDir(null)?.canonicalPath
private val obbDir: String? = context.obbDir.canonicalPath
private val sharedDir : String? = Environment.getExternalStorageDirectory().canonicalPath
private val downloadsSharedDir: String? = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).canonicalPath
private val documentsSharedDir: String? = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS).canonicalPath
@@ -140,6 +141,10 @@ internal enum class StorageScope {
return APP
}
if (obbDir != null && canonicalPathFile.startsWith(obbDir)) {
return APP
}
if (sharedDir != null && canonicalPathFile.startsWith(sharedDir)) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
// Before R, apps had access to shared storage so long as they have the right