From 255c6d650eab73678fa7e99bd89cf575c3854feb Mon Sep 17 00:00:00 2001
From: Aditya Mehta <adityamehta307@gmail.com>
Date: Wed, 1 Nov 2017 09:53:19 +0530
Subject: [PATCH] replaced traditional file sharing with FileProvider (#174)

replaced traditional file sharing with FileProvider (fixes #173)
---
 app/src/main/AndroidManifest.xml                    | 10 ++++++++++
 .../dfa/diaspora_android/util/ActivityUtils.java    | 13 +++++++++++++
 .../dfa/diaspora_android/web/BrowserFragment.java   | 13 +++++++++++--
 .../diaspora_android/web/ContextMenuWebView.java    |  4 +++-
 app/src/main/res/xml/file_provider_paths.xml        |  3 +++
 5 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/xml/file_provider_paths.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 48404d25..453cec1c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,16 @@
             android:authorities="${applicationId}.mainactivity"
             android:exported="false" />
 
+        <!--File provider for sharing files-->
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths" />
+        </provider>
         <service
             android:name="com.github.dfa.diaspora_android.service.FetchPodsService"
             android:enabled="true"
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java b/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
index 0c16b21f..e998cd13 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/ActivityUtils.java
@@ -1,10 +1,14 @@
 package com.github.dfa.diaspora_android.util;
 
 import android.app.Activity;
+import android.content.Context;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v4.content.FileProvider;
 import android.view.View;
 
+import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.web.WebHelper;
 
@@ -70,4 +74,13 @@ public class ActivityUtils extends net.gsantner.opoc.util.ActivityUtils {
             }
         }
     }
+
+    /**
+     * This method creates file sharing uri by using FileProvider
+     * @return
+     */
+    public static Uri getFileSharingUri(Context context,File file) {
+
+        return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID,file);
+    }
 }
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
index ccf3db0f..98b5c186 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
@@ -42,6 +42,7 @@ import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
 import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
+import com.github.dfa.diaspora_android.util.ActivityUtils;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;
 
@@ -228,13 +229,21 @@ public class BrowserFragment extends ThemedFragment {
 
         // Only show share intent when Action Share Screenshot was selected
         if (hasToShareScreenshot) {
+
+            Uri bmpUri = ActivityUtils.getFileSharingUri(getContext(),new File(fileSaveDirectory, fileSaveName));
+
             Intent sharingIntent = new Intent(Intent.ACTION_SEND);
             sharingIntent.setType("image/jpeg");
             sharingIntent.putExtra(Intent.EXTRA_SUBJECT, webView.getTitle());
             sharingIntent.putExtra(Intent.EXTRA_TEXT, webView.getUrl());
-            Uri bmpUri = Uri.fromFile(new File(fileSaveDirectory, fileSaveName));
+            sharingIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             sharingIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
-            startActivity(Intent.createChooser(sharingIntent, getString(R.string.action_share_dotdotdot)));
+
+            PackageManager pm = getActivity().getPackageManager();
+
+            if (sharingIntent.resolveActivity(pm) != null) {
+                startActivity(Intent.createChooser(sharingIntent, getString(R.string.action_share_dotdotdot)));
+            }
         } else {
             // Broadcast that this file is indexable
             File file = new File(fileSaveDirectory, fileSaveName);
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java b/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
index cb5ed280..caa2f68a 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/ContextMenuWebView.java
@@ -39,6 +39,7 @@ import android.widget.Toast;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.service.ImageDownloadTask;
+import com.github.dfa.diaspora_android.util.ActivityUtils;
 
 import java.io.File;
 
@@ -165,7 +166,8 @@ public class ContextMenuWebView extends NestedWebView {
                                 new ImageDownloadTask(null, local.getPath()) {
                                     @Override
                                     protected void onPostExecute(Bitmap result) {
-                                        Uri myUri = Uri.fromFile(new File(local.getPath()));
+
+                                        Uri myUri = ActivityUtils.getFileSharingUri(context, new File(local.getPath()));
                                         Intent sharingIntent = new Intent();
                                         sharingIntent.setAction(Intent.ACTION_SEND);
                                         sharingIntent.putExtra(Intent.EXTRA_STREAM, myUri);
diff --git a/app/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml
new file mode 100644
index 00000000..c8826f4c
--- /dev/null
+++ b/app/src/main/res/xml/file_provider_paths.xml
@@ -0,0 +1,3 @@
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
+</paths>
\ No newline at end of file