From 7fbfff133ffa298964657b28db44f2d68ba40795 Mon Sep 17 00:00:00 2001
From: v4_adi <v4_adi@Androids-MacBook-Air.local>
Date: Wed, 1 Nov 2017 02:57:41 +0530
Subject: [PATCH] code refactored, created fileProvider utility method

---
 app/src/main/AndroidManifest.xml                    |  2 +-
 .../dfa/diaspora_android/util/ActivityUtils.java    | 13 +++++++++++++
 .../dfa/diaspora_android/web/BrowserFragment.java   |  5 ++---
 .../diaspora_android/web/ContextMenuWebView.java    |  6 +++---
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 200b6aa6..453cec1c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
             android:authorities="${applicationId}.mainactivity"
             android:exported="false" />
 
-        <!--File provider for sharinf files-->
+        <!--File provider for sharing files-->
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}"
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 6708578b..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
@@ -29,7 +29,6 @@ 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;
@@ -39,11 +38,11 @@ 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;
 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;
 
@@ -231,7 +230,7 @@ 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));
+            Uri bmpUri = ActivityUtils.getFileSharingUri(getContext(),new File(fileSaveDirectory, fileSaveName));
 
             Intent sharingIntent = new Intent(Intent.ACTION_SEND);
             sharingIntent.setType("image/jpeg");
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 690d41ff..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
@@ -31,16 +31,15 @@ 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;
+import com.github.dfa.diaspora_android.util.ActivityUtils;
 
 import java.io.File;
 
@@ -167,7 +166,8 @@ public class ContextMenuWebView extends NestedWebView {
                                 new ImageDownloadTask(null, local.getPath()) {
                                     @Override
                                     protected void onPostExecute(Bitmap result) {
-                                        Uri myUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID,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);