Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1753-query-filter' into 'master'

Browse Source 
Define manifest <queries> allowing us to make intent queries on API 30+

See merge request briar/briar!1323
This commit is contained in:
akwizgran
2021-01-05 14:47:00 +00:00
parent 9a25ad892d 98788c7c80
commit 04517e942e
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
briar-android/src/main/AndroidManifest.xml
View File

@@ -449,4 +449,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>

1
briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
View File

@@ -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;