diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-20 18:33:45 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-20 18:33:45 +0200 |
commit | 71aeffdfc8d409bed99ee6a56fa8343446e66a83 (patch) | |
tree | 8f1abcb0996ee84ee98758829ee62677d3e69977 /OpenKeychain/src/main/AndroidManifest.xml | |
parent | f2d3abd4c9cd521754d932a057356b511247be00 (diff) | |
parent | 91443c2f43615f25cd412007d89fe5a8ccc082bb (diff) | |
download | open-keychain-71aeffdfc8d409bed99ee6a56fa8343446e66a83.tar.gz open-keychain-71aeffdfc8d409bed99ee6a56fa8343446e66a83.tar.bz2 open-keychain-71aeffdfc8d409bed99ee6a56fa8343446e66a83.zip |
Merge pull request #1207 from adithyaphilip/register-keyserver-urls
support for handling keyserver urls from browser, added documentation
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index d0f50d5cc..8c66176fd 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -624,6 +624,23 @@ <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.bin" /> </intent-filter> + <!-- VIEW from keyserver urls opened in a browser --> + <intent-filter android:label="@string/intent_import_key"> + <action android:name="android.intent.action.VIEW" /> + + <category android:name="android.intent.category.BROWSABLE" /> + <category android:name="android.intent.category.DEFAULT" /> + + <data android:scheme="https"/> + <data android:scheme="http"/> + <!-- if we don't specify a host, pathPattern will be ignored--> + <data android:host="*"/> + <!-- convention for keyserver paths specified by internet draft + draft-shaw-openpgp-hkp-00.txt + (http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00#section-3) --> + <data android:pathPattern="/pks/lookup.*"/> + </intent-filter> + <!-- Keychain's own Actions --> <!-- IMPORT_KEY with files TODO: does this work? --> <intent-filter android:label="@string/intent_import_key"> |