Use FileProvider to transform URIs in results

spacecowboy · Oct 22, 2016 · 101aa70 · 101aa70
1 parent 8fb5579
commit 101aa70
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java
@@ -13,6 +13,7 @@
 import android.support.annotation.NonNull;
 import android.support.v4.content.AsyncTaskLoader;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.content.FileProvider;
 import android.support.v4.content.Loader;
 import android.support.v7.util.SortedList;
 import android.support.v7.widget.util.SortedListAdapterCallback;
@@ -196,7 +197,10 @@ public File getRoot() {
     @NonNull
     @Override
     public Uri toUri(@NonNull final File file) {
-        return Uri.fromFile(file);
+        return FileProvider
+                .getUriForFile(getContext(),
+                        getContext().getApplicationContext().getPackageName() + ".provider",
+                        file);
     }
 
     /**

diff --git a/library/src/main/res/xml/nnf_provider_paths.xml b/library/src/main/res/xml/nnf_provider_paths.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <root-path
+        name="root"
+        path="." />
+</paths>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -37,6 +37,16 @@
             android:label="@string/title_activity_no_nonsense_file_picker"/>
 
         <!-- SD-card pickers -->
+        <!-- You must define a fileprovider for the sd-card pickers -->
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/nnf_provider_paths"/>
+        </provider>
         <activity
             android:name="com.nononsenseapps.filepicker.FilePickerActivity"
             android:label="@string/title_activity_no_nonsense_file_picker"