From 2b7b1c83b8ceda5807a7a70d27c1dcee54db2664 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 2 Nov 2022 18:45:14 +0100
Subject: [PATCH] Improved share error handling

---
 .../main/java/eu/faircode/email/AdapterAttachment.java    | 8 ++++++--
 app/src/main/java/eu/faircode/email/AdapterImage.java     | 6 +++++-
 app/src/main/java/eu/faircode/email/Helper.java           | 8 ++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 17eb8a7a3d..d5402b10df 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -349,8 +349,12 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         }
 
         private void onShare(EntityAttachment attachment) {
-            String title = (attachment.name == null ? attachment.cid : attachment.name);
-            Helper.share(context, attachment.getFile(context), attachment.getMimeType(), title);
+            try {
+                String title = (attachment.name == null ? attachment.cid : attachment.name);
+                Helper.share(context, attachment.getFile(context), attachment.getMimeType(), title);
+            } catch (Throwable ex) {
+                Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
+            }
         }
 
         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 a58b6f2695..10f4905463 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -210,7 +210,11 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
 
             EntityAttachment attachment = items.get(pos);
             if (attachment.available)
-                Helper.share(context, attachment.getFile(context), attachment.getMimeType(), attachment.name);
+                try {
+                    Helper.share(context, attachment.getFile(context), attachment.getMimeType(), attachment.name);
+                } catch (Throwable ex) {
+                    Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
+                }
             else {
                 if (attachment.progress == null) {
                     Bundle args = new Bundle();
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 6358b090ca..6237a890ed 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -866,12 +866,8 @@ public class Helper {
 
     static void share(Context context, File file, String type, String name) {
         // https://developer.android.com/reference/androidx/core/content/FileProvider
-        try {
-            Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
-            share(context, uri, type, name);
-        } catch (Throwable ex) {
-            Log.e(ex);
-        }
+        Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+        share(context, uri, type, name);
     }
 
     static void share(Context context, Uri uri, String type, String name) {