Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '909-restrict-access-to-panic-prefs' into 'master'

Browse Source 
Don't allow other apps to open the panic prefs activity

See merge request !503
This commit is contained in:
akwizgran
2017-03-31 08:25:21 +00:00
parent da22d91ef3 8e1ada4cdc
commit f039bd1239
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,13 +357,12 @@
<activity <activity
android:name=".android.panic.PanicPreferencesActivity" android:name=".android.panic.PanicPreferencesActivity"
android:label="@string/panic_setting"> android:label="@string/panic_setting"
<intent-filter> android:parentActivityName=".android.settings.SettingsActivity">
<action android:name="info.guardianproject.panic.action.CONNECT"/> <meta-data
<action android:name="info.guardianproject.panic.action.DISCONNECT"/> android:name="android.support.PARENT_ACTIVITY"
android:value=".android.settings.SettingsActivity"
<category android:name="android.intent.category.DEFAULT"/> />
</intent-filter>
</activity> </activity>
<activity <activity