From 4e9ee66b34909a70bc32f5d45d27b1fc7e050ba3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 30 Jan 2021 11:13:29 +0100
Subject: [PATCH] Improved activity not found error

---
 .../java/eu/faircode/email/ActivityBase.java  |  4 +-
 .../eu/faircode/email/AdapterAccount.java     |  3 +-
 .../eu/faircode/email/AdapterContact.java     |  3 +-
 .../java/eu/faircode/email/AdapterFolder.java |  3 +-
 .../eu/faircode/email/AdapterMessage.java     | 16 +++----
 .../java/eu/faircode/email/FragmentBase.java  |  4 +-
 .../eu/faircode/email/FragmentCompose.java    |  6 +--
 .../eu/faircode/email/FragmentDialogBase.java |  5 +--
 .../faircode/email/FragmentOptionsMisc.java   |  2 +-
 .../main/java/eu/faircode/email/Helper.java   | 42 ++++++++++++++-----
 10 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index cb02f069f8..084c281a36 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -445,7 +445,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
             super.startActivity(intent);
         } catch (ActivityNotFoundException ex) {
             Log.w(ex);
-            ToastEx.makeText(this, getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+            Helper.reportNoViewer(this, intent);
         } catch (Throwable ex) {
             Log.e(ex);
             ToastEx.makeText(this, Log.formatThrowable(ex), Toast.LENGTH_LONG).show();
@@ -463,7 +463,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
             if (Helper.isTnef(intent.getType(), null))
                 Helper.viewFAQ(this, 155);
             else
-                ToastEx.makeText(this, getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+                Helper.reportNoViewer(this, intent);
         } catch (Throwable ex) {
             Log.e(ex);
             ToastEx.makeText(this, Log.formatThrowable(ex), Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index e0dd3b0731..73d170ff12 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -43,7 +43,6 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.PopupMenu;
@@ -427,7 +426,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                         context.startActivity(intent);
                     } catch (ActivityNotFoundException ex) {
                         Log.w(ex);
-                        ToastEx.makeText(context, context.getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+                        Helper.reportNoViewer(context, intent);
                     }
                 }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterContact.java b/app/src/main/java/eu/faircode/email/AdapterContact.java
index f5415d82eb..9a2db4fa89 100644
--- a/app/src/main/java/eu/faircode/email/AdapterContact.java
+++ b/app/src/main/java/eu/faircode/email/AdapterContact.java
@@ -45,7 +45,6 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -289,7 +288,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
                         context.startActivity(share);
                     } catch (ActivityNotFoundException ex) {
                         Log.w(ex);
-                        ToastEx.makeText(context, context.getString(R.string.title_no_viewer, share), Toast.LENGTH_LONG).show();
+                        Helper.reportNoViewer(context, share);
                     }
                 }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index a4000e51e3..513dcb5484 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -49,7 +49,6 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -863,7 +862,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                         context.startActivity(intent);
                     } catch (ActivityNotFoundException ex) {
                         Log.w(ex);
-                        ToastEx.makeText(context, context.getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+                        Helper.reportNoViewer(context, intent);
                     }
                 }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b677d5db65..e1e13fd3f6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2846,7 +2846,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             context.startActivity((Intent) result);
                         } catch (ActivityNotFoundException ex) {
                             Log.w(ex);
-                            ToastEx.makeText(context, context.getString(R.string.title_no_viewer, result), Toast.LENGTH_LONG).show();
+                            Helper.reportNoViewer(context, (Intent) result);
                         }
                     }
                 }
@@ -3251,9 +3251,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     context.startActivity(intent);
                 } catch (ActivityNotFoundException ex) {
                     Log.w(ex);
-                    ToastEx.makeText(context,
-                            context.getString(R.string.title_no_viewer, intent),
-                            Toast.LENGTH_LONG).show();
+                    Helper.reportNoViewer(context, intent);
                 }
             }
         }
@@ -3494,7 +3492,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         context.startActivity(intent);
                     } catch (ActivityNotFoundException ex) {
                         Log.w(ex);
-                        ToastEx.makeText(context, context.getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+                        Helper.reportNoViewer(context, intent);
                     }
                 }
 
