From 2e1484bcb2e1a98a9a9d2eae12fa7659b4af342d Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Thu, 1 Dec 2016 00:04:06 +1100 Subject: [PATCH] Correctly check whether mailto: links can be handled Similar to the litecoin/bitcoin/flattr stuff, we need to check that a proper URI can be handled via an intent. This previously just checked whether the email address could be handled without the mailto: prefix. --- .../fdroid/views/AppDetailsRecyclerViewAdapter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 5cb2b9a2b..7b3648214 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -363,10 +363,10 @@ public class AppDetailsRecyclerViewAdapter } // Email button - if (uriIsSetAndCanBeOpened(mApp.email)) { - final String subject = Uri.encode(mContext.getString(R.string.app_details_subject, mApp.name)); - String url = "mailto:" + mApp.email + "?subject=" + subject; - addLinkItemView(vh.contentView, R.string.menu_email, R.drawable.ic_email, url); + final String subject = Uri.encode(mContext.getString(R.string.app_details_subject, mApp.name)); + String emailUrl = mApp.email == null ? null : ("mailto:" + mApp.email + "?subject=" + subject); + if (uriIsSetAndCanBeOpened(emailUrl)) { + addLinkItemView(vh.contentView, R.string.menu_email, R.drawable.ic_email, emailUrl); } } else if (viewType == VIEWTYPE_PERMISSIONS) { final ExpandableLinearLayoutViewHolder vh = (ExpandableLinearLayoutViewHolder) holder;