Fixed: Lost persisted URIs after granted

anggrayudi · anggrayudi · commit 791e70d9511e · 2020-12-23T22:51:20.000+07:00
diff --git a/gradle.properties b/gradle.properties
@@ -19,4 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-STORAGE_VERSION=0.4.0
+STORAGE_VERSION=0.4.1
diff --git a/storage/src/main/java/com/anggrayudi/storage/SimpleStorage.kt b/storage/src/main/java/com/anggrayudi/storage/SimpleStorage.kt
@@ -360,9 +360,9 @@ class SimpleStorage private constructor(private val wrapper: ComponentWrapper) {
                     .filter { it.isReadPermission && it.isWritePermission && it.uri.isExternalStorageDocument }
                     .map { it.uri }
                 val writeFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                val uniqueUriParents = DocumentFileCompat.findUniqueParents(persistedUris.mapNotNull { it.path })
+                val uniqueUriParents = DocumentFileCompat.findUniqueParents(persistedUris.mapNotNull { it.path?.substringAfter("/tree/") })
                 persistedUris.forEach {
-                    if (it.path !in uniqueUriParents) {
+                    if (DocumentFileCompat.buildAbsolutePath(it.path.orEmpty().substringAfter("/tree/")) !in uniqueUriParents) {
                         resolver.releasePersistableUriPermission(it, writeFlags)
                         Timber.d("Removed redundant URI permission => $it")
                     }
diff --git a/storage/src/test/java/com/anggrayudi/storage/file/DocumentFileCompatTest.kt b/storage/src/test/java/com/anggrayudi/storage/file/DocumentFileCompatTest.kt
@@ -59,9 +59,9 @@ class DocumentFileCompatTest {
             "/storage/9016-4EF8/Music/Favorites/Pop",
             "/storage/emulated/0/Music",
             "/storage/emulated/0/Music Indo",
-            "/tree/primary/b/c",
-            "/tree/primary/b",
-            "/tree/primary/b/d",
+            "/folder/subFolder/b/c",
+            "/folder/subFolder/b",
+            "/folder/subFolder/b/d",
             "primary:Alarm/Morning",
             "primary:Alarm",
         )
@@ -72,7 +72,7 @@ class DocumentFileCompatTest {
             "/storage/9016-4EF8/Music",
             "/storage/emulated/0/Music",
             "/storage/emulated/0/Music Indo",
-            "/tree/primary/b",
+            "/folder/subFolder/b",
             "/storage/emulated/0/Alarm",
         )
 
