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

Jump to bottom

Fix directory access when the running app has the All files access permission #75146

Merged
merged 1 commit into from
Mar 21, 2023
Merged

Fix directory access when the running app has the All files access permission #75146

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
9 changes: 8 additions & 1 deletion platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@ internal enum class StorageScope {
return UNKNOWN
}

// If we have 'All Files Access' permission, we can access all directories without
// restriction.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
&& Environment.isExternalStorageManager()) {
return APP
}

val canonicalPathFile = pathFile.canonicalPath

if (internalAppDir != null && canonicalPathFile.startsWith(internalAppDir)) {
Expand All @@ -90,7 +97,7 @@ internal enum class StorageScope {
return APP
}

var rootDir: String? = System.getenv("ANDROID_ROOT")
val rootDir: String? = System.getenv("ANDROID_ROOT")
if (rootDir != null && canonicalPathFile.startsWith(rootDir)) {
return APP
}
Expand Down