diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-11 16:50:18 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-11 16:50:18 +0300 |
| commit | b362668f8144f07b2bd388ccae4d52dca1590396 (patch) | |
| tree | b259266ade960e65cc1021669b34b5c326650620 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 39849c2c572e23341d3fda260e72d4fc8367a68d (diff) | |
| parent | 26a73724548797cec791ea4b622e5e8baea06980 (diff) | |
| download | open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.tar.gz open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.tar.bz2 open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.zip | |
Merge pull request #1865 from vanitasvitae/master
Fixed 'Orbot appears not to be running' (#1792)
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index bead69c58..0ab1e6aff 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -104,6 +104,12 @@ <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/> </intent-filter> </receiver> + <!-- broadcast receiver for Orbots status --> + <receiver android:name=".util.orbot.OrbotStatusReceiver"> + <intent-filter> + <action android:name="org.torproject.android.intent.action.STATUS"/> + </intent-filter> + </receiver> <!-- singleTop for NFC dispatch, see SecurityTokenOperationActivity --> <activity android:name=".ui.MainActivity" |