From 16210b561c38b50355ac3a702c702b1a204d0d58 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 8 Jan 2020 09:06:30 +0100
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/AdapterAttachment.java  | 40 +---------------
 .../java/eu/faircode/email/AdapterImage.java  | 47 ++-----------------
 .../main/java/eu/faircode/email/Helper.java   | 29 ++++++++++++
 3 files changed, 33 insertions(+), 83 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 968c1d4b59..b7d2f847de 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -22,11 +22,7 @@ package eu.faircode.email;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,7 +32,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.FileProvider;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -48,9 +43,6 @@ import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListUpdateCallback;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.snackbar.Snackbar;
-
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -218,37 +210,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         }
 
         private void onShare(EntityAttachment attachment) {
-            // https://developer.android.com/reference/android/support/v4/content/FileProvider
-            File file = attachment.getFile(context);
-            Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
-            Log.i("uri=" + uri);
-
-            String type = attachment.getMimeType();
-
-            // Build intent
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setDataAndTypeAndNormalize(uri, type);
-            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-            if (!TextUtils.isEmpty(attachment.name))
-                intent.putExtra(Intent.EXTRA_TITLE, Helper.sanitizeFilename(attachment.name));
-            Log.i("Intent=" + intent + " type=" + type);
-
-            // Get targets
-            PackageManager pm = context.getPackageManager();
-            List<ResolveInfo> ris = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-            for (ResolveInfo ri : ris) {
-                Log.i("Target=" + ri);
-                context.grantUriPermission(ri.activityInfo.packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
-            }
-
-            // Check if viewer available
-            if (ris.size() == 0)
-                Snackbar.make(
-                        (View) itemView.getParent(),
-                        context.getString(R.string.title_no_viewer, type),
-                        Snackbar.LENGTH_LONG).show();
-            else
-                context.startActivity(intent);
+            Helper.share(context, attachment.getFile(context), attachment.type, attachment.name);
         }
 
         private void onDownload(EntityAttachment attachment) {
diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java
index 7284a877c3..9228de2880 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -20,11 +20,7 @@ package eu.faircode.email;
 */
 
 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -34,7 +30,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.FileProvider;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -44,9 +39,6 @@ import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListUpdateCallback;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.snackbar.Snackbar;
-
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -105,42 +97,9 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
                 return;
 
             EntityAttachment attachment = items.get(pos);
-            if (attachment.available) {
-                // Build file name
-                File file = attachment.getFile(context);
-
-                // https://developer.android.com/reference/android/support/v4/content/FileProvider
-                Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
-                Log.i("uri=" + uri);
-
-                // Build intent
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setDataAndTypeAndNormalize(uri, attachment.type);
-                intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                if (!TextUtils.isEmpty(attachment.name))
-                    intent.putExtra(Intent.EXTRA_TITLE, attachment.name);
-                Log.i("Sharing " + file + " type=" + attachment.type);
-                Log.i("Intent=" + intent);
-
-                // Get targets
-                PackageManager pm = context.getPackageManager();
-                List<ResolveInfo> ris = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-                for (ResolveInfo ri : ris) {
-                    Log.i("Target=" + ri);
-                    context.grantUriPermission(ri.activityInfo.packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                }
-
-                // Check if viewer available
-                if (ris.size() == 0) {
-                    Snackbar.make(
-                            parentFragment.getView(),
-                            context.getString(R.string.title_no_viewer, attachment.type),
-                            Snackbar.LENGTH_LONG).show();
-                    return;
-                }
-
-                context.startActivity(intent);
-            } else {
+            if (attachment.available)
+                Helper.share(context, attachment.getFile(context), attachment.type, attachment.name);
+            else {
                 if (attachment.progress == null) {
                     Bundle args = new Bundle();
                     args.putLong("id", attachment.id);
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 78d1e9d2d6..fb2ead0b45 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -78,6 +78,7 @@ import androidx.biometric.BiometricPrompt;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
 import androidx.core.graphics.ColorUtils;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Lifecycle;
@@ -254,6 +255,34 @@ public class Helper {
             return Intent.createChooser(intent, context.getString(R.string.title_select_app));
     }
 
+    static void share(Context context, File file, String type, String name) {
+        // https://developer.android.com/reference/android/support/v4/content/FileProvider
+        Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+        Log.i("uri=" + uri);
+
+        // Build intent
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndTypeAndNormalize(uri, type);
+        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        if (!TextUtils.isEmpty(name))
+            intent.putExtra(Intent.EXTRA_TITLE, Helper.sanitizeFilename(name));
+        Log.i("Intent=" + intent + " type=" + type);
+
+        // Get targets
+        PackageManager pm = context.getPackageManager();
+        List<ResolveInfo> ris = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+        for (ResolveInfo ri : ris) {
+            Log.i("Target=" + ri);
+            context.grantUriPermission(ri.activityInfo.packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        }
+
+        // Check if viewer available
+        if (ris.size() == 0)
+            ToastEx.makeText(context, R.string.title_no_viewer, Toast.LENGTH_LONG).show();
+        else
+            context.startActivity(intent);
+    }
+
     static void view(Context context, Intent intent) {
         Uri uri = intent.getData();
         if ("http".equals(uri.getScheme()) || "https".equals(uri.getScheme()))