diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:22 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:22 +0200 |
| commit | 1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc (patch) | |
| tree | add2f0d85813f9ece1be3c926b4ae8f221d7cf47 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | d6d678dae3ed5d794a9aa5e289197d264f6a7ff9 (diff) | |
| parent | c442d3bd0d3bac96614d3d5c0e833a42cab4706e (diff) | |
| download | open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.gz open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.bz2 open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.zip | |
Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
OpenKeychain/src/main/res/menu/decrypt_menu.xml
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 f72506144..5280b3047 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -628,6 +628,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"> |