Use FileProvider to get file URI for API 24+ (#280)

amahi · Oct 17, 2017 · 25149de · 25149de
1 parent 041f4f7
commit 25149de
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/org/amahi/anywhere/util/Downloader.java b/src/main/java/org/amahi/anywhere/util/Downloader.java
@@ -27,6 +27,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
+import android.support.v4.content.FileProvider;
 
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FileDownloadFailedEvent;
@@ -114,7 +115,13 @@ private void finishDownloading() {
             String downloadUri = downloadInformation.getString(
                 downloadInformation.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
 
-            BusProvider.getBus().post(new FileDownloadedEvent(Uri.parse(downloadUri)));
+            if (downloadUri.substring(0, 7).matches("file://")) {
+                downloadUri = downloadUri.substring(7);
+            }
+            File file = new File(downloadUri);
+            Uri contentUri = FileProvider.getUriForFile(context, "org.amahi.anywhere.fileprovider", file);
+
+            BusProvider.getBus().post(new FileDownloadedEvent(contentUri));
         } else {
             BusProvider.getBus().post(new FileDownloadFailedEvent());
         }

diff --git a/src/main/res/xml/file_paths.xml b/src/main/res/xml/file_paths.xml
@@ -2,5 +2,8 @@
 <paths>
     <external-path
         name="user_images"
-        path="Android/data/org.amahi.anywhere/files/Pictures" />
-</paths>
+        path="Android/data/org.amahi.anywhere/files/Pictures"/>
+    <external-path
+        name="user_downloads"
+        path="Android/data/org.amahi.anywhere/files/Download"/>
+</paths>