(#62) Remove unnecessary rootUri param

Author: LaksCastro

android/src/main/kotlin/io/lakscastro/sharedstorage/storageaccessframework/DocumentFileApi.kt

@@ -423,18 +423,8 @@ internal class DocumentFileApi(private val plugin: SharedStoragePlugin) :
     if (eventSink == null) return
 
     val columns = args["columns"] as List<*>
-    val rootUri =
-      Uri.parse(args["rootUri"] as String) // Must be a Uri you have access over (granted by OPEN_DOCUMENT_TREE intent)
     val uri = Uri.parse(args["uri"] as String)
-
-    val documentId = try {
-      DocumentsContract.getDocumentId(uri)
-    } catch (e: IllegalArgumentException) {
-      DocumentsContract.getTreeDocumentId(uri)
-    }
-    val documentUri =
-      DocumentsContract.buildDocumentUriUsingTree(rootUri, documentId)
-    val document = DocumentFile.fromTreeUri(plugin.context, documentUri)
+    val document = DocumentFile.fromTreeUri(plugin.context, uri)
 
     if (document == null) {
       eventSink.error(
@@ -463,7 +453,6 @@ internal class DocumentFileApi(private val plugin: SharedStoragePlugin) :
                 plugin.context.contentResolver,
                 rootOnly = true,
                 targetUri = document.uri,
-                rootUri = rootUri,
                 columns =
                 columns
                   .map { parseDocumentFileColumn(parseDocumentFileColumn(it as String)!!) }

android/src/main/kotlin/io/lakscastro/sharedstorage/storageaccessframework/DocumentsContractApi.kt

@@ -31,13 +31,10 @@ internal class DocumentsContractApi(private val plugin: SharedStoragePlugin) :
     when (call.method) {
       GET_DOCUMENT_THUMBNAIL -> {
         if (Build.VERSION.SDK_INT >= API_21) {
-          val rootUri = Uri.parse(call.argument("rootUri"))
-          val documentId = call.argument<String>("documentId")
+          val uri = Uri.parse(call.argument("uri"))
           val width = call.argument<Int>("width")!!
           val height = call.argument<Int>("height")!!
 
-          val uri = DocumentsContract.buildDocumentUriUsingTree(rootUri, documentId)
-
           val bitmap =
               DocumentsContract.getDocumentThumbnail(
                   plugin.context.contentResolver,

android/src/main/kotlin/io/lakscastro/sharedstorage/storageaccessframework/lib/DocumentCommon.kt

@@ -83,7 +83,6 @@ fun createDocumentFileMap(documentFile: DocumentFile?): Map<String, Any?>? {
  * ```
  */
 fun createCursorRowMap(
-  rootUri: Uri,
   parentUri: Uri,
   uri: Uri,
   data: Map<String, Any>,
@@ -105,7 +104,6 @@ fun createCursorRowMap(
     "data" to formattedData,
     "metadata" to mapOf(
       "parentUri" to "$parentUri",
-      "rootUri" to "$rootUri",
       "isDirectory" to isDirectory,
       "uri" to "$uri"
     )
@@ -132,12 +130,22 @@ fun traverseDirectoryEntries(
   targetUri: Uri,
   columns: Array<String>,
   rootOnly: Boolean,
-  rootUri: Uri,
   block: (data: Map<String, Any>, isLast: Boolean) -> Unit
 ): Boolean {
+  val documentId = try {
+    DocumentsContract.getDocumentId(targetUri)
+  } catch(e: IllegalArgumentException) {
+    DocumentsContract.getTreeDocumentId(targetUri)
+  }
+  val treeDocumentId = DocumentsContract.getTreeDocumentId(targetUri)
+
+  val rootUri = DocumentsContract.buildTreeDocumentUri(
+    targetUri.authority,
+    treeDocumentId
+  )
   val childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(
     rootUri,
-    DocumentsContract.getDocumentId(targetUri)
+    documentId
   )
 
   // Keep track of our directory hierarchy
@@ -191,7 +199,7 @@ fun traverseDirectoryEntries(
         val isDirectory = if (mimeType != null) isDirectory(mimeType) else null
 
         val uri = DocumentsContract.buildDocumentUriUsingTree(
-          parent,
+          rootUri,
           DocumentsContract.getDocumentId(
             DocumentsContract.buildDocumentUri(parent.authority, id)
           )
@@ -208,7 +216,6 @@ fun traverseDirectoryEntries(
 
         block(
           createCursorRowMap(
-            targetUri,
             parent,
             uri,
             data,

example/lib/screens/folder_files/folder_file_card.dart

@@ -33,14 +33,12 @@ class _FolderFileCardState extends State<FolderFileCard> {
   Uint8List? imageBytes;
 
   Future<void> _loadThumbnailIfAvailable() async {
-    final rootUri = file.metadata?.rootUri;
-    final documentId = file.data?[DocumentFileColumn.id] as String?;
+    final uri = file.metadata?.uri;
 
-    if (rootUri == null || documentId == null) return;
+    if (uri == null) return;
 
     final bitmap = await getDocumentThumbnail(
-      rootUri: rootUri,
-      documentId: documentId,
+      uri: uri,
       width: _size.width,
       height: _size.height,
     );
@@ -75,10 +73,10 @@ class _FolderFileCardState extends State<FolderFileCard> {
     super.dispose();
   }
 
-  void _openFolderFileListPage(Uri uri, {required Uri rootUri}) {
+  void _openFolderFileListPage(Uri uri) {
     Navigator.of(context).push(
       MaterialPageRoute(
-        builder: (context) => FolderFileList(uri: uri, rootUri: rootUri),
+        builder: (context) => FolderFileList(uri: uri),
       ),
     );
   }
@@ -153,7 +151,6 @@ class _FolderFileCardState extends State<FolderFileCard> {
             'summary': '${file.data?[DocumentFileColumn.summary]}',
             'id': '${file.data?[DocumentFileColumn.id]}',
             'parentUri': '${file.metadata?.parentUri}',
-            'rootUri': '${file.metadata?.rootUri}',
             'uri': '${file.metadata?.uri}',
           },
         ),
@@ -166,7 +163,6 @@ class _FolderFileCardState extends State<FolderFileCard> {
                   if (_isDirectory) {
                     _openFolderFileListPage(
                       file.metadata!.uri!,
-                      rootUri: file.metadata!.rootUri!,
                     );
                   }
                 },

example/lib/screens/folder_files/folder_file_list.dart

@@ -13,11 +13,9 @@ class FolderFileList extends StatefulWidget {
   const FolderFileList({
     Key? key,
     required this.uri,
-    required this.rootUri,
   }) : super(key: key);
 
   final Uri uri;
-  final Uri rootUri;
 
   @override
   _FolderFileListState createState() => _FolderFileListState();
@@ -169,8 +167,7 @@ class _FolderFileListState extends State<FolderFileList> {
       DocumentFileColumn.id,
     ];
 
-    final fileListStream =
-        listFiles(folderUri, columns: columns, rootUri: widget.rootUri);
+    final fileListStream = listFiles(folderUri, columns: columns);
 
     _listener = fileListStream.listen(
       (file) {

example/lib/screens/persisted_uris/persisted_uri_card.dart

@@ -50,12 +50,7 @@ class _PersistedUriCardState extends State<PersistedUriCard> {
   void _openListFilesPage() {
     Navigator.of(context).push(
       MaterialPageRoute(
-        builder: (context) => FolderFileList(
-          uri: widget.permissionUri.uri,
-
-          rootUri: widget.permissionUri
-              .uri, // Since the persisted uri is the root uri itself we use the same uri for both: target listing uri and the granted root uri
-        ),
+        builder: (context) => FolderFileList(uri: widget.permissionUri.uri),
       ),
     );
   }

lib/src/saf/partial_document_file.dart

@@ -52,22 +52,19 @@ class PartialDocumentFile {
 class QueryMetadata {
   const QueryMetadata._({
     required this.parentUri,
-    required this.rootUri,
     required this.isDirectory,
     required this.uri,
   });
 
   factory QueryMetadata.fromMap(Map<String, dynamic> map) {
     return QueryMetadata._(
       parentUri: _parseUri(map['parentUri'] as String?),
-      rootUri: _parseUri(map['rootUri'] as String?),
       isDirectory: map['isDirectory'] as bool?,
       uri: _parseUri(map['uri'] as String?),
     );
   }
 
   final Uri? parentUri;
-  final Uri? rootUri;
   final bool? isDirectory;
   final Uri? uri;
 
@@ -80,7 +77,6 @@ class QueryMetadata {
   Map<String, dynamic> toMap() {
     return <String, dynamic>{
       'parentUri': '$parentUri',
-      'rootUri': '$rootUri',
       'isDirectory': isDirectory,
       'uri': uri,
     };
@@ -91,11 +87,10 @@ class QueryMetadata {
     if (other is! QueryMetadata) return false;
 
     return other.parentUri == parentUri &&
-        other.rootUri == rootUri &&
         other.isDirectory == isDirectory &&
         other.uri == uri;
   }
 
   @override
-  int get hashCode => Object.hash(parentUri, rootUri, isDirectory, uri);
+  int get hashCode => Object.hash(parentUri, isDirectory, uri);
 }

lib/src/saf/saf.dart

@@ -102,14 +102,12 @@ Future<bool?> canWrite(Uri uri) async => kDocumentFileChannel
 /// [Refer to details](https://developer.android.com/reference/android/provider/DocumentsContract#getDocumentThumbnail(android.content.ContentResolver,%20android.net.Uri,%20android.graphics.Point,%20android.os.CancellationSignal)).
 /// {@endtemplate}
 Future<DocumentBitmap?> getDocumentThumbnail({
-  required Uri rootUri,
-  required String documentId,
+  required Uri uri,
   required double width,
   required double height,
 }) async {
   final args = <String, dynamic>{
-    'rootUri': '$rootUri',
-    'documentId': documentId,
+    'uri': '$uri',
     'width': width,
     'height': height,
   };
@@ -148,13 +146,11 @@ Future<DocumentBitmap?> getDocumentThumbnail({
 Stream<PartialDocumentFile> listFiles(
   Uri uri, {
   required List<DocumentFileColumn> columns,
-  required Uri rootUri,
 }) {
   final args = <String, dynamic>{
     'uri': '$uri',
     'event': 'listFiles',
     'columns': columns.map((e) => '$e').toList(),
-    'rootUri': '$rootUri',
   };
 
   final onCursorRowResult =