@@ -3578,7 +3576,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         Helper.getChooser(context, pick), FragmentMessages.REQUEST_PICK_CONTACT);
             } catch (ActivityNotFoundException ex) {
                 Log.w(ex);
-                ToastEx.makeText(context, context.getString(R.string.title_no_viewer, pick), Toast.LENGTH_LONG).show();
+                Helper.reportNoViewer(context, pick);
             } catch (Throwable ex) {
                 Log.unexpectedError(parentFragment.getParentFragmentManager(), ex, false);
             }
@@ -4450,7 +4448,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 }.execute(context, owner, args, "view:cid");
 
             else
-                ToastEx.makeText(context, context.getString(R.string.title_no_viewer, uri), Toast.LENGTH_LONG).show();
+                Helper.reportNoViewer(context, uri);
         }
 
         private void onMenuButton(final TupleMessageEx message, String button, boolean isChecked) {
@@ -4893,9 +4891,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     PackageManager pm = context.getPackageManager();
                     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R &&
                             intent.resolveActivity(pm) == null) // system whitelisted
-                        Snackbar.make(parentFragment.getView(),
-                                context.getString(R.string.title_no_viewer, intent), Snackbar.LENGTH_LONG)
-                                .setGestureInsetBottomIgnored(true).show();
+                        Helper.reportNoViewer(context, intent);
                     else
                         context.startActivity(intent);
                 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 86fb347af2..2881764a4a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -143,7 +143,7 @@ public class FragmentBase extends Fragment {
             super.startActivity(intent);
         } catch (ActivityNotFoundException ex) {
             Log.w(ex);
-            ToastEx.makeText(getContext(), getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+            Helper.reportNoViewer(getContext(), intent);
         } catch (Throwable ex) {
             Log.e(ex);
             ToastEx.makeText(getContext(), Log.formatThrowable(ex), Toast.LENGTH_LONG).show();
@@ -158,7 +158,7 @@ public class FragmentBase extends Fragment {
             super.startActivityForResult(intent, requestCode);
         } catch (ActivityNotFoundException ex) {
             Log.w(ex);
-            ToastEx.makeText(getContext(), getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+            Helper.reportNoViewer(getContext(), intent);
         } catch (Throwable ex) {
             Log.e(ex);
             ToastEx.makeText(getContext(), Log.formatThrowable(ex), Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 139bd90ef1..8b92671327 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1722,8 +1722,7 @@ public class FragmentCompose extends FragmentBase {
                 startActivityForResult(intent, REQUEST_RECORD_AUDIO);
             } catch (SecurityException ex) {
                 Log.w(ex);
-                Snackbar.make(view, getString(R.string.title_no_viewer, intent), Snackbar.LENGTH_INDEFINITE)
-                        .setGestureInsetBottomIgnored(true).show();
+                Helper.reportNoViewer(getContext(), intent);
             }
     }
 
@@ -2146,8 +2145,7 @@ public class FragmentCompose extends FragmentBase {
                     startActivityForResult(intent, REQUEST_TAKE_PHOTO);
                 } catch (SecurityException ex) {
                     Log.w(ex);
-                    Snackbar.make(view, getString(R.string.title_no_viewer, intent), Snackbar.LENGTH_LONG)
-                            .setGestureInsetBottomIgnored(true).show();
+                    Helper.reportNoViewer(getContext(), intent);
                 } catch (Throwable ex) {
                     // / java.lang.IllegalArgumentException: Failed to resolve canonical path for ...
                     Log.unexpectedError(getParentFragmentManager(), ex);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogBase.java b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
index 2c03620bec..6ae5a0e735 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java
@@ -23,7 +23,6 @@ import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -208,7 +207,7 @@ public class FragmentDialogBase extends DialogFragment {
             super.startActivity(intent);
         } catch (ActivityNotFoundException ex) {
             Log.w(ex);
-            ToastEx.makeText(getContext(), getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+            Helper.reportNoViewer(getContext(), intent);
         }
     }
 
@@ -218,7 +217,7 @@ public class FragmentDialogBase extends DialogFragment {
             super.startActivityForResult(intent, requestCode);
         } catch (ActivityNotFoundException ex) {
             Log.w(ex);
-            ToastEx.makeText(getContext(), getString(R.string.title_no_viewer, intent), Toast.LENGTH_LONG).show();
+            Helper.reportNoViewer(getContext(), intent);
         }
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index f7d02fbe26..b74b9db66a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -440,7 +440,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                     getContext().startActivity(app);
                 } catch (Throwable ex) {
                     Log.w(ex);
-                    ToastEx.makeText(getContext(), getString(R.string.title_no_viewer, app), Toast.LENGTH_LONG).show();
+                    Helper.reportNoViewer(getContext(), app);
                 }
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 7cab233e03..42db6dc76f 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -575,15 +575,12 @@ public class Helper {
             }
 
             // Check if viewer available
-            if (ris == null || ris.size() == 0) {
+            if (ris == null || ris.size() == 0)
                 if (isTnef(type, null))
                     viewFAQ(context, 155);
-                else {
-                    String message = context.getString(R.string.title_no_viewer,
-                            type != null ? type : name != null ? name : file.getName());
-                    ToastEx.makeText(context, message, Toast.LENGTH_LONG).show();
-                }
-            } else
+                else
+                    reportNoViewer(context, intent);
+            else
                 context.startActivity(intent);
         } else
             context.startActivity(intent);
@@ -611,7 +608,7 @@ public class Helper {
                 context.startActivity(intent);
             } catch (ActivityNotFoundException ex) {
                 Log.w(ex);
-                ToastEx.makeText(context, context.getString(R.string.title_no_viewer, uri), Toast.LENGTH_LONG).show();
+                reportNoViewer(context, intent);
             }
     }
 
@@ -636,7 +633,7 @@ public class Helper {
                 context.startActivity(view);
             } catch (ActivityNotFoundException ex) {
                 Log.w(ex);
-                ToastEx.makeText(context, context.getString(R.string.title_no_viewer, uri), Toast.LENGTH_LONG).show();
+                reportNoViewer(context, uri);
             } catch (Throwable ex) {
                 Log.e(ex);
                 ToastEx.makeText(context, Log.formatThrowable(ex, false), Toast.LENGTH_LONG).show();
@@ -659,7 +656,7 @@ public class Helper {
                 customTabsIntent.launchUrl(context, uri);
             } catch (ActivityNotFoundException ex) {
                 Log.w(ex);
-                ToastEx.makeText(context, context.getString(R.string.title_no_viewer, uri), Toast.LENGTH_LONG).show();
+                reportNoViewer(context, uri);
             } catch (Throwable ex) {
                 Log.e(ex);
                 ToastEx.makeText(context, Log.formatThrowable(ex, false), Toast.LENGTH_LONG).show();
@@ -743,6 +740,31 @@ public class Helper {
         return ("Microsoft".equalsIgnoreCase(Build.MANUFACTURER) && "Surface Duo".equals(Build.MODEL));
     }
 
+    static void reportNoViewer(Context context, Uri uri) {
+        reportNoViewer(context, new Intent().setData(uri));
+    }
+
+    static void reportNoViewer(Context context, Intent intent) {
+        StringBuilder sb = new StringBuilder();
+
+        String title = intent.getStringExtra(Intent.EXTRA_TITLE);
+        if (TextUtils.isEmpty(title)) {
+            Uri data = intent.getData();
+            if (data == null)
+                sb.append(intent.toString());
+            else
+                sb.append(data.toString());
+        } else
+            sb.append(title);
+
+        String type = intent.getType();
+        if (!TextUtils.isEmpty(type))
+            sb.append(' ').append(type);
+
+        String message = context.getString(R.string.title_no_viewer, sb.toString());
+        ToastEx.makeText(context, message, Toast.LENGTH_LONG).show();
+    }
+
     // Graphics
 
     static int dp2pixels(Context context, int dp) {