From e7ade759dd50d3a5348b4c906baf4c89a6ce25c3 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Sat, 4 Jun 2016 00:00:24 +0100 Subject: [PATCH] Fix crash when no email client is installed See issue #114 --- .../contributions/ContributionsListFragment.java | 11 ++++++++++- commons/app/src/main/res/values/strings.xml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index abdc6463c..7e6db87b1 100644 --- a/commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -1,6 +1,7 @@ package fr.free.nrw.commons.contributions; import android.app.Activity; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -17,6 +18,7 @@ import android.support.v4.app.Fragment; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import android.widget.Toast; import fr.free.nrw.commons.AboutActivity; import fr.free.nrw.commons.CommonsApplication; @@ -106,7 +108,14 @@ public class ContributionsListFragment extends Fragment { feedbackIntent.setType("message/rfc822"); feedbackIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { CommonsApplication.FEEDBACK_EMAIL }); feedbackIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(CommonsApplication.FEEDBACK_EMAIL_SUBJECT, CommonsApplication.APPLICATION_VERSION)); - startActivity(feedbackIntent); + + try { + startActivity(feedbackIntent); + } + catch (ActivityNotFoundException e) { + Toast.makeText(getActivity(), R.string.no_email_client, Toast.LENGTH_SHORT).show(); + } + return true; case R.id.menu_refresh: ((SourceRefresher)getActivity()).refreshSource(); diff --git a/commons/app/src/main/res/values/strings.xml b/commons/app/src/main/res/values/strings.xml index 8b55dede3..5b53614a7 100644 --- a/commons/app/src/main/res/values/strings.xml +++ b/commons/app/src/main/res/values/strings.xml @@ -80,6 +80,7 @@ <a href="https://wikimediafoundation.org/wiki/Privacy_policy">Privacy policy</a> About Send Feedback (via Email) + No email client installed Recently used categories Waiting for first sync...