From 79fc33630b0f56c2a909a4ed6f0e2c50cdb28b97 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 6 Mar 2020 10:34:00 -0400
Subject: [PATCH] Add toast instead of crash if no email app installed.

---
 .../conversationlist/ConversationListFragment.java       | 9 ---------
 .../org/thoughtcrime/securesms/help/HelpFragment.java    | 7 +++++--
 app/src/main/res/menu/text_secure_normal.xml             | 3 ---
 app/src/main/res/values/strings.xml                      | 3 ++-
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 15894f1f26..de80909e2b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -298,7 +298,6 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
       case R.id.menu_mark_all_read:     handleMarkAllRead();     return true;
       case R.id.menu_invite:            handleInvite();          return true;
       case R.id.menu_insights:          handleInsights();        return true;
-      case R.id.menu_help:              handleHelp();            return true;
     }
 
     return false;
@@ -597,14 +596,6 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
     getNavigator().goToInsights();
   }
 
-  private void handleHelp() {
-    try {
-      startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://support.signal.org")));
-    } catch (ActivityNotFoundException e) {
-      Toast.makeText(requireActivity(), R.string.ConversationListActivity_there_is_no_browser_installed_on_your_device, Toast.LENGTH_LONG).show();
-    }
-  }
-
   @SuppressLint("StaticFieldLeak")
   private void handleArchiveAllSelected() {
     Set<Long> selectedConversations = new HashSet<>(defaultAdapter.getBatchSelections());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java
index 078a02c469..57de235f4f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.help;
 
 import android.content.Intent;
-import android.content.pm.LabeledIntent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -157,7 +156,11 @@ public class HelpFragment extends Fragment {
     intent.putExtra(Intent.EXTRA_SUBJECT, getEmailSubject());
     intent.putExtra(Intent.EXTRA_TEXT, body.toString());
 
-    startActivity(intent);
+    if (IntentUtils.isResolvable(requireContext(), intent)) {
+      startActivity(intent);
+    } else {
+      Toast.makeText(requireContext(), R.string.HelpFragment__no_email_app_found, Toast.LENGTH_LONG).show();
+    }
   }
 
   private String getEmailSubject() {
diff --git a/app/src/main/res/menu/text_secure_normal.xml b/app/src/main/res/menu/text_secure_normal.xml
index baa40c98e2..a20f11c831 100644
--- a/app/src/main/res/menu/text_secure_normal.xml
+++ b/app/src/main/res/menu/text_secure_normal.xml
@@ -20,7 +20,4 @@
           android:id="@+id/menu_insights"
           android:visible="false" />
 
-    <item android:title="@string/text_secure_normal__help"
-          android:id="@+id/menu_help"/>
-
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d66cdc514..71920464cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1450,7 +1450,7 @@
     <string name="HelpFragment__emoji_3" translatable="false">emoji_3</string>
     <string name="HelpFragment__emoji_2" translatable="false">emoji_2</string>
     <string name="HelpFragment__emoji_1" translatable="false">emoji_1</string>
-    <string name="HelpFragment__link__debug_info" translatable="false">https://support.signal.org/hc/en-us/articles/360007318591-Debug-Logs-and-Crash-Reports</string>
+    <string name="HelpFragment__link__debug_info" translatable="false">https://support.signal.org/hc/articles/360007318591</string>
     <string name="HelpFragment__link__faq" translatable="false">https://support.signal.org</string>
     <string name="HelpFragment__support_info">Support Info</string>
     <string name="HelpFragment__subject">Subject:</string>
@@ -1464,6 +1464,7 @@
     <string name="HelpFragment__could_not_upload_logs">Could not upload logs</string>
     <string name="HelpFragment__signal_support">Signal Support</string>
     <string name="HelpFragment__please_be_as_descriptive_as_possible">Please be as descriptive as possible to help us understand the issue.</string>
+    <string name="HelpFragment__no_email_app_found">No email app found.</string>
 
     <!-- arrays.xml -->
     <string name="arrays__import_export">Import</string>