From 98788c7c8007b7acabe76f40c5b7e270be7ae25e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 14 Dec 2020 12:01:56 -0300
Subject: [PATCH] Define manifest <queries> allowing us to make intent queries
 on API 30+

---
 briar-android/src/main/AndroidManifest.xml    | 23 +++++++++++++++++++
 .../panic/PanicPreferencesFragment.java       |  1 +
 2 files changed, 24 insertions(+)

diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 8ea033382..42ce436be 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -443,4 +443,27 @@
 			android:theme="@style/BriarTheme" />
 
 	</application>
+
+	<queries>
+		<package android:name="info.guardianproject.ripple" />
+		<package android:name="com.huawei.systemmanager" />
+
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="https" />
+		</intent>
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="http" />
+		</intent>
+		<!-- white-listing the intents below does not seem necessary,
+		but they are still included in case modified Android versions require it -->
+		<intent>
+			<action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
+		</intent>
+		<intent>
+			<action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
+		</intent>
+	</queries>
+
 </manifest>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
index 2f4f1ac6a..e37fbaa5b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
@@ -82,6 +82,7 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
 		entries.add(0, getString(R.string.panic_app_setting_none));
 		entryValues.add(0, PACKAGE_NAME_NONE);
 
+		// only info.guardianproject.ripple is whitelisted in manifest
 		for (ResolveInfo resolveInfo : PanicResponder.resolveTriggerApps(pm)) {
 			if (resolveInfo.activityInfo == null)
 				continue;