From 72aa5397f82dff5fbb5e927b365271414d052c96 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 5 Nov 2019 15:17:10 -0300
Subject: [PATCH] [android] fail gracefully when
 ACTION_CHANNEL_NOTIFICATION_SETTINGS is not available

---
 .../briar/android/settings/SettingsFragment.java          | 8 +++++++-
 briar-android/src/main/res/values/strings.xml             | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
index b87e0e4cb..0ebe6fb2c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
@@ -489,7 +489,13 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			Intent intent = new Intent(ACTION_CHANNEL_NOTIFICATION_SETTINGS)
 					.putExtra(EXTRA_APP_PACKAGE, packageName)
 					.putExtra(EXTRA_CHANNEL_ID, channelId);
-			startActivity(intent);
+			Context ctx = requireContext();
+			if (intent.resolveActivity(ctx.getPackageManager()) != null) {
+				startActivity(intent);
+			} else {
+				Toast.makeText(ctx, R.string.error_start_activity, LENGTH_SHORT)
+						.show();
+			}
 			return true;
 		});
 	}
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index e21adf686..6f6584795 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -120,6 +120,7 @@
 	<string name="fix">Fix</string>
 	<string name="help">Help</string>
 	<string name="sorry">Sorry</string>
+	<string name="error_start_activity">Unavailable on your system</string>
 
 	<!-- Contacts and Private Conversations-->
 	<string name="no_contacts">No contacts to show</string>