From c52c254b916d863332020ec64d1b877ae10a4ee0 Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Sat, 20 Nov 2021 23:54:18 -0300
Subject: [PATCH 01/11] (#3) Add `Environment.getExternalStorageDirectory`
 support

---
 .gitignore                                    |  2 ++
 android/build.gradle                          |  2 +-
 android/settings.gradle                       |  2 +-
 android/src/main/AndroidManifest.xml          |  2 +-
 .../sharedstorage/EnvironmentDirectoryOf.kt   |  5 ++--
 .../sharedstorage/SharedStoragePlugin.kt      |  7 ++++-
 example/README.md                             |  4 +--
 example/android/app/build.gradle              |  4 +--
 .../android/app/src/main/AndroidManifest.xml  | 26 ++++++++--------
 example/lib/main.dart                         | 18 +++++++++--
 example/pubspec.lock                          | 30 ++++++++++++++-----
 example/pubspec.yaml                          |  8 ++---
 lib/shared_storage.dart                       | 19 ++++++++++++
 13 files changed, 89 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index fe5a19e..d754b83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 .history
 .svn/
 
+*/**/pubspec.lock
+
 # IntelliJ related
 *.iml
 *.ipr
diff --git a/android/build.gradle b/android/build.gradle
index 76c12f3..b104d07 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,4 +1,4 @@
-group 'com.pinciat.external_path'
+group 'io.lakscastro.sharedstorage'
 version '1.0-SNAPSHOT'
 
 buildscript {
diff --git a/android/settings.gradle b/android/settings.gradle
index e688d1d..0f44934 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'external_path'
+rootProject.name = 'sharedstorage'
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 4f813cd..d8a8d77 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.pinciat.external_path">
+  package="io.lakscastro.sharedstorage">
 </manifest>
diff --git a/android/src/main/kotlin/io/lakscastro/sharedstorage/EnvironmentDirectoryOf.kt b/android/src/main/kotlin/io/lakscastro/sharedstorage/EnvironmentDirectoryOf.kt
index f65e94c..344e9b7 100644
--- a/android/src/main/kotlin/io/lakscastro/sharedstorage/EnvironmentDirectoryOf.kt
+++ b/android/src/main/kotlin/io/lakscastro/sharedstorage/EnvironmentDirectoryOf.kt
@@ -1,8 +1,9 @@
 package io.lakscastro.sharedstorage
 
 import android.os.Environment
+import java.io.File
 
-fun environmentDirectoryOf(directory: String): String {
+fun environmentDirectoryOf(directory: String): File {
   val mapper = mapOf(
     "EnvironmentDirectory.Alarms" to Environment.DIRECTORY_ALARMS,
     "EnvironmentDirectory.DCIM" to Environment.DIRECTORY_DCIM,
@@ -15,5 +16,5 @@ fun environmentDirectoryOf(directory: String): String {
     "EnvironmentDirectory.Ringtones" to Environment.DIRECTORY_RINGTONES
   )
 
-  return mapper[directory] ?: directory
+  return Environment.getExternalStoragePublicDirectory(mapper[directory] ?: directory)
 }
\ No newline at end of file
diff --git a/android/src/main/kotlin/io/lakscastro/sharedstorage/SharedStoragePlugin.kt b/android/src/main/kotlin/io/lakscastro/sharedstorage/SharedStoragePlugin.kt
index 1ad70a2..30cbd36 100644
--- a/android/src/main/kotlin/io/lakscastro/sharedstorage/SharedStoragePlugin.kt
+++ b/android/src/main/kotlin/io/lakscastro/sharedstorage/SharedStoragePlugin.kt
@@ -25,6 +25,8 @@ class SharedStoragePlugin : FlutterPlugin, MethodCallHandler {
     const val METHOD_CHANNEL_NAME = "io.lakscastro.plugins/sharedstorage"
 
     const val GET_EXTERNAL_STORAGE_PUBLIC_DIRECTORY = "getExternalStoragePublicDirectory"
+    const val GET_EXTERNAL_STORAGE_DIRECTORY = "getExternalStorageDirectory"
+
     const val GET_MEDIA_STORE_CONTENT_DIRECTORY = "getMediaStoreContentDirectory"
     const val GET_ROOT_DIRECTORY = "getRootDirectory"
   }
@@ -42,13 +44,16 @@ class SharedStoragePlugin : FlutterPlugin, MethodCallHandler {
   override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
     when (call.method) {
       GET_EXTERNAL_STORAGE_PUBLIC_DIRECTORY -> getExternalStoragePublicDirectory(result, call.argument<String?>("directory") as String)
+      GET_EXTERNAL_STORAGE_DIRECTORY -> getExternalStorageDirectory(result)
       GET_MEDIA_STORE_CONTENT_DIRECTORY -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) getMediaStoreContentDirectory(result, call.argument<String?>("collection") as String) else result.notImplemented()
       GET_ROOT_DIRECTORY -> getRootDirectory(result)
       else -> result.notImplemented()
     }
   }
 
-  private fun getExternalStoragePublicDirectory(result: Result, directory: String) = result.success(Environment.getExternalStoragePublicDirectory(environmentDirectoryOf(directory)).absolutePath)
+  private fun getExternalStoragePublicDirectory(result: Result, directory: String) = result.success(environmentDirectoryOf(directory).absolutePath)
+
+  private fun getExternalStorageDirectory(result: Result) = result.success(Environment.getExternalStorageDirectory().absolutePath)
 
   @RequiresApi(Build.VERSION_CODES.Q)
   private fun getMediaStoreContentDirectory(result: Result, collection: String) = result.success(mediaStoreOf(collection))
diff --git a/example/README.md b/example/README.md
index 9649278..8bdf14f 100644
--- a/example/README.md
+++ b/example/README.md
@@ -1,6 +1,6 @@
-# external_path_example
+# sharedstorage_example
 
-Demonstrates how to use the external_path plugin.
+Demonstrates how to use the shared_storage plugin.
 
 ## Getting Started
 
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 51b8236..5f20f05 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 29
 
   sourceSets {
     main.java.srcDirs += 'src/main/kotlin'
@@ -35,7 +35,7 @@ android {
   defaultConfig {
     applicationId "io.lakscastro.sharedstorage.example"
     minSdkVersion 16
-    targetSdkVersion 30
+    targetSdkVersion 29
     versionCode flutterVersionCode.toInteger()
     versionName flutterVersionName
   }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 537c76b..c3cb6c3 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,36 +1,36 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.lakscastro.sharedstorage.example">
 
-   <application
-        android:label="Shared Storage Example"
-        android:icon="@mipmap/ic_launcher">
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <application
+        android:icon="@mipmap/ic_launcher"
+        android:requestLegacyExternalStorage="true"
+        android:label="Shared Storage Example">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <!-- Displays an Android View that continues showing the launch screen
                  Drawable until Flutter paints its first frame, then this splash
                  screen fades out. A splash screen is useful to avoid any visual
                  gap between the end of Android's launch screen and the painting of
                  Flutter's first frame. -->
             <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 1c1c595..45f0d5f 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_storage/shared_storage.dart';
 
 void main() => runApp(const App());
@@ -26,9 +27,20 @@ class _AppState extends State<App> {
   }
 
   Future<void> _getPublicDirectoryPath() async {
-    /// [/storage/emulated/0/Download]
-    topLevelSharedDirectory =
-        await getExternalStoragePublicDirectory(EnvironmentDirectory.downloads);
+    /// `/storage/emulated/0`
+    topLevelSharedDirectory = await getExternalStoragePublicDirectory(
+        const EnvironmentDirectory.custom('CustomExternalStorageFolder'));
+
+    /// If you want to write on the shared storage path, remember to
+    /// add [permission_handler] package
+    await Permission.storage.request();
+
+    if (topLevelSharedDirectory != null) {
+      /// Remember to add `android:requestLegacyExternalStorage="true"`
+      /// to your Android manifest, otherwise this write request will fail
+      await Directory(topLevelSharedDirectory!.absolute.path)
+          .create(recursive: true);
+    }
 
     setState(() => {});
   }
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 60f8c2b..f45b220 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -43,13 +43,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.3"
   fake_async:
     dependency: transitive
     description:
@@ -102,13 +95,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.3"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.7.0"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
   shared_storage:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0+1"
+    version: "0.1.1"
   sky_engine:
     dependency: transitive
     description: flutter
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 0279b78..3df5313 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -9,10 +9,10 @@ environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  flutter_lints: ^1.0.4
   flutter:
     sdk: flutter
-
+  flutter_lints: ^1.0.4
+  permission_handler: 6.1.3
   shared_storage:
     # When depending on this package from a real application you should use:
     #   shared_storage: ^x.y.z
@@ -21,10 +21,6 @@ dependencies:
     # the parent directory to use the current plugin's version.
     path: ../
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/lib/shared_storage.dart b/lib/shared_storage.dart
index b02a02e..b667bd6 100644
--- a/lib/shared_storage.dart
+++ b/lib/shared_storage.dart
@@ -164,6 +164,25 @@ Future<Directory?> getExternalStoragePublicDirectory(
   return Directory(publicDir);
 }
 
+/// Return the primary shared/external storage directory.
+/// This directory may not currently be accessible
+/// if it has been mounted by the user on their
+/// computer, has been removed from the device,
+/// or some other problem has happened.
+/// You can determine its current state with getExternalStorageState().
+///
+/// [Refer to details](https://developer.android.com/reference/android/os/Environment#getExternalStorageDirectory())
+Future<Directory?> getExternalStorageDirectory() async {
+  const kGetExternalStorageDirectory = 'getExternalStorageDirectory';
+
+  final publicDir =
+      await _kChannel.invokeMethod<String>(kGetExternalStorageDirectory);
+
+  if (publicDir == null) return null;
+
+  return Directory(publicDir);
+}
+
 /// The contract between the media provider and applications.
 ///
 /// Can get the absolute path given a [collection]

From bd4169bc2ea388a51da64ccbc7a5a89de0085d1c Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Mon, 22 Nov 2021 11:17:08 -0300
Subject: [PATCH 02/11] (#4) Add basic support for SAF `Storage Access
 Framework`

---
 android/build.gradle                          |   1 +
 .../sharedstorage/SharedStoragePlugin.kt      | 239 ++++++++++++++++--
 example/.gitignore                            |   2 +-
 example/android/app/build.gradle              |   4 +-
 .../android/app/src/main/AndroidManifest.xml  |   1 -
 example/lib/main.dart                         | 105 ++++++--
 example/lib/persisted_uri_card.dart           | 113 +++++++++
 example/pubspec.lock                          | 189 --------------
 example/pubspec.yaml                          |   1 -
 lib/shared_storage.dart                       | 228 +----------------
 lib/src/environment/environment.dart          |  70 +++++
 .../environment/environment_directory.dart    |  78 ++++++
 lib/src/media_store/media_store.dart          |  25 ++
 .../media_store/media_store_collection.dart   |  45 ++++
 lib/src/method_channel.dart                   |   6 +
 .../storage_access_framework.dart             |  81 ++++++
 .../uri_permission.dart                       |  54 ++++
 17 files changed, 781 insertions(+), 461 deletions(-)
 create mode 100644 example/lib/persisted_uri_card.dart
 delete mode 100644 example/pubspec.lock
 create mode 100644 lib/src/environment/environment.dart
 create mode 100644 lib/src/environment/environment_directory.dart
 create mode 100644 lib/src/media_store/media_store.dart
 create mode 100644 lib/src/media_store/media_store_collection.dart
 create mode 100644 lib/src/method_channel.dart
 create mode 100644 lib/src/storage_access_framework/storage_access_framework.dart
 create mode 100644 lib/src/storage_access_framework/uri_permission.dart

diff --git a/android/build.gradle b/android/build.gradle
index b104d07..3b36289 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -37,4 +37,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "androidx.documentfile:documentfile:1.0.1"
 }
diff --git a/android/src/main/kotlin/io/lakscastro/sharedstorage/SharedStoragePlugin.kt b/android/src/main/kotlin/io/lakscastro/sharedstorage/SharedStoragePlugin.kt
index 30cbd36..ca4973e 100644
--- a/android/src/main/kotlin/io/lakscastro/sharedstorage/SharedStoragePlugin.kt
+++ b/android/src/main/kotlin/io/lakscastro/sharedstorage/SharedStoragePlugin.kt
@@ -1,19 +1,30 @@
 package io.lakscastro.sharedstorage
 
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
 import androidx.annotation.NonNull
-
+import androidx.annotation.RequiresApi
+import androidx.documentfile.provider.DocumentFile
 import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
-import android.content.Context
-import android.os.Build
-import android.os.Environment
-import androidx.annotation.RequiresApi
+import io.flutter.plugin.common.PluginRegistry
 
 /** SharedStoragePlugin */
-class SharedStoragePlugin : FlutterPlugin, MethodCallHandler {
+class SharedStoragePlugin :
+  FlutterPlugin,
+  MethodCallHandler,
+  ActivityAware,
+  PluginRegistry.ActivityResultListener {
   /// The MethodChannel that will the communication between Flutter and native Android
   ///
   /// This local reference serves to register the plugin with the Flutter Engine and unregister it
@@ -21,42 +32,232 @@ class SharedStoragePlugin : FlutterPlugin, MethodCallHandler {
   private lateinit var channel: MethodChannel
   private lateinit var context: Context
 
+  private var binding: ActivityPluginBinding? = null
+
+  private val activity
+    get(): Activity? = binding?.activity
+
+  private val pendingResults: MutableMap<Int, Result> = mutableMapOf()
+
   companion object {
     const val METHOD_CHANNEL_NAME = "io.lakscastro.plugins/sharedstorage"
 
-    const val GET_EXTERNAL_STORAGE_PUBLIC_DIRECTORY = "getExternalStoragePublicDirectory"
+    const val GET_EXTERNAL_STORAGE_PUBLIC_DIRECTORY =
+      "getExternalStoragePublicDirectory"
     const val GET_EXTERNAL_STORAGE_DIRECTORY = "getExternalStorageDirectory"
 
-    const val GET_MEDIA_STORE_CONTENT_DIRECTORY = "getMediaStoreContentDirectory"
+    const val GET_MEDIA_STORE_CONTENT_DIRECTORY =
+      "getMediaStoreContentDirectory"
     const val GET_ROOT_DIRECTORY = "getRootDirectory"
+
+    const val OPEN_DOCUMENT_TREE = "openDocumentTree"
+    const val OPEN_DOCUMENT_TREE_CODE = 10
+
+    const val CREATE_DOCUMENT_FILE = "createDocumentFile"
+    const val PERSISTED_URI_PERMISSIONS = "persistedUriPermissions"
+    const val RELEASE_PERSISTABLE_URI_PERMISSION =
+      "releasePersistableUriPermission"
   }
 
-  override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+  override fun onAttachedToEngine(
+    @NonNull flutterPluginBinding: FlutterPluginBinding
+  ) {
     context = flutterPluginBinding.applicationContext
-    channel = MethodChannel(flutterPluginBinding.binaryMessenger, METHOD_CHANNEL_NAME)
+    channel =
+      MethodChannel(
+        flutterPluginBinding.binaryMessenger,
+        METHOD_CHANNEL_NAME
+      )
     channel.setMethodCallHandler(this)
   }
 
-  override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
+  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+    this.binding = binding
+
+    binding.addActivityResultListener(this)
+  }
+
+  override fun onDetachedFromEngine(@NonNull binding: FlutterPluginBinding) {
     channel.setMethodCallHandler(null)
   }
 
-  override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+  /// Allow usage of [this] as [MethodCallHandler]
+  override fun onMethodCall(
+    @NonNull call: MethodCall,
+    @NonNull result: Result
+  ) {
     when (call.method) {
-      GET_EXTERNAL_STORAGE_PUBLIC_DIRECTORY -> getExternalStoragePublicDirectory(result, call.argument<String?>("directory") as String)
-      GET_EXTERNAL_STORAGE_DIRECTORY -> getExternalStorageDirectory(result)
-      GET_MEDIA_STORE_CONTENT_DIRECTORY -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) getMediaStoreContentDirectory(result, call.argument<String?>("collection") as String) else result.notImplemented()
+      GET_EXTERNAL_STORAGE_PUBLIC_DIRECTORY ->
+        getExternalStoragePublicDirectory(
+          result,
+          call.argument<String?>("directory") as String
+        )
+      GET_EXTERNAL_STORAGE_DIRECTORY ->
+        getExternalStorageDirectory(result)
+      GET_MEDIA_STORE_CONTENT_DIRECTORY ->
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+          getMediaStoreContentDirectory(
+            result,
+            call.argument<String?>("collection") as String
+          )
+        else result.notImplemented()
       GET_ROOT_DIRECTORY -> getRootDirectory(result)
+      OPEN_DOCUMENT_TREE ->
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+          openDocumentTree(result)
+      CREATE_DOCUMENT_FILE ->
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+          createDocumentFile(
+            result,
+            call.argument<String?>("mimeType") as String,
+            call.argument<String?>("displayName") as String,
+            call.argument<String?>("directoryUri") as String,
+            call.argument<String?>("content") as String
+          )
+        }
+      PERSISTED_URI_PERMISSIONS ->
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+          persistedUriPermissions(result)
+      RELEASE_PERSISTABLE_URI_PERMISSION ->
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+          releasePersistableUriPermission(
+            result,
+            call.argument<String?>("directoryUri") as String
+          )
       else -> result.notImplemented()
     }
   }
 
-  private fun getExternalStoragePublicDirectory(result: Result, directory: String) = result.success(environmentDirectoryOf(directory).absolutePath)
+  private fun getExternalStoragePublicDirectory(
+    result: Result,
+    directory: String
+  ) = result.success(environmentDirectoryOf(directory).absolutePath)
+
+  private fun getExternalStorageDirectory(result: Result) =
+    result.success(Environment.getExternalStorageDirectory().absolutePath)
+
+  @RequiresApi(Build.VERSION_CODES.Q)
+  private fun getMediaStoreContentDirectory(
+    result: Result,
+    collection: String
+  ) = result.success(mediaStoreOf(collection))
+
+  private fun getRootDirectory(result: Result) =
+    result.success(Environment.getRootDirectory().absolutePath)
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  private fun openDocumentTree(result: Result) {
+    val intent =
+      Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+        addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+      }
+
+    if (pendingResults[OPEN_DOCUMENT_TREE_CODE] != null) return
+
+    pendingResults[OPEN_DOCUMENT_TREE_CODE] = result
+
+    activity?.startActivityForResult(intent, OPEN_DOCUMENT_TREE_CODE)
+  }
+
+  @RequiresApi(Build.VERSION_CODES.KITKAT)
+  private fun createDocumentFile(
+    result: Result,
+    mimeType: String,
+    displayName: String,
+    directory: String,
+    content: String
+  ) {
+    val parentUri = Uri.parse(directory)
+
+    val parentDocumentDirectory =
+      DocumentFile.fromTreeUri(context, parentUri)
+
+    val createdFile =
+      parentDocumentDirectory?.createFile(mimeType, displayName)
+
+    createdFile?.uri?.apply {
+      context.contentResolver.openOutputStream(this)?.apply {
+        write(content.toByteArray())
+        flush()
+        result.success(path)
+      }
+    }
+  }
+
+  @RequiresApi(Build.VERSION_CODES.KITKAT)
+  private fun persistedUriPermissions(result: Result) {
+    val persistedUriPermissions =
+      context.contentResolver.persistedUriPermissions
+
+    result.success(
+      persistedUriPermissions
+        .map {
+          mapOf(
+            "isReadPermission" to it.isReadPermission,
+            "isWritePermission" to it.isWritePermission,
+            "persistedTime" to it.persistedTime,
+            "uri" to "${it.uri}"
+          )
+        }
+        .toList()
+    )
+  }
+
+  @RequiresApi(Build.VERSION_CODES.KITKAT)
+  private fun releasePersistableUriPermission(
+    result: Result,
+    directoryUri: String
+  ) {
+    context.contentResolver.releasePersistableUriPermission(
+      Uri.parse(directoryUri),
+      Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+    )
 
-  private fun getExternalStorageDirectory(result: Result) = result.success(Environment.getExternalStorageDirectory().absolutePath)
+    result.success(null)
+  }
+
+  override fun onDetachedFromActivityForConfigChanges() {
+    binding?.removeActivityResultListener(this)
+  }
+
+  override fun onReattachedToActivityForConfigChanges(
+    binding: ActivityPluginBinding
+  ) {
+    this.binding = binding
+  }
+
+  override fun onDetachedFromActivity() {
+    binding = null
+  }
 
   @RequiresApi(Build.VERSION_CODES.Q)
-  private fun getMediaStoreContentDirectory(result: Result, collection: String) = result.success(mediaStoreOf(collection))
+  override fun onActivityResult(
+    requestCode: Int,
+    resultCode: Int,
+    data: Intent?
+  ): Boolean {
+    when (requestCode) {
+      OPEN_DOCUMENT_TREE_CODE -> {
+        try {
+          val uri = data?.data
+
+          if (uri != null) {
+            context.contentResolver.takePersistableUriPermission(
+              uri,
+              Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+            )
+
+            pendingResults[OPEN_DOCUMENT_TREE_CODE]?.success("$uri")
 
-  private fun getRootDirectory(result: Result) = result.success(Environment.getRootDirectory().absolutePath)
+            return true
+          }
+        } finally {
+          pendingResults.remove(OPEN_DOCUMENT_TREE_CODE)
+        }
+      }
+    }
+
+    return false
+  }
 }
diff --git a/example/.gitignore b/example/.gitignore
index 0fa6b67..84dfd94 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -8,7 +8,7 @@
 .buildlog/
 .history
 .svn/
-
+pubspec.lock
 # IntelliJ related
 *.iml
 *.ipr
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 5f20f05..80b1c86 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-  compileSdkVersion 29
+  compileSdkVersion 31
 
   sourceSets {
     main.java.srcDirs += 'src/main/kotlin'
@@ -35,7 +35,7 @@ android {
   defaultConfig {
     applicationId "io.lakscastro.sharedstorage.example"
     minSdkVersion 16
-    targetSdkVersion 29
+    targetSdkVersion 31
     versionCode flutterVersionCode.toInteger()
     versionName flutterVersionName
   }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index c3cb6c3..6bf72fe 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -4,7 +4,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application
         android:icon="@mipmap/ic_launcher"
-        android:requestLegacyExternalStorage="true"
         android:label="Shared Storage Example">
         <activity
             android:name=".MainActivity"
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 45f0d5f..539bc5b 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,11 +1,25 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_storage/shared_storage.dart';
+import 'package:shared_storage_example/persisted_uri_card.dart';
 
-void main() => runApp(const App());
+/// TODO: Add examples using [Environment] and [MediaStore] API
+void main() => runApp(const Root());
+
+class Root extends StatefulWidget {
+  const Root({Key? key}) : super(key: key);
+
+  @override
+  _RootState createState() => _RootState();
+}
+
+class _RootState extends State<Root> {
+  @override
+  Widget build(BuildContext context) {
+    return const MaterialApp(home: App());
+  }
+}
 
 class App extends StatefulWidget {
   const App({Key? key}) : super(key: key);
@@ -15,45 +29,80 @@ class App extends StatefulWidget {
 }
 
 class _AppState extends State<App> {
-  Directory? topLevelSharedDirectory;
-
-  String? get _absolutePath => topLevelSharedDirectory?.absolute.path;
+  List<UriPermission>? persistedPermissionUris;
 
   @override
   void initState() {
     super.initState();
 
-    _getPublicDirectoryPath();
+    _loadPersistedUriPermissions();
   }
 
-  Future<void> _getPublicDirectoryPath() async {
-    /// `/storage/emulated/0`
-    topLevelSharedDirectory = await getExternalStoragePublicDirectory(
-        const EnvironmentDirectory.custom('CustomExternalStorageFolder'));
+  Future<void> _loadPersistedUriPermissions() async {
+    persistedPermissionUris = await persistedUriPermissions();
 
-    /// If you want to write on the shared storage path, remember to
-    /// add [permission_handler] package
-    await Permission.storage.request();
+    setState(() => {});
+  }
 
-    if (topLevelSharedDirectory != null) {
-      /// Remember to add `android:requestLegacyExternalStorage="true"`
-      /// to your Android manifest, otherwise this write request will fail
-      await Directory(topLevelSharedDirectory!.absolute.path)
-          .create(recursive: true);
-    }
+  void _openDocumentTree() async {
+    /// Prompt user with a folder picker (Available for Android 5.0+)
+    await openDocumentTree();
 
-    setState(() => {});
+    /// TODO: Add broadcast listener to be aware when a Uri permission changes
+    await _loadPersistedUriPermissions();
+  }
+
+  Widget _buildNoFolderAllowedYetWarning() {
+    return Padding(
+      padding: const EdgeInsets.all(16),
+      child: Center(
+        child: Text(
+          'No folders allowed yet',
+          style: TextStyle(
+            color: const Color(0xFF000000).withOpacity(.2),
+          ),
+        ),
+      ),
+    );
   }
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      home: Scaffold(
-        appBar: AppBar(
-          title: const Text('SharedStorage Sample'),
-        ),
-        body: Center(
-          child: Text(_absolutePath ?? 'Loading...'),
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('SharedStorage Sample'),
+      ),
+      body: RefreshIndicator(
+        onRefresh: _loadPersistedUriPermissions,
+        child: CustomScrollView(
+          slivers: [
+            SliverPadding(
+              padding: const EdgeInsets.all(12),
+              sliver: SliverList(
+                delegate: SliverChildListDelegate(
+                  [
+                    Center(
+                      child: TextButton(
+                        onPressed: _openDocumentTree,
+                        child: const Text('New allowed folder'),
+                      ),
+                    ),
+                    if (persistedPermissionUris != null)
+                      if (persistedPermissionUris!.isEmpty)
+                        _buildNoFolderAllowedYetWarning()
+                      else
+                        for (final permissionUri in persistedPermissionUris!)
+                          PersistedUriCard(
+                            permissionUri: permissionUri,
+                            onChange: _loadPersistedUriPermissions,
+                          )
+                    else
+                      const Text('Loading...'),
+                  ],
+                ),
+              ),
+            ),
+          ],
         ),
       ),
     );
diff --git a/example/lib/persisted_uri_card.dart b/example/lib/persisted_uri_card.dart
new file mode 100644
index 0000000..47f5d42
--- /dev/null
+++ b/example/lib/persisted_uri_card.dart
@@ -0,0 +1,113 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:shared_storage/shared_storage.dart';
+
+class PersistedUriCard extends StatefulWidget {
+  final UriPermission permissionUri;
+  final VoidCallback onChange;
+
+  const PersistedUriCard(
+      {Key? key, required this.permissionUri, required this.onChange})
+      : super(key: key);
+
+  @override
+  _PersistedUriCardState createState() => _PersistedUriCardState();
+}
+
+class _PersistedUriCardState extends State<PersistedUriCard> {
+  void _appendSampleFile(Uri parentUri) async {
+    /// Create a new file inside the folder [parentUri]
+    await createDocumentFile(
+      mimeType: 'text/plain',
+      content: 'Sample File Content',
+      displayName: 'File created by Shared Storage Sample App',
+      directory: parentUri,
+    );
+  }
+
+  TextSpan _buildTextSpan(String key, String value) {
+    return TextSpan(
+      children: [
+        TextSpan(
+          text: '$key: ',
+        ),
+        TextSpan(
+          text: '$value\n',
+          style: const TextStyle(
+            fontWeight: FontWeight.bold,
+            decoration: TextDecoration.underline,
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _revokeUri(Uri uri) async {
+    await releasePersistableUriPermission(uri);
+
+    widget.onChange();
+  }
+
+  Widget _buildActionButton(String text,
+      {required VoidCallback onTap, Color? color}) {
+    return TextButton(
+      style: TextButton.styleFrom(primary: color),
+      onPressed: onTap,
+      child: Text(text),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text.rich(
+              TextSpan(
+                children: [
+                  _buildTextSpan(
+                    'isWritePermission',
+                    '${widget.permissionUri.isWritePermission}',
+                  ),
+                  _buildTextSpan(
+                    'isReadPermission',
+                    '${widget.permissionUri.isReadPermission}',
+                  ),
+                  _buildTextSpan(
+                    'persistedTime',
+                    '${widget.permissionUri.persistedTime}',
+                  ),
+                  _buildTextSpan(
+                    'uri',
+                    '${widget.permissionUri.uri}',
+                  ),
+                ],
+              ),
+            ),
+            Row(
+              children: [
+                _buildActionButton(
+                  'Create Sample File',
+                  onTap: () => _appendSampleFile(
+                    widget.permissionUri.uri,
+                  ),
+                ),
+                const Padding(padding: EdgeInsets.all(4)),
+                _buildActionButton(
+                  'Revoke',
+                  onTap: () => _revokeUri(
+                    widget.permissionUri.uri,
+                  ),
+                  color: Colors.red,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/example/pubspec.lock b/example/pubspec.lock
deleted file mode 100644
index f45b220..0000000
--- a/example/pubspec.lock
+++ /dev/null
@@ -1,189 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.8.1"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.15.0"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct main"
-    description:
-      name: flutter_lints
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.4"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.1"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.12.10"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.7.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0"
-  permission_handler:
-    dependency: "direct main"
-    description:
-      name: permission_handler
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.1.3"
-  permission_handler_platform_interface:
-    dependency: transitive
-    description:
-      name: permission_handler_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.7.0"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.2"
-  shared_storage:
-    dependency: "direct main"
-    description:
-      path: ".."
-      relative: true
-    source: path
-    version: "0.1.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.10.0"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.4.2"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-sdks:
-  dart: ">=2.14.0 <3.0.0"
-  flutter: ">=2.5.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 3df5313..ac2a1c6 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -12,7 +12,6 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_lints: ^1.0.4
-  permission_handler: 6.1.3
   shared_storage:
     # When depending on this package from a real application you should use:
     #   shared_storage: ^x.y.z
diff --git a/lib/shared_storage.dart b/lib/shared_storage.dart
index b667bd6..8bbbbae 100644
--- a/lib/shared_storage.dart
+++ b/lib/shared_storage.dart
@@ -1,220 +1,8 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:flutter/services.dart';
-
-/// Method Channel of this plugin
-///
-/// Flutter uses this to communicate with native Android
-const _kChannel = MethodChannel('io.lakscastro.plugins/sharedstorage');
-
-/// Representation of the [android.provider.MediaStore] Android SDK
-///
-/// [Refer to details](https://developer.android.com/reference/android/provider/MediaStore#summary)
-class MediaStoreCollection {
-  final String id;
-
-  const MediaStoreCollection._(this.id);
-
-  static const _kPrefix = 'MediaStoreCollection';
-
-  /// Available for Android [10 to 12]
-  ///
-  /// Equivalent to:
-  /// - [MediaStore.Audio]
-  static const audio = MediaStoreCollection._('$_kPrefix.Audio');
-
-  /// Available for Android [10 to 12]
-  ///
-  /// Equivalent to:
-  /// - [MediaStore.Downloads]
-  static const downloads = MediaStoreCollection._('$_kPrefix.Downloads');
-
-  /// Available for Android [10 to 12]
-  ///
-  /// Equivalent to:
-  /// - [MediaStore.Images]
-  static const images = MediaStoreCollection._('$_kPrefix.Images');
-
-  /// Available for Android [10 to 12]
-  ///
-  /// Equivalent to:
-  /// - [MediaStore.Video]
-  static const video = MediaStoreCollection._('$_kPrefix.Video');
-
-  @override
-  bool operator ==(Object other) {
-    return other is MediaStoreCollection && other.id == id;
-  }
-
-  @override
-  int get hashCode => id.hashCode;
-
-  @override
-  String toString() => id;
-}
-
-/// Enumeration to all fields of [android.os.Environment]
-/// class available to API level 16 or higher
-///
-/// - You can also create a custom [EnvironmentDirectory]
-/// by using [custom] constructor
-///
-/// - This generally returns a directory pointing to `/storage/emulated/0/[this]`
-///
-/// [Refer to details](https://developer.android.com/reference/android/os/Environment#fields_1)
-class EnvironmentDirectory {
-  final String id;
-
-  const EnvironmentDirectory._(this.id);
-
-  /// Define a custom [folder]
-  const EnvironmentDirectory.custom(String folder) : id = folder;
-
-  static const _kPrefix = 'EnvironmentDirectory';
-
-  /// Available for Android [4.1 to 9.0]
-  ///
-  /// Equivalent to [Environment.DIRECTORY_ALARMS]
-  static const alarms = EnvironmentDirectory._('$_kPrefix.Alarms');
-
-  /// Available for Android [4.1 to 9]
-  ///
-  /// Equivalent to:
-  /// - [Environment.DIRECTORY_DCIM] on Android [4.1 to 9]
-  static const dcim = EnvironmentDirectory._('$_kPrefix.DCIM');
-
-  /// Available for Android [4.1 to 9]
-  ///
-  /// Equivalent to:
-  /// - [Environment.DIRECTORY_DOWNLOADS] on Android [4.1 to 9]
-  static const downloads = EnvironmentDirectory._('$_kPrefix.Downloads');
-
-  /// Available for Android [4.1 to 9]
-  ///
-  /// - [Environment.DIRECTORY_MOVIES] on Android [4.1 to 9]
-  static const movies = EnvironmentDirectory._('$_kPrefix.Movies');
-
-  /// Available for Android [4.1 to 9]
-  ///
-  /// - [Environment.DIRECTORY_MUSIC] on Android [4.1 to 9]
-  static const music = EnvironmentDirectory._('$_kPrefix.Music');
-
-  /// Available for Android [4.1 to 9]
-  ///
-  /// - [Environment.DIRECTORY_NOTIFICATIONS] on Android [4.1 to 9]
-  static const notifications =
-      EnvironmentDirectory._('$_kPrefix.Notifications');
-
-  /// Available for Android [4.1 to 9]
-  ///
-  /// - [Environment.DIRECTORY_PICTURES] on Android [4.1 to 9]
-  static const pictures = EnvironmentDirectory._('$_kPrefix.Pictures');
-
-  /// Available for Android [4.1 to 9]
-  ///
-  /// - [Environment.DIRECTORY_PODCASTS] on Android [4.1 to 9]
-  static const podcasts = EnvironmentDirectory._('$_kPrefix.Podcasts');
-
-  /// Available for Android [4.1 to 9]
-  ///
-  /// - [Environment.DIRECTORY_RINGTONES] on Android [4.1 to 9]
-  static const ringtones = EnvironmentDirectory._('$_kPrefix.Ringtones');
-
-  @override
-  bool operator ==(Object other) {
-    return other is EnvironmentDirectory && other.id == id;
-  }
-
-  @override
-  int get hashCode => id.hashCode;
-
-  @override
-  String toString() => id;
-}
-
-/// Get a top-level shared/external storage directory for placing files of a
-/// particular type. This is where the user will typically place and manage
-/// their own files, so you should be careful about what you put here to
-/// ensure you don't erase their files or get in the way
-/// of their own organization.
-///
-/// _Added in API level 8_
-///
-/// _Deprecated in API level 29_
-///
-/// Equivalent to [Environment.getExternalStoragePublicDirectory] Android method
-///
-/// Throws [UnsupportedError] if not available on current Android version
-///
-/// [Refer to details](https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String))
-Future<Directory?> getExternalStoragePublicDirectory(
-    EnvironmentDirectory directory) async {
-  const kGetExternalStoragePublicDirectory =
-      'getExternalStoragePublicDirectory';
-  const kDirectoryArg = 'directory';
-
-  final args = <String, String>{kDirectoryArg: '$directory'};
-
-  final publicDir = await _kChannel.invokeMethod<String>(
-      kGetExternalStoragePublicDirectory, args);
-
-  if (publicDir == null) return null;
-
-  return Directory(publicDir);
-}
-
-/// Return the primary shared/external storage directory.
-/// This directory may not currently be accessible
-/// if it has been mounted by the user on their
-/// computer, has been removed from the device,
-/// or some other problem has happened.
-/// You can determine its current state with getExternalStorageState().
-///
-/// [Refer to details](https://developer.android.com/reference/android/os/Environment#getExternalStorageDirectory())
-Future<Directory?> getExternalStorageDirectory() async {
-  const kGetExternalStorageDirectory = 'getExternalStorageDirectory';
-
-  final publicDir =
-      await _kChannel.invokeMethod<String>(kGetExternalStorageDirectory);
-
-  if (publicDir == null) return null;
-
-  return Directory(publicDir);
-}
-
-/// The contract between the media provider and applications.
-///
-/// Can get the absolute path given a [collection]
-///
-/// [Refer to details](https://developer.android.com/reference/android/provider/MediaStore#summary)
-Future<Directory?> getMediaStoreContentDirectory(
-    MediaStoreCollection collection) async {
-  const kGetMediaStoreContentDirectory = 'getMediaStoreContentDirectory';
-  const kCollectionArg = 'collection';
-
-  final args = <String, String>{kCollectionArg: '$collection'};
-
-  final publicDir =
-      await _kChannel.invokeMethod(kGetMediaStoreContentDirectory, args);
-
-  if (publicDir == null) return null;
-
-  return Directory(publicDir);
-}
-
-/// Return root of the "system" partition holding the core Android OS.
-/// Always present and mounted read-only.
-///
-/// Equivalent to [Environment.getRootDirectory]
-///
-/// [Refer to details](https://developer.android.com/reference/android/os/Environment#getRootDirectory())
-Future<Directory?> getRootDirectory() async {
-  const kGetRootDirectory = 'getRootDirectory';
-
-  final publicDir = await _kChannel.invokeMethod(kGetRootDirectory);
-
-  if (publicDir == null) return null;
-
-  return Directory(publicDir);
-}
+library shared_storage;
+
+export './src/environment/environment.dart';
+export './src/environment/environment_directory.dart';
+export './src/media_store/media_store.dart';
+export './src/media_store/media_store_collection.dart';
+export './src/storage_access_framework/storage_access_framework.dart';
+export './src/storage_access_framework/uri_permission.dart';
diff --git a/lib/src/environment/environment.dart b/lib/src/environment/environment.dart
new file mode 100644
index 0000000..e57bb2d
--- /dev/null
+++ b/lib/src/environment/environment.dart
@@ -0,0 +1,70 @@
+import 'dart:io';
+
+import '../method_channel.dart';
+import 'environment_directory.dart';
+
+/// Return root of the "system" partition holding the core Android OS.
+/// Always present and mounted read-only.
+///
+/// Equivalent to [Environment.getRootDirectory]
+///
+/// [Refer to details](https://developer.android.com/reference/android/os/Environment#getRootDirectory())
+Future<Directory?> getRootDirectory() async {
+  const kGetRootDirectory = 'getRootDirectory';
+
+  final publicDir = await kChannel.invokeMethod<String?>(kGetRootDirectory);
+
+  if (publicDir == null) return null;
+
+  return Directory(publicDir);
+}
+
+/// Get a top-level shared/external storage directory for placing files of a
+/// particular type. This is where the user will typically place and manage
+/// their own files, so you should be careful about what you put here to
+/// ensure you don't erase their files or get in the way
+/// of their own organization.
+///
+/// _Added in API level 8_
+///
+/// _Deprecated in API level 29_
+///
+/// Equivalent to [Environment.getExternalStoragePublicDirectory] Android method
+///
+/// Throws [UnsupportedError] if not available on current Android version
+///
+/// [Refer to details](https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String))
+Future<Directory?> getExternalStoragePublicDirectory(
+    EnvironmentDirectory directory) async {
+  const kGetExternalStoragePublicDirectory =
+      'getExternalStoragePublicDirectory';
+  const kDirectoryArg = 'directory';
+
+  final args = <String, String>{kDirectoryArg: '$directory'};
+
+  final publicDir = await kChannel.invokeMethod<String?>(
+      kGetExternalStoragePublicDirectory, args);
+
+  if (publicDir == null) return null;
+
+  return Directory(publicDir);
+}
+
+/// Return the primary shared/external storage directory.
+/// This directory may not currently be accessible
+/// if it has been mounted by the user on their
+/// computer, has been removed from the device,
+/// or some other problem has happened.
+/// You can determine its current state with getExternalStorageState().
+///
+/// [Refer to details](https://developer.android.com/reference/android/os/Environment#getExternalStorageDirectory())
+Future<Directory?> getExternalStorageDirectory() async {
+  const kGetExternalStorageDirectory = 'getExternalStorageDirectory';
+
+  final publicDir =
+      await kChannel.invokeMethod<String>(kGetExternalStorageDirectory);
+
+  if (publicDir == null) return null;
+
+  return Directory(publicDir);
+}
diff --git a/lib/src/environment/environment_directory.dart b/lib/src/environment/environment_directory.dart
new file mode 100644
index 0000000..2f89641
--- /dev/null
+++ b/lib/src/environment/environment_directory.dart
@@ -0,0 +1,78 @@
+/// Enumeration to all fields of [android.os.Environment]
+/// class available to API level 16 or higher
+///
+/// - You can also create a custom [EnvironmentDirectory]
+/// by using [custom] constructor
+///
+/// - This generally returns a directory pointing to `/storage/emulated/0/[this]`
+///
+/// [Refer to details](https://developer.android.com/reference/android/os/Environment#fields_1)
+class EnvironmentDirectory {
+  final String id;
+
+  const EnvironmentDirectory._(this.id);
+
+  /// Define a custom [folder]
+  const EnvironmentDirectory.custom(String folder) : id = folder;
+
+  static const _kPrefix = 'EnvironmentDirectory';
+
+  /// Available for Android [4.1 to 9.0]
+  ///
+  /// Equivalent to [Environment.DIRECTORY_ALARMS]
+  static const alarms = EnvironmentDirectory._('$_kPrefix.Alarms');
+
+  /// Available for Android [4.1 to 9]
+  ///
+  /// Equivalent to:
+  /// - [Environment.DIRECTORY_DCIM] on Android [4.1 to 9]
+  static const dcim = EnvironmentDirectory._('$_kPrefix.DCIM');
+
+  /// Available for Android [4.1 to 9]
+  ///
+  /// Equivalent to:
+  /// - [Environment.DIRECTORY_DOWNLOADS] on Android [4.1 to 9]
+  static const downloads = EnvironmentDirectory._('$_kPrefix.Downloads');
+
+  /// Available for Android [4.1 to 9]
+  ///
+  /// - [Environment.DIRECTORY_MOVIES] on Android [4.1 to 9]
+  static const movies = EnvironmentDirectory._('$_kPrefix.Movies');
+
+  /// Available for Android [4.1 to 9]
+  ///
+  /// - [Environment.DIRECTORY_MUSIC] on Android [4.1 to 9]
+  static const music = EnvironmentDirectory._('$_kPrefix.Music');
+
+  /// Available for Android [4.1 to 9]
+  ///
+  /// - [Environment.DIRECTORY_NOTIFICATIONS] on Android [4.1 to 9]
+  static const notifications =
+      EnvironmentDirectory._('$_kPrefix.Notifications');
+
+  /// Available for Android [4.1 to 9]
+  ///
+  /// - [Environment.DIRECTORY_PICTURES] on Android [4.1 to 9]
+  static const pictures = EnvironmentDirectory._('$_kPrefix.Pictures');
+
+  /// Available for Android [4.1 to 9]
+  ///
+  /// - [Environment.DIRECTORY_PODCASTS] on Android [4.1 to 9]
+  static const podcasts = EnvironmentDirectory._('$_kPrefix.Podcasts');
+
+  /// Available for Android [4.1 to 9]
+  ///
+  /// - [Environment.DIRECTORY_RINGTONES] on Android [4.1 to 9]
+  static const ringtones = EnvironmentDirectory._('$_kPrefix.Ringtones');
+
+  @override
+  bool operator ==(Object other) {
+    return other is EnvironmentDirectory && other.id == id;
+  }
+
+  @override
+  int get hashCode => id.hashCode;
+
+  @override
+  String toString() => id;
+}
diff --git a/lib/src/media_store/media_store.dart b/lib/src/media_store/media_store.dart
new file mode 100644
index 0000000..a73a2cd
--- /dev/null
+++ b/lib/src/media_store/media_store.dart
@@ -0,0 +1,25 @@
+import 'dart:io';
+
+import 'package:shared_storage/src/media_store/media_store_collection.dart';
+
+import '../method_channel.dart';
+
+/// The contract between the media provider and applications.
+///
+/// Can get the absolute path given a [collection]
+///
+/// [Refer to details](https://developer.android.com/reference/android/provider/MediaStore#summary)
+Future<Directory?> getMediaStoreContentDirectory(
+    MediaStoreCollection collection) async {
+  const kGetMediaStoreContentDirectory = 'getMediaStoreContentDirectory';
+  const kCollectionArg = 'collection';
+
+  final args = <String, String>{kCollectionArg: '$collection'};
+
+  final publicDir = await kChannel.invokeMethod<String?>(
+      kGetMediaStoreContentDirectory, args);
+
+  if (publicDir == null) return null;
+
+  return Directory(publicDir);
+}
diff --git a/lib/src/media_store/media_store_collection.dart b/lib/src/media_store/media_store_collection.dart
new file mode 100644
index 0000000..621586a
--- /dev/null
+++ b/lib/src/media_store/media_store_collection.dart
@@ -0,0 +1,45 @@
+/// Representation of the [android.provider.MediaStore] Android SDK
+///
+/// [Refer to details](https://developer.android.com/reference/android/provider/MediaStore#summary)
+class MediaStoreCollection {
+  final String id;
+
+  const MediaStoreCollection._(this.id);
+
+  static const _kPrefix = 'MediaStoreCollection';
+
+  /// Available for Android [10 to 12]
+  ///
+  /// Equivalent to:
+  /// - [MediaStore.Audio]
+  static const audio = MediaStoreCollection._('$_kPrefix.Audio');
+
+  /// Available for Android [10 to 12]
+  ///
+  /// Equivalent to:
+  /// - [MediaStore.Downloads]
+  static const downloads = MediaStoreCollection._('$_kPrefix.Downloads');
+
+  /// Available for Android [10 to 12]
+  ///
+  /// Equivalent to:
+  /// - [MediaStore.Images]
+  static const images = MediaStoreCollection._('$_kPrefix.Images');
+
+  /// Available for Android [10 to 12]
+  ///
+  /// Equivalent to:
+  /// - [MediaStore.Video]
+  static const video = MediaStoreCollection._('$_kPrefix.Video');
+
+  @override
+  bool operator ==(Object other) {
+    return other is MediaStoreCollection && other.id == id;
+  }
+
+  @override
+  int get hashCode => id.hashCode;
+
+  @override
+  String toString() => 'MediaStoreCollection.$id';
+}
diff --git a/lib/src/method_channel.dart b/lib/src/method_channel.dart
new file mode 100644
index 0000000..3e8f2ce
--- /dev/null
+++ b/lib/src/method_channel.dart
@@ -0,0 +1,6 @@
+import 'package:flutter/services.dart';
+
+/// Method Channel of this plugin
+///
+/// Flutter uses this to communicate with native Android
+const kChannel = MethodChannel('io.lakscastro.plugins/sharedstorage');
diff --git a/lib/src/storage_access_framework/storage_access_framework.dart b/lib/src/storage_access_framework/storage_access_framework.dart
new file mode 100644
index 0000000..93ba0ce
--- /dev/null
+++ b/lib/src/storage_access_framework/storage_access_framework.dart
@@ -0,0 +1,81 @@
+import 'package:shared_storage/shared_storage.dart';
+import 'package:shared_storage/src/method_channel.dart';
+import 'package:shared_storage/src/storage_access_framework/uri_permission.dart';
+
+/// TODO: Add [initialDir] param as mentioned here:
+/// TODO: Add documentation
+Future<Uri?> openDocumentTree() async {
+  const kOpenDocumentTree = 'openDocumentTree';
+
+  final selectedDirectoryUri =
+      await kChannel.invokeMethod<String?>(kOpenDocumentTree);
+
+  if (selectedDirectoryUri == null) return null;
+
+  return Uri.parse(selectedDirectoryUri);
+}
+
+/// TODO: Add documentation
+Future<Uri?> createDocumentFile({
+  required String mimeType,
+  required String content,
+  required String displayName,
+  required Uri directory,
+}) async {
+  const kCreateDocumentFile = 'createDocumentFile';
+
+  const kMimeTypeArg = 'mimeType';
+  const kContentArg = 'content';
+  const kDisplayNameArg = 'displayName';
+  const kDirectoryUriArg = 'directoryUri';
+
+  final directoryUri = '$directory';
+
+  final args = <String, String>{
+    kMimeTypeArg: mimeType,
+    kContentArg: content,
+    kDisplayNameArg: displayName,
+    kDirectoryUriArg: directoryUri,
+  };
+
+  final createdFileUri =
+      await kChannel.invokeMethod<String?>(kCreateDocumentFile, args);
+
+  if (createdFileUri == null) return null;
+
+  return Uri.parse(createdFileUri);
+}
+
+Future<List<UriPermission>?> persistedUriPermissions() async {
+  const kPersistedUriPermissions = 'persistedUriPermissions';
+
+  final persistedUriPermissions =
+      await kChannel.invokeListMethod(kPersistedUriPermissions);
+
+  if (persistedUriPermissions == null) return null;
+
+  return persistedUriPermissions
+      .map((internalHashMap) => UriPermission.fromMap(
+          Map.from(internalHashMap).cast<String, dynamic>()))
+      .toList();
+}
+
+Future<void> releasePersistableUriPermission(Uri directory) async {
+  const kReleasePersistableUriPermission = 'releasePersistableUriPermission';
+
+  const kDirectoryUri = 'directoryUri';
+
+  final args = <String, String>{kDirectoryUri: '$directory'};
+
+  await kChannel.invokeMethod(kReleasePersistableUriPermission, args);
+}
+
+/// Convenient method to verify if a given [uri]
+/// is allowed to be write or read from SAF API's
+///
+/// TODO: Improve documentation
+Future<bool> isPersistedUri(Uri uri) async {
+  final persistedUris = await persistedUriPermissions();
+
+  return persistedUris?.any((persistedUri) => persistedUri.uri == uri) ?? false;
+}
diff --git a/lib/src/storage_access_framework/uri_permission.dart b/lib/src/storage_access_framework/uri_permission.dart
new file mode 100644
index 0000000..3c77329
--- /dev/null
+++ b/lib/src/storage_access_framework/uri_permission.dart
@@ -0,0 +1,54 @@
+/// Description of a single Uri permission grant.
+/// This grants may have been created via `Intent#FLAG_GRANT_READ_URI_PERMISSION`,
+/// etc when sending an `Intent`, or explicitly through `Context#grantUriPermission(String, android.net.Uri, int)`.
+///
+/// [Refer to details](https://developer.android.com/reference/android/content/UriPermission)
+class UriPermission {
+  final bool isReadPermission;
+  final bool isWritePermission;
+  final int persistedTime;
+  final Uri uri;
+
+  const UriPermission(
+      {required this.isReadPermission,
+      required this.isWritePermission,
+      required this.persistedTime,
+      required this.uri});
+
+  @override
+  bool operator ==(Object other) =>
+      other is UriPermission &&
+      isReadPermission == other.isReadPermission &&
+      isWritePermission == other.isWritePermission &&
+      persistedTime == other.persistedTime &&
+      uri == other.uri;
+
+  @override
+  int get hashCode =>
+      Object.hash(isReadPermission, isWritePermission, persistedTime, uri);
+
+  static UriPermission fromMap(Map<String, dynamic> map) {
+    return UriPermission(
+      isReadPermission: map['isReadPermission'],
+      isWritePermission: map['isWritePermission'],
+      persistedTime: map['persistedTime'],
+      uri: Uri.parse(map['uri']),
+    );
+  }
+
+  Map<String, dynamic> toMap(Map<String, dynamic> map) {
+    return <String, dynamic>{
+      'isReadPermission': isReadPermission,
+      'isWritePermission': isWritePermission,
+      'persistedTime': persistedTime,
+      'uri': '$uri',
+    };
+  }
+
+  @override
+  String toString() => 'UriPermission('
+      'isReadPermission: $isReadPermission, '
+      'isWritePermission: $isWritePermission, '
+      'persistedTime: $persistedTime, '
+      'uri: $uri)';
+}

From c34c15d7a201a982438649138655e533bf42c91e Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 00:31:49 -0300
Subject: [PATCH 03/11] (#7) Update `CHANGELOG.md` and add `v0.2.0`

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5dda2d..8ab6a6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.2.0
+
+Add basic support for `Storage Access Framework` and `targetSdk 31`
+
+- The package now supports basic intents from `Storage Access Framework`
+- Your App needs update the `build.gradle` by targeting the current sdk to `31`
+
 ## 0.1.1
 
 Minor improvements on `pub.dev` documentation

From b00757dd61700291b2624add3d6aec7a23306c5c Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 01:12:32 -0300
Subject: [PATCH 04/11] (#7) Add missing docs to the new `SAF` APIs

---
 .../storage_access_framework.dart             | 37 +++++++++++++++++--
 .../uri_permission.dart                       | 15 ++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/lib/src/storage_access_framework/storage_access_framework.dart b/lib/src/storage_access_framework/storage_access_framework.dart
index 93ba0ce..d9375f0 100644
--- a/lib/src/storage_access_framework/storage_access_framework.dart
+++ b/lib/src/storage_access_framework/storage_access_framework.dart
@@ -2,8 +2,15 @@ import 'package:shared_storage/shared_storage.dart';
 import 'package:shared_storage/src/method_channel.dart';
 import 'package:shared_storage/src/storage_access_framework/uri_permission.dart';
 
-/// TODO: Add [initialDir] param as mentioned here:
-/// TODO: Add documentation
+/// Start Activity Action: Allow the user to pick a directory subtree.
+/// When invoked, the system will display the various `DocumentsProvider`
+/// instances installed on the device, letting the user navigate through them.
+/// Apps can fully manage documents within the returned directory.
+///
+/// [Refer to details](https://developer.android.com/reference/android/content/Intent#ACTION_OPEN_DOCUMENT_TREE)
+///
+/// TODO: Implement [initialDir] param to
+/// support the initial directory of the directory picker
 Future<Uri?> openDocumentTree() async {
   const kOpenDocumentTree = 'openDocumentTree';
 
@@ -15,7 +22,18 @@ Future<Uri?> openDocumentTree() async {
   return Uri.parse(selectedDirectoryUri);
 }
 
-/// TODO: Add documentation
+/// Starts Activity Action: Allow the user to create a new document.
+/// When invoked, the system will display the various `DocumentsProvider`
+/// instances installed on the device, letting the user navigate through them.
+/// The returned document may be a newly created document with no content,
+/// or it may be an existing document with the requested MIME type.
+///
+/// - [mimeType] is the kind of file that you want to create
+/// - [content] the file content, will be converted to bytes `List<Int>`
+/// - [displayName] the name of the file without any extension
+/// - [directory] Needs to be the [URI] directory returned by `openDocumentTree`
+///
+/// [Refer to details](https://developer.android.com/reference/android/content/Intent#ACTION_CREATE_DOCUMENT)
 Future<Uri?> createDocumentFile({
   required String mimeType,
   required String content,
@@ -46,6 +64,10 @@ Future<Uri?> createDocumentFile({
   return Uri.parse(createdFileUri);
 }
 
+/// Returns an `List<URI>` with all persisted [URI]
+///
+/// To persist an [URI] call `openDocumentTree`
+/// and to remove an persisted [URI] call `releasePersistableUriPermission`
 Future<List<UriPermission>?> persistedUriPermissions() async {
   const kPersistedUriPermissions = 'persistedUriPermissions';
 
@@ -60,6 +82,12 @@ Future<List<UriPermission>?> persistedUriPermissions() async {
       .toList();
 }
 
+/// Will revoke an persistable URI
+///
+/// Call this when your App no longer wants the permission of an [URI] returned
+/// by `openDocumentTree` method
+///
+/// To get the current persisted [URI]s call `persistedUriPermissions`
 Future<void> releasePersistableUriPermission(Uri directory) async {
   const kReleasePersistableUriPermission = 'releasePersistableUriPermission';
 
@@ -73,7 +101,8 @@ Future<void> releasePersistableUriPermission(Uri directory) async {
 /// Convenient method to verify if a given [uri]
 /// is allowed to be write or read from SAF API's
 ///
-/// TODO: Improve documentation
+/// This uses the `releasePersistableUriPermission` method to get the List
+/// of allowed [URI]s then will verify if the [uri] is included in
 Future<bool> isPersistedUri(Uri uri) async {
   final persistedUris = await persistedUriPermissions();
 
diff --git a/lib/src/storage_access_framework/uri_permission.dart b/lib/src/storage_access_framework/uri_permission.dart
index 3c77329..9f1f482 100644
--- a/lib/src/storage_access_framework/uri_permission.dart
+++ b/lib/src/storage_access_framework/uri_permission.dart
@@ -4,11 +4,26 @@
 ///
 /// [Refer to details](https://developer.android.com/reference/android/content/UriPermission)
 class UriPermission {
+  /// Whether an [UriPermission] is created with [`FLAG_GRANT_READ_URI_PERMISSION`](https://developer.android.com/reference/android/content/Intent#FLAG_GRANT_READ_URI_PERMISSION)
   final bool isReadPermission;
+
+  /// Whether an [UriPermission] is created with [`FLAG_GRANT_WRITE_URI_PERMISSION`](https://developer.android.com/reference/android/content/Intent#FLAG_GRANT_WRITE_URI_PERMISSION)
   final bool isWritePermission;
+
+  /// Return the time when this permission was first persisted, in milliseconds
+  /// since January 1, 1970 00:00:00.0 UTC. Returns `INVALID_TIME` if
+  /// not persisted.
+  ///
+  /// [Refer to details](https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/content/UriPermission.java#77)
   final int persistedTime;
+
+  /// Return the Uri this permission pertains to.
+  ///
+  /// [Refer to details](https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/content/UriPermission.java#56)
   final Uri uri;
 
+  /// Even we allow create instances of this class avoid it and use
+  /// `persistedUriPermissions` API instead
   const UriPermission(
       {required this.isReadPermission,
       required this.isWritePermission,

From 6726d5eff7a788f983e953a241279993b9fe1d63 Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 01:29:08 -0300
Subject: [PATCH 05/11] (#7) Add `SAF` API to `README.md` docs

---
 README.md | 65 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index b6ea8a2..c126328 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Plugin to fetch Android shared storage/folders info
 - _**Android Only**_
 - _**Alpha version**_
 - _**Supports Android 4.1+ (API Level 16+)**_
+- _**The `targetSdk` should be set to `31`**_
 
 ### Features
 
@@ -19,8 +20,8 @@ This plugin allow us to get path of top-level shared folder (Downloads, DCIM, Vi
 ```dart
 /// Get Android [downloads] top-level shared folder
 /// You can also create a reference to a custom directory as: `EnvironmentDirectory.custom('Custom Folder')`
-final sharedDirectory = 
-    await getExternalStoragePublicDirectory(EnvironmentDirectory.downloads); 
+final sharedDirectory =
+    await getExternalStoragePublicDirectory(EnvironmentDirectory.downloads);
 
 print(sharedDirectory.path); /// `/storage/emulated/0/Download`
 ```
@@ -29,26 +30,74 @@ print(sharedDirectory.path); /// `/storage/emulated/0/Download`
 
 ```dart
 /// Get Android [downloads] shared folder for Android 9+
-final sharedDirectory = 
+final sharedDirectory =
     await getMediaStoreContentDirectory(MediaStoreCollection.downloads);
 
 print(sharedDirectory.path); /// `/external/downloads`
 ```
 
-- Get root Android path, note that is a read-only folder
+- Start `OPEN_DOCUMENT_TREE` activity to prompt user to select an folder to enable write and read access to be used by the `Storage Access Framework` API
 
 ```dart
-/// Get Android root folder
-final sharedDirectory = await getRootDirectory();
+/// Get permissions to manage an Android directory
+final selectedUriDir = await openDocumentTree();
 
-print(sharedDirectory.path); /// `/system`
+print(selectedUriDir);
+```
+
+- Create a new file using the `SAF` API
+
+```dart
+/// Create a new file using the `SAF` API
+final newDocumentFile = await createDocumentFile(
+  mimeType: '	text/plain',
+  content: 'My Plain Text Comment Created by shared_storage plugin',
+  displayName: 'CreatedBySharedStorageFlutterPlugin',
+  directory: anySelectedUriByTheOpenDocumentTreeAPI,
+);
+
+print(newDocumentFile);
+```
+
+- Get all persisted [URI]s by the `openDocumentTree` API, from `SAF` API
+
+```dart
+/// You have [write] and [read] access to all persisted [URI]s
+final listOfPersistedUris = await persistedUriPermissions();
+
+print(newDocumentFile);
+```
+
+- Revoke a current persisted [URI], from `SAF` API
+
+```dart
+/// Can be any [URI] returned by the `persistedUriPermissions`
+final uri = ...;
+
+/// After calling this, you no longer has access to the [uri]
+await releasePersistableUriPermission(uri);
+
+print(newDocumentFile);
+```
+
+- Convenient method to know if a given [uri] is a persisted `uri` ("persisted uri" means that you have `write` and `read` access to the `uri` even if devices reboot)
+
+```dart
+/// Can be any [URI], but the method will only return [true] if the [uri]
+/// is also present in the list returned by `persistedUriPermissions`
+final uri = ...;
+
+/// Verify if you have [write] and [read] access to a given [uri]
+final isPersisted = await isPersistedUri(uri);
+
+print(newDocumentFile);
 ```
 
 ### Android API's
 
 Most Flutter plugins uses Android API's under the hood. So this plugin do the same, and to retrieve Android shared folder paths the following API's are being used:
 
-[`🔗 android.os.Environment`](https://developer.android.com/reference/android/os/Environment#summary) [`🔗 android.provider.MediaStore`](https://developer.android.com/reference/android/provider/MediaStore#summary)
+[`🔗android.os.Environment`](https://developer.android.com/reference/android/os/Environment#summary) [`🔗android.provider.MediaStore`](https://developer.android.com/reference/android/provider/MediaStore#summary) [`🔗android.provider.DocumentsProvider`](https://developer.android.com/guide/topics/providers/document-provider)
 
 <br>
 

From b3c1de3bd1c0f60e6c32651d675b7ab6dc1340aa Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 01:30:29 -0300
Subject: [PATCH 06/11] (#7) Tiny documentation fixes `README.md`

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c126328..c25fa95 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ print(newDocumentFile);
 /// You have [write] and [read] access to all persisted [URI]s
 final listOfPersistedUris = await persistedUriPermissions();
 
-print(newDocumentFile);
+print(listOfPersistedUris);
 ```
 
 - Revoke a current persisted [URI], from `SAF` API
@@ -76,8 +76,6 @@ final uri = ...;
 
 /// After calling this, you no longer has access to the [uri]
 await releasePersistableUriPermission(uri);
-
-print(newDocumentFile);
 ```
 
 - Convenient method to know if a given [uri] is a persisted `uri` ("persisted uri" means that you have `write` and `read` access to the `uri` even if devices reboot)
@@ -89,8 +87,6 @@ final uri = ...;
 
 /// Verify if you have [write] and [read] access to a given [uri]
 final isPersisted = await isPersistedUri(uri);
-
-print(newDocumentFile);
 ```
 
 ### Android API's

From c2d673b4b8f39e9cb4488128661de650149bc641 Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 01:35:41 -0300
Subject: [PATCH 07/11]  (#7) Add action to publish the plugin when a new
 commit is pushed to the `release` branch

---
 .github/workflows/publish.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/workflows/publish.yaml

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
new file mode 100644
index 0000000..1590a1f
--- /dev/null
+++ b/.github/workflows/publish.yaml
@@ -0,0 +1,15 @@
+on: 
+  push:
+    branches:
+      - release
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dart-lang/setup-dart@v1
+
+      - name: Run Pub Publish
+        run: dart pub publish --dry-run
\ No newline at end of file

From 3c6249fd73b0cfa6c8475797baa265d523aaa945 Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 01:36:32 -0300
Subject: [PATCH 08/11] (#7) Update plugin version on `pubspec.yaml`

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 5e96383..03aea0b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: shared_storage
 description: "📁 Flutter plugin to get Android shared folders like DCIM, Downloads, Video, Audio. Works with Android 4.1 (API Level 16+)"
-version: 0.1.1
+version: 0.2.0
 homepage: https://github.com/LaksCastro/shared-storage
 repository: https://github.com/LaksCastro/shared-storage
 issue_tracker: https://github.com/LaksCastro/shared-storage/issues

From 497cafa2c8bfc59fc0fbfb64a5ee3f85af081607 Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 01:49:02 -0300
Subject: [PATCH 09/11] (#7) Add `master` branch trigger to debug on PR

---
 .github/workflows/publish.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 1590a1f..0b12f47 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -2,6 +2,7 @@ on:
   push:
     branches:
       - release
+      - master
 
 jobs:
   publish:

From 480ba9d973d20b69b233798ea31bfefb1fd093bf Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 01:53:39 -0300
Subject: [PATCH 10/11] Revert "(#7) Add `master` branch trigger to debug on
 PR"

This reverts commit 497cafa2c8bfc59fc0fbfb64a5ee3f85af081607.
---
 .github/workflows/publish.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 0b12f47..1590a1f 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - release
-      - master
 
 jobs:
   publish:

From cf8d85292bb4ac8307e915bfa51b1b229cd6baf6 Mon Sep 17 00:00:00 2001
From: LaksCastro <lakscastro@gmail.com>
Date: Thu, 25 Nov 2021 01:54:44 -0300
Subject: [PATCH 11/11] (#7) Remove actionn `--dry-run` pub arg

---
 .github/workflows/publish.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 1590a1f..95d62c7 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -12,4 +12,4 @@ jobs:
       - uses: dart-lang/setup-dart@v1
 
       - name: Run Pub Publish
-        run: dart pub publish --dry-run
\ No newline at end of file
+        run: dart pub publish
\ No newline at end of file