From 5660787e57bd95410869a75a2b7aec1eda4f0edc Mon Sep 17 00:00:00 2001
From: v4_adi <v4_adi@Androids-MacBook-Air.local>
Date: Wed, 1 Nov 2017 02:34:06 +0530
Subject: [PATCH] WIP: replaced traditional file sharing with FileProvider

---
 app/src/main/AndroidManifest.xml                   | 10 ++++++++++
 .../dfa/diaspora_android/web/BrowserFragment.java  | 14 ++++++++++++--
 .../diaspora_android/web/ContextMenuWebView.java   |  4 +++-
 app/src/main/res/xml/file_provider_paths.xml       |  3 +++
 4 files changed, 28 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..200b6aa6 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 sharinf 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/web/BrowserFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
index ccf3db0f..6708578b 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
@@ -29,6 +29,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.FileProvider;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,6 +39,7 @@ import android.webkit.WebView;
 import android.widget.ProgressBar;
 
 import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
@@ -228,13 +230,21 @@ public class BrowserFragment extends ThemedFragment {
 
         // Only show share intent when Action Share Screenshot was selected
         if (hasToShareScreenshot) {
+
+            Uri bmpUri = FileProvider.getUriForFile(getContext(), BuildConfig.APPLICATION_ID, 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..690d41ff 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
@@ -31,11 +31,13 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Environment;
+import android.support.v4.content.FileProvider;
 import android.util.AttributeSet;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.github.dfa.diaspora_android.BuildConfig;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.service.ImageDownloadTask;
@@ -165,7 +167,7 @@ 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 = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID,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