Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-23 04:16:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ported: Fix directory access when the running app has the All files access permission

Browse Source 
- m4gr3d
e2c7d3e6c0
This commit is contained in:
Relintai 2023-04-15 11:11:29 +02:00
parent 464b0b5e08
commit 76f9237411
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/io/StorageScope.kt
View File

@ -66,7 +66,7 @@ internal enum class StorageScope {
/**
* Determines which [StorageScope] the given path falls under.
*/
fun identifyStorageScope(path: String?): StorageScope {
fun identifyStorageScope(path: String?): StorageScope {
if (path == null) {
return UNKNOWN
}
@ -76,31 +76,42 @@ 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)) {
if (internalAppDir != null && canonicalPathFile.startsWith(internalAppDir)) {
return APP
}
if (internalCacheDir != null && canonicalPathFile.startsWith(internalCacheDir)) {
if (internalCacheDir != null && canonicalPathFile.startsWith(internalCacheDir)) {
return APP
}
if (externalAppDir != null && canonicalPathFile.startsWith(externalAppDir)) {
if (externalAppDir != null && canonicalPathFile.startsWith(externalAppDir)) {
return APP
}
if (sharedDir != null && canonicalPathFile.startsWith(sharedDir)) {
val rootDir: String? = System.getenv("ANDROID_ROOT")
if (rootDir != null && canonicalPathFile.startsWith(rootDir)) {
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
// permissions (and flag on Q).
return APP
}
// Post R, access is limited based on the target destination
// 'Downloads' and 'Documents' are still accessible
if ((downloadsSharedDir != null && canonicalPathFile.startsWith(downloadsSharedDir))
|| (documentsSharedDir != null && canonicalPathFile.startsWith(documentsSharedDir))) {
// Post R, access is limited based on the target destination
// 'Downloads' and 'Documents' are still accessible
if ((downloadsSharedDir != null && canonicalPathFile.startsWith(downloadsSharedDir))
|| (documentsSharedDir != null && canonicalPathFile.startsWith(documentsSharedDir))) {
return APP
